ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qemu-kvm/memory/core' into staging

This commit is contained in:
Anthony Liguori 2011-08-29 08:48:43 -05:00
parent 751d63c371 b5fe14cc7e
commit 950c671df1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
memory.c
View File

@ -304,7 +304,7 @@ static void as_memory_range_add(AddressSpace *as, FlatRange *fr)
} }
if (!fr->readable) { if (!fr->readable) {
phys_offset &= TARGET_PAGE_MASK; phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
} }
cpu_register_physical_memory_log(fr->addr.start, 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, void memory_region_init_rom_device(MemoryRegion *mr,
const MemoryRegionOps *ops, const MemoryRegionOps *ops,
void *opaque,
DeviceState *dev, DeviceState *dev,
const char *name, const char *name,
uint64_t size) uint64_t size)
{ {
memory_region_init(mr, name, size); memory_region_init(mr, name, size);
mr->ops = ops;
mr->opaque = opaque;
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_rom_device; mr->destructor = memory_region_destructor_rom_device;
mr->ram_addr = qemu_ram_alloc(dev, name, size); mr->ram_addr = qemu_ram_alloc(dev, name, size);

1
memory.h
View File

@ -235,6 +235,7 @@ void memory_region_init_alias(MemoryRegion *mr,
*/ */
void memory_region_init_rom_device(MemoryRegion *mr, void memory_region_init_rom_device(MemoryRegion *mr,
const MemoryRegionOps *ops, const MemoryRegionOps *ops,
void *opaque,
DeviceState *dev, /* FIXME: layering violation */ DeviceState *dev, /* FIXME: layering violation */
const char *name, const char *name,
uint64_t size); uint64_t size);