Split IRQ and memory region initialization in a different function to
be reused by callers that realize the serial device themself, and
connect irq/mem after.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/char/serial.c         | 20 +++++++++++++-------
 include/hw/char/serial.h |  3 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 72d48b5cd8..41548e159c 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -1078,27 +1078,33 @@ static const MemoryRegionOps serial_mm_ops[3] = {
     },
 };
 
+void serial_mm_connect(SerialMMState *self, enum device_endian end,
+                       MemoryRegion *address_space, qemu_irq irq)
+{
+    SerialState *s = SERIAL(self);
+
+    qdev_connect_gpio_out_named(DEVICE(self), "serial-irq", 0, irq);
+    memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], self,
+                          "serial", 8 << self->regshift);
+    memory_region_add_subregion(address_space, s->base, &s->io);
+}
+
 SerialState *serial_mm_init(MemoryRegion *address_space,
                             hwaddr base, int regshift,
                             qemu_irq irq, int baudbase,
                             Chardev *chr, enum device_endian end)
 {
     DeviceState *dev = DEVICE(object_new(TYPE_SERIAL_MM));
-    SerialMMState *m = SERIAL_MM(dev);
-    SerialState *s = SERIAL(dev);
 
-    qdev_connect_gpio_out_named(dev, "serial-irq", 0, irq);
     qdev_prop_set_uint32(dev, "baudbase", baudbase);
     qdev_prop_set_chr(dev, "chardev", chr);
     qdev_prop_set_uint8(dev, "regshift", regshift);
     qdev_prop_set_uint64(dev, "base", base);
     qdev_init_nofail(dev);
 
-    memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], s,
-                          "serial", 8 << m->regshift);
-    memory_region_add_subregion(address_space, base, &s->io);
+    serial_mm_connect(SERIAL_MM(dev), end, address_space, irq);
 
-    return s;
+    return SERIAL(dev);
 }
 
 static Property serial_mm_properties[] = {
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 5e657d8ade..84ef8f01f0 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -104,6 +104,9 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
                             qemu_irq irq, int baudbase,
                             Chardev *chr, enum device_endian end);
 
+void serial_mm_connect(SerialMMState *self, enum device_endian end,
+                       MemoryRegion *address_space, qemu_irq irq);
+
 /* serial-isa.c */
 
 #define MAX_ISA_SERIAL_PORTS 4
-- 
2.23.0.606.g08da6496b6

On Tue, 22 Oct 2019 at 17:23, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> Split IRQ and memory region initialization in a different function to
> be reused by callers that realize the serial device themself, and
> connect irq/mem after.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  hw/char/serial.c         | 20 +++++++++++++-------
>  include/hw/char/serial.h |  3 +++
>  2 files changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 72d48b5cd8..41548e159c 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -1078,27 +1078,33 @@ static const MemoryRegionOps serial_mm_ops[3] = {
>      },
>  };
>
> +void serial_mm_connect(SerialMMState *self, enum device_endian end,
> +                       MemoryRegion *address_space, qemu_irq irq)
> +{
> +    SerialState *s = SERIAL(self);
> +
> +    qdev_connect_gpio_out_named(DEVICE(self), "serial-irq", 0, irq);
> +    memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], self,
> +                          "serial", 8 << self->regshift);
> +    memory_region_add_subregion(address_space, s->base, &s->io);
> +}

This function isn't needed if you make SerialMMState a sysbus
device which provides the MMIO region and the IRQ in the
usual way.

thanks
-- PMM