From patchwork Thu Jul 31 06:31:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 375138 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BE80C14011D for ; Thu, 31 Jul 2014 16:36:01 +1000 (EST) Received: from localhost ([::1]:54487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCjy3-0004o5-Rz for incoming@patchwork.ozlabs.org; Thu, 31 Jul 2014 02:35:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCjxF-0003WY-HZ for qemu-devel@nongnu.org; Thu, 31 Jul 2014 02:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCjx3-000881-KA for qemu-devel@nongnu.org; Thu, 31 Jul 2014 02:35:09 -0400 Received: from mga14.intel.com ([192.55.52.115]:9761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCjx3-00087p-EU for qemu-devel@nongnu.org; Thu, 31 Jul 2014 02:34:57 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 30 Jul 2014 23:28:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,770,1400050800"; d="scan'208";a="569811616" Received: from tchen0-linux.bj.intel.com ([10.238.154.58]) by fmsmga001.fm.intel.com with ESMTP; 30 Jul 2014 23:34:23 -0700 From: Tiejun Chen To: mst@redhat.com Date: Thu, 31 Jul 2014 14:31:36 +0800 Message-Id: <1406788299-8394-3-git-send-email-tiejun.chen@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406788299-8394-1-git-send-email-tiejun.chen@intel.com> References: <1406788299-8394-1-git-send-email-tiejun.chen@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [v2][PATCH 2/5] hw:pci-host:piix: split i440fx_init 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 We'd like to split i440fx_init and then we can share something with other stuff. Signed-off-by: Tiejun Chen --- hw/pci-host/piix.c | 91 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 16 deletions(-) v2: * New patch to separate i440fx_init diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index e0e0946..a9a5570 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -305,25 +305,14 @@ static int i440fx_initfn(PCIDevice *dev) return 0; } -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, - int *piix3_devfn, - ISABus **isa_bus, qemu_irq *pic, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_address_space, - MemoryRegion *ram_memory) +static void i440fx_pci_host_create(DeviceState **dev_bridge, + PCIBus **bus_bridge, + MemoryRegion *address_space_io, + MemoryRegion *pci_address_space) { DeviceState *dev; PCIBus *b; - PCIDevice *d; PCIHostState *s; - PIIX3State *piix3; - PCII440FXState *f; - unsigned i; - I440FXState *i440fx; dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); s = PCI_HOST_BRIDGE(dev); @@ -333,8 +322,48 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL); qdev_init_nofail(dev); - d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE); + *bus_bridge = b; + *dev_bridge = dev; +} + +static PCIDevice *i440fx_pci0_create(PCIBus **bus_bridge, + const char *type, + PCII440FXState **pi440fx_state) +{ + PCIBus *b; + PCIDevice *d; + + b = *bus_bridge; + + d = pci_create_simple(b, 0, type); *pi440fx_state = I440FX_PCI_DEVICE(d); + return d; +} + +static PCIBus *i440fx_pci_setup(DeviceState **dev_bridge, + PCIBus **bus_bridge, + PCIDevice *d, + PCII440FXState **pi440fx_state, + int *piix3_devfn, + ISABus **isa_bus, qemu_irq *pic, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + ram_addr_t ram_size, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *pci_address_space, + MemoryRegion *ram_memory) +{ + DeviceState *dev; + PCIBus *b; + PCII440FXState *f; + I440FXState *i440fx; + unsigned i; + PIIX3State *piix3; + + b = *bus_bridge; + dev = *dev_bridge; + f = *pi440fx_state; f->system_memory = address_space_mem; f->pci_address_space = pci_address_space; @@ -392,6 +421,36 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, return b; } +PCIBus *i440fx_init(PCII440FXState **pi440fx_state, + int *piix3_devfn, + ISABus **isa_bus, + qemu_irq *pic, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + ram_addr_t ram_size, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *pci_address_space, + MemoryRegion *ram_memory) +{ + PCIDevice *d; + DeviceState *dev_bridge; + PCIBus *bus_bridge; + + i440fx_pci_host_create(&dev_bridge, &bus_bridge, address_space_io, + pci_address_space); + + d = i440fx_pci0_create(&bus_bridge, TYPE_I440FX_PCI_DEVICE, pi440fx_state); + + bus_bridge = i440fx_pci_setup(&dev_bridge, &bus_bridge, d, pi440fx_state, + piix3_devfn, isa_bus, pic, address_space_mem, + address_space_io, ram_size, below_4g_mem_size, + above_4g_mem_size, pci_address_space, + ram_memory); + + return bus_bridge; +} + PCIBus *find_i440fx(void) { PCIHostState *s = OBJECT_CHECK(PCIHostState,