From 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 9 Sep 2013 16:15:52 +0000 Subject: pc: Initializing ram_memory under Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin CC: qemu-stable@nongnu.org --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 275e39595d..5bb493724b 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); } -- cgit v1.2.3 From 254c12825f93f405658ca3366cd34f8a8ad23511 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 9 Sep 2013 16:15:53 +0000 Subject: pc_q35: Initialize Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_q35.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'hw') diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d7b7c3bf9a..464a8924c8 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -76,6 +76,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); object_property_add_child(qdev_get_machine(), "icc-bridge", OBJECT(icc_bridge), NULL); -- cgit v1.2.3