commit 47fc74154c1dd68d70209a87213805fdad0d2790
author Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Fri Jun 24 14:40:41 2022 +0100
committer Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Sun Jun 26 18:40:12 2022 +0100
tree cbe35e2095540377ea43f0b6398f5f5fea1f61e5
parent f4de68d1d45f1f104535a82f3e0dd3c393c6539e

pckbd: implement i8042_mmio_init() function

This enables use to set the required value of extended_state directly during
device init rather than in i8042_mm_init().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220624134109.881989-27-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

hw/input/pckbd.c

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index bc51f7e..b8623d2 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -684,6 +684,14 @@
     sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->region);
 }
 
+static void i8042_mmio_init(Object *obj)
+{
+    MMIOKBDState *s = I8042_MMIO(obj);
+    KBDState *ks = &s->kbd;
+
+    ks->extended_state = true;
+}
+
 static Property i8042_mmio_properties[] = {
     DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX),
     DEFINE_PROP_UINT32("size", MMIOKBDState, size, -1),
@@ -716,8 +724,6 @@
     s->irq_kbd = kbd_irq;
     s->irq_mouse = mouse_irq;
 
-    s->extended_state = true;
-
     vmstate_register(NULL, 0, &vmstate_kbd, s);
 
     region = &I8042_MMIO(dev)->region;
@@ -729,6 +735,7 @@
 static const TypeInfo i8042_mmio_info = {
     .name          = TYPE_I8042_MMIO,
     .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_init = i8042_mmio_init,
     .instance_size = sizeof(MMIOKBDState),
     .class_init    = i8042_mmio_class_init
 };