* [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set
@ 2021-12-01 22:32 Philippe Mathieu-Daudé
2021-12-15 10:26 ` Philippe Mathieu-Daudé
2021-12-17 9:22 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-01 22:32 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Michael S. Tsirkin, Richard Henderson,
Philippe Mathieu-Daudé,
Calvin Buckley, Paolo Bonzini
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>
---
Amusingly 'qemu-system-x86_64 -device vmmouse,i8042=i8042' now works.
---
hw/i386/vmmouse.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 3d663682863..a56c185f159 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set
2021-12-01 22:32 [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set Philippe Mathieu-Daudé
@ 2021-12-15 10:26 ` Philippe Mathieu-Daudé
2021-12-17 9:22 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-15 10:26 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Calvin Buckley, Paolo Bonzini,
Richard Henderson, Michael S. Tsirkin
ping?
On 12/1/21 23:32, Philippe Mathieu-Daudé wrote:
> 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>
> ---
> Amusingly 'qemu-system-x86_64 -device vmmouse,i8042=i8042' now works.
> ---
> hw/i386/vmmouse.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index 3d663682863..a56c185f159 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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set
2021-12-01 22:32 [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set Philippe Mathieu-Daudé
2021-12-15 10:26 ` Philippe Mathieu-Daudé
@ 2021-12-17 9:22 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-12-17 9:22 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Eduardo Habkost, Calvin Buckley, Richard Henderson, Michael S. Tsirkin
On 12/1/21 23:32, Philippe Mathieu-Daudé wrote:
> 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>
> ---
> Amusingly 'qemu-system-x86_64 -device vmmouse,i8042=i8042' now works.
> ---
> hw/i386/vmmouse.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index 3d663682863..a56c185f159 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;
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-17 9:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 22:32 [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set Philippe Mathieu-Daudé
2021-12-15 10:26 ` Philippe Mathieu-Daudé
2021-12-17 9:22 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).