Commit 8c40b8d9 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

sun4u: move ISABus inside of EBusState 



Since the EBus is effectively a PCI-ISA bridge then the underlying ISA bus
should be contained within the PCI bridge itself.

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

hw/sparc64/sun4u.c

+5 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ typedef struct EbusState { 
    /*< private >*/

    PCIDevice parent_obj;



    ISABus *isa_bus;

    MemoryRegion bar0;

    MemoryRegion bar1;

} EbusState;
@@ -245,8 +246,10 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp) 
{

    EbusState *s = EBUS(pci_dev);



    if (!isa_bus_new(DEVICE(pci_dev), get_system_memory(),

                     pci_address_space_io(pci_dev), errp)) {

    s->isa_bus = isa_bus_new(DEVICE(pci_dev), get_system_memory(),

                             pci_address_space_io(pci_dev), errp);

    if (!s->isa_bus) {

        error_setg(errp, "unable to instantiate EBUS ISA bus");

        return;

    }