diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:45:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:45:57 -0500 |
| commit | 97fdb9410bb5398fd33f51a37e637d697ace9f73 (patch) | |
| tree | 4ef6c9bacf43f9da6aadd5168220a7203dd29b35 /include | |
| parent | 964737ea195de1560f3bcf55b8b6d4f7d0d4a619 (diff) | |
| parent | 254c12825f93f405658ca3366cd34f8a8ad23511 (diff) | |
| download | qemu-97fdb9410bb5398fd33f51a37e637d697ace9f73.tar.gz | |
Merge remote-tracking branch 'sstabellini/xen-2013-09-09' into staging
# By Anthony PERARD
# Via Stefano Stabellini
* sstabellini/xen-2013-09-09:
pc_q35: Initialize Xen.
pc: Initializing ram_memory under Xen.
Message-id: alpine.DEB.2.02.1309091718030.6397@kaball.uk.xensource.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/xen.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6d42dd1bd1..e1f88bf9cf 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); -int xen_hvm_init(void); +int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -struct MemoryRegion; void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif -struct MemoryRegion; void xen_register_framebuffer(struct MemoryRegion *mr); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 |