49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
|
From 12756f09bddf7e31b9bf846bd5301ddbdcadfedf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 26 Sep 2024 11:15:58 +0800
|
||
|
|
Subject: [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry picked from commit 5a3a2eb3b1096a52580c1b8c3eb0739714e7d941
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.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.41.0.windows.1
|
||
|
|
|