[RFC,08/11] hw/isa: Extract bus part from isa_register_portio_list()

Commit Message

Philippe Mathieu-Daudé May 18, 2021, 9:55 p.m. UTC

isa_register_portio_list() takes an ISADevice argument mostly
to resolve the ISA bus. Extract the bus logic to a new function:
isa_bus_register_portio_list().

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 include/hw/isa/isa.h |  4 ++++
 hw/isa/isa-bus.c     | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

Patch

diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index fd8b84d8007..ce31eef8858 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -139,6 +139,10 @@  void isa_register_portio_list(ISADevice *dev,
                               uint16_t start,
                               const MemoryRegionPortio *portio,
                               void *opaque, const char *name);
+void isa_bus_register_portio_list(ISABus *isabus, Object *owner,
+                                  PortioList *piolist, uint16_t start,
+                                  const MemoryRegionPortio *portio,
+                                  void *opaque, const char *name);
 
 static inline ISABus *isa_bus_from_device(ISADevice *d)
 {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 65a26ac6c2c..c79d7e338b0 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -140,20 +140,29 @@  void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start)
     isa_init_ioport(dev, start);
 }
 
+void isa_bus_register_portio_list(ISABus *isabus, Object *owner,
+                                  PortioList *piolist, uint16_t start,
+                                  const MemoryRegionPortio *portio,
+                                  void *opaque, const char *name)
+{
+    assert(piolist && !piolist->owner);
+
+    portio_list_init(piolist, owner, portio, opaque, name);
+    portio_list_add(piolist, isabus->address_space_io, start);
+}
+
 void isa_register_portio_list(ISADevice *dev,
                               PortioList *piolist, uint16_t start,
                               const MemoryRegionPortio *pio_start,
                               void *opaque, const char *name)
 {
-    assert(piolist && !piolist->owner);
-
     /* START is how we should treat DEV, regardless of the actual
        contents of the portio array.  This is how the old code
        actually handled e.g. the FDC device.  */
     isa_init_ioport(dev, start);
 
-    portio_list_init(piolist, OBJECT(dev), pio_start, opaque, name);
-    portio_list_add(piolist, isabus->address_space_io, start);
+    isa_bus_register_portio_list(isabus, OBJECT(dev), piolist, start,
+                                 pio_start, opaque, name);
 }
 
 static void isa_device_init(Object *obj)