summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:45:57 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:45:57 -0500
commit97fdb9410bb5398fd33f51a37e637d697ace9f73 (patch)
tree4ef6c9bacf43f9da6aadd5168220a7203dd29b35 /hw/i386/pc_piix.c
parent964737ea195de1560f3bcf55b8b6d4f7d0d4a619 (diff)
parent254c12825f93f405658ca3366cd34f8a8ad23511 (diff)
downloadhqemu-97fdb9410bb5398fd33f51a37e637d697ace9f73.zip
hqemu-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 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 147d08c..907792b 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -89,7 +89,7 @@ static void pc_init1(QEMUMachineInitArgs *args,
FWCfgState *fw_cfg = NULL;
PcGuestInfo *guest_info;
- if (xen_enabled() && xen_hvm_init() != 0) {
+ if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) {
fprintf(stderr, "xen hardware virtual machine initialisation failed\n");
exit(1);
}
OpenPOWER on IntegriCloud