[Qemu-devel] [RFC 0/6] ISA bus improvements

[Qemu-devel] [RFC 0/6] ISA bus improvements

[Hervé Poussineau]

Following patches aim to change ISA bus to a first-citizen class in Qemu.

They add ISA bus ops (like for scsi and usb buses), and use them to
remove the infamous isa_mem_base variable, which can't be changed after
startup.

Last two patches convert two ISA bridges to the new API. ISA bridges
used in MIPS/Malta and MIPS/fulong2e are not converted (yet).

Once all callers are converted, most of the work will be done to
support architectures with multiple ISA buses

Hervé Poussineau (6):
  isa: rename isa_bus_new to isa_bus_bridge_init
  isa: rework ISA bus internals, and add ISA bus ops structure
  isa: add isa_address_space() method
  vga: use isa_address_space() method
  isa: improve bus implementation of PIIX3 bridge
  isa: improve bus implementation of ebus bridge

 hw/cirrus_vga.c |    4 +-
 hw/isa-bus.c    |   86 ++++++++++++++++++++++++++++++++++++++++++++++--------
 hw/isa.h        |   19 +++++++++++-
 hw/mips_jazz.c  |    2 +-
 hw/mips_r4k.c   |    2 +-
 hw/pc_piix.c    |    4 +-
 hw/piix4.c      |    2 +-
 hw/piix_pci.c   |   23 ++++++++++++++-
 hw/ppc_prep.c   |    2 +-
 hw/sun4u.c      |   39 ++++++++++++++++++++----
 hw/vga-isa.c    |    4 +-
 hw/vga.c        |    4 +-
 hw/vt82c686.c   |    2 +-
 13 files changed, 158 insertions(+), 35 deletions(-)

-- 
1.7.5.4

[Qemu-devel] [RFC 1/6] isa: rename isa_bus_new to isa_bus_bridge_init

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/isa-bus.c   |    2 +-
 hw/isa.h       |    2 +-
 hw/mips_jazz.c |    2 +-
 hw/mips_r4k.c  |    2 +-
 hw/pc_piix.c   |    2 +-
 hw/piix4.c     |    2 +-
 hw/piix_pci.c  |    2 +-
 hw/ppc_prep.c  |    2 +-
 hw/sun4u.c     |    2 +-
 hw/vt82c686.c  |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 2765543..21b4b51 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -38,7 +38,7 @@ static struct BusInfo isa_bus_info = {
     .get_fw_dev_path = isabus_get_fw_dev_path,
 };
 
