Move the initialisation of the register memory region to the I8042_MMIO device
realize function.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/input/pckbd.c | 12 +++++++++++-
include/hw/input/i8042.h | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index e13a62bd4f..addd1f058a 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -674,6 +674,15 @@ static void i8042_mmio_reset(DeviceState *dev)
kbd_reset(ks);
}
+static void i8042_mmio_realize(DeviceState *dev, Error **errp)
+{
+ MMIOKBDState *s = I8042_MMIO(dev);
+ KBDState *ks = &s->kbd;
+
+ memory_region_init_io(&s->region, OBJECT(dev), &i8042_mmio_ops, ks,
+ "i8042", s->size);
+}
+
static Property i8042_mmio_properties[] = {
DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX),
DEFINE_PROP_UINT32("size", MMIOKBDState, size, -1),
@@ -684,6 +693,7 @@ static void i8042_mmio_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->realize = i8042_mmio_realize;
dc->reset = i8042_mmio_reset;
device_class_set_props(dc, i8042_mmio_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
@@ -707,7 +717,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
vmstate_register(NULL, 0, &vmstate_kbd, s);
- memory_region_init_io(region, NULL, &i8042_mmio_ops, s, "i8042", size);
+ region = &I8042_MMIO(dev)->region;
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index ac4098b957..59d695a9dd 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -58,6 +58,7 @@ struct MMIOKBDState {
KBDState kbd;
uint32_t size;
+ MemoryRegion region;
};
#define I8042_A20_LINE "a20"
--
2.20.1