diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:12 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:12 -0600 |
commit | 4a1cc6800a54b154a214e7ecf36c63c8c81f2074 (patch) | |
tree | fabd1db70f86cce4b49f3a32e880f9e22b56ab0a /memory.c | |
parent | cde7fc31dee7a7bac96779f77a21825b187871d3 (diff) | |
parent | ce76b8a8ab61255f9029b5244b885cb8bef60e97 (diff) |
Merge remote-tracking branch 'qemu-kvm/memory/xen' into staging
Diffstat (limited to 'memory.c')
-rw-r--r-- | memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -997,7 +997,7 @@ void memory_region_init_ram(MemoryRegion *mr, memory_region_init(mr, name, size); mr->terminates = true; mr->destructor = memory_region_destructor_ram; - mr->ram_addr = qemu_ram_alloc(dev, name, size); + mr->ram_addr = qemu_ram_alloc(dev, name, size, mr); mr->backend_registered = true; } @@ -1010,7 +1010,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, memory_region_init(mr, name, size); mr->terminates = true; mr->destructor = memory_region_destructor_ram_from_ptr; - mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr); + mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr, mr); mr->backend_registered = true; } @@ -1037,7 +1037,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, mr->opaque = opaque; mr->terminates = true; 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, mr); mr->ram_addr |= cpu_register_io_memory(memory_region_read_thunk, memory_region_write_thunk, mr, |