From nobody Thu May 2 07:44:28 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 1492466471180625.8989926781411; Mon, 17 Apr 2017 15:01:11 -0700 (PDT) Received: from localhost ([::1]:38923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Ehp-0001MO-MP for importer@patchew.org; Mon, 17 Apr 2017 18:01:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EgE-0000KQ-6h for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgD-0005lX-B6 for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgD-0005lQ-4d for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:29 -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 0422465CE1; Mon, 17 Apr 2017 21:59:28 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 389EA17BB7; Mon, 17 Apr 2017 21:59:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0422465CE1 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0422465CE1 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:10 -0300 Message-Id: <20170417215916.12431-2-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-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.38]); Mon, 17 Apr 2017 21:59:28 +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 1/7] pci: Change pci_host_bus_register() parameter to PCIHostState 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" The function requires a PCI_HOST_BRIDGE object, so change the parameter type to reflect that. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson Reviewed-by: Marcel Apfelbaum --- hw/pci/pci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 259483b1c0..25118fb91d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -312,11 +312,9 @@ static void pcibus_reset(BusState *qbus) } } =20 -static void pci_host_bus_register(DeviceState *host) +static void pci_host_bus_register(PCIHostState *phb) { - PCIHostState *host_bridge =3D PCI_HOST_BRIDGE(host); - - QLIST_INSERT_HEAD(&pci_host_bridges, host_bridge, next); + QLIST_INSERT_HEAD(&pci_host_bridges, phb, next); } =20 PCIBus *pci_find_primary_bus(void) @@ -377,7 +375,7 @@ static void pci_bus_init(PCIBus *bus, DeviceState *pare= nt, /* host bridge */ QLIST_INIT(&bus->child); =20 - pci_host_bus_register(parent); + pci_host_bus_register(PCI_HOST_BRIDGE(host)); } =20 bool pci_bus_is_express(PCIBus *bus) --=20 2.11.0.259.g40922b1 From nobody Thu May 2 07:44:28 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 1492466638342837.8441394502906; Mon, 17 Apr 2017 15:03:58 -0700 (PDT) Received: from localhost ([::1]:38935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EkW-0003SS-HY for importer@patchew.org; Mon, 17 Apr 2017 18:03:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EgL-0000PP-KP for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgI-0005mU-L1 for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55886) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgI-0005mI-ER for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:34 -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 4EE777FD6F; Mon, 17 Apr 2017 21:59:33 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76E14171F7; Mon, 17 Apr 2017 21:59:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4EE777FD6F 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 4EE777FD6F From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:11 -0300 Message-Id: <20170417215916.12431-3-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-1-ehabkost@redhat.com> 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.27]); Mon, 17 Apr 2017 21:59:33 +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 2/7] pci: Change pci_bus_init() 'parent' parameter to PCIHostState 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" pci_bus_init() already requires 'parent' to be a PCI_HOST_BRIDGE object, so change the parameter type to reflect that. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson Reviewed-by: Marcel Apfelbaum --- hw/pci/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 25118fb91d..d9535c0bdc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -362,7 +362,7 @@ const char *pci_root_bus_path(PCIDevice *dev) return rootbus->qbus.name; } =20 -static void pci_bus_init(PCIBus *bus, DeviceState *parent, +static void pci_bus_init(PCIBus *bus, PCIHostState *phb, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, uint8_t devfn_min) @@ -375,7 +375,7 @@ static void pci_bus_init(PCIBus *bus, DeviceState *pare= nt, /* host bridge */ QLIST_INIT(&bus->child); =20 - pci_host_bus_register(PCI_HOST_BRIDGE(host)); + pci_host_bus_register(phb); } =20 bool pci_bus_is_express(PCIBus *bus) @@ -394,8 +394,9 @@ 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); + pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); } =20 PCIBus *pci_bus_new(DeviceState *parent, const char *name, @@ -403,10 +404,11 @@ PCIBus *pci_bus_new(DeviceState *parent, const char *= name, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename) { + PCIHostState *phb =3D PCI_HOST_BRIDGE(parent); PCIBus *bus; =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_init(bus, phb, address_space_mem, address_space_io, devfn_min); return bus; } =20 --=20 2.11.0.259.g40922b1 From nobody Thu May 2 07:44:28 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 1492466691037726.6687550521546; Mon, 17 Apr 2017 15:04:51 -0700 (PDT) Received: from localhost ([::1]:38936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0ElN-00047J-KW for importer@patchew.org; Mon, 17 Apr 2017 18:04:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EgZ-0000ZV-Tf for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgY-0005r2-LA for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgT-0005nJ-Dg; Mon, 17 Apr 2017 17:59:45 -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 C337FC06586B; Mon, 17 Apr 2017 21:59:38 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id C253717ACA; Mon, 17 Apr 2017 21:59:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C337FC06586B 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 C337FC06586B From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:12 -0300 Message-Id: <20170417215916.12431-4-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-1-ehabkost@redhat.com> MIME-Version: 1.0 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]); Mon, 17 Apr 2017 21:59:39 +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 3/7] pci: Change pci_bus_new*() parameter to PCIHostState 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 , "Michael S. Tsirkin" , aik@ozlabs.ru, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , David Gibson , Laszlo Ersek 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" The pci_bus_new*() functions already require the 'parent' argument to be a PCI_HOST_BRIDGE object. Change the parameter type to reflect that. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: "Herv=C3=A9 Poussineau" Cc: Peter Maydell Cc: qemu-ppc@nongnu.org Cc: qemu-arm@nongnu.org Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- include/hw/pci/pci.h | 5 +++-- hw/pci-bridge/pci_expander_bridge.c | 15 ++++++++------- hw/pci-host/piix.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci-host/q35.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/pci/pci.c | 13 ++++++------- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index a37a2d5cb6..2242aa25eb 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -393,12 +393,13 @@ 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, +void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, + PCIHostState *phb, 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, +PCIBus *pci_bus_new(PCIHostState *phb, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, uint8_t devfn_min, const char *typename); diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 6ac187fa32..39d29d2230 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -213,7 +213,8 @@ static gint pxb_compare(gconstpointer a, gconstpointer = b) static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) { PXBDev *pxb =3D convert_to_pxb(dev); - DeviceState *ds, *bds =3D NULL; + DeviceState *bds =3D NULL; + PCIHostState *phb; PCIBus *bus; const char *dev_name =3D NULL; Error *local_err =3D NULL; @@ -228,11 +229,11 @@ static void pxb_dev_realize_common(PCIDevice *dev, bo= ol pcie, Error **errp) dev_name =3D dev->qdev.id; } =20 - ds =3D qdev_create(NULL, TYPE_PXB_HOST); + phb =3D PCI_HOST_BRIDGE(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_bus_new(phb, dev_name, NULL, NULL, 0, TYPE_PXB_PCIE_BU= S); } else { - bus =3D pci_bus_new(ds, "pxb-internal", NULL, NULL, 0, TYPE_PXB_BU= S); + bus =3D pci_bus_new(phb, "pxb-internal", NULL, NULL, 0, TYPE_PXB_B= US); 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); @@ -244,7 +245,7 @@ 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; + phb->bus =3D bus; =20 pxb_register_bus(dev, bus, &local_err); if (local_err) { @@ -252,7 +253,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool= pcie, Error **errp) goto err_register_bus; } =20 - qdev_init_nofail(ds); + qdev_init_nofail(DEVICE(phb)); if (bds) { qdev_init_nofail(bds); } @@ -267,7 +268,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool= pcie, Error **errp) err_register_bus: object_unref(OBJECT(bds)); object_unparent(OBJECT(bus)); - object_unref(OBJECT(ds)); + object_unref(OBJECT(phb)); } =20 static void pxb_dev_realize(PCIDevice *dev, Error **errp) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index f9218aa952..91fec05b38 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -340,7 +340,7 @@ 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, + b =3D pci_bus_new(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); diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 260a119a9e..2e2cd267f4 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -269,7 +269,7 @@ 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, + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), h, NULL, &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS); =20 /* Bus master address space */ diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 344f77b10c..860b47a1ba 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_bus_new(DEVICE(s), "pcie.0", + pci->bus =3D pci_bus_new(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/versatile.c b/hw/pci-host/versatile.c index 467cbb9cb8..24ef87610b 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -386,7 +386,7 @@ 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= ", + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), h, "pci", &s->pci_mem_space, &s->pci_io_space, PCI_DEVFN(11, 0), TYPE_PCI_BUS); h->bus =3D &s->pci_bus; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d9535c0bdc..f4488b46fc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -388,26 +388,25 @@ 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, +void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, + PCIHostState *phb, 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); pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); } =20 -PCIBus *pci_bus_new(DeviceState *parent, const char *name, +PCIBus *pci_bus_new(PCIHostState *phb, 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); PCIBus *bus; =20 - bus =3D PCI_BUS(qbus_create(typename, parent, name)); + bus =3D PCI_BUS(qbus_create(typename, DEVICE(phb), name)); pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); return bus; } @@ -431,7 +430,7 @@ PCIBus *pci_register_bus(DeviceState *parent, const cha= r *name, { PCIBus *bus; =20 - bus =3D pci_bus_new(parent, name, address_space_mem, + bus =3D pci_bus_new(PCI_HOST_BRIDGE(parent), name, address_space_mem, address_space_io, devfn_min, typename); pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq); return bus; --=20 2.11.0.259.g40922b1 From nobody Thu May 2 07:44:28 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 149246650848471.39709193154886; Mon, 17 Apr 2017 15:01:48 -0700 (PDT) Received: from localhost ([::1]:38926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EiQ-0001r6-WB for importer@patchew.org; Mon, 17 Apr 2017 18:01:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EgW-0000WJ-F8 for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgT-0005o8-CS for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgT-0005nm-3g; Mon, 17 Apr 2017 17:59:45 -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 4273B6198B; Mon, 17 Apr 2017 21:59:41 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B7AD17BB7; Mon, 17 Apr 2017 21:59:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4273B6198B Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4273B6198B From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:13 -0300 Message-Id: <20170417215916.12431-5-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-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.38]); Mon, 17 Apr 2017 21:59: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 4/7] pci: Change pci_register_bus() 'parent' parameter to PCIHostState 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 , Paul Burton , "Michael S. Tsirkin" , aik@ozlabs.ru, Alexander Graf , Scott Wood , Yongbok Kim , qemu-ppc@nongnu.org, Marcel Apfelbaum , David Gibson , David Gibson , Laszlo Ersek , Christian Borntraeger , Aurelien Jarno , 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" pci_register_bus() already requires the 'parent' argument to be a PCI_HOST_BRIDGE object. Change the parameter type to reflect that. Cc: Richard Henderson Cc: Aurelien Jarno Cc: Yongbok Kim Cc: Alexander Graf Cc: Scott Wood Cc: Paul Burton Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: David Gibson Cc: Cornelia Huck Cc: Christian Borntraeger Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck Reviewed-by: David Gibson Reviewed-by: Marcel Apfelbaum --- include/hw/pci/pci.h | 2 +- hw/alpha/typhoon.c | 2 +- hw/mips/gt64xxx_pci.c | 2 +- hw/pci-host/apb.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/gpex.c | 2 +- hw/pci-host/grackle.c | 2 +- hw/pci-host/ppce500.c | 2 +- hw/pci-host/uninorth.c | 4 ++-- hw/pci-host/xilinx-pcie.c | 2 +- hw/pci/pci.c | 4 ++-- hw/ppc/ppc4xx_pci.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/sh4/sh_pci.c | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 2242aa25eb..56387ccb0c 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -408,7 +408,7 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, = pci_map_irq_fn map_irq, 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, +PCIBus *pci_register_bus(PCIHostState *phb, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, MemoryRegion *address_space_mem, diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index f50f5cf186..ac0633a55e 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -883,7 +883,7 @@ 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", + b =3D pci_register_bus(phb, "pci", typhoon_set_irq, sys_map_irq, s, &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 4811843ab6..bd131bcdc6 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1171,7 +1171,7 @@ 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", + phb->bus =3D pci_register_bus(phb, "pci", gt64120_pci_set_irq, gt64120_pci_map_irq, pic, &d->pci0_mem, diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 653e711121..1156a54224 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -671,7 +671,7 @@ 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", + phb->bus =3D pci_register_bus(phb, "pci", pci_apb_set_irq, pci_pbm_map_irq, d, &d->pci_mmio, get_system_io(), diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 1999ece590..27842edc04 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -714,7 +714,7 @@ static int bonito_pcihost_initfn(SysBusDevice *dev) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); =20 - phb->bus =3D pci_register_bus(DEVICE(dev), "pci", + phb->bus =3D pci_register_bus(phb, "pci", pci_bonito_set_irq, pci_bonito_map_irq, de= v, get_system_memory(), get_system_io(), 0x28, 32, TYPE_PCI_BUS); diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 66055ee5cc..042d127271 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -62,7 +62,7 @@ static void gpex_host_realize(DeviceState *dev, Error **e= rrp) sysbus_init_irq(sbd, &s->irq[i]); } =20 - pci->bus =3D pci_register_bus(dev, "pcie.0", gpex_set_irq, + pci->bus =3D pci_register_bus(pci, "pcie.0", gpex_set_irq, pci_swizzle_map_irq_fn, s, &s->io_mmio, &s->io_ioport, 0, 4, TYPE_PCIE_BUS); =20 diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 2c8acdaaca..a56c063be9 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -82,7 +82,7 @@ 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, + phb->bus =3D pci_register_bus(phb, NULL, pci_grackle_set_irq, pci_grackle_map_irq, pic, diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index e502bc0505..4a1e99f426 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -465,7 +465,7 @@ 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, + b =3D pci_register_bus(h, NULL, mpc85xx_pci_set_irq, mpc85xx_pci_map_irq, s, &s->busmem, &s->pio, PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS); h->bus =3D b; diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index df342ac3cb..b1b89183fc 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_register_bus(dev, NULL, + h->bus =3D pci_register_bus(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic, &d->pci_mmio, @@ -299,7 +299,7 @@ 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, + h->bus =3D pci_register_bus(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic, &d->pci_mmio, diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 8b71e2d950..c951684148 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -129,7 +129,7 @@ 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->bus =3D pci_register_bus(pci, s->name, xilinx_pcie_set_irq, pci_swizzle_map_irq_fn, s, &s->mmio, &s->io, 0, 4, TYPE_PCIE_BUS); =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index f4488b46fc..f60d0497ef 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -421,7 +421,7 @@ 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, +PCIBus *pci_register_bus(PCIHostState *phb, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, MemoryRegion *address_space_mem, @@ -430,7 +430,7 @@ PCIBus *pci_register_bus(DeviceState *parent, const cha= r *name, { PCIBus *bus; =20 - bus =3D pci_bus_new(PCI_HOST_BRIDGE(parent), name, address_space_mem, + bus =3D pci_bus_new(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..f755c6faae 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -314,7 +314,7 @@ 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, + b =3D pci_register_bus(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; diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 98c52e411f..0f293f9e75 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_register_bus(dev, NULL, + bus =3D pci_register_bus(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); diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 69b0291e8a..99aae965bb 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -560,7 +560,7 @@ static int s390_pcihost_init(SysBusDevice *dev) =20 DPRINTF("host_init\n"); =20 - b =3D pci_register_bus(DEVICE(dev), NULL, + b =3D pci_register_bus(phb, NULL, s390_pci_set_irq, s390_pci_map_irq, NULL, get_system_memory(), get_system_io(), 0, 64, TYPE_PCI_BUS); diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 1747628f3d..bca849c10f 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_register_bus(DEVICE(dev), "pci", + phb->bus =3D pci_register_bus(phb, "pci", sh_pci_set_irq, sh_pci_map_irq, s->irq, get_system_memory(), --=20 2.11.0.259.g40922b1 From nobody Thu May 2 07:44:28 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 1492466518574120.69087238543375; Mon, 17 Apr 2017 15:01:58 -0700 (PDT) Received: from localhost ([::1]:38927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Eia-0001yw-V8 for importer@patchew.org; Mon, 17 Apr 2017 18:01:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0EgW-0000WV-Kz for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgU-0005pt-Iq for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgU-0005pJ-9g; Mon, 17 Apr 2017 17:59:46 -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 188D17FD43; Mon, 17 Apr 2017 21:59:45 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6D19783BB; Mon, 17 Apr 2017 21:59:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 188D17FD43 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 188D17FD43 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:14 -0300 Message-Id: <20170417215916.12431-6-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-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]); Mon, 17 Apr 2017 21:59:45 +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 5/7] pci: Set phb->bus inside pci_register_bus() 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 , Paul Burton , "Michael S. Tsirkin" , aik@ozlabs.ru, Alexander Graf , Scott Wood , Yongbok Kim , qemu-ppc@nongnu.org, Marcel Apfelbaum , David Gibson , David Gibson , Laszlo Ersek , Christian Borntraeger , Aurelien Jarno , 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" Every single caller of of pci_register_bus() saves the return value in phb->bus. Do that inside pci_register_bus() to avoid code duplication and make it harder to break. Most (but not all) conversions done using the following Coccinelle script: @@ identifier b; expression phb; @@ -b =3D pci_register_bus(phb, ARGS); +phb->bus =3D pci_register_bus(phb, ARGS); ... -phb->bus =3D b; @@ expression phb; expression list ARGS; @@ -phb->bus =3D pci_register_bus(phb, ARGS); +pci_register_bus(phb, ARGS); Cc: Richard Henderson Cc: Aurelien Jarno Cc: Yongbok Kim Cc: Alexander Graf Cc: Scott Wood Cc: Paul Burton Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: David Gibson Cc: Cornelia Huck Cc: Christian Borntraeger Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck Reviewed-by: David Gibson --- include/hw/pci/pci.h | 12 ++++++------ hw/alpha/typhoon.c | 10 +++++----- hw/mips/gt64xxx_pci.c | 9 +++------ hw/pci-host/apb.c | 7 ++----- hw/pci-host/bonito.c | 7 +++---- hw/pci-host/gpex.c | 5 ++--- hw/pci-host/grackle.c | 9 ++------- hw/pci-host/ppce500.c | 8 ++++---- hw/pci-host/uninorth.c | 18 ++++++------------ hw/pci-host/xilinx-pcie.c | 6 +++--- hw/pci/pci.c | 14 +++++++------- hw/ppc/ppc4xx_pci.c | 8 ++++---- hw/ppc/spapr_pci.c | 10 +++++----- hw/s390x/s390-pci-bus.c | 10 +++++----- hw/sh4/sh_pci.c | 9 +++------ 15 files changed, 60 insertions(+), 82 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 56387ccb0c..3b1e2c408a 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -408,12 +408,12 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq= , pci_map_irq_fn map_irq, 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(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_register_bus(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 ac0633a55e..5926686d79 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -883,11 +883,11 @@ 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_register_bus(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_register_bus(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 bd131bcdc6..69963453f0 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1171,12 +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_register_bus(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); + pci_register_bus(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-host/apb.c b/hw/pci-host/apb.c index 1156a54224..ea86260b04 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -671,11 +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_register_bus(phb, "pci", - pci_apb_set_irq, pci_pbm_map_irq, d, - &d->pci_mmio, - get_system_io(), - 0, 32, TYPE_PCI_BUS); + pci_register_bus(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 27842edc04..bbe595605d 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_register_bus(phb, "pci", - pci_bonito_set_irq, pci_bonito_map_irq, de= v, - get_system_memory(), get_system_io(), - 0x28, 32, TYPE_PCI_BUS); + pci_register_bus(phb, "pci", pci_bonito_set_irq, pci_bonito_map_irq, d= ev, + 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 042d127271..66e2f3d29c 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -62,9 +62,8 @@ static void gpex_host_realize(DeviceState *dev, Error **e= rrp) sysbus_init_irq(sbd, &s->irq[i]); } =20 - pci->bus =3D pci_register_bus(pci, "pcie.0", gpex_set_irq, - pci_swizzle_map_irq_fn, s, &s->io_mmio, - &s->io_ioport, 0, 4, TYPE_PCIE_BUS); + pci_register_bus(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 a56c063be9..691af0a29e 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -82,13 +82,8 @@ 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(phb, NULL, - pci_grackle_set_irq, - pci_grackle_map_irq, - pic, - &d->pci_mmio, - address_space_io, - 0, 4, TYPE_PCI_BUS); + pci_register_bus(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/ppce500.c b/hw/pci-host/ppce500.c index 4a1e99f426..43a06961d0 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -465,10 +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(h, NULL, mpc85xx_pci_set_irq, - mpc85xx_pci_map_irq, s, &s->busmem, &s->pio, - PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS); - h->bus =3D b; + pci_register_bus(h, 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 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/uninorth.c b/hw/pci-host/uninorth.c index b1b89183fc..4d709e5468 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -233,12 +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_register_bus(h, NULL, - pci_unin_set_irq, pci_unin_map_irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + pci_register_bus(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic, + &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 +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_register_bus(h, NULL, - pci_unin_set_irq, pci_unin_map_irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); + pci_register_bus(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic, + &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/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index c951684148..6d53677f57 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -129,9 +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_register_bus(pci, s->name, xilinx_pcie_set_irq, - pci_swizzle_map_irq_fn, s, &s->mmio, - &s->io, 0, 4, TYPE_PCIE_BUS); + pci_register_bus(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 f60d0497ef..d3adf806e5 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -421,19 +421,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(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_register_bus(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(phb, name, address_space_mem, address_space_io, devfn_min, typename); pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq); - return bus; + phb->bus =3D bus; } =20 int pci_bus_num(PCIBus *s) diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index f755c6faae..ab158b3ef1 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -314,10 +314,10 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq[i]); } =20 - b =3D pci_register_bus(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_register_bus(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 0f293f9e75..5749f14d9f 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1697,11 +1697,11 @@ 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(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); - phb->bus =3D bus; + pci_register_bus(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 99aae965bb..466067a380 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -560,15 +560,15 @@ static int s390_pcihost_init(SysBusDevice *dev) =20 DPRINTF("host_init\n"); =20 - b =3D pci_register_bus(phb, NULL, - s390_pci_set_irq, s390_pci_map_irq, NULL, - get_system_memory(), get_system_io(), 0, 64, - TYPE_PCI_BUS); + pci_register_bus(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 bca849c10f..bb43bad77d 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -131,12 +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_register_bus(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); + pci_register_bus(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 Thu May 2 07:44:28 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 1492466703380506.9752984279762; Mon, 17 Apr 2017 15:05:03 -0700 (PDT) Received: from localhost ([::1]:38938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Ela-0004HP-3l for importer@patchew.org; Mon, 17 Apr 2017 18:05:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Ega-0000a3-TR for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0EgZ-0005rS-PX for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0EgZ-0005rC-H4 for qemu-devel@nongnu.org; Mon, 17 Apr 2017 17:59:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C4D38FCF5; Mon, 17 Apr 2017 21:59:50 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E2006046B; Mon, 17 Apr 2017 21:59:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6C4D38FCF5 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6C4D38FCF5 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:15 -0300 Message-Id: <20170417215916.12431-7-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 17 Apr 2017 21:59:50 +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 6/7] pci: Set phb->bus inside pci_bus_new() 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" Every single caller of pci_bus_new() saves the return value inside phb->bus. Do that inside pci_bus_new() to avoid code duplication and make it harder to break. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- hw/pci-bridge/pci_expander_bridge.c | 2 -- hw/pci-host/piix.c | 1 - hw/pci-host/q35.c | 6 +++--- hw/pci/pci.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 39d29d2230..8344ca1cc8 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -245,8 +245,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 - phb->bus =3D bus; - pxb_register_bus(dev, bus, &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 91fec05b38..818e4979d8 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -342,7 +342,6 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, s =3D PCI_HOST_BRIDGE(dev); b =3D pci_bus_new(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); =20 diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 860b47a1ba..5b41412075 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(pci, "pcie.0", - s->mch.pci_address_space, s->mch.address_space_= io, - 0, TYPE_PCIE_BUS); + pci_bus_new(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/pci.c b/hw/pci/pci.c index d3adf806e5..486aeb7514 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -408,6 +408,7 @@ PCIBus *pci_bus_new(PCIHostState *phb, const char *name, =20 bus =3D PCI_BUS(qbus_create(typename, DEVICE(phb), name)); pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); + phb->bus =3D bus; return bus; } =20 @@ -433,7 +434,6 @@ void pci_register_bus(PCIHostState *phb, const char *na= me, bus =3D pci_bus_new(phb, name, address_space_mem, address_space_io, devfn_min, typename); pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq); - phb->bus =3D bus; } =20 int pci_bus_num(PCIBus *s) --=20 2.11.0.259.g40922b1 From nobody Thu May 2 07:44:28 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 1492466693873607.8288241469085; Mon, 17 Apr 2017 15:04:53 -0700 (PDT) Received: from localhost ([::1]:38937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0ElQ-0004BG-Gd for importer@patchew.org; Mon, 17 Apr 2017 18:04:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Egi-0000h1-LY for qemu-devel@nongnu.org; Mon, 17 Apr 2017 18:00:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0Egh-0005tH-Pk for qemu-devel@nongnu.org; Mon, 17 Apr 2017 18:00:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0Egf-0005sT-83; Mon, 17 Apr 2017 17:59:57 -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 1197D33C17F; Mon, 17 Apr 2017 21:59:56 +0000 (UTC) Received: from localhost (ovpn-116-4.gru2.redhat.com [10.97.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6D545C54E; Mon, 17 Apr 2017 21:59:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1197D33C17F 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 1197D33C17F From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 18:59:16 -0300 Message-Id: <20170417215916.12431-8-ehabkost@redhat.com> In-Reply-To: <20170417215916.12431-1-ehabkost@redhat.com> References: <20170417215916.12431-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.29]); Mon, 17 Apr 2017 21:59:56 +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 7/7] pci: Set phb->bus inside 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: Peter Maydell , "Michael S. Tsirkin" , aik@ozlabs.ru, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , David Gibson , Laszlo Ersek 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_bus_new_inplace() sets phb->bus to point to 'bus'. Do that inside pci_bus_new_inplace() to avoid code duplication and make it harder to break. Cc: "Herv=C3=A9 Poussineau" Cc: Marcel Apfelbaum Cc: "Michael S. Tsirkin" Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-ppc@nongnu.org Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson --- hw/pci-host/prep.c | 2 -- hw/pci-host/versatile.c | 1 - hw/pci/pci.c | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 2e2cd267f4..6efa5bc5ef 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -284,8 +284,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/versatile.c b/hw/pci-host/versatile.c index 24ef87610b..630f1ac1c5 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -389,7 +389,6 @@ static void pci_vpb_init(Object *obj) pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), h, "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/pci.c b/hw/pci/pci.c index 486aeb7514..ef226f8b41 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -397,6 +397,7 @@ void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, { qbus_create_inplace(bus, bus_size, typename, DEVICE(phb), name); pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); + phb->bus =3D bus; } =20 PCIBus *pci_bus_new(PCIHostState *phb, const char *name, --=20 2.11.0.259.g40922b1