698c429494
- Fix issue of virtio-9p-ccw having been mistakenly dropped from qemu (bsc#1182496) hw-s390x-fix-build-for-virtio-9p-ccw.patch - Tweaked some spec file details to be again compatible with quilt setup using the spec file as input - Remove BuildRequires that were added in anticipation of building ovmf within this package. We have not taken that route OBS-URL: https://build.opensuse.org/request/show/874876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=619
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 12 Feb 2021 20:23:18 -0700
|
|
Subject: spice-app: avoid crash when core spice module doesn't loaded
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
git-commit: 122e4ef6dea14a078a860ca253852e18ddebb8e2
|
|
|
|
When qemu is built with modules, but a given module doesn't load
|
|
qemu should handle that gracefully. When ui-spice-core.so isn't
|
|
able to be loaded and qemu is invoked with -display spice-app or
|
|
-spice, qemu will dereference a null pointer. With this change we
|
|
check the pointer before dereferencing and error out in a normal
|
|
way.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Message-Id: <20210213032318.346093-1-brogers@suse.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
ui/spice-app.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ui/spice-app.c b/ui/spice-app.c
|
|
index 026124ef56a0ef26fbe3cf0a1aba..4325ac2d9c5403e8d77099825fc3 100644
|
|
--- a/ui/spice-app.c
|
|
+++ b/ui/spice-app.c
|
|
@@ -129,6 +129,7 @@ static void spice_app_atexit(void)
|
|
static void spice_app_display_early_init(DisplayOptions *opts)
|
|
{
|
|
QemuOpts *qopts;
|
|
+ QemuOptsList *list;
|
|
GError *err = NULL;
|
|
|
|
if (opts->has_full_screen) {
|
|
@@ -159,11 +160,16 @@ static void spice_app_display_early_init(DisplayOptions *opts)
|
|
exit(1);
|
|
}
|
|
}
|
|
+ list = qemu_find_opts("spice");
|
|
+ if (list == NULL) {
|
|
+ error_report("spice-app missing spice support");
|
|
+ exit(1);
|
|
+ }
|
|
|
|
type_register(&char_vc_type_info);
|
|
|
|
sock_path = g_strjoin("", app_dir, "/", "spice.sock", NULL);
|
|
- qopts = qemu_opts_create(qemu_find_opts("spice"), NULL, 0, &error_abort);
|
|
+ qopts = qemu_opts_create(list, NULL, 0, &error_abort);
|
|
qemu_opt_set(qopts, "disable-ticketing", "on", &error_abort);
|
|
qemu_opt_set(qopts, "unix", "on", &error_abort);
|
|
qemu_opt_set(qopts, "addr", sock_path, &error_abort);
|