diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-12 22:52:22 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-18 19:28:46 +0100 |
| commit | 6f9f245b932de0c05f618fb1ff2c251dce23cd29 (patch) | |
| tree | 4e2437dc995945250e2cf403cab81064aa16b965 /hw/input | |
| parent | 6a05d0b3d1474ad5fd7ba1cc7040dffbc3c15a11 (diff) | |
| download | qemu-6f9f245b932de0c05f618fb1ff2c251dce23cd29.zip qemu-6f9f245b932de0c05f618fb1ff2c251dce23cd29.tar.gz qemu-6f9f245b932de0c05f618fb1ff2c251dce23cd29.tar.bz2 | |
pl050: don't use legacy ps2_mouse_init() function
Instantiate the PS2 mouse device within PL050MouseState using
object_initialize_child() in pl050_mouse_init() and realize it in
pl050_mouse_realize() accordingly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220712215251.7944-12-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/pl050.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 64b579e..ec5e192 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -183,17 +183,24 @@ static void pl050_kbd_init(Object *obj) static void pl050_mouse_realize(DeviceState *dev, Error **errp) { PL050DeviceClass *pdc = PL050_GET_CLASS(dev); + PL050MouseState *s = PL050_MOUSE_DEVICE(dev); PL050State *ps = PL050(dev); - ps->ps2dev = ps2_mouse_init(); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mouse), errp)) { + return; + } + + ps->ps2dev = PS2_DEVICE(&s->mouse); pdc->parent_realize(dev, errp); } static void pl050_mouse_init(Object *obj) { - PL050State *s = PL050(obj); + PL050MouseState *s = PL050_MOUSE_DEVICE(obj); + PL050State *ps = PL050(obj); - s->is_mouse = true; + ps->is_mouse = true; + object_initialize_child(obj, "mouse", &s->mouse, TYPE_PS2_MOUSE_DEVICE); } static void pl050_kbd_class_init(ObjectClass *oc, void *data) |