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 /exec.c | |
| parent | cde7fc31dee7a7bac96779f77a21825b187871d3 (diff) | |
| parent | ce76b8a8ab61255f9029b5244b885cb8bef60e97 (diff) | |
| download | focaccia-qemu-4a1cc6800a54b154a214e7ecf36c63c8c81f2074.tar.gz focaccia-qemu-4a1cc6800a54b154a214e7ecf36c63c8c81f2074.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/xen' into staging
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/exec.c b/exec.c index 06889bdf18..fbcb1bf028 100644 --- a/exec.c +++ b/exec.c @@ -2916,7 +2916,8 @@ static ram_addr_t last_ram_offset(void) } 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 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, } #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 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, 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) |