@@ -631,10 +631,11 @@ static void bonito_host_realize(DeviceState *dev, Error **errp)
sysbus_init_irq(SYS_BUS_DEVICE(dev), &bs->irq);
memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_SIZE);
- phb->bus = pci_register_root_bus(dev, "pci",
- pci_bonito_set_irq, pci_bonito_map_irq,
- dev, &bs->pci_mem, get_system_io(),
- PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS);
+
+ phb->bus = pci_root_bus_new(dev, "pci", &bs->pci_mem, get_system_io(),
+ PCI_DEVFN(5, 0), TYPE_PCI_BUS);
+ pci_bus_irqs(phb->bus, pci_bonito_set_irq, dev, 32);
+ pci_bus_map_irqs(phb->bus, pci_bonito_map_irq);
for (size_t i = 0; i < 3; i++) {
char *name = g_strdup_printf("pci.lomem%zu", i);
pci_bonito_map_irq() is board-specific but has to be implemented in the north bridge because pci_register_root_bus() wants a pci_map_irq_fn. Inline pci_register_root_bus() so we can move pci_bonito_map_irq() to board code in the next step. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/pci-host/bonito.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)