Commit 950c671d authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

parents 751d63c3 b5fe14cc

memory.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

memory.h

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ void memory_region_init_alias(MemoryRegion *mr, 
 */

void memory_region_init_rom_device(MemoryRegion *mr,

                                   const MemoryRegionOps *ops,

                                   void *opaque,

                                   DeviceState *dev, /* FIXME: layering violation */

                                   const char *name,

                                   uint64_t size);