]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
pc_q35: Initialize Xen.
authorAnthony PERARD <anthony.perard@citrix.com>
Mon, 9 Sep 2013 16:15:53 +0000 (16:15 +0000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 25 Sep 2013 03:47:27 +0000 (22:47 -0500)
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/i386/pc_q35.c

index 10e770e36289dfc56f4b2a94e1d7cacd04c15cad..dd13130934bcf1a3fe23e0d7e4109fd8b62637f0 100644 (file)
@@ -81,6 +81,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);