From nobody Tue Feb 10 20:31:08 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.zohomail.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 1499810143131159.1216661615448; Tue, 11 Jul 2017 14:55:43 -0700 (PDT) Received: from localhost ([::1]:49088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dV389-0002pV-0T for importer@patchew.org; Tue, 11 Jul 2017 17:55:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dV36J-0001JS-Dy for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:53:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dV36I-0005Mg-4r for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:53:47 -0400 Received: from chuckie.co.uk ([82.165.15.123]:35128 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dV36H-0005MG-Ti for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:53:46 -0400 Received: from host109-153-193-12.range109-153.btcentralplus.com ([109.153.193.12] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dV36F-0003gf-NB; Tue, 11 Jul 2017 22:53:44 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Tue, 11 Jul 2017 22:53:23 +0100 Message-Id: <1499810007-28613-5-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1499810007-28613-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1499810007-28613-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.153.193.12 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 4/8] apb: fix up PCI bus nomenclature 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: , 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" Rather than referring to the PCI busses as bus2 and bus3, refer to them as busA and busB as per the documentation. Also replace the long bus names with the shorter pciA and pciB aliases (to make it easier to attach additional devices to either from the command line). Signed-off-by: Mark Cave-Ayland --- hw/pci-host/apb.c | 12 +++++------- hw/sparc64/sun4u.c | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 326f5ef..622c341 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -656,7 +656,7 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Erro= r **errp) =20 PCIBus *pci_apb_init(hwaddr special_base, hwaddr mem_base, - qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3, + qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB, qemu_irq **pbm_irqs) { DeviceState *dev; @@ -706,18 +706,16 @@ PCIBus *pci_apb_init(hwaddr special_base, pci_dev =3D pci_create_multifunction(phb->bus, PCI_DEVFN(1, 0), true, "pbm-bridge"); br =3D PCI_BRIDGE(pci_dev); - pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 1", - pci_apb_map_irq); + pci_bridge_map_irq(br, "pciB", pci_apb_map_irq); qdev_init_nofail(&pci_dev->qdev); - *bus2 =3D pci_bridge_get_sec_bus(br); + *busB =3D pci_bridge_get_sec_bus(br); =20 pci_dev =3D pci_create_multifunction(phb->bus, PCI_DEVFN(1, 1), true, "pbm-bridge"); br =3D PCI_BRIDGE(pci_dev); - pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 2", - pci_apb_map_irq); + pci_bridge_map_irq(br, "pciA", pci_apb_map_irq); qdev_init_nofail(&pci_dev->qdev); - *bus3 =3D pci_bridge_get_sec_bus(br); + *busA =3D pci_bridge_get_sec_bus(br); =20 return phb->bus; } diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 4f96d97..5ddd30f 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -426,7 +426,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, Nvram *nvram; unsigned int i; uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_en= try; - PCIBus *pci_bus, *pci_bus2, *pci_bus3; + PCIBus *pci_bus, *pci_busA, *pci_busB; PCIDevice *ebus; ISABus *isa_bus; SysBusDevice *s; @@ -446,11 +446,11 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, prom_init(hwdef->prom_addr, bios_name); =20 ivec_irqs =3D qemu_allocate_irqs(sparc64_cpu_set_ivec_irq, cpu, IVEC_M= AX); - pci_bus =3D pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &p= ci_bus2, - &pci_bus3, &pbm_irqs); + pci_bus =3D pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &p= ci_busA, + &pci_busB, &pbm_irqs); pci_vga_init(pci_bus); =20 - /* XXX Should be pci_bus3 */ + /* XXX Should be pci_busA */ ebus =3D pci_create_simple(pci_bus, -1, "ebus"); isa_bus =3D pci_ebus_init(ebus, pbm_irqs); =20 --=20 1.7.10.4