From nobody Sat Feb 7 06:39:57 2026 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