Merge remote-tracking branch 'qemu-kvm/memory/core' into staging
This commit is contained in:
commit
950c671df1
5
memory.c
5
memory.c
|
@ -304,7 +304,7 @@ static void as_memory_range_add(AddressSpace *as, FlatRange *fr)
|
|||
}
|
||||
|
||||
if (!fr->readable) {
|
||||
phys_offset &= TARGET_PAGE_MASK;
|
||||
phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
|
||||
}
|
||||
|
||||
cpu_register_physical_memory_log(fr->addr.start,
|
||||
|
@ -962,11 +962,14 @@ void memory_region_init_alias(MemoryRegion *mr,
|
|||
|
||||
void memory_region_init_rom_device(MemoryRegion *mr,
|
||||
const MemoryRegionOps *ops,
|
||||
void *opaque,
|
||||
DeviceState *dev,
|
||||
const char *name,
|
||||
uint64_t size)
|
||||
{
|
||||
memory_region_init(mr, name, size);
|
||||
mr->ops = ops;
|
||||
mr->opaque = opaque;
|
||||
mr->terminates = true;
|
||||
mr->destructor = memory_region_destructor_rom_device;
|
||||
mr->ram_addr = qemu_ram_alloc(dev, name, size);
|
||||
|
|
Loading…
Reference in a new issue