From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCmNp-0007xv-Vd for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCmNk-0005Sv-TD for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:10:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCmNk-0005Sf-BN for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:10:40 -0400 Date: Thu, 31 Jul 2014 11:10:50 +0200 From: "Michael S. Tsirkin" Message-ID: <20140731091050.GA31192@redhat.com> References: <1406788299-8394-1-git-send-email-tiejun.chen@intel.com> <1406788299-8394-3-git-send-email-tiejun.chen@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1406788299-8394-3-git-send-email-tiejun.chen@intel.com> Subject: Re: [Qemu-devel] [v2][PATCH 2/5] hw:pci-host:piix: split i440fx_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tiejun Chen Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com On Thu, Jul 31, 2014 at 02:31:36PM +0800, Tiejun Chen wrote: > We'd like to split i440fx_init and then we can share something > with other stuff. > > Signed-off-by: Tiejun Chen I think this is too much work for very little benefit. Just pass const char *type to i440fx_init. --> i440fx: make type configurable at run-time Xen wants to supply a different pci host device, inheriting i440fx. Make this configurable. Signed-off-by: Michael S. Tsirkin -- diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index be8fdfe..72e612b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -230,7 +230,8 @@ extern int no_hpet; struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, +PCIBus *i440fx_init(const char *type, + PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 31125b7..5fefde6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -194,7 +194,8 @@ static void pc_init1(MachineState *machine, } if (pci_enabled) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi, + pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, + &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, above_4g_mem_size, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index e0e0946..f0c5b5d 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -305,7 +305,8 @@ static int i440fx_initfn(PCIDevice *dev) return 0; } -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, +PCIBus *i440fx_init(const char *type, + PCII440FXState **pi440fx_state, int *piix3_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, @@ -325,7 +326,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, unsigned i; I440FXState *i440fx; - dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); + dev = qdev_create(NULL, type); s = PCI_HOST_BRIDGE(dev); b = pci_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS);