[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 29/50] pckbd: more vmstate_register() from i8042_mm_init() to i80
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 29/50] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize() |
Date: |
Sun, 22 May 2022 19:18:15 +0100 |
Note in this case it is not possible to register a (new) VMStateDescription in
the DeviceClass without breaking migration compatibility for the MIPS magnum
machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/input/pckbd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index eb77ad193e..7f3578aa4d 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -681,6 +681,9 @@ static void i8042_mmio_realize(DeviceState *dev, Error
**errp)
memory_region_init_io(&s->region, OBJECT(dev), &i8042_mmio_ops, ks,
"i8042", s->size);
+
+ /* Note we can't use dc->vmsd without breaking migration compatibility */
+ vmstate_register(NULL, 0, &vmstate_kbd, ks);
}
static void i8042_mmio_init(Object *obj)
@@ -721,8 +724,6 @@ MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq
mouse_irq,
s->irq_kbd = kbd_irq;
s->irq_mouse = mouse_irq;
- vmstate_register(NULL, 0, &vmstate_kbd, s);
-
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
--
2.20.1
- [PATCH 15/50] pl050: split pl050_update_irq() into separate pl050_set_irq() and pl050_update_irq() functions, (continued)
- [PATCH 15/50] pl050: split pl050_update_irq() into separate pl050_set_irq() and pl050_update_irq() functions, Mark Cave-Ayland, 2022/05/22
- [PATCH 13/50] ps2: don't use vmstate_register() in ps2_mouse_init(), Mark Cave-Ayland, 2022/05/22
- [PATCH 17/50] lasips2: rename ps2dev_update_irq() to lasips2_port_set_irq(), Mark Cave-Ayland, 2022/05/22
- [PATCH 16/50] lasips2: spacing fixes, Mark Cave-Ayland, 2022/05/22
- [PATCH 19/50] pckbd: move KBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/05/22
- [PATCH 18/50] pckbd: checkpatch fixes, Mark Cave-Ayland, 2022/05/22
- [PATCH 20/50] pckbd: move ISAKBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/05/22
- [PATCH 22/50] pckbd: implement i8042_mmio_reset() for I8042_MMIO device, Mark Cave-Ayland, 2022/05/22
- [PATCH 24/50] pckbd: add size qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/05/22
- [PATCH 21/50] pckbd: introduce new I8042_MMIO QOM type, Mark Cave-Ayland, 2022/05/22
- [PATCH 29/50] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize(),
Mark Cave-Ayland <=
- [PATCH 31/50] ps2: make ps2_raise_irq() function static, Mark Cave-Ayland, 2022/05/22
- [PATCH 23/50] pckbd: add mask qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/05/22
- [PATCH 26/50] pckbd: implement i8042_mmio_init() function, Mark Cave-Ayland, 2022/05/22
- [PATCH 25/50] pckbd: implement i8042_mmio_realize() function, Mark Cave-Ayland, 2022/05/22
- [PATCH 35/50] pckbd: replace irq_kbd and irq_mouse with qemu_irq array in KBDState, Mark Cave-Ayland, 2022/05/22
- [PATCH 32/50] ps2: use ps2_raise_irq() instead of calling update_irq() directly, Mark Cave-Ayland, 2022/05/22
- [PATCH 27/50] pckbd: alter i8042_mm_init() to return a I8042_MMIO device, Mark Cave-Ayland, 2022/05/22
- [PATCH 28/50] pckbd: move mapping of I8042_MMIO registers to MIPS magnum machine, Mark Cave-Ayland, 2022/05/22