diff options
| author | Thomas Huth <thuth@redhat.com> | 2020-01-29 12:29:54 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-02-06 11:02:48 +0100 |
| commit | bb38df846dc73ebca7d28585c1773f612e335274 (patch) | |
| tree | 65af30251a75b65b239b8da45acec48bdf3f6093 /hw/i386/vmmouse.c | |
| parent | 34959c24b0ef0d64316d96dc7d4c2566016696ea (diff) | |
| download | focaccia-qemu-bb38df846dc73ebca7d28585c1773f612e335274.tar.gz focaccia-qemu-bb38df846dc73ebca7d28585c1773f612e335274.zip | |
hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport
QEMU currently crashes when the user tries to use the "vmmouse" on a machine without vmport, e.g.: $ x86_64-softmmu/qemu-system-x86_64 -machine microvm -device vmmouse Segmentation fault (core dumped) or: $ x86_64-softmmu/qemu-system-x86_64 -device vmmouse -M pc,vmport=off Segmentation fault (core dumped) Let's avoid the crash by checking for the vmport device first. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Message-Id: <20200129112954.4282-1-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/i386/vmmouse.c')
| -rw-r--r-- | hw/i386/vmmouse.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 7c2a375527..e8e62bd96b 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" @@ -269,6 +270,11 @@ static void vmmouse_realizefn(DeviceState *dev, Error **errp) DPRINTF("vmmouse_init\n"); + if (!object_resolve_path_type("", TYPE_VMPORT, NULL)) { + error_setg(errp, "vmmouse needs a machine with vmport"); + return; + } + vmport_register(VMMOUSE_STATUS, vmmouse_ioport_read, s); vmport_register(VMMOUSE_COMMAND, vmmouse_ioport_read, s); vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s); |