commit fce537d4a741521ac182d54465c568b101b9a71e
author Avi Kivity <avi@redhat.com> Sun Dec 18 15:48:55 2011 +0200
committer Avi Kivity <avi@redhat.com> Mon Dec 19 17:23:24 2011 +0200
tree 5eaa74102ac97de28b109d285c5eef65726d8eb5
parent 5ab97b7f81dccccee03a3f1d03a4d09a27f0eeff

memory, xen: pass MemoryRegion to xen_ram_alloc()

Currently xen_ram_alloc() relies on ram_addr, which is going away.
Give it something else to use as a cookie.

Signed-off-by: Avi Kivity <avi@redhat.com>

exec.c

diff --git a/exec.c b/exec.c
index 06889bd..fbcb1bf 100644
--- a/exec.c
+++ b/exec.c
@@ -2916,7 +2916,8 @@
 }
 
 ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
-                                   ram_addr_t size, void *host)
+                                   ram_addr_t size, void *host,
+                                   MemoryRegion *mr)
 {
     RAMBlock *new_block, *block;
 
@@ -2972,7 +2973,7 @@
             }
 #else
             if (xen_enabled()) {
-                xen_ram_alloc(new_block->offset, size);
+                xen_ram_alloc(new_block->offset, size, mr);
             } else {
                 new_block->host = qemu_vmalloc(size);
             }
@@ -2995,9 +2996,10 @@
     return new_block->offset;
 }
 
-ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size)
+ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size,
+                          MemoryRegion *mr)
 {
-    return qemu_ram_alloc_from_ptr(dev, name, size, NULL);
+    return qemu_ram_alloc_from_ptr(dev, name, size, NULL, mr);
 }
 
 void qemu_ram_free_from_ptr(ram_addr_t addr)