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