diff options
| author | Mark Cave-Ayland | 2022-07-12 23:52:49 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2022-07-18 20:28:46 +0200 |
| commit | 9d1a4250377fdbc05088adbff1e1aa3572ce9889 (patch) | |
| tree | 6c99deed4b0b1fa8bb2f27acf894a7864fd82cad /include/hw | |
| parent | ps2: remove unused legacy ps2_kbd_init() function (diff) | |
| download | qemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.tar.gz qemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.tar.xz qemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.zip | |
pckbd: don't use legacy ps2_mouse_init() function
Instantiate the PS2 mouse device within KBDState using
object_initialize_child() in i8042_initfn() and i8042_mmio_init() and realize
it in i8042_realizefn() and i8042_mmio_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-39-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/input/i8042.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 8beb0ac01f..e199f1ece8 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -32,7 +32,7 @@ typedef struct KBDState { uint8_t cbdata; uint8_t pending_tmp; PS2KbdState ps2kbd; - void *mouse; + PS2MouseState ps2mouse; QEMUTimer *throttle_timer; qemu_irq irqs[2]; |