From patchwork Mon Sep 9 16:27:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 273617 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 321572C009E for ; Tue, 10 Sep 2013 02:28:14 +1000 (EST) Received: from localhost ([::1]:52697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ4Jv-0000vl-NJ for incoming@patchwork.ozlabs.org; Mon, 09 Sep 2013 12:28:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ4Jb-0000vM-38 for qemu-devel@nongnu.org; Mon, 09 Sep 2013 12:27:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJ4JW-00079d-FE for qemu-devel@nongnu.org; Mon, 09 Sep 2013 12:27:51 -0400 Received: from smtp.citrix.com ([66.165.176.89]:29433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ4JW-00079R-8y for qemu-devel@nongnu.org; Mon, 09 Sep 2013 12:27:46 -0400 X-IronPort-AV: E=Sophos;i="4.90,872,1371081600"; d="scan'208";a="52051275" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 09 Sep 2013 16:27:45 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Mon, 9 Sep 2013 12:27:45 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1VJ4JK-0005ot-QH; Mon, 09 Sep 2013 17:27:34 +0100 From: Stefano Stabellini To: Date: Mon, 9 Sep 2013 17:27:12 +0100 Message-ID: <1378744032-24952-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Anthony PERARD , xen-devel@lists.xensource.com, qemu-devel@nongnu.org, Stefano Stabellini Subject: [Qemu-devel] [PULL 2/2] pc_q35: Initialize Xen. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Anthony PERARD Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_q35.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d7b7c3b..464a892 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);