commit 57f6c3aac08d16eb7fe4a447dbbbfeb314d39234
author Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Fri Jun 24 14:40:37 2022 +0100
committer Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Sun Jun 26 18:40:11 2022 +0100
tree 75c43d80249690d41b8aa93a0f7e999ac6d23d64
parent 150ee013ed3f2af7eec493cd68ae774a85d40a2b

pckbd: implement i8042_mmio_reset() for I8042_MMIO device

This allows the I8042_MMIO reset function to be registered directly within the
DeviceClass rather than using qemu_register_reset() directly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220624134109.881989-23-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 89a41ed..7b520d0 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -665,10 +665,19 @@
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
+static void i8042_mmio_reset(DeviceState *dev)
+{
+    MMIOKBDState *s = I8042_MMIO(dev);
+    KBDState *ks = &s->kbd;
+
+    kbd_reset(ks);
+}
+
 static void i8042_mmio_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 
+    dc->reset = i8042_mmio_reset;
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 }
 
@@ -695,7 +704,6 @@
 
     s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
     s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
-    qemu_register_reset(kbd_reset, s);
 }
 
 static const TypeInfo i8042_mmio_info = {