From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Markus Armbruster" <armbru@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
qemu-trivial@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PULL 06/12] hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport
Date: Thu, 6 Feb 2020 13:50:21 +0100 [thread overview]
Message-ID: <20200206125027.1926263-7-laurent@vivier.eu> (raw)
In-Reply-To: <20200206125027.1926263-1-laurent@vivier.eu>
From: Thomas Huth <thuth@redhat.com>
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>
---
hw/i386/vmmouse.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 7c2a3755271a..e8e62bd96b8c 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);
--
2.24.1
next prev parent reply other threads:[~2020-02-06 13:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 12:50 [PULL 00/12] Trivial branch patches Laurent Vivier
2020-02-06 12:50 ` [PULL 01/12] hw/smbios/smbios: Remove unused include Laurent Vivier
2020-02-06 12:50 ` [PULL 02/12] monitor: fix memory leak in monitor_fdset_dup_fd_find_remove Laurent Vivier
2020-02-06 12:50 ` [PULL 03/12] MAINTAINERS: update Leif Lindholm's address Laurent Vivier
2020-02-06 12:50 ` [PULL 04/12] hw/timer/m48t59: Convert debug printf()s to trace events Laurent Vivier
2020-02-06 12:50 ` [PULL 05/12] hw/bt: Remove empty Kconfig file Laurent Vivier
2020-02-06 12:50 ` Laurent Vivier [this message]
2020-02-06 12:50 ` [PULL 07/12] MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section Laurent Vivier
2020-02-06 12:50 ` [PULL 08/12] qemu-options: replace constant 1 with HAS_ARG Laurent Vivier
2020-02-06 12:50 ` [PULL 09/12] qemu-img: Place the '-i aio' option in alphabetical order Laurent Vivier
2020-02-06 12:50 ` [PULL 10/12] hw/pci/pci_bridge: Fix typo in comment Laurent Vivier
2020-02-06 12:50 ` [PULL 11/12] aspeed/i2c: Prevent uninitialized warning Laurent Vivier
2020-02-06 12:50 ` [PULL 12/12] MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines Laurent Vivier
2020-02-06 16:21 ` [PULL 00/12] Trivial branch patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206125027.1926263-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=andrew@aj.id.au \
--cc=armbru@redhat.com \
--cc=clg@kaod.org \
--cc=darren.kenny@oracle.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=joel@jms.id.au \
--cc=kwolf@redhat.com \
--cc=mjt@tls.msk.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).