* [PATCH 1/2] exec/ioport: Factor portio_list_register_flush_coalesced() out
2023-02-07 23:46 [PATCH 0/2] exec/ioport: Factor portio_list_register[flush_coalesced]() out Philippe Mathieu-Daudé
@ 2023-02-07 23:46 ` Philippe Mathieu-Daudé
2023-02-08 19:11 ` Richard Henderson
2023-02-07 23:46 ` [PATCH 2/2] exec/ioport: Factor portio_list_register() out Philippe Mathieu-Daudé
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-07 23:46 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Peter Xu, Hervé Poussineau,
Bernhard Beschow, David Hildenbrand, Michael S. Tsirkin,
Mark Cave-Ayland, qemu-ppc, Gerd Hoffmann, Paolo Bonzini
We always follow the same pattern when registering
coalesced portio:
- portio_list_init()
- portio_list_set_flush_coalesced()
- portio_list_add()
Factor these 3 operations in a single helper named
portio_list_register_flush_coalesced().
Drop portio_list_set_flush_coalesced() which is now
inlined.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/display/qxl.c | 7 +++----
hw/display/vga.c | 5 ++---
include/exec/ioport.h | 5 ++++-
softmmu/ioport.c | 27 ++++++++++++++++++++++-----
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index ec712d3ca2..2ecaa0643f 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2224,10 +2224,9 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp)
}
vga_init(vga, OBJECT(dev),
pci_address_space(dev), pci_address_space_io(dev), false);
- portio_list_init(&qxl->vga_port_list, OBJECT(dev), qxl_vga_portio_list,
- vga, "vga");
- portio_list_set_flush_coalesced(&qxl->vga_port_list);
- portio_list_add(&qxl->vga_port_list, pci_address_space_io(dev), 0x3b0);
+ portio_list_register_flush_coalesced(&qxl->vga_port_list, OBJECT(dev),
+ qxl_vga_portio_list, vga, "vga",
+ pci_address_space_io(dev), 0x3b0);
qxl->have_vga = true;
vga->con = graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl);
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 7a5fdff649..98d644922e 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2309,9 +2309,8 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
1);
memory_region_set_coalescing(vga_io_memory);
if (init_vga_ports) {
- portio_list_init(&s->vga_port_list, obj, vga_ports, s, "vga");
- portio_list_set_flush_coalesced(&s->vga_port_list);
- portio_list_add(&s->vga_port_list, address_space_io, 0x3b0);
+ portio_list_register_flush_coalesced(&s->vga_port_list, obj, vga_ports,
+ s, "vga", address_space_io, 0x3b0);
}
if (vbe_ports) {
portio_list_init(&s->vbe_port_list, obj, vbe_ports, s, "vbe");
diff --git a/include/exec/ioport.h b/include/exec/ioport.h
index e34f668998..eb9882a3ee 100644
--- a/include/exec/ioport.h
+++ b/include/exec/ioport.h
@@ -65,7 +65,10 @@ typedef struct PortioList {
void portio_list_init(PortioList *piolist, Object *owner,
const struct MemoryRegionPortio *callbacks,
void *opaque, const char *name);
-void portio_list_set_flush_coalesced(PortioList *piolist);
+void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset);
void portio_list_destroy(PortioList *piolist);
void portio_list_add(PortioList *piolist,
struct MemoryRegion *address_space,
diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index cb8adb0b93..be0c920c5c 100644
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -124,6 +124,7 @@ void portio_list_init(PortioList *piolist,
++n;
}
+ assert(owner);
piolist->ports = callbacks;
piolist->nr = 0;
piolist->regions = g_new0(MemoryRegion *, n);
@@ -134,11 +135,6 @@ void portio_list_init(PortioList *piolist,
piolist->flush_coalesced_mmio = false;
}
-void portio_list_set_flush_coalesced(PortioList *piolist)
-{
- piolist->flush_coalesced_mmio = true;
-}
-
void portio_list_destroy(PortioList *piolist)
{
MemoryRegionPortioList *mrpio;
@@ -297,3 +293,24 @@ void portio_list_del(PortioList *piolist)
memory_region_del_subregion(piolist->address_space, &mrpio->mr);
}
}
+
+static void do_portio_list_register(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset,
+ bool flush_coalesced_mmio)
+{
+ assert(piolist && !piolist->owner);
+ portio_list_init(piolist, owner, callbacks, opaque, name);
+ piolist->flush_coalesced_mmio = flush_coalesced_mmio;
+ portio_list_add(piolist, mr, offset);
+}
+
+void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset)
+{
+ do_portio_list_register(piolist, owner, callbacks,
+ opaque, name, mr, offset, true);
+}
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] exec/ioport: Factor portio_list_register() out
2023-02-07 23:46 [PATCH 0/2] exec/ioport: Factor portio_list_register[flush_coalesced]() out Philippe Mathieu-Daudé
2023-02-07 23:46 ` [PATCH 1/2] exec/ioport: Factor portio_list_register_flush_coalesced() out Philippe Mathieu-Daudé
@ 2023-02-07 23:46 ` Philippe Mathieu-Daudé
2023-02-08 19:13 ` Richard Henderson
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-07 23:46 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Peter Xu, Hervé Poussineau,
Bernhard Beschow, David Hildenbrand, Michael S. Tsirkin,
Mark Cave-Ayland, qemu-ppc, Gerd Hoffmann, Paolo Bonzini
We always follow the same pattern when registering
non-coalesced portio:
- portio_list_init()
- portio_list_add()
Factor these 2 operations in a single helper named
portio_list_register(). Since both calls become local
to ioport.c, reduce their scope by declaring them static.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/audio/adlib.c | 4 ++--
hw/display/vga.c | 4 ++--
hw/dma/i82374.c | 7 +++----
hw/isa/isa-bus.c | 6 ++----
hw/watchdog/wdt_ib700.c | 4 ++--
include/exec/ioport.h | 10 ++++------
softmmu/ioport.c | 21 ++++++++++++++-------
7 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 5f979b1487..cc03c99306 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -291,8 +291,8 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
adlib_portio_list[0].offset = s->port;
adlib_portio_list[1].offset = s->port + 8;
- portio_list_init (&s->port_list, OBJECT(s), adlib_portio_list, s, "adlib");
- portio_list_add (&s->port_list, isa_address_space_io(&s->parent_obj), 0);
+ portio_list_register(&s->port_list, OBJECT(s), adlib_portio_list, s,
+ "adlib", isa_address_space_io(&s->parent_obj), 0);
}
static Property adlib_properties[] = {
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 98d644922e..aa899fddc3 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2313,7 +2313,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
s, "vga", address_space_io, 0x3b0);
}
if (vbe_ports) {
- portio_list_init(&s->vbe_port_list, obj, vbe_ports, s, "vbe");
- portio_list_add(&s->vbe_port_list, address_space_io, 0x1ce);
+ portio_list_register(&s->vbe_port_list, obj, vbe_ports, s,
+ "vbe", address_space_io, 0x1ce);
}
}
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 34c3aaf7d3..cb68eee192 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -131,10 +131,9 @@ static void i82374_realize(DeviceState *dev, Error **errp)
}
i8257_dma_init(isa_bus, true);
- portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s,
- "i82374");
- portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),
- s->iobase);
+ portio_list_register(&s->port_list, OBJECT(s), i82374_portio_list, s,
+ "i82374", isa_address_space_io(&s->parent_obj),
+ s->iobase);
memset(s->commands, 0, sizeof(s->commands));
}
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index f155b80010..4fe61d6dfe 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -123,8 +123,6 @@ int isa_register_portio_list(ISADevice *dev,
const MemoryRegionPortio *pio_start,
void *opaque, const char *name)
{
- assert(piolist && !piolist->owner);
-
if (!isabus) {
return -ENODEV;
}
@@ -134,8 +132,8 @@ int isa_register_portio_list(ISADevice *dev,
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);
+ portio_list_register(piolist, OBJECT(dev), pio_start, opaque, name,
+ isabus->address_space_io, start);
return 0;
}
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index b116c3a3aa..ac4f0be7d8 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -115,8 +115,8 @@ static void wdt_ib700_realize(DeviceState *dev, Error **errp)
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ib700_timer_expired, s);
- portio_list_init(&s->port_list, OBJECT(s), wdt_portio_list, s, "ib700");
- portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), 0);
+ portio_list_register(&s->port_list, OBJECT(s), wdt_portio_list, s,
+ "ib700", isa_address_space_io(&s->parent_obj), 0);
}
static void wdt_ib700_reset(DeviceState *dev)
diff --git a/include/exec/ioport.h b/include/exec/ioport.h
index eb9882a3ee..ca44f269ea 100644
--- a/include/exec/ioport.h
+++ b/include/exec/ioport.h
@@ -62,17 +62,15 @@ typedef struct PortioList {
bool flush_coalesced_mmio;
} PortioList;
-void portio_list_init(PortioList *piolist, Object *owner,
- const struct MemoryRegionPortio *callbacks,
- void *opaque, const char *name);
+void portio_list_register(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset);
void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
const MemoryRegionPortio *callbacks,
void *opaque, const char *name,
MemoryRegion *mr, uint32_t offset);
void portio_list_destroy(PortioList *piolist);
-void portio_list_add(PortioList *piolist,
- struct MemoryRegion *address_space,
- uint32_t addr);
void portio_list_del(PortioList *piolist);
#endif /* IOPORT_H */
diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index be0c920c5c..42d43f8b27 100644
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -113,10 +113,9 @@ uint32_t cpu_inl(uint32_t addr)
return val;
}
-void portio_list_init(PortioList *piolist,
- Object *owner,
- const MemoryRegionPortio *callbacks,
- void *opaque, const char *name)
+static void portio_list_init(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name)
{
unsigned n = 0;
@@ -246,9 +245,8 @@ static void portio_list_add_1(PortioList *piolist,
++piolist->nr;
}
-void portio_list_add(PortioList *piolist,
- MemoryRegion *address_space,
- uint32_t start)
+static void portio_list_add(PortioList *piolist, MemoryRegion *address_space,
+ uint32_t start)
{
const MemoryRegionPortio *pio, *pio_start = piolist->ports;
unsigned int off_low, off_high, off_last, count;
@@ -314,3 +312,12 @@ void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
do_portio_list_register(piolist, owner, callbacks,
opaque, name, mr, offset, true);
}
+
+void portio_list_register(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset)
+{
+ do_portio_list_register(piolist, owner, callbacks,
+ opaque, name, mr, offset, false);
+}
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread