From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 9 Sep 2013 16:15:53 +0000 (+0000)
Subject: pc_q35: Initialize Xen.
X-Git-Tag: qemu-xen-4.4.0-rc1~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b40187fc0ce1c0ffad51cd0f149a4e5bed332653;p=qemu-upstream-4.4-testing.git

pc_q35: Initialize Xen.

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)
---

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 10e770e36..dd1313093 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -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);