-ISABus *isa_bus_new(DeviceState *dev)
+ISABus *isa_bus_bridge_init(DeviceState *dev)
 {
     if (isabus) {
         fprintf(stderr, "Can't create a second ISA bus\n");
diff --git a/hw/isa.h b/hw/isa.h
index f1f2181..d6938f1 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -25,7 +25,7 @@ struct ISADeviceInfo {
     isa_qdev_initfn init;
 };
 
-ISABus *isa_bus_new(DeviceState *dev);
+ISABus *isa_bus_bridge_init(DeviceState *dev);
 void isa_bus_irqs(qemu_irq *irqs);
 qemu_irq isa_get_irq(int isairq);
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index f6ab6dc..7da78ca 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -180,7 +180,7 @@ void mips_jazz_init (ram_addr_t ram_size,
 
     /* ISA devices */
     i8259 = i8259_init(env->irq[4]);
-    isa_bus_new(NULL);
+    isa_bus_bridge_init(NULL);
     isa_bus_irqs(i8259);
     cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
     DMA_init(0, cpu_exit_irq);
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 2834a46..f0db92b 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -265,7 +265,7 @@ void mips_r4k_init (ram_addr_t ram_size,
 
     /* The PIC is attached to the MIPS CPU INT0 pin */
     i8259 = i8259_init(env->irq[2]);
-    isa_bus_new(NULL);
+    isa_bus_bridge_init(NULL);
     isa_bus_irqs(i8259);
 
     rtc_init(2000, NULL);
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 7dd5008..d8f285c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -134,7 +134,7 @@ static void pc_init1(MemoryRegion *system_memory,
     } else {
         pci_bus = NULL;
         i440fx_state = NULL;
-        isa_bus_new(NULL);
+        isa_bus_bridge_init(NULL);
     }
     isa_bus_irqs(isa_irq);
 
diff --git a/hw/piix4.c b/hw/piix4.c
index 9590e7b..984de8b 100644
--- a/hw/piix4.c
+++ b/hw/piix4.c
@@ -87,7 +87,7 @@ static int piix4_initfn(PCIDevice *dev)
 {
     PIIX4State *d = DO_UPCAST(PIIX4State, dev, dev);
 
-    isa_bus_new(&d->dev.qdev);
+    isa_bus_bridge_init(&d->dev.qdev);
     piix4_dev = &d->dev;
     qemu_register_reset(piix4_reset, d);
     return 0;
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 28a3ee2..0b56553 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -447,7 +447,7 @@ static int piix3_initfn(PCIDevice *dev)
 {
     PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
 
-    isa_bus_new(&d->dev.qdev);
+    isa_bus_bridge_init(&d->dev.qdev);
     qemu_register_reset(piix3_reset, d);
     return 0;
 }
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 38d8573..620b69f 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -651,7 +651,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
     i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]);
     pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io());
     /* Hmm, prep has no pci-isa bridge ??? */
-    isa_bus_new(NULL);
+    isa_bus_bridge_init(NULL);
     isa_bus_irqs(i8259);
     //    pci_bus = i440fx_init();
     /* Register 8 MB of ISA IO space (needed for non-contiguous map) */
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 7b2d0b1..7e5a7e1 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -544,7 +544,7 @@ pci_ebus_init1(PCIDevice *pci_dev)
 {
     EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
 
-    isa_bus_new(&pci_dev->qdev);
+    isa_bus_bridge_init(&pci_dev->qdev);
 
     pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
     pci_dev->config[0x05] = 0x00;
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 5c973ed..25430d7 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -490,7 +490,7 @@ static int vt82c686b_initfn(PCIDevice *d)
     uint8_t *wmask;
     int i;
 
-    isa_bus_new(&d->qdev);
+    isa_bus_bridge_init(&d->qdev);
 
     pci_conf = d->config;
     pci_config_set_prog_interface(pci_conf, 0x0);
-- 
1.7.5.4

[Qemu-devel] [RFC 2/6] isa: rework ISA bus internals, and add ISA bus ops structure

[Hervé Poussineau]

This allows future implementations of real pci-isa bridges
or EISA bus emulation

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/isa-bus.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 hw/isa.h     |   15 ++++++++++++++
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 21b4b51..4757ff9 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -21,12 +21,9 @@
 #include "sysbus.h"
 #include "isa.h"
 
-struct ISABus {
-    BusState qbus;
-    qemu_irq *irqs;
-};
 static ISABus *isabus;
 target_phys_addr_t isa_mem_base = 0;
+static qemu_irq *isa_bus_default_irqs;
 
 static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
 static char *isabus_get_fw_dev_path(DeviceState *dev);
@@ -38,6 +35,24 @@ static struct BusInfo isa_bus_info = {
     .get_fw_dev_path = isabus_get_fw_dev_path,
 };
 
+static void isa_bus_default_set_irqs(ISABus *bus, qemu_irq *irqs)
+{
+    isa_bus_default_irqs = irqs;
+}
+
+static qemu_irq isa_bus_default_get_irq(ISABus *bus, int isairq)
+{
+    if (isairq < 0 || isairq > 15) {
+        hw_error("isa irq %d invalid", isairq);
+    }
+    return isa_bus_default_irqs[isairq];
+}
+
+static ISABusOps isa_bus_default_ops = {
+    .set_irqs = isa_bus_default_set_irqs,
+    .get_irq = isa_bus_default_get_irq,
+};
+
 ISABus *isa_bus_bridge_init(DeviceState *dev)
 {
     if (isabus) {
@@ -48,14 +63,29 @@ ISABus *isa_bus_bridge_init(DeviceState *dev)
         dev = qdev_create(NULL, "isabus-bridge");
         qdev_init_nofail(dev);
     }
-
-    isabus = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));
+    else {
+        isabus = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));
+        isabus->ops = &isa_bus_default_ops;
+    }
     return isabus;
 }
 
