From patchwork Wed Sep 25 12:57:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 277846 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 A36E42C032F for ; Wed, 25 Sep 2013 23:10:02 +1000 (EST) Received: from localhost ([::1]:52467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOoqu-0002xa-DE for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 09:10:00 -0400 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 Received: from mail-qa0-x229.google.com ([2607:f8b0:400d:c00::229]:43352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOogD-0000MW-Kv; Wed, 25 Sep 2013 08:58:57 -0400 Received: by mail-qa0-f41.google.com with SMTP id ii20so3394300qab.0 for ; Wed, 25 Sep 2013 05:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VdrFIDVCuILgK6VGhuclCfu3HwfOgOtVq7ID8lpqydg=; b=TKmDQTGdU5F6PODY3YVmu48BfVNyF/QEH8HbUUKiImA2Y+i8Jq4LwQIcxBA9pbnj4a gnvpikYURottNm1OU+q6hs0pZBczb/eRDylkuKowjx7s1P4DO9U6zi6zo4KUTZiYlzuj EIPv5+PyOWG0R2mH+I/qe9ynhNFUAN6PNhIgwsut+w5mwbca2ch7y4PZbR2A87sP6jHa xzwCjT09tYZtUGHnyTLX8ZAU8PRqMednI5lYcBzWcn1wydOegAwZDCBKW5kTtnzyPXo9 blT9PyH/iohKnEUxMXM+tn+O2St7m1kR/M40LBGcHEBYSbWT9dlZebGayOWe/GnwdPMg utHg== X-Received: by 10.49.47.84 with SMTP id b20mr1979853qen.83.1380113936924; Wed, 25 Sep 2013 05:58:56 -0700 (PDT) Received: from loki.morrigu.org ([70.114.130.150]) by mx.google.com with ESMTPSA id g2sm65250216qaf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 05:58:56 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 07:57:57 -0500 Message-Id: <1380113886-16845-30-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::229 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 29/38] 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 (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);