[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 07/16] apb: return APBState from pci_apb_init() ra
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCHv3 07/16] apb: return APBState from pci_apb_init() rather than PCIBus |
Date: |
Thu, 21 Dec 2017 08:20:36 +0000 |
This is a first step towards removing pci_apb_init() completely.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/pci-host/apb.c | 8 ++++----
hw/sparc64/sun4u.c | 6 ++++--
include/hw/pci-host/apb.h | 6 +++---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index c7837efb7a..0c709992ec 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -612,9 +612,9 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Error
**errp)
pci_bridge_update_mappings(PCI_BRIDGE(br));
}
-PCIBus *pci_apb_init(hwaddr special_base,
- hwaddr mem_base,
- qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)
+APBState *pci_apb_init(hwaddr special_base,
+ hwaddr mem_base,
+ qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)
{
DeviceState *dev;
SysBusDevice *s;
@@ -675,7 +675,7 @@ PCIBus *pci_apb_init(hwaddr special_base,
qdev_init_nofail(&pci_dev->qdev);
*busA = pci_bridge_get_sec_bus(br);
- return phb->bus;
+ return d;
}
static void pci_pbm_reset(DeviceState *d)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index b441f1ecdb..a64ddc569d 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -482,6 +482,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_entry;
+ APBState *apb;
PCIBus *pci_bus, *pci_busA, *pci_busB;
PCIDevice *ebus, *pci_dev;
SysBusDevice *s;
@@ -502,8 +503,9 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
prom_init(hwdef->prom_addr, bios_name);
ivec_irqs = qemu_allocate_irqs(sparc64_cpu_set_ivec_irq, cpu, IVEC_MAX);
- pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs,
&pci_busA,
- &pci_busB);
+ apb = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_busA,
+ &pci_busB);
+ pci_bus = PCI_HOST_BRIDGE(apb)->bus;
/* Only in-built Simba PBMs can exist on the root bus, slot 0 on busA is
reserved (leaving no slots free after on-board devices) however slots
diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h
index 35d7d5ad7b..a4ef51adc8 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -89,7 +89,7 @@ typedef struct PBMPCIBridge {
#define PBM_PCI_BRIDGE(obj) \
OBJECT_CHECK(PBMPCIBridge, (obj), TYPE_PBM_PCI_BRIDGE)
-PCIBus *pci_apb_init(hwaddr special_base,
- hwaddr mem_base,
- qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);
+APBState *pci_apb_init(hwaddr special_base,
+ hwaddr mem_base,
+ qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);
#endif
--
2.11.0
- [Qemu-devel] [PATCHv3 00/16] sun4u: tidy-up CPU, APB and ebus, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 06/16] apb: APB QOMify tidy-up, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 07/16] apb: return APBState from pci_apb_init() rather than PCIBus,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCHv3 04/16] sun4u: remove pci_ebus_init() function, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 03/16] sun4u: move ISABus inside of EBusState, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 05/16] sun4u: move initialisation of all ISABus devices into ebus_realize(), Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 02/16] sun4u: ebus QOMify tidy-up, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 01/16] apb: move QOM macros and typedefs from apb.c to apb.h, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 09/16] apb: move the two secondary PCI bridges objects into APBState, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 08/16] apb: use gpios to wire up the apb device to the SPARC CPU IRQs, Mark Cave-Ayland, 2017/12/21