[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/16] hw/i386/vmmouse: Require 'i8042' property to be set
From: |
Paolo Bonzini |
Subject: |
[PULL 16/16] hw/i386/vmmouse: Require 'i8042' property to be set |
Date: |
Sun, 19 Dec 2021 15:20:08 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
If the 'i8042' property is not set, mouse events handled by
vmmouse_mouse_event() end calling i8042_isa_mouse_fake_event()
with a NULL argument, resulting in ps2_mouse_fake_event() being
called with invalid PS2MouseState pointer. Fix by requiring
the 'i8042' property to be always set:
$ qemu-system-x86_64 -device vmmouse
qemu-system-x86_64: -device vmmouse: 'i8042' link is not set
Fixes: 91c9e09147b ("vmmouse: convert to qdev")
Reported-by: Calvin Buckley <calvin@cmpct.info>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/752
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211201223253.36080-1-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/i386/vmmouse.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 3d66368286..a56c185f15 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -286,6 +286,10 @@ static void vmmouse_realizefn(DeviceState *dev, Error
**errp)
DPRINTF("vmmouse_init\n");
+ if (!s->i8042) {
+ error_setg(errp, "'i8042' link is not set");
+ return;
+ }
if (!object_resolve_path_type("", TYPE_VMPORT, NULL)) {
error_setg(errp, "vmmouse needs a machine with vmport");
return;
--
2.33.1
- [PULL 07/16] configure, meson: move ARCH to meson.build, (continued)
- [PULL 07/16] configure, meson: move ARCH to meson.build, Paolo Bonzini, 2021/12/19
- [PULL 08/16] configure: remove unnecessary symlinks, Paolo Bonzini, 2021/12/19
- [PULL 10/16] meson: reenable test-fdmon-epoll, Paolo Bonzini, 2021/12/19
- [PULL 11/16] cpu: remove unnecessary #ifdef CONFIG_TCG, Paolo Bonzini, 2021/12/19
- [PULL 09/16] configure: remove DIRS, Paolo Bonzini, 2021/12/19
- [PULL 12/16] meson: add "check" argument to run_command, Paolo Bonzini, 2021/12/19
- [PULL 13/16] hw/scsi: Fix scsi_bus_init_named() docstring, Paolo Bonzini, 2021/12/19
- [PULL 14/16] hw/scsi/megasas: Fails command if SGL buffer overflows, Paolo Bonzini, 2021/12/19
- [PULL 15/16] tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521, Paolo Bonzini, 2021/12/19
- [PULL 16/16] hw/i386/vmmouse: Require 'i8042' property to be set,
Paolo Bonzini <=
- Re: [PULL 00/16] Misc patches for 2021-12-20, Richard Henderson, 2021/12/19