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: 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:
parent
ad6856e875
commit
8c40b8d9fb
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user