From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosSI-00008D-8E for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UosSF-0005VL-Uv for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:44:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosSF-0005V7-N0 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:43:59 -0400 Date: Tue, 18 Jun 2013 11:43:54 +0200 From: Igor Mammedov Message-ID: <20130618114354.08afc4a4@thinkpad> In-Reply-To: <1371472598-20330-2-git-send-email-paul.durrant@citrix.com> References: <1371472598-20330-1-git-send-email-paul.durrant@citrix.com> <1371472598-20330-2-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] Allow use of pc machine type (accel=xen) for Xen HVM domains. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Durrant Cc: qemu-devel@nongnu.org, xen-devel@lists.xen.org On Mon, 17 Jun 2013 13:36:36 +0100 Paul Durrant wrote: > Xen HVM domains normally spawn QEMU with a dedicated xenfv machine type. The > initialization code for this machine type can easily be pulled into the > generic pc initialization code and guarded with a test for whether the xen > accelerator options is specified, which is more consistent with the way > other accelerators are used. > > Signed-off-by: Paul Durrant > --- > hw/i386/pc_piix.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index d618570..6d3f161 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -91,6 +91,10 @@ static void pc_init1(MemoryRegion *system_memory, > DeviceState *icc_bridge; > FWCfgState *fw_cfg = NULL; > > + if (xen_hvm_init() != 0) { > + hw_error("xen hardware virtual machine initialisation failed"); > + } > + would it work if starting QEMU without xen? > icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); > object_property_add_child(qdev_get_machine(), "icc-bridge", > OBJECT(icc_bridge), NULL); > @@ -320,9 +324,6 @@ static void pc_init_isa(QEMUMachineInitArgs *args) > #ifdef CONFIG_XEN > static void pc_xen_hvm_init(QEMUMachineInitArgs *args) > { > - if (xen_hvm_init() != 0) { > - hw_error("xen hardware virtual machine initialisation failed"); > - } > pc_init_pci(args); > } > #endif > -- > 1.7.10.4 > > -- Regards, Igor