mirror of https://github.com/proxmox/mirror_qemu
apb: return APBState from pci_apb_init() rather than PCIBus
This is a first step towards removing pci_apb_init() completely. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>master
parent
b26f441903
commit
588978c0a1
|
@ -612,7 +612,7 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Error **errp)
|
||||||
pci_bridge_update_mappings(PCI_BRIDGE(br));
|
pci_bridge_update_mappings(PCI_BRIDGE(br));
|
||||||
}
|
}
|
||||||
|
|
||||||
PCIBus *pci_apb_init(hwaddr special_base,
|
APBState *pci_apb_init(hwaddr special_base,
|
||||||
hwaddr mem_base,
|
hwaddr mem_base,
|
||||||
qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)
|
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);
|
qdev_init_nofail(&pci_dev->qdev);
|
||||||
*busA = pci_bridge_get_sec_bus(br);
|
*busA = pci_bridge_get_sec_bus(br);
|
||||||
|
|
||||||
return phb->bus;
|
return d;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pci_pbm_reset(DeviceState *d)
|
static void pci_pbm_reset(DeviceState *d)
|
||||||
|
|
|
@ -482,6 +482,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
|
||||||
Nvram *nvram;
|
Nvram *nvram;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
|
uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
|
||||||
|
APBState *apb;
|
||||||
PCIBus *pci_bus, *pci_busA, *pci_busB;
|
PCIBus *pci_bus, *pci_busA, *pci_busB;
|
||||||
PCIDevice *ebus, *pci_dev;
|
PCIDevice *ebus, *pci_dev;
|
||||||
SysBusDevice *s;
|
SysBusDevice *s;
|
||||||
|
@ -502,8 +503,9 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
|
||||||
prom_init(hwdef->prom_addr, bios_name);
|
prom_init(hwdef->prom_addr, bios_name);
|
||||||
|
|
||||||
ivec_irqs = qemu_allocate_irqs(sparc64_cpu_set_ivec_irq, cpu, IVEC_MAX);
|
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_busB);
|
||||||
|
pci_bus = PCI_HOST_BRIDGE(apb)->bus;
|
||||||
|
|
||||||
/* Only in-built Simba PBMs can exist on the root bus, slot 0 on busA is
|
/* 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
|
reserved (leaving no slots free after on-board devices) however slots
|
||||||
|
|
|
@ -89,7 +89,7 @@ typedef struct PBMPCIBridge {
|
||||||
#define PBM_PCI_BRIDGE(obj) \
|
#define PBM_PCI_BRIDGE(obj) \
|
||||||
OBJECT_CHECK(PBMPCIBridge, (obj), TYPE_PBM_PCI_BRIDGE)
|
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,
|
hwaddr mem_base,
|
||||||
qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);
|
qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue