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 /xen-stub.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 'xen-stub.c')
| -rw-r--r-- | xen-stub.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xen-stub.c b/xen-stub.c index efe2ab55f2..5fa400faae 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -8,6 +8,7 @@ #include "qemu-common.h" #include "hw/xen.h" +#include "memory.h" void xenstore_store_pv_console_info(int i, CharDriverState *chr) { @@ -30,7 +31,7 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level) { } -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size) +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) { } |