aboutsummaryrefslogtreecommitdiff
path: root/include/hw/input
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-07-12 22:52:49 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-07-18 19:28:46 +0100
commit9d1a4250377fdbc05088adbff1e1aa3572ce9889 (patch)
tree6c99deed4b0b1fa8bb2f27acf894a7864fd82cad /include/hw/input
parent5e8312ab8ed16c0e671a13eda680959c7ac1e980 (diff)
downloadqemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.zip
qemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.tar.gz
qemu-9d1a4250377fdbc05088adbff1e1aa3572ce9889.tar.bz2
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/input')
-rw-r--r--include/hw/input/i8042.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index 8beb0ac..e199f1e 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];