From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI1F3-0007cS-OA for qemu-devel@nongnu.org; Thu, 14 Aug 2014 16:03:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI1Ex-00027T-Jg for qemu-devel@nongnu.org; Thu, 14 Aug 2014 16:03:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI1Ex-00027P-AU for qemu-devel@nongnu.org; Thu, 14 Aug 2014 16:03:15 -0400 Date: Thu, 14 Aug 2014 22:03:49 +0200 From: "Michael S. Tsirkin" Message-ID: <20140814200349.GA12179@redhat.com> References: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> <1408044362-11621-34-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1408044362-11621-34-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 33/33] piix: Move pc_xen_hvm_init() closer to xenfv_machine_class_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , qemu-devel@nongnu.org, Igor Mammedov , Andreas =?iso-8859-1?Q?F=E4rber?= On Thu, Aug 14, 2014 at 04:26:02PM -0300, Eduardo Habkost wrote: > Put all the Xen code in a single place. > > Signed-off-by: Eduardo Habkost Would apply to the new igd passthrough machine type as well? > --- > hw/i386/pc_piix.c | 26 ++++++++++++-------------- > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 293422b..89ecb54 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -291,20 +291,6 @@ static void pc_init1(MachineState *machine) > } > } > > -#ifdef CONFIG_XEN > -static void pc_xen_hvm_init(MachineState *machine) > -{ > - PCIBus *bus; > - > - pc_init1(machine); > - > - bus = pci_find_primary_bus(); > - if (bus != NULL) { > - pci_create_simple(bus, -1, "xen-platform"); > - } > -} > -#endif > - > static void pc_i440fx_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -890,6 +876,18 @@ static const TypeInfo isapc_machine_type_info = { > }; > > #ifdef CONFIG_XEN > +static void pc_xen_hvm_init(MachineState *machine) > +{ > + PCIBus *bus; > + > + pc_init1(machine); > + > + bus = pci_find_primary_bus(); > + if (bus != NULL) { > + pci_create_simple(bus, -1, "xen-platform"); > + } > +} > + > static void xenfv_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > -- > 1.9.3