aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:45:12 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:45:12 -0600
commit4a1cc6800a54b154a214e7ecf36c63c8c81f2074 (patch)
treefabd1db70f86cce4b49f3a32e880f9e22b56ab0a /hw
parentcde7fc31dee7a7bac96779f77a21825b187871d3 (diff)
parentce76b8a8ab61255f9029b5244b885cb8bef60e97 (diff)
Merge remote-tracking branch 'qemu-kvm/memory/xen' into staging
Diffstat (limited to 'hw')
-rw-r--r--hw/xen.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xen.h b/hw/xen.h
index 21621115e4..f9f66e83ef 100644
--- a/hw/xen.h
+++ b/hw/xen.h
@@ -44,7 +44,9 @@ void xen_vcpu_init(void);
void xenstore_store_pv_console_info(int i, struct CharDriverState *chr);
#if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY)
-void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size);
+struct MemoryRegion;
+void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
+ struct MemoryRegion *mr);
#endif
#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400