+void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host)
+{
+    if (isabus) {
+        hw_error("Can't create a second ISA bus");
+    }
+    qbus_create_inplace(&bus->qbus, &isa_bus_info, host, NULL);
+    bus->ops = ops;
+    isabus = bus;
+}
+
 void isa_bus_irqs(qemu_irq *irqs)
 {
-    isabus->irqs = irqs;
+    if (!isabus || !isabus->ops->set_irqs) {
+        hw_error("Tried to set isa irqs with no isa bus present.");
+    }
+    isabus->ops->set_irqs(isabus, irqs);
 }
 
 /*
@@ -66,10 +96,10 @@ void isa_bus_irqs(qemu_irq *irqs)
  */
 qemu_irq isa_get_irq(int isairq)
 {
-    if (isairq < 0 || isairq > 15) {
-        hw_error("isa irq %d invalid", isairq);
+    if (!isabus || !isabus->ops->get_irq) {
+        hw_error("ISA bus invalid");
     }
-    return isabus->irqs[isairq];
+    return isabus->ops->get_irq(isabus, isairq);
 }
 
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
@@ -169,9 +199,15 @@ static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)
     }
 }
 
+typedef struct {
+    SysBusDevice busdev;
+    ISABus bus;
+} ISABridgeSysBusState;
+
 static int isabus_bridge_init(SysBusDevice *dev)
 {
-    /* nothing */
+    ISABridgeSysBusState *isa = FROM_SYSBUS(ISABridgeSysBusState, dev);
+    isa_bus_new(&isa->bus, &isa_bus_default_ops, &dev->qdev);
     return 0;
 }
 
@@ -179,7 +215,7 @@ static SysBusDeviceInfo isabus_bridge_info = {
     .init = isabus_bridge_init,
     .qdev.name  = "isabus-bridge",
     .qdev.fw_name  = "isa",
-    .qdev.size  = sizeof(SysBusDevice),
+    .qdev.size  = sizeof(ISABridgeSysBusState),
     .qdev.no_user = 1,
 };
 
diff --git a/hw/isa.h b/hw/isa.h
index d6938f1..8c1583f 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -8,6 +8,7 @@
 #include "qdev.h"
 
 typedef struct ISABus ISABus;
+typedef struct ISABusOps ISABusOps;
 typedef struct ISADevice ISADevice;
 typedef struct ISADeviceInfo ISADeviceInfo;
 
@@ -25,7 +26,21 @@ struct ISADeviceInfo {
     isa_qdev_initfn init;
 };
 
+/* isa-bus.c */
+
+struct ISABus {
+    BusState qbus;
+    ISABusOps *ops;
+};
+
+struct ISABusOps {
+    void (*set_irqs)(ISABus *bus, qemu_irq *irqs);
+    qemu_irq (*get_irq)(ISABus *bus, int isairq);
+};
+
 ISABus *isa_bus_bridge_init(DeviceState *dev);
+
+void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host);
 void isa_bus_irqs(qemu_irq *irqs);
 qemu_irq isa_get_irq(int isairq);
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
-- 
1.7.5.4

[Qemu-devel] [RFC 3/6] isa: add isa_address_space() method

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/isa-bus.c |   24 ++++++++++++++++++++++++
 hw/isa.h     |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 4757ff9..2bc384a 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -20,10 +20,12 @@
 #include "monitor.h"
 #include "sysbus.h"
 #include "isa.h"
+#include "exec-memory.h"
 
 static ISABus *isabus;
 target_phys_addr_t isa_mem_base = 0;
 static qemu_irq *isa_bus_default_irqs;
+static MemoryRegion *isa_bus_default_mem;
 
 static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
 static char *isabus_get_fw_dev_path(DeviceState *dev);
@@ -48,9 +50,23 @@ static qemu_irq isa_bus_default_get_irq(ISABus *bus, int isairq)
     return isa_bus_default_irqs[isairq];
 }
 
+static MemoryRegion *isa_bus_default_get_address_space(ISABus *bus)
+{
+    if (!isa_bus_default_mem) {
+        /* First call to this method, initialize memory region */
+        isa_bus_default_mem = (MemoryRegion *)qemu_malloc(sizeof(MemoryRegion));
+        memory_region_init(isa_bus_default_mem, "isa-memory", 0x00100000);
+        memory_region_add_subregion(get_system_memory(),
+                                    isa_mem_base,
+                                    isa_bus_default_mem);
+    }
+    return isa_bus_default_mem;
+}
+
 static ISABusOps isa_bus_default_ops = {
     .set_irqs = isa_bus_default_set_irqs,
     .get_irq = isa_bus_default_get_irq,
+    .get_address_space = isa_bus_default_get_address_space,
 };
 
 ISABus *isa_bus_bridge_init(DeviceState *dev)
@@ -102,6 +118,14 @@ qemu_irq isa_get_irq(int isairq)
     return isabus->ops->get_irq(isabus, isairq);
 }
 
+MemoryRegion *isa_address_space(void)
+{
+    if (!isabus || !isabus->ops->get_address_space) {
+        hw_error("Tried to get isa address space with no isa bus present.");
+    }
+    return isabus->ops->get_address_space(isabus);
+}
+
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
 {
     assert(dev->nirqs < ARRAY_SIZE(dev->isairq));
diff --git a/hw/isa.h b/hw/isa.h
index 8c1583f..19c4720 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -36,6 +36,7 @@ struct ISABus {
 struct ISABusOps {
     void (*set_irqs)(ISABus *bus, qemu_irq *irqs);
     qemu_irq (*get_irq)(ISABus *bus, int isairq);
+    MemoryRegion *(*get_address_space)(ISABus *bus);
 };
 
 ISABus *isa_bus_bridge_init(DeviceState *dev);
@@ -43,6 +44,7 @@ ISABus *isa_bus_bridge_init(DeviceState *dev);
 void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host);
 void isa_bus_irqs(qemu_irq *irqs);
 qemu_irq isa_get_irq(int isairq);
+MemoryRegion *isa_address_space(void);
 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
 void isa_init_ioport(ISADevice *dev, uint16_t ioport);
 void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length);
-- 
1.7.5.4

[Qemu-devel] [RFC 4/6] vga: use isa_address_space() method

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/cirrus_vga.c |    4 ++--
 hw/vga-isa.c    |    4 ++--
 hw/vga.c        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index b489309..ebc4aec 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2856,8 +2856,8 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
     memory_region_init_io(&s->low_mem, &cirrus_vga_mem_ops, s,
                           "cirrus-low-memory", 0x20000);
     memory_region_add_subregion(&s->low_mem_container, 0, &s->low_mem);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         &s->low_mem_container,
                                         1);
     memory_region_set_coalescing(&s->low_mem);
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index fef7f58..bbbf643 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -51,8 +51,8 @@ static int vga_initfn(ISADevice *dev)
 
     vga_common_init(s, VGA_RAM_SIZE);
     vga_io_memory = vga_init_io(s);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         vga_io_memory, 1);
     memory_region_set_coalescing(vga_io_memory);
     isa_init_ioport(dev, 0x3c0);
diff --git a/hw/vga.c b/hw/vga.c
index 33dc478..0d4b5c2 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2250,8 +2250,8 @@ void vga_init(VGACommonState *s)
     s->bank_offset = 0;
 
     vga_io_memory = vga_init_io(s);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         vga_io_memory,
                                         1);
     memory_region_set_coalescing(vga_io_memory);
-- 
1.7.5.4

[Qemu-devel] [RFC 5/6] isa: improve bus implementation of PIIX3 bridge

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/pc_piix.c  |    2 +-
 hw/piix_pci.c |   23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index d8f285c..af45a13 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -135,8 +135,8 @@ static void pc_init1(MemoryRegion *system_memory,
         pci_bus = NULL;
         i440fx_state = NULL;
         isa_bus_bridge_init(NULL);
+        isa_bus_irqs(i8259);
     }
-    isa_bus_irqs(isa_irq);
 
     pc_register_ferr_irq(isa_get_irq(13));
 
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 0b56553..4be1dcd 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -30,6 +30,7 @@
 #include "sysbus.h"
 #include "range.h"
 #include "xen.h"
+#include "exec-memory.h"
 
 /*
  * I440FX chipset data sheet.
@@ -45,6 +46,7 @@ typedef PCIHostState I440FXState;
 
 typedef struct PIIX3State {
     PCIDevice dev;
+    ISABus bus;
 
     /*
      * bitmap to track pic levels.
@@ -443,11 +445,30 @@ static const VMStateDescription vmstate_piix3 = {
     }
 };
 
+static qemu_irq piix3_bus_get_irq(ISABus *bus, int isairq)
+{
+    PIIX3State *d = container_of(bus, PIIX3State, bus);
+    if (isairq < 0 || isairq >= PIIX_NUM_PIC_IRQS) {
+        hw_error("isa irq %d invalid", isairq);
+    }
+    return d->pic[isairq];
+}
+
+static MemoryRegion *piix3_bus_get_address_space(ISABus *bus)
+{
+    return get_system_memory();
+}
+
+static ISABusOps piix3_bus_ops = {
+    .get_irq = piix3_bus_get_irq,
+    .get_address_space = piix3_bus_get_address_space,
+};
+
 static int piix3_initfn(PCIDevice *dev)
 {
     PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
 
-    isa_bus_bridge_init(&d->dev.qdev);
+    isa_bus_new(&d->bus, &piix3_bus_ops, &dev->qdev);
     qemu_register_reset(piix3_reset, d);
     return 0;
 }
-- 
1.7.5.4

[Qemu-devel] [RFC 6/6] isa: improve bus implementation of ebus bridge

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/sun4u.c |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 7e5a7e1..898541e 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -38,6 +38,7 @@
 #include "loader.h"
 #include "elf.h"
 #include "blockdev.h"
+#include "exec-memory.h"
 
 //#define DEBUG_IRQ
 //#define DEBUG_EBUS
@@ -93,6 +94,9 @@ struct hwdef {
 
 typedef struct EbusState {
     PCIDevice pci_dev;
+    ISABus bus;
+    MemoryRegion isa_mem_space;
+    qemu_irq *isa_irq;
     MemoryRegion bar0;
     MemoryRegion bar1;
 } EbusState;
@@ -532,19 +536,40 @@ static void dummy_isa_irq_handler(void *opaque, int n, int level)
 static void
 pci_ebus_init(PCIBus *bus, int devfn)
 {
-    qemu_irq *isa_irq;
-
     pci_create_simple(bus, devfn, "ebus");
-    isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16);
-    isa_bus_irqs(isa_irq);
 }
 
+static qemu_irq pci_ebus_get_irq(ISABus *bus, int isairq)
+{
+    EbusState *s = container_of(bus, EbusState, bus);
+    if (isairq < 0 || isairq >= 16) {
+        hw_error("isa irq %d invalid", isairq);
+    }
+    return s->isa_irq[isairq];
+}
+
+static MemoryRegion *pci_ebus_get_address_space(ISABus *bus)
+{
+    EbusState *s = container_of(bus, EbusState, bus);
+    return &s->isa_mem_space;
+}
+
+static ISABusOps pci_ebus_ops = {
+    .get_irq = pci_ebus_get_irq,
+    .get_address_space = pci_ebus_get_address_space,
+};
+
 static int
 pci_ebus_init1(PCIDevice *pci_dev)
 {
     EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
 
-    isa_bus_bridge_init(&pci_dev->qdev);
+    isa_bus_new(&s->bus, &pci_ebus_ops, &pci_dev->qdev);
+    memory_region_init(&s->isa_mem_space, "isa-memory", 0x00100000);
+    memory_region_add_subregion(get_system_memory(),
+                                APB_PCI_IO_BASE,
+                                &s->isa_mem_space);
+    s->isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16);
 
     pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
     pci_dev->config[0x05] = 0x00;
@@ -759,12 +784,12 @@ static void sun4uv_init(ram_addr_t RAM_size,
     irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS);
     pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, irq, &pci_bus2,
                            &pci_bus3);
-    isa_mem_base = APB_PCI_IO_BASE;
-    pci_vga_init(pci_bus);
 
     // XXX Should be pci_bus3
     pci_ebus_init(pci_bus, -1);
 
+    pci_vga_init(pci_bus);
+
     i = 0;
     if (hwdef->console_serial_base) {
         serial_mm_init(hwdef->console_serial_base, 0, NULL, 115200,
-- 
1.7.5.4

Re: [Qemu-devel] [RFC 6/6] isa: improve bus implementation of ebus bridge

[Richard Henderson]

On 08/20/2011 07:56 AM, Hervé Poussineau wrote:
> +    memory_region_init(&s->isa_mem_space, "isa-memory", 0x00100000);
> +    memory_region_add_subregion(get_system_memory(),
> +                                APB_PCI_IO_BASE,
> +                                &s->isa_mem_space);

You should be passing on, or adding this subregion to, the PCI
memory region.  Unfortunately, apb_pci.c hasn't been converted
to the new api yet...


r~