Commit 588978c0 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

apb: return APBState from pci_apb_init() rather than PCIBus 



This is a first step towards removing pci_apb_init() completely.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarArtyom Tarasenko <atar4qemu@gmail.com>
parent b26f4419

hw/pci-host/apb.c

+4 −4
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Error **errp) 
    pci_bridge_update_mappings(PCI_BRIDGE(br));

}



PCIBus *pci_apb_init(hwaddr special_base,

APBState *pci_apb_init(hwaddr special_base,

                       hwaddr mem_base,

                       qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)

{
@@ -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)

hw/sparc64/sun4u.c

+4 −2
Original line number Diff line number Diff line
@@ -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,

    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

include/hw/pci-host/apb.h

+3 −3
Original line number Diff line number Diff line
@@ -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,

APBState *pci_apb_init(hwaddr special_base,

                       hwaddr mem_base,

                       qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);

#endif