apb: move the two secondary PCI bridges objects into APBState

This enables us to remove these parameters from pci_apb_init().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2017-12-21 07:32:57 +00:00
parent 2a4d6af51b
commit 4272ad4018
3 changed files with 12 additions and 12 deletions

View file

@ -68,6 +68,8 @@ typedef struct APBState {
MemoryRegion pci_ioport;
uint64_t pci_irq_in;
IOMMUState iommu;
PCIBridge *bridgeA;
PCIBridge *bridgeB;
uint32_t pci_control[16];
uint32_t pci_irq_map[8];
uint32_t pci_err_irq_map[4];
@ -92,6 +94,5 @@ typedef struct PBMPCIBridge {
OBJECT_CHECK(PBMPCIBridge, (obj), TYPE_PBM_PCI_BRIDGE)
APBState *pci_apb_init(hwaddr special_base,
hwaddr mem_base,
PCIBus **bus2, PCIBus **bus3);
hwaddr mem_base);
#endif