From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492553961334377.23365875995046; Tue, 18 Apr 2017 15:19:21 -0700 (PDT) Received: from localhost ([::1]:44866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bSx-0001ZI-Ra for importer@patchew.org; Tue, 18 Apr 2017 18:19:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRK-0000d4-Lh for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRJ-0002Qm-SZ for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46146) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRJ-0002QQ-MX for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B499D3D95F; Tue, 18 Apr 2017 22:17:36 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79B5E17B92; Tue, 18 Apr 2017 22:17:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B499D3D95F Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B499D3D95F From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:19 -0300 Message-Id: <20170418221724.5707-2-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 18 Apr 2017 22:17:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 1/6] pci: Inline pci_host_bus_register() inside pci_bus_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, David Gibson , Laszlo Ersek , Marcel Apfelbaum , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's no need for a separate function just to append an item to pci_host_bridges. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson Reviewed-by: Marcel Apfelbaum --- hw/pci/pci.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 259483b1c0..328f36cd21 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -312,13 +312,6 @@ static void pcibus_reset(BusState *qbus) } } =20 -static void pci_host_bus_register(DeviceState *host) -{ - PCIHostState *host_bridge =3D PCI_HOST_BRIDGE(host); - - QLIST_INSERT_HEAD(&pci_host_bridges, host_bridge, next); -} - PCIBus *pci_find_primary_bus(void) { PCIBus *primary_bus =3D NULL; @@ -369,6 +362,8 @@ static void pci_bus_init(PCIBus *bus, DeviceState *pare= nt, MemoryRegion *address_space_io, uint8_t devfn_min) { + PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); + assert(PCI_FUNC(devfn_min) =3D=3D 0); bus->devfn_min =3D devfn_min; bus->address_space_mem =3D address_space_mem; @@ -377,7 +372,7 @@ static void pci_bus_init(PCIBus *bus, DeviceState *pare= nt, /* host bridge */ QLIST_INIT(&bus->child); =20 - pci_host_bus_register(parent); + QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); } =20 bool pci_bus_is_express(PCIBus *bus) --=20 2.11.0.259.g40922b1 From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149255410542373.00583026057984; Tue, 18 Apr 2017 15:21:45 -0700 (PDT) Received: from localhost ([::1]:44881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bVH-0003Uq-Ve for importer@patchew.org; Tue, 18 Apr 2017 18:21:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRS-0000i9-I1 for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRP-0002T6-EE for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35338) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRP-0002Sh-4r for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2625231F3FD; Tue, 18 Apr 2017 22:17:42 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E21617DD4; Tue, 18 Apr 2017 22:17:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2625231F3FD Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2625231F3FD From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:20 -0300 Message-Id: <20170418221724.5707-3-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 18 Apr 2017 22:17:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 2/6] pci: Move pci_bus_init() logic to pci_bus_new_inplace() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, David Gibson , Laszlo Ersek , Marcel Apfelbaum , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of having 3 separate functions, just make pci_bus_new() a wrapper that allocates the object and calls pci_bus_new_inplace(). Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- hw/pci/pci.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 328f36cd21..0d28ee4e3f 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -357,24 +357,6 @@ const char *pci_root_bus_path(PCIDevice *dev) return rootbus->qbus.name; } =20 -static void pci_bus_init(PCIBus *bus, DeviceState *parent, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min) -{ - PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); - - assert(PCI_FUNC(devfn_min) =3D=3D 0); - bus->devfn_min =3D devfn_min; - bus->address_space_mem =3D address_space_mem; - bus->address_space_io =3D address_space_io; - - /* host bridge */ - QLIST_INIT(&bus->child); - - QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); -} - bool pci_bus_is_express(PCIBus *bus) { return object_dynamic_cast(OBJECT(bus), TYPE_PCIE_BUS); @@ -391,8 +373,20 @@ void pci_bus_new_inplace(PCIBus *bus, size_t bus_size,= DeviceState *parent, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename) { + PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); + qbus_create_inplace(bus, bus_size, typename, parent, name); - pci_bus_init(bus, parent, address_space_mem, address_space_io, devfn_m= in); + + assert(PCI_FUNC(devfn_min) =3D=3D 0); + bus->devfn_min =3D devfn_min; + bus->address_space_mem =3D address_space_mem; + bus->address_space_io =3D address_space_io; + + /* host bridge */ + QLIST_INIT(&bus->child); + + QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); + } =20 PCIBus *pci_bus_new(DeviceState *parent, const char *name, @@ -400,10 +394,11 @@ PCIBus *pci_bus_new(DeviceState *parent, const char *= name, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename) { - PCIBus *bus; + size_t bus_size =3D object_type_get_instance_size(typename); + PCIBus *bus =3D g_malloc(bus_size); =20 - bus =3D PCI_BUS(qbus_create(typename, parent, name)); - pci_bus_init(bus, parent, address_space_mem, address_space_io, devfn_m= in); + pci_bus_new_inplace(bus, bus_size, parent, name, address_space_mem, + address_space_io, devfn_min, typename); return bus; } =20 --=20 2.11.0.259.g40922b1 From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492554005271798.8462774147343; Tue, 18 Apr 2017 15:20:05 -0700 (PDT) Received: from localhost ([::1]:44868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bTf-00027U-Ls for importer@patchew.org; Tue, 18 Apr 2017 18:20:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRk-0000qj-PY for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRd-0002XR-Aa for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRW-0002V0-S0; Tue, 18 Apr 2017 18:17:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 848EEC04B92B; Tue, 18 Apr 2017 22:17:49 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 976A25C541; Tue, 18 Apr 2017 22:17:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 848EEC04B92B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 848EEC04B92B From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:21 -0300 Message-Id: <20170418221724.5707-4-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 18 Apr 2017 22:17:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 3/6] pci: Rename and change signatures of pci_bus_new() & related functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , Paul Burton , "Michael S. Tsirkin" , aik@ozlabs.ru, Yongbok Kim , qemu-ppc@nongnu.org, Alexander Graf , Scott Wood , Christian Borntraeger , qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , David Gibson , Richard Henderson , Laszlo Ersek , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" pci_bus_new*() and pci_register_bus() work only when the 'parent' argument is a PCI_HOST_BRIDGE object. Rename them to reflect that they are meant to initialize a bus that's in a PCI host bridge. The new function names are: * pci_host_bus_init() (replacing pci_bus_new()) * pci_host_bus_init_inplace() (replacing pci_bus_new_inplace()) * pci_host_bus_init_irqs() (replacing pci_register_bus()) This also replaces the DeviceState *parent parameter on those functions with a PCIHostState *phb parameter. This was implemented using the following Coccinelle patch: // 1) Rename pci_bus_new(): @@ typedef PCIBus; typedef PCIHostState; typedef DeviceState; identifier parent; parameter list ARGS; @@ -PCIBus *pci_bus_new(DeviceState *parent, ARGS); +PCIBus *pci_host_bus_init(PCIHostState *phb, ARGS); @@ typedef PCIBus; typedef PCIHostState; identifier parent; parameter list ARGS; @@ -PCIBus *pci_bus_new(DeviceState *parent, ARGS) +PCIBus *pci_host_bus_init(PCIHostState *phb, ARGS) { <... -parent +DEVICE(phb) ...> } @@ expression parent; expression list ARGS; @@ -pci_bus_new(parent, ARGS) +pci_host_bus_init(PCI_HOST_BRIDGE(parent), ARGS) // 2) Rename pci_bus_new_inplace(): @@ typedef PCIBus; typedef PCIHostState; typedef DeviceState; identifier bus, bus_size, parent; parameter list ARGS; @@ -void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, - DeviceState *parent, ARGS); +void pci_host_bus_init_inplace(PCIHostState *phb, + PCIBus *bus, size_t bus_size, ARGS); @@ typedef PCIBus; typedef PCIHostState; typedef DeviceState; identifier bus, bus_size, parent; parameter list ARGS; @@ -void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, - DeviceState *parent, ARGS) +void pci_host_bus_init_inplace(PCIHostState *phb, + PCIBus *bus, size_t bus_size, ARGS) { -PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); <... -parent +DEVICE(phb) ...> } @@ expression bus, bus_size, parent; expression list ARGS; @@ -pci_bus_new_inplace(bus, bus_size, parent, ARGS) +pci_host_bus_init_inplace(PCI_HOST_BRIDGE(parent), bus, bus_size, ARGS) // 3) Rename pci_register_bus(): @@ typedef PCIBus; typedef PCIHostState; identifier parent; parameter list ARGS; @@ -PCIBus *pci_register_bus(DeviceState *parent, ARGS); +PCIBus *pci_host_bus_init_irqs(PCIHostState *phb, ARGS); @@ typedef PCIBus; typedef PCIHostState; identifier parent; parameter list ARGS; @@ -PCIBus *pci_register_bus(DeviceState *parent, ARGS) +PCIBus *pci_host_bus_init_irqs(PCIHostState *phb, ARGS) { <... -parent +DEVICE(phb) ...> } @@ expression parent; expression list ARGS; @@ -pci_register_bus(parent, ARGS) +pci_host_bus_init_irqs(PCI_HOST_BRIDGE(parent), ARGS) // 5) fix redundant casts on the resulting code: @@ expression o; @@ -PCI_HOST_BRIDGE(DEVICE(o)) +PCI_HOST_BRIDGE(o) @@ expression o; @@ -DEVICE(PCI_HOST_BRIDGE(o)) +DEVICE(o) @@ idexpression PCIHostState *phb; @@ -PCI_HOST_BRIDGE(phb) +phb @@ idexpression PCIHostState *phb; expression dev; @@ phb =3D PCI_HOST_BRIDGE(dev); <... -PCI_HOST_BRIDGE(dev) +phb ...> @@ identifier phb; identifier dev; @@ PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); <... -PCI_HOST_BRIDGE(dev) +phb ...> Cc: Alexander Graf Cc: Aurelien Jarno Cc: Christian Borntraeger Cc: Cornelia Huck Cc: David Gibson Cc: "Herv=C3=A9 Poussineau" Cc: Marcel Apfelbaum Cc: "Michael S. Tsirkin" Cc: Paul Burton Cc: Peter Maydell Cc: Richard Henderson Cc: Scott Wood Cc: Yongbok Kim Cc: qemu-arm@nongnu.org Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost --- include/hw/pci/pci.h | 31 ++++++++++++------------- hw/alpha/typhoon.c | 7 +++--- hw/mips/gt64xxx_pci.c | 11 +++++---- hw/pci-bridge/pci_expander_bridge.c | 6 +++-- hw/pci-host/apb.c | 9 ++++---- hw/pci-host/bonito.c | 8 +++---- hw/pci-host/gpex.c | 7 +++--- hw/pci-host/grackle.c | 11 ++++----- hw/pci-host/piix.c | 4 ++-- hw/pci-host/ppce500.c | 7 +++--- hw/pci-host/prep.c | 5 +++-- hw/pci-host/q35.c | 6 ++--- hw/pci-host/uninorth.c | 20 +++++++---------- hw/pci-host/versatile.c | 7 +++--- hw/pci-host/xilinx-pcie.c | 7 +++--- hw/pci/pci.c | 45 +++++++++++++++++++--------------= ---- hw/ppc/ppc4xx_pci.c | 7 +++--- hw/ppc/spapr_pci.c | 8 +++---- hw/s390x/s390-pci-bus.c | 8 +++---- hw/sh4/sh_pci.c | 10 ++++----- 20 files changed, 111 insertions(+), 113 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index a37a2d5cb6..85fe3ae743 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -393,26 +393,27 @@ typedef PCIINTxRoute (*pci_route_irq_fn)(void *opaque= , int pin); =20 bool pci_bus_is_express(PCIBus *bus); bool pci_bus_is_root(PCIBus *bus); -void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent, - const char *name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, const char *typename); -PCIBus *pci_bus_new(DeviceState *parent, const char *name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, const char *typename); +void pci_host_bus_init_inplace(PCIHostState *phb, PCIBus *bus, + size_t bus_size, const char *name, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + uint8_t devfn_min, const char *typename); +PCIBus *pci_host_bus_init(PCIHostState *phb, const char *name, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, uint8_t devfn_mi= n, + const char *typename); void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_= irq, void *irq_opaque, int nirq); int pci_bus_get_irq_level(PCIBus *bus, int irq_num); /* 0 <=3D pin <=3D 3 0 =3D INTA, 1 =3D INTB, 2 =3D INTC, 3 =3D INTD */ int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin); -PCIBus *pci_register_bus(DeviceState *parent, const char *name, - pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, - void *irq_opaque, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, int nirq, const char *typename= ); +PCIBus *pci_host_bus_init_irqs(PCIHostState *phb, const char *name, + pci_set_irq_fn set_irq, pci_map_irq_fn map_= irq, + void *irq_opaque, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + uint8_t devfn_min, int nirq, + const char *typename); void pci_bus_set_route_irq_fn(PCIBus *, pci_route_irq_fn); PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin); bool pci_intx_route_changed(PCIINTxRoute *old, PCIINTxRoute *new); diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index f50f5cf186..24f1959ab8 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -883,10 +883,9 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa= _bus, memory_region_add_subregion(addr_space, 0x801fc000000ULL, &s->pchip.reg_io); =20 - b =3D pci_register_bus(dev, "pci", - typhoon_set_irq, sys_map_irq, s, - &s->pchip.reg_mem, &s->pchip.reg_io, - 0, 64, TYPE_PCI_BUS); + b =3D pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq, + sys_map_irq, s, &s->pchip.reg_mem, + &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); phb->bus =3D b; qdev_init_nofail(dev); =20 diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 4811843ab6..5ca9f07031 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1171,12 +1171,11 @@ PCIBus *gt64120_register(qemu_irq *pic) phb =3D PCI_HOST_BRIDGE(dev); memory_region_init(&d->pci0_mem, OBJECT(dev), "pci0-mem", UINT32_MAX); address_space_init(&d->pci0_mem_as, &d->pci0_mem, "pci0-mem"); - phb->bus =3D pci_register_bus(dev, "pci", - gt64120_pci_set_irq, gt64120_pci_map_irq, - pic, - &d->pci0_mem, - get_system_io(), - PCI_DEVFN(18, 0), 4, TYPE_PCI_BUS); + phb->bus =3D pci_host_bus_init_irqs(phb, "pci", + gt64120_pci_set_irq, + gt64120_pci_map_irq, pic, &d->pci0_m= em, + get_system_io(), PCI_DEVFN(18, 0), 4, + TYPE_PCI_BUS); qdev_init_nofail(dev); memory_region_init_io(&d->ISD_mem, OBJECT(dev), &isd_mem_ops, d, "isd-= mem", 0x1000); =20 diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 6ac187fa32..853448ef70 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -230,9 +230,11 @@ static void pxb_dev_realize_common(PCIDevice *dev, boo= l pcie, Error **errp) =20 ds =3D qdev_create(NULL, TYPE_PXB_HOST); if (pcie) { - bus =3D pci_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_PCIE_BUS= ); + bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(ds), dev_name, NULL, NUL= L, 0, + TYPE_PXB_PCIE_BUS); } else { - bus =3D pci_bus_new(ds, "pxb-internal", NULL, NULL, 0, TYPE_PXB_BU= S); + bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(ds), "pxb-internal", NUL= L, + NULL, 0, TYPE_PXB_BUS); bds =3D qdev_create(BUS(bus), "pci-bridge"); bds->id =3D dev_name; qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_= nr); diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 653e711121..38d08c661c 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -671,11 +671,10 @@ PCIBus *pci_apb_init(hwaddr special_base, dev =3D qdev_create(NULL, TYPE_APB); d =3D APB_DEVICE(dev); phb =3D PCI_HOST_BRIDGE(dev); - phb->bus =3D pci_register_bus(DEVICE(phb), "pci", - pci_apb_set_irq, pci_pbm_map_irq, d, - &d->pci_mmio, - get_system_io(), - 0, 32, TYPE_PCI_BUS); + phb->bus =3D pci_host_bus_init_irqs(phb, "pci", + pci_apb_set_irq, pci_pbm_map_irq, d, + &d->pci_mmio, get_system_io(), 0, 32, + TYPE_PCI_BUS); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); /* apb_config */ diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 1999ece590..8b6e80aa82 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -714,10 +714,10 @@ static int bonito_pcihost_initfn(SysBusDevice *dev) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); =20 - phb->bus =3D pci_register_bus(DEVICE(dev), "pci", - pci_bonito_set_irq, pci_bonito_map_irq, de= v, - get_system_memory(), get_system_io(), - 0x28, 32, TYPE_PCI_BUS); + phb->bus =3D pci_host_bus_init_irqs(phb, "pci", + pci_bonito_set_irq, pci_bonito_map_i= rq, + dev, get_system_memory(), + get_system_io(), 0x28, 32, TYPE_PCI_= BUS); =20 return 0; } diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 66055ee5cc..9ea9927cf8 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -62,9 +62,10 @@ static void gpex_host_realize(DeviceState *dev, Error **= errp) sysbus_init_irq(sbd, &s->irq[i]); } =20 - pci->bus =3D pci_register_bus(dev, "pcie.0", gpex_set_irq, - pci_swizzle_map_irq_fn, s, &s->io_mmio, - &s->io_ioport, 0, 4, TYPE_PCIE_BUS); + pci->bus =3D pci_host_bus_init_irqs(pci, "pcie.0", + gpex_set_irq, pci_swizzle_map_irq_fn= , s, + &s->io_mmio, &s->io_ioport, 0, 4, + TYPE_PCIE_BUS); =20 qdev_set_parent_bus(DEVICE(&s->gpex_root), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->gpex_root)); diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 2c8acdaaca..0844c30d9a 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -82,13 +82,10 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - phb->bus =3D pci_register_bus(dev, NULL, - pci_grackle_set_irq, - pci_grackle_map_irq, - pic, - &d->pci_mmio, - address_space_io, - 0, 4, TYPE_PCI_BUS); + phb->bus =3D pci_host_bus_init_irqs(phb, NULL, + pci_grackle_set_irq, + pci_grackle_map_irq, pic, &d->pci_mm= io, + address_space_io, 0, 4, TYPE_PCI_BUS= ); =20 pci_create_simple(phb->bus, 0, "grackle"); qdev_init_nofail(dev); diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index f9218aa952..364d57039b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -340,8 +340,8 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, =20 dev =3D qdev_create(NULL, host_type); s =3D PCI_HOST_BRIDGE(dev); - b =3D pci_bus_new(dev, NULL, pci_address_space, - address_space_io, 0, TYPE_PCI_BUS); + b =3D pci_host_bus_init(s, NULL, pci_address_space, + address_space_io, 0, TYPE_PCI_BUS); s->bus =3D b; object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), N= ULL); qdev_init_nofail(dev); diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index e502bc0505..babb12af31 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -465,9 +465,10 @@ static int e500_pcihost_initfn(SysBusDevice *dev) /* PIO lives at the bottom of our bus space */ memory_region_add_subregion_overlap(&s->busmem, 0, &s->pio, -2); =20 - b =3D pci_register_bus(DEVICE(dev), NULL, mpc85xx_pci_set_irq, - mpc85xx_pci_map_irq, s, &s->busmem, &s->pio, - PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS); + b =3D pci_host_bus_init_irqs(h, NULL, + mpc85xx_pci_set_irq, mpc85xx_pci_map_irq, s, + &s->busmem, &s->pio, + PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BU= S); h->bus =3D b; =20 /* Set up PCI view of memory */ diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 260a119a9e..65add936c7 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -269,8 +269,9 @@ static void raven_pcihost_initfn(Object *obj) memory_region_add_subregion_overlap(address_space_mem, 0x80000000, &s->pci_io_non_contiguous, 1); memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_mem= ory); - pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NULL, - &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); + pci_host_bus_init_inplace(h, &s->pci_bus, + sizeof(s->pci_bus), NULL, &s->pci_memory, + &s->pci_io, 0, TYPE_PCI_BUS); =20 /* Bus master address space */ memory_region_init(&s->bm, obj, "bm-raven", UINT32_MAX); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 344f77b10c..947dc3f124 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -49,9 +49,9 @@ static void q35_host_realize(DeviceState *dev, Error **er= rp) sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); =20 - pci->bus =3D pci_bus_new(DEVICE(s), "pcie.0", - s->mch.pci_address_space, s->mch.address_space_= io, - 0, TYPE_PCIE_BUS); + pci->bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(s), "pcie.0", + s->mch.pci_address_space, + s->mch.address_space_io, 0, TYPE_PCIE_BUS= ); PC_MACHINE(qdev_get_machine())->bus =3D pci->bus; qdev_set_parent_bus(DEVICE(&s->mch), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->mch)); diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index df342ac3cb..079faad6ff 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -233,12 +233,10 @@ PCIBus *pci_pmac_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - h->bus =3D pci_register_bus(dev, NULL, - pci_unin_set_irq, pci_unin_map_irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + h->bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), NULL, + pci_unin_set_irq, pci_unin_map_irq, pi= c, + &d->pci_mmio, address_space_io, + PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); =20 #if 0 pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north"); @@ -299,12 +297,10 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - h->bus =3D pci_register_bus(dev, NULL, - pci_unin_set_irq, pci_unin_map_irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + h->bus =3D pci_host_bus_init_irqs(h, NULL, + pci_unin_set_irq, pci_unin_map_irq, pi= c, + &d->pci_mmio, address_space_io, + PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); =20 sysbus_mmio_map(s, 0, 0xf0800000); sysbus_mmio_map(s, 1, 0xf0c00000); diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 467cbb9cb8..cad8848723 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -386,9 +386,10 @@ static void pci_vpb_init(Object *obj) memory_region_init(&s->pci_io_space, OBJECT(s), "pci_io", 1ULL << 32); memory_region_init(&s->pci_mem_space, OBJECT(s), "pci_mem", 1ULL << 32= ); =20 - pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), "pci= ", - &s->pci_mem_space, &s->pci_io_space, - PCI_DEVFN(11, 0), TYPE_PCI_BUS); + pci_host_bus_init_inplace(h, &s->pci_bus, + sizeof(s->pci_bus), "pci", &s->pci_mem_space, + &s->pci_io_space, PCI_DEVFN(11, 0), + TYPE_PCI_BUS); h->bus =3D &s->pci_bus; =20 object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_VERSATILE_PCI_= HOST); diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 8b71e2d950..0a3d19b22c 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -129,9 +129,10 @@ static void xilinx_pcie_host_realize(DeviceState *dev,= Error **errp) sysbus_init_mmio(sbd, &pex->mmio); sysbus_init_mmio(sbd, &s->mmio); =20 - pci->bus =3D pci_register_bus(dev, s->name, xilinx_pcie_set_irq, - pci_swizzle_map_irq_fn, s, &s->mmio, - &s->io, 0, 4, TYPE_PCIE_BUS); + pci->bus =3D pci_host_bus_init_irqs(pci, s->name, + xilinx_pcie_set_irq, + pci_swizzle_map_irq_fn, s, &s->mmio, + &s->io, 0, 4, TYPE_PCIE_BUS); =20 qdev_set_parent_bus(DEVICE(&s->root), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->root)); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 0d28ee4e3f..37d65eaf7e 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -367,15 +367,13 @@ bool pci_bus_is_root(PCIBus *bus) return PCI_BUS_GET_CLASS(bus)->is_root(bus); } =20 -void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent, - const char *name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, const char *typename) +void pci_host_bus_init_inplace(PCIHostState *phb, PCIBus *bus, + size_t bus_size, const char *name, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + uint8_t devfn_min, const char *typename) { - PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); - - qbus_create_inplace(bus, bus_size, typename, parent, name); + qbus_create_inplace(bus, bus_size, typename, DEVICE(phb), name); =20 assert(PCI_FUNC(devfn_min) =3D=3D 0); bus->devfn_min =3D devfn_min; @@ -389,16 +387,17 @@ void pci_bus_new_inplace(PCIBus *bus, size_t bus_size= , DeviceState *parent, =20 } =20 -PCIBus *pci_bus_new(DeviceState *parent, const char *name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, const char *typename) +PCIBus *pci_host_bus_init(PCIHostState *phb, const char *name, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, uint8_t devfn_m= in, + const char *typename) { size_t bus_size =3D object_type_get_instance_size(typename); PCIBus *bus =3D g_malloc(bus_size); =20 - pci_bus_new_inplace(bus, bus_size, parent, name, address_space_mem, - address_space_io, devfn_min, typename); + pci_host_bus_init_inplace(phb, bus, bus_size, + name, address_space_mem, address_space_io, + devfn_min, typename); return bus; } =20 @@ -412,17 +411,19 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq= , pci_map_irq_fn map_irq, bus->irq_count =3D g_malloc0(nirq * sizeof(bus->irq_count[0])); } =20 -PCIBus *pci_register_bus(DeviceState *parent, const char *name, - pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, - void *irq_opaque, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - uint8_t devfn_min, int nirq, const char *typename) +PCIBus *pci_host_bus_init_irqs(PCIHostState *phb, const char *name, + pci_set_irq_fn set_irq, + pci_map_irq_fn map_irq, void *irq_opaque, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + uint8_t devfn_min, int nirq, + const char *typename) { PCIBus *bus; =20 - bus =3D pci_bus_new(parent, name, address_space_mem, - address_space_io, devfn_min, typename); + bus =3D pci_host_bus_init(phb, name, + address_space_mem, + address_space_io, devfn_min, typename); pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq); return bus; } diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index dc19682970..0d767a1a23 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -314,9 +314,10 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq[i]); } =20 - b =3D pci_register_bus(DEVICE(dev), NULL, ppc4xx_pci_set_irq, - ppc4xx_pci_map_irq, s->irq, get_system_memory(), - get_system_io(), 0, 4, TYPE_PCI_BUS); + b =3D pci_host_bus_init_irqs(h, NULL, + ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->= irq, + get_system_memory(), get_system_io(), 0, 4, + TYPE_PCI_BUS); h->bus =3D b; =20 pci_create_simple(b, 0, "ppc4xx-host-bridge"); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 98c52e411f..7f29cc77b0 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1697,10 +1697,10 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) memory_region_add_subregion(get_system_memory(), sphb->io_win_addr, &sphb->iowindow); =20 - bus =3D pci_register_bus(dev, NULL, - pci_spapr_set_irq, pci_spapr_map_irq, sphb, - &sphb->memspace, &sphb->iospace, - PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); + bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), NULL, + pci_spapr_set_irq, pci_spapr_map_irq, sph= b, + &sphb->memspace, &sphb->iospace, + PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_B= US); phb->bus =3D bus; qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), NULL); =20 diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 69b0291e8a..267e1de510 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -560,10 +560,10 @@ static int s390_pcihost_init(SysBusDevice *dev) =20 DPRINTF("host_init\n"); =20 - b =3D pci_register_bus(DEVICE(dev), NULL, - s390_pci_set_irq, s390_pci_map_irq, NULL, - get_system_memory(), get_system_io(), 0, 64, - TYPE_PCI_BUS); + b =3D pci_host_bus_init_irqs(phb, NULL, + s390_pci_set_irq, s390_pci_map_irq, NULL, + get_system_memory(), get_system_io(), 0, 64, + TYPE_PCI_BUS); pci_setup_iommu(b, s390_pci_dma_iommu, s); =20 bus =3D BUS(b); diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 1747628f3d..f589b1628e 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -131,12 +131,10 @@ static int sh_pci_device_init(SysBusDevice *dev) for (i =3D 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } - phb->bus =3D pci_register_bus(DEVICE(dev), "pci", - sh_pci_set_irq, sh_pci_map_irq, - s->irq, - get_system_memory(), - get_system_io(), - PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS); + phb->bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), "pci", + sh_pci_set_irq, sh_pci_map_irq, s->i= rq, + get_system_memory(), get_system_io(), + PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS); memory_region_init_io(&s->memconfig_p4, OBJECT(s), &sh_pci_reg_ops, s, "sh_pci", 0x224); memory_region_init_alias(&s->memconfig_a7, OBJECT(s), "sh_pci.2", --=20 2.11.0.259.g40922b1 From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492554113547798.3286962270818; Tue, 18 Apr 2017 15:21:53 -0700 (PDT) Received: from localhost ([::1]:44883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bVQ-0003c3-7A for importer@patchew.org; Tue, 18 Apr 2017 18:21:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRd-0000oF-UD for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRc-0002XH-Lg for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:17:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRc-0002Ww-Cb; Tue, 18 Apr 2017 18:17:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5BA6F787E9; Tue, 18 Apr 2017 22:17:55 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02BB0784BA; Tue, 18 Apr 2017 22:17:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5BA6F787E9 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5BA6F787E9 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:22 -0300 Message-Id: <20170418221724.5707-5-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 18 Apr 2017 22:17:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 4/6] pci: Manually simplify QOM casts at pci_host_bus_init*() calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , aik@ozlabs.ru, Alexander Graf , qemu-ppc@nongnu.org, Marcel Apfelbaum , David Gibson , Laszlo Ersek , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Those redundant casts were not detected by the Coccinelle patch because there are multiple variables and casts involved. Fix them manually. Cc: "Michael S. Tsirkin" Cc: Alexander Graf Cc: David Gibson Cc: Aurelien Jarno Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- hw/pci-host/q35.c | 2 +- hw/pci-host/uninorth.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/sh4/sh_pci.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 947dc3f124..4258076979 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -49,7 +49,7 @@ static void q35_host_realize(DeviceState *dev, Error **er= rp) sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); =20 - pci->bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(s), "pcie.0", + pci->bus =3D pci_host_bus_init(pci, "pcie.0", s->mch.pci_address_space, s->mch.address_space_io, 0, TYPE_PCIE_BUS= ); PC_MACHINE(qdev_get_machine())->bus =3D pci->bus; diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 079faad6ff..d9fb5fdc93 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -233,7 +233,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - h->bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), NULL, + h->bus =3D pci_host_bus_init_irqs(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pi= c, &d->pci_mmio, address_space_io, PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 7f29cc77b0..ce132c5eea 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1697,7 +1697,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) memory_region_add_subregion(get_system_memory(), sphb->io_win_addr, &sphb->iowindow); =20 - bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), NULL, + bus =3D pci_host_bus_init_irqs(phb, NULL, pci_spapr_set_irq, pci_spapr_map_irq, sph= b, &sphb->memspace, &sphb->iospace, PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_B= US); diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index f589b1628e..8be2e830e9 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -131,7 +131,7 @@ static int sh_pci_device_init(SysBusDevice *dev) for (i =3D 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } - phb->bus =3D pci_host_bus_init_irqs(PCI_HOST_BRIDGE(dev), "pci", + phb->bus =3D pci_host_bus_init_irqs(phb, "pci", sh_pci_set_irq, sh_pci_map_irq, s->i= rq, get_system_memory(), get_system_io(), PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS); --=20 2.11.0.259.g40922b1 From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492554068200813.1870096880679; Tue, 18 Apr 2017 15:21:08 -0700 (PDT) Received: from localhost ([::1]:44876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bUg-00030K-IM for importer@patchew.org; Tue, 18 Apr 2017 18:21:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRs-0000zl-Ef for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRo-0002ag-7m for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRe-0002XZ-J7; Tue, 18 Apr 2017 18:17:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77C3161D1F; Tue, 18 Apr 2017 22:17:57 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id B74A8783F6; Tue, 18 Apr 2017 22:17:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 77C3161D1F Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 77C3161D1F From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:23 -0300 Message-Id: <20170418221724.5707-6-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 18 Apr 2017 22:17:57 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 5/6] pci: Set phb->bus inside pci_host_bus_init_inplace() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , Paul Burton , "Michael S. Tsirkin" , aik@ozlabs.ru, Yongbok Kim , qemu-ppc@nongnu.org, Alexander Graf , Scott Wood , Christian Borntraeger , qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , David Gibson , Richard Henderson , Laszlo Ersek , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Every single caller of pci_host_bus_init*() sets phb->bus to point to 'bus'. Do that inside pci_bus_new_inplace() to avoid code duplication and make it harder to break. Generated using the following Coccinelle patch: @@ identifier b; expression phb; expression list ARGS; @@ -b =3D pci_host_bus_init(phb, ARGS); +pci_host_bus_init(phb, ARGS); +b =3D phb->bus; ... -phb->bus =3D b; @@ expression phb; expression list ARGS; @@ -phb->bus =3D pci_host_bus_init(phb, ARGS); +pci_host_bus_init(phb, ARGS); @@ expression PHB, BUS; expression list ARGS; @@ pci_host_bus_init_inplace(PHB, BUS, ARGS); ... -PHB->bus =3D BUS; @@ typedef PCIHostState; typedef PCIBus; identifier phb, BUS; @@ void pci_host_bus_init_inplace(PCIHostState *phb, PCIBus *BUS, ...) { ... + phb->bus =3D BUS; } @@ identifier b; expression phb; expression list ARGS; @@ -b =3D pci_host_bus_init_irqs(phb, ARGS); +pci_host_bus_init_irqs(phb, ARGS); +b =3D phb->bus; ... -phb->bus =3D b; @@ expression phb; expression list ARGS; @@ -phb->bus =3D pci_host_bus_init_irqs(phb, ARGS); +pci_host_bus_init_irqs(phb, ARGS); Cc: Alexander Graf Cc: Aurelien Jarno Cc: Christian Borntraeger Cc: Cornelia Huck Cc: David Gibson Cc: "Herv=C3=A9 Poussineau" Cc: Marcel Apfelbaum Cc: "Michael S. Tsirkin" Cc: Paul Burton Cc: Peter Maydell Cc: Richard Henderson Cc: Scott Wood Cc: Yongbok Kim Cc: qemu-arm@nongnu.org Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost --- hw/alpha/typhoon.c | 8 ++++---- hw/mips/gt64xxx_pci.c | 8 +++----- hw/pci-bridge/pci_expander_bridge.c | 12 ++++++------ hw/pci-host/apb.c | 6 ++---- hw/pci-host/bonito.c | 7 +++---- hw/pci-host/gpex.c | 7 +++---- hw/pci-host/grackle.c | 7 +++---- hw/pci-host/piix.c | 6 +++--- hw/pci-host/ppce500.c | 9 ++++----- hw/pci-host/prep.c | 2 -- hw/pci-host/q35.c | 5 ++--- hw/pci-host/uninorth.c | 14 ++++++-------- hw/pci-host/versatile.c | 1 - hw/pci-host/xilinx-pcie.c | 7 +++---- hw/pci/pci.c | 2 +- hw/ppc/ppc4xx_pci.c | 9 ++++----- hw/ppc/spapr_pci.c | 9 ++++----- hw/s390x/s390-pci-bus.c | 9 ++++----- hw/sh4/sh_pci.c | 7 +++---- 19 files changed, 58 insertions(+), 77 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 24f1959ab8..a35fac5381 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -883,10 +883,10 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **is= a_bus, memory_region_add_subregion(addr_space, 0x801fc000000ULL, &s->pchip.reg_io); =20 - b =3D pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq, - sys_map_irq, s, &s->pchip.reg_mem, - &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); - phb->bus =3D b; + pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq, sys_map_irq, s, + &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64, + TYPE_PCI_BUS); + b =3D phb->bus; qdev_init_nofail(dev); =20 /* Host memory as seen from the PCI side, via the IOMMU. */ diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 5ca9f07031..428d5e2dd9 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1171,11 +1171,9 @@ PCIBus *gt64120_register(qemu_irq *pic) phb =3D PCI_HOST_BRIDGE(dev); memory_region_init(&d->pci0_mem, OBJECT(dev), "pci0-mem", UINT32_MAX); address_space_init(&d->pci0_mem_as, &d->pci0_mem, "pci0-mem"); - phb->bus =3D pci_host_bus_init_irqs(phb, "pci", - gt64120_pci_set_irq, - gt64120_pci_map_irq, pic, &d->pci0_m= em, - get_system_io(), PCI_DEVFN(18, 0), 4, - TYPE_PCI_BUS); + pci_host_bus_init_irqs(phb, "pci", gt64120_pci_set_irq, + gt64120_pci_map_irq, pic, &d->pci0_mem, + get_system_io(), PCI_DEVFN(18, 0), 4, TYPE_PCI_= BUS); qdev_init_nofail(dev); memory_region_init_io(&d->ISD_mem, OBJECT(dev), &isd_mem_ops, d, "isd-= mem", 0x1000); =20 diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 853448ef70..e88b0aa682 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -230,11 +230,13 @@ static void pxb_dev_realize_common(PCIDevice *dev, bo= ol pcie, Error **errp) =20 ds =3D qdev_create(NULL, TYPE_PXB_HOST); if (pcie) { - bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(ds), dev_name, NULL, NUL= L, 0, - TYPE_PXB_PCIE_BUS); + pci_host_bus_init(PCI_HOST_BRIDGE(ds), dev_name, NULL, NULL, 0, + TYPE_PXB_PCIE_BUS); + bus =3D PCI_HOST_BRIDGE(ds)->bus; } else { - bus =3D pci_host_bus_init(PCI_HOST_BRIDGE(ds), "pxb-internal", NUL= L, - NULL, 0, TYPE_PXB_BUS); + pci_host_bus_init(PCI_HOST_BRIDGE(ds), "pxb-internal", NULL, NULL,= 0, + TYPE_PXB_BUS); + bus =3D PCI_HOST_BRIDGE(ds)->bus; bds =3D qdev_create(BUS(bus), "pci-bridge"); bds->id =3D dev_name; qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_= nr); @@ -246,8 +248,6 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool= pcie, Error **errp) bus->address_space_io =3D dev->bus->address_space_io; bus->map_irq =3D pxb_map_irq_fn; =20 - PCI_HOST_BRIDGE(ds)->bus =3D bus; - pxb_register_bus(dev, bus, &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 38d08c661c..ebcb93d9ac 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -671,10 +671,8 @@ PCIBus *pci_apb_init(hwaddr special_base, dev =3D qdev_create(NULL, TYPE_APB); d =3D APB_DEVICE(dev); phb =3D PCI_HOST_BRIDGE(dev); - phb->bus =3D pci_host_bus_init_irqs(phb, "pci", - pci_apb_set_irq, pci_pbm_map_irq, d, - &d->pci_mmio, get_system_io(), 0, 32, - TYPE_PCI_BUS); + pci_host_bus_init_irqs(phb, "pci", pci_apb_set_irq, pci_pbm_map_irq, d, + &d->pci_mmio, get_system_io(), 0, 32, TYPE_PCI_= BUS); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); /* apb_config */ diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 8b6e80aa82..ff3db73900 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -714,10 +714,9 @@ static int bonito_pcihost_initfn(SysBusDevice *dev) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); =20 - phb->bus =3D pci_host_bus_init_irqs(phb, "pci", - pci_bonito_set_irq, pci_bonito_map_i= rq, - dev, get_system_memory(), - get_system_io(), 0x28, 32, TYPE_PCI_= BUS); + pci_host_bus_init_irqs(phb, "pci", pci_bonito_set_irq, pci_bonito_map_= irq, + dev, get_system_memory(), get_system_io(), 0x28, + 32, TYPE_PCI_BUS); =20 return 0; } diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 9ea9927cf8..9e5d2e2dc4 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -62,10 +62,9 @@ static void gpex_host_realize(DeviceState *dev, Error **= errp) sysbus_init_irq(sbd, &s->irq[i]); } =20 - pci->bus =3D pci_host_bus_init_irqs(pci, "pcie.0", - gpex_set_irq, pci_swizzle_map_irq_fn= , s, - &s->io_mmio, &s->io_ioport, 0, 4, - TYPE_PCIE_BUS); + pci_host_bus_init_irqs(pci, "pcie.0", gpex_set_irq, + pci_swizzle_map_irq_fn, s, &s->io_mmio, + &s->io_ioport, 0, 4, TYPE_PCIE_BUS); =20 qdev_set_parent_bus(DEVICE(&s->gpex_root), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->gpex_root)); diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 0844c30d9a..b3126852de 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -82,10 +82,9 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - phb->bus =3D pci_host_bus_init_irqs(phb, NULL, - pci_grackle_set_irq, - pci_grackle_map_irq, pic, &d->pci_mm= io, - address_space_io, 0, 4, TYPE_PCI_BUS= ); + pci_host_bus_init_irqs(phb, NULL, pci_grackle_set_irq, + pci_grackle_map_irq, pic, &d->pci_mmio, + address_space_io, 0, 4, TYPE_PCI_BUS); =20 pci_create_simple(phb->bus, 0, "grackle"); qdev_init_nofail(dev); diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 364d57039b..ec5a39706e 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -340,9 +340,9 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, =20 dev =3D qdev_create(NULL, host_type); s =3D PCI_HOST_BRIDGE(dev); - b =3D pci_host_bus_init(s, NULL, pci_address_space, - address_space_io, 0, TYPE_PCI_BUS); - s->bus =3D b; + pci_host_bus_init(s, NULL, pci_address_space, address_space_io, 0, + TYPE_PCI_BUS); + b =3D s->bus; object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), N= ULL); qdev_init_nofail(dev); =20 diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index babb12af31..d7091709d2 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -465,11 +465,10 @@ static int e500_pcihost_initfn(SysBusDevice *dev) /* PIO lives at the bottom of our bus space */ memory_region_add_subregion_overlap(&s->busmem, 0, &s->pio, -2); =20 - b =3D pci_host_bus_init_irqs(h, NULL, - mpc85xx_pci_set_irq, mpc85xx_pci_map_irq, s, - &s->busmem, &s->pio, - PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BU= S); - h->bus =3D b; + pci_host_bus_init_irqs(h, NULL, mpc85xx_pci_set_irq, mpc85xx_pci_map_i= rq, + s, &s->busmem, &s->pio, + PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS); + b =3D h->bus; =20 /* Set up PCI view of memory */ memory_region_init(&s->bm, OBJECT(s), "bm-e500", UINT64_MAX); diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 65add936c7..da151fc051 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -285,8 +285,6 @@ static void raven_pcihost_initfn(Object *obj) address_space_init(&s->bm_as, &s->bm, "raven-bm"); pci_setup_iommu(&s->pci_bus, raven_pcihost_set_iommu, s); =20 - h->bus =3D &s->pci_bus; - object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_RAVEN_PCI_DEVI= CE); pci_dev =3D DEVICE(&s->pci_dev); qdev_set_parent_bus(pci_dev, BUS(&s->pci_bus)); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 4258076979..c285d2caca 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -49,9 +49,8 @@ static void q35_host_realize(DeviceState *dev, Error **er= rp) sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); =20 - pci->bus =3D pci_host_bus_init(pci, "pcie.0", - s->mch.pci_address_space, - s->mch.address_space_io, 0, TYPE_PCIE_BUS= ); + pci_host_bus_init(pci, "pcie.0", s->mch.pci_address_space, + s->mch.address_space_io, 0, TYPE_PCIE_BUS); PC_MACHINE(qdev_get_machine())->bus =3D pci->bus; qdev_set_parent_bus(DEVICE(&s->mch), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->mch)); diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index d9fb5fdc93..febabeaec7 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -233,10 +233,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - h->bus =3D pci_host_bus_init_irqs(h, NULL, - pci_unin_set_irq, pci_unin_map_irq, pi= c, - &d->pci_mmio, address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + pci_host_bus_init_irqs(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pi= c, + &d->pci_mmio, address_space_io, PCI_DEVFN(11, 0= ), + 4, TYPE_PCI_BUS); =20 #if 0 pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north"); @@ -297,10 +296,9 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - h->bus =3D pci_host_bus_init_irqs(h, NULL, - pci_unin_set_irq, pci_unin_map_irq, pi= c, - &d->pci_mmio, address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + pci_host_bus_init_irqs(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pi= c, + &d->pci_mmio, address_space_io, PCI_DEVFN(11, 0= ), + 4, TYPE_PCI_BUS); =20 sysbus_mmio_map(s, 0, 0xf0800000); sysbus_mmio_map(s, 1, 0xf0c00000); diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index cad8848723..caf7f6407a 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -390,7 +390,6 @@ static void pci_vpb_init(Object *obj) sizeof(s->pci_bus), "pci", &s->pci_mem_space, &s->pci_io_space, PCI_DEVFN(11, 0), TYPE_PCI_BUS); - h->bus =3D &s->pci_bus; =20 object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_VERSATILE_PCI_= HOST); qdev_set_parent_bus(DEVICE(&s->pci_dev), BUS(&s->pci_bus)); diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 0a3d19b22c..f988c7e58e 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -129,10 +129,9 @@ static void xilinx_pcie_host_realize(DeviceState *dev,= Error **errp) sysbus_init_mmio(sbd, &pex->mmio); sysbus_init_mmio(sbd, &s->mmio); =20 - pci->bus =3D pci_host_bus_init_irqs(pci, s->name, - xilinx_pcie_set_irq, - pci_swizzle_map_irq_fn, s, &s->mmio, - &s->io, 0, 4, TYPE_PCIE_BUS); + pci_host_bus_init_irqs(pci, s->name, xilinx_pcie_set_irq, + pci_swizzle_map_irq_fn, s, &s->mmio, &s->io, 0,= 4, + TYPE_PCIE_BUS); =20 qdev_set_parent_bus(DEVICE(&s->root), BUS(pci->bus)); qdev_init_nofail(DEVICE(&s->root)); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 37d65eaf7e..dd065a0881 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -384,7 +384,7 @@ void pci_host_bus_init_inplace(PCIHostState *phb, PCIBu= s *bus, QLIST_INIT(&bus->child); =20 QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); - + phb->bus =3D bus; } =20 PCIBus *pci_host_bus_init(PCIHostState *phb, const char *name, diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 0d767a1a23..992be1bce9 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -314,11 +314,10 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq[i]); } =20 - b =3D pci_host_bus_init_irqs(h, NULL, - ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->= irq, - get_system_memory(), get_system_io(), 0, 4, - TYPE_PCI_BUS); - h->bus =3D b; + pci_host_bus_init_irqs(h, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, + s->irq, get_system_memory(), get_system_io(), 0= , 4, + TYPE_PCI_BUS); + b =3D h->bus; =20 pci_create_simple(b, 0, "ppc4xx-host-bridge"); =20 diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index ce132c5eea..06e8a8740b 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1697,11 +1697,10 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) memory_region_add_subregion(get_system_memory(), sphb->io_win_addr, &sphb->iowindow); =20 - bus =3D pci_host_bus_init_irqs(phb, NULL, - pci_spapr_set_irq, pci_spapr_map_irq, sph= b, - &sphb->memspace, &sphb->iospace, - PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_B= US); - phb->bus =3D bus; + pci_host_bus_init_irqs(phb, NULL, pci_spapr_set_irq, pci_spapr_map_irq, + sphb, &sphb->memspace, &sphb->iospace, + PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); + bus =3D phb->bus; qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), NULL); =20 /* diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 267e1de510..5e174e90f4 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -560,15 +560,14 @@ static int s390_pcihost_init(SysBusDevice *dev) =20 DPRINTF("host_init\n"); =20 - b =3D pci_host_bus_init_irqs(phb, NULL, - s390_pci_set_irq, s390_pci_map_irq, NULL, - get_system_memory(), get_system_io(), 0, 64, - TYPE_PCI_BUS); + pci_host_bus_init_irqs(phb, NULL, s390_pci_set_irq, s390_pci_map_irq, + NULL, get_system_memory(), get_system_io(), 0, = 64, + TYPE_PCI_BUS); + b =3D phb->bus; pci_setup_iommu(b, s390_pci_dma_iommu, s); =20 bus =3D BUS(b); qbus_set_hotplug_handler(bus, DEVICE(dev), NULL); - phb->bus =3D b; =20 s->bus =3D S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, DEVICE(s), NULL= )); qbus_set_hotplug_handler(BUS(s->bus), DEVICE(s), NULL); diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 8be2e830e9..5745738fb9 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -131,10 +131,9 @@ static int sh_pci_device_init(SysBusDevice *dev) for (i =3D 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } - phb->bus =3D pci_host_bus_init_irqs(phb, "pci", - sh_pci_set_irq, sh_pci_map_irq, s->i= rq, - get_system_memory(), get_system_io(), - PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS); + pci_host_bus_init_irqs(phb, "pci", sh_pci_set_irq, sh_pci_map_irq, s->= irq, + get_system_memory(), get_system_io(), + PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS); memory_region_init_io(&s->memconfig_p4, OBJECT(s), &sh_pci_reg_ops, s, "sh_pci", 0x224); memory_region_init_alias(&s->memconfig_a7, OBJECT(s), "sh_pci.2", --=20 2.11.0.259.g40922b1 From nobody Wed May 1 07:59:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492554193441537.5072981371333; Tue, 18 Apr 2017 15:23:13 -0700 (PDT) Received: from localhost ([::1]:44892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bWh-0004o6-IA for importer@patchew.org; Tue, 18 Apr 2017 18:23:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0bRs-0000zm-Ek for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0bRp-0002as-0e for qemu-devel@nongnu.org; Tue, 18 Apr 2017 18:18:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0bRo-0002Yb-NQ; Tue, 18 Apr 2017 18:18:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DADAC054900; Tue, 18 Apr 2017 22:18:03 +0000 (UTC) Received: from localhost (ovpn-116-28.gru2.redhat.com [10.97.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF3D517DD4; Tue, 18 Apr 2017 22:17:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4DADAC054900 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4DADAC054900 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 18 Apr 2017 19:17:24 -0300 Message-Id: <20170418221724.5707-7-ehabkost@redhat.com> In-Reply-To: <20170418221724.5707-1-ehabkost@redhat.com> References: <20170418221724.5707-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 18 Apr 2017 22:18:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 6/6] pci: Remove unnecessary PCIBus variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , "Michael S. Tsirkin" , aik@ozlabs.ru, Alexander Graf , Scott Wood , qemu-ppc@nongnu.org, Marcel Apfelbaum , David Gibson , David Gibson , Laszlo Ersek , Christian Borntraeger , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" "phb->bus" is a short expression, there's no need for an extra variable just to hold its value. Generated using the following Coccinelle patch: @@ identifier b; identifier phb; typedef PCIBus; @@ -PCIBus *b; ... when !=3D b -b =3D phb->bus; <... -b +phb->bus ...> Cc: Richard Henderson Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: Alexander Graf Cc: Scott Wood Cc: David Gibson Cc: Cornelia Huck Cc: Christian Borntraeger Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck --- hw/alpha/typhoon.c | 10 ++++------ hw/pci-bridge/pci_expander_bridge.c | 4 +--- hw/pci-host/piix.c | 26 +++++++++++++------------- hw/pci-host/ppce500.c | 8 +++----- hw/ppc/ppc4xx_pci.c | 4 +--- hw/ppc/spapr_pci.c | 6 ++---- hw/s390x/s390-pci-bus.c | 6 ++---- 7 files changed, 26 insertions(+), 38 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index a35fac5381..051de095e0 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -820,7 +820,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_= bus, DeviceState *dev; TyphoonState *s; PCIHostState *phb; - PCIBus *b; int i; =20 dev =3D qdev_create(NULL, TYPE_TYPHOON_PCI_HOST_BRIDGE); @@ -886,24 +885,23 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **is= a_bus, pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq, sys_map_irq, s, &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); - b =3D phb->bus; qdev_init_nofail(dev); =20 /* Host memory as seen from the PCI side, via the IOMMU. */ memory_region_init_iommu(&s->pchip.iommu, OBJECT(s), &typhoon_iommu_op= s, "iommu-typhoon", UINT64_MAX); address_space_init(&s->pchip.iommu_as, &s->pchip.iommu, "pchip0-pci"); - pci_setup_iommu(b, typhoon_pci_dma_iommu, s); + pci_setup_iommu(phb->bus, typhoon_pci_dma_iommu, s); =20 /* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */ memory_region_init_io(&s->pchip.reg_iack, OBJECT(s), &alpha_pci_iack_o= ps, - b, "pci0-iack", 64*MB); + phb->bus, "pci0-iack", 64 * MB); memory_region_add_subregion(addr_space, 0x801f8000000ULL, &s->pchip.reg_iack); =20 /* Pchip0 PCI configuration, 0x801.FE00.0000, 16MB. */ memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &alpha_pci_conf1_= ops, - b, "pci0-conf", 16*MB); + phb->bus, "pci0-conf", 16 * MB); memory_region_add_subregion(addr_space, 0x801fe000000ULL, &s->pchip.reg_conf); =20 @@ -928,7 +926,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_= bus, isa_bus_irqs(*isa_bus, isa_irqs); } =20 - return b; + return phb->bus; } =20 static int typhoon_pcihost_init(SysBusDevice *dev) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index e88b0aa682..bdd03f661a 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -114,7 +114,6 @@ static const char *pxb_host_root_bus_path(PCIHostState = *host_bridge, static char *pxb_host_ofw_unit_address(const SysBusDevice *dev) { const PCIHostState *pxb_host; - const PCIBus *pxb_bus; const PXBDev *pxb_dev; int position; const DeviceState *pxb_dev_base; @@ -122,8 +121,7 @@ static char *pxb_host_ofw_unit_address(const SysBusDevi= ce *dev) const SysBusDevice *main_host_sbd; =20 pxb_host =3D PCI_HOST_BRIDGE(dev); - pxb_bus =3D pxb_host->bus; - pxb_dev =3D convert_to_pxb(pxb_bus->parent_dev); + pxb_dev =3D convert_to_pxb(pxb_host->bus->parent_dev); position =3D g_list_index(pxb_dev_list, pxb_dev); assert(position >=3D 0); =20 diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index ec5a39706e..7b623f5d1b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -330,7 +330,6 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, MemoryRegion *ram_memory) { DeviceState *dev; - PCIBus *b; PCIDevice *d; PCIHostState *s; PIIX3State *piix3; @@ -342,11 +341,10 @@ PCIBus *i440fx_init(const char *host_type, const char= *pci_type, s =3D PCI_HOST_BRIDGE(dev); pci_host_bus_init(s, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); - b =3D s->bus; object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), N= ULL); qdev_init_nofail(dev); =20 - d =3D pci_create_simple(b, 0, pci_type); + d =3D pci_create_simple(s->bus, 0, pci_type); *pi440fx_state =3D I440FX_PCI_DEVICE(d); f =3D *pi440fx_state; f->system_memory =3D address_space_mem; @@ -391,18 +389,20 @@ PCIBus *i440fx_init(const char *host_type, const char= *pci_type, * connected to the IOAPIC directly. * These additional routes can be discovered through ACPI. */ if (xen_enabled()) { - PCIDevice *pci_dev =3D pci_create_simple_multifunction(b, - -1, true, "PIIX3-xen"); + PCIDevice *pci_dev =3D pci_create_simple_multifunction(s->bus, + -1, true, + "PIIX3-xen"); piix3 =3D PIIX3_PCI_DEVICE(pci_dev); - pci_bus_irqs(b, xen_piix3_set_irq, xen_pci_slot_get_pirq, - piix3, XEN_PIIX_NUM_PIRQS); + pci_bus_irqs(s->bus, xen_piix3_set_irq, xen_pci_slot_get_pirq, + piix3, XEN_PIIX_NUM_PIRQS); } else { - PCIDevice *pci_dev =3D pci_create_simple_multifunction(b, - -1, true, "PIIX3"); + PCIDevice *pci_dev =3D pci_create_simple_multifunction(s->bus, + -1, true, + "PIIX3"); piix3 =3D PIIX3_PCI_DEVICE(pci_dev); - pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, - PIIX_NUM_PIRQS); - pci_bus_set_route_irq_fn(b, piix3_route_intx_pin_to_irq); + pci_bus_irqs(s->bus, piix3_set_irq, pci_slot_get_pirq, piix3, + PIIX_NUM_PIRQS); + pci_bus_set_route_irq_fn(s->bus, piix3_route_intx_pin_to_irq); } piix3->pic =3D pic; *isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); @@ -417,7 +417,7 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, =20 i440fx_update_memory_mappings(f); =20 - return b; + return s->bus; } =20 PCIBus *find_i440fx(void) diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index d7091709d2..24decdbbbc 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -445,7 +445,6 @@ static int e500_pcihost_initfn(SysBusDevice *dev) { PCIHostState *h; PPCE500PCIState *s; - PCIBus *b; int i; =20 h =3D PCI_HOST_BRIDGE(dev); @@ -468,15 +467,14 @@ static int e500_pcihost_initfn(SysBusDevice *dev) pci_host_bus_init_irqs(h, NULL, mpc85xx_pci_set_irq, mpc85xx_pci_map_i= rq, s, &s->busmem, &s->pio, PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS); - b =3D h->bus; =20 /* Set up PCI view of memory */ memory_region_init(&s->bm, OBJECT(s), "bm-e500", UINT64_MAX); memory_region_add_subregion(&s->bm, 0x0, &s->busmem); address_space_init(&s->bm_as, &s->bm, "pci-bm"); - pci_setup_iommu(b, e500_pcihost_set_iommu, s); + pci_setup_iommu(h->bus, e500_pcihost_set_iommu, s); =20 - pci_create_simple(b, 0, "e500-host-bridge"); + pci_create_simple(h->bus, 0, "e500-host-bridge"); =20 memory_region_init(&s->container, OBJECT(h), "pci-container", PCIE500_= ALL_SIZE); memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_be_ops, = h, @@ -489,7 +487,7 @@ static int e500_pcihost_initfn(SysBusDevice *dev) memory_region_add_subregion(&s->container, PCIE500_CFGDATA, &h->data_m= em); memory_region_add_subregion(&s->container, PCIE500_REG_BASE, &s->iomem= ); sysbus_init_mmio(dev, &s->container); - pci_bus_set_route_irq_fn(b, e500_route_intx_pin_to_irq); + pci_bus_set_route_irq_fn(h->bus, e500_route_intx_pin_to_irq); =20 return 0; } diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 992be1bce9..80516a387c 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -304,7 +304,6 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) { PPC4xxPCIState *s; PCIHostState *h; - PCIBus *b; int i; =20 h =3D PCI_HOST_BRIDGE(dev); @@ -317,9 +316,8 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) pci_host_bus_init_irqs(h, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq, get_system_memory(), get_system_io(), 0= , 4, TYPE_PCI_BUS); - b =3D h->bus; =20 - pci_create_simple(b, 0, "ppc4xx-host-bridge"); + pci_create_simple(h->bus, 0, "ppc4xx-host-bridge"); =20 /* XXX split into 2 memory regions, one for config space, one for regs= */ memory_region_init(&s->container, OBJECT(s), "pci-container", PCI_ALL_= SIZE); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 06e8a8740b..b1ce50427c 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1570,7 +1570,6 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) PCIHostState *phb =3D PCI_HOST_BRIDGE(s); char *namebuf; int i; - PCIBus *bus; uint64_t msi_window_size =3D 4096; sPAPRTCETable *tcet; const unsigned windows_supported =3D @@ -1700,7 +1699,6 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) pci_host_bus_init_irqs(phb, NULL, pci_spapr_set_irq, pci_spapr_map_irq, sphb, &sphb->memspace, &sphb->iospace, PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); - bus =3D phb->bus; qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), NULL); =20 /* @@ -1739,9 +1737,9 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) memory_region_add_subregion(&sphb->iommu_root, SPAPR_PCI_MSI_WINDOW, &sphb->msiwindow); =20 - pci_setup_iommu(bus, spapr_pci_dma_iommu, sphb); + pci_setup_iommu(phb->bus, spapr_pci_dma_iommu, sphb); =20 - pci_bus_set_route_irq_fn(bus, spapr_route_intx_pin_to_irq); + pci_bus_set_route_irq_fn(phb->bus, spapr_route_intx_pin_to_irq); =20 QLIST_INSERT_HEAD(&spapr->phbs, sphb, list); =20 diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 5e174e90f4..c2776ba221 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -553,7 +553,6 @@ static void s390_pci_iommu_free(S390pciState *s, PCIBus= *bus, int32_t devfn) =20 static int s390_pcihost_init(SysBusDevice *dev) { - PCIBus *b; BusState *bus; PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); S390pciState *s =3D S390_PCI_HOST_BRIDGE(dev); @@ -563,10 +562,9 @@ static int s390_pcihost_init(SysBusDevice *dev) pci_host_bus_init_irqs(phb, NULL, s390_pci_set_irq, s390_pci_map_irq, NULL, get_system_memory(), get_system_io(), 0, = 64, TYPE_PCI_BUS); - b =3D phb->bus; - pci_setup_iommu(b, s390_pci_dma_iommu, s); + pci_setup_iommu(phb->bus, s390_pci_dma_iommu, s); =20 - bus =3D BUS(b); + bus =3D BUS(phb->bus); qbus_set_hotplug_handler(bus, DEVICE(dev), NULL); =20 s->bus =3D S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, DEVICE(s), NULL= )); --=20 2.11.0.259.g40922b1