From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOogP-0003qp-6c for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOogD-0000Mq-Rw for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:59:09 -0400 Sender: fluxion From: Michael Roth Date: Wed, 25 Sep 2013 07:57:57 -0500 Message-Id: <1380113886-16845-30-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 29/38] pc_q35: Initialize Xen. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Anthony PERARD Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin (cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511) Signed-off-by: Michael Roth --- hw/i386/pc_q35.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..dd13130 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); -- 1.7.9.5