Add a new pl050_init() function which initialises a qdev input gpio for handling
incoming PS2 IRQs, and then wire up the PS2 device to use it. At the same time
set update_irq() and update_arg to NULL in ps2_kbd_init() and ps2_mouse_init()
to ensure that any accidental attempt to use the legacy update_irq() function will
cause a NULL pointer dereference.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/input/pl050.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index 66f8c20d9f..fe6a281307 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -32,6 +32,8 @@ struct PL050State {
     bool is_mouse;
 };
 
+#define PL050_INPUT_IRQ    0
+
 static const VMStateDescription vmstate_pl050 = {
     .name = "pl050",
     .version_id = 2,
@@ -65,7 +67,7 @@ static void pl050_update_irq(PL050State *s)
     qemu_set_irq(s->irq, level);
 }
 
-static void pl050_set_irq(void *opaque, int level)
+static void pl050_set_irq(void *opaque, int n, int level)
 {
     PL050State *s = (PL050State *)opaque;
 
@@ -164,10 +166,12 @@ static void pl050_realize(DeviceState *dev, Error **errp)
     sysbus_init_mmio(sbd, &s->iomem);
     sysbus_init_irq(sbd, &s->irq);
     if (s->is_mouse) {
-        s->dev = ps2_mouse_init(pl050_set_irq, s);
+        s->dev = ps2_mouse_init(NULL, NULL);
     } else {
-        s->dev = ps2_kbd_init(pl050_set_irq, s);
+        s->dev = ps2_kbd_init(NULL, NULL);
     }
+    qdev_connect_gpio_out(DEVICE(s->dev), PS2_DEVICE_IRQ,
+                          qdev_get_gpio_in(dev, PL050_INPUT_IRQ));
 }
 
 static void pl050_keyboard_init(Object *obj)
@@ -196,6 +200,11 @@ static const TypeInfo pl050_mouse_info = {
     .instance_init = pl050_mouse_init,
 };
 
+static void pl050_init(Object *obj)
+{
+    qdev_init_gpio_in(DEVICE(obj), pl050_set_irq, 1);
+}
+
 static void pl050_class_init(ObjectClass *oc, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
@@ -207,6 +216,7 @@ static void pl050_class_init(ObjectClass *oc, void *data)
 static const TypeInfo pl050_type_info = {
     .name          = TYPE_PL050,
     .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_init = pl050_init,
     .instance_size = sizeof(PL050State),
     .abstract      = true,
     .class_init    = pl050_class_init,
-- 
2.20.1

On Sun, 22 May 2022 at 19:20, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
>
> Add a new pl050_init() function which initialises a qdev input gpio for handling
> incoming PS2 IRQs, and then wire up the PS2 device to use it. At the same time
> set update_irq() and update_arg to NULL in ps2_kbd_init() and ps2_mouse_init()
> to ensure that any accidental attempt to use the legacy update_irq() function will
> cause a NULL pointer dereference.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>  hw/input/pl050.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/hw/input/pl050.c b/hw/input/pl050.c
> index 66f8c20d9f..fe6a281307 100644
> --- a/hw/input/pl050.c
> +++ b/hw/input/pl050.c
> @@ -32,6 +32,8 @@ struct PL050State {
>      bool is_mouse;
>  };
>
> +#define PL050_INPUT_IRQ

> +
>  static const VMStateDescription vmstate_pl050 = {
>      .name = "pl050",
>      .version_id = 2,
> @@ -65,7 +67,7 @@ static void pl050_update_irq(PL050State *s)
>      qemu_set_irq(s->irq, level);
>  }
>
> -static void pl050_set_irq(void *opaque, int level)
> +static void pl050_set_irq(void *opaque, int n, int level)
>  {
>      PL050State *s = (PL050State *)opaque;
>
> @@ -164,10 +166,12 @@ static void pl050_realize(DeviceState *dev, Error **errp)
>      sysbus_init_mmio(sbd, &s->iomem);
>      sysbus_init_irq(sbd, &s->irq);
>      if (s->is_mouse) {
> -        s->dev = ps2_mouse_init(pl050_set_irq, s);
> +        s->dev = ps2_mouse_init(NULL, NULL);
>      } else {
> -        s->dev = ps2_kbd_init(pl050_set_irq, s);
> +        s->dev = ps2_kbd_init(NULL, NULL);
>      }
> +    qdev_connect_gpio_out(DEVICE(s->dev), PS2_DEVICE_IRQ,
> +                          qdev_get_gpio_in(dev, PL050_INPUT_IRQ));
>  }
>
>  static void pl050_keyboard_init(Object *obj)
> @@ -196,6 +200,11 @@ static const TypeInfo pl050_mouse_info = {
>      .instance_init = pl050_mouse_init,
>  };
>
> +static void pl050_init(Object *obj)
> +{
> +    qdev_init_gpio_in(DEVICE(obj), pl050_set_irq, 1);
> +}

Better to use a named GPIO input here I think, especially
since it's kind of an internal implementation detail of the device.

thanks
-- PMM