36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From a0f199b76debf55933c2b3b917c13c86784e3be0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alon Levy <alevy@redhat.com>
|
||
|
|
Date: Wed, 3 Oct 2012 20:13:58 +0200
|
||
|
|
Subject: [PATCH 514/647] hw/qxl: exit on failure to register qxl interface
|
||
|
|
|
||
|
|
This prevents a segfault later on when the device reset handler
|
||
|
|
tries to access a NULL ssd.worker since interface_attach_worker has
|
||
|
|
not been called.
|
||
|
|
|
||
|
|
Signed-off-by: Alon Levy <alevy@redhat.com>
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
---
|
||
|
|
hw/qxl.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/qxl.c b/hw/qxl.c
|
||
|
|
index 9389752..a2dd020 100644
|
||
|
|
--- a/hw/qxl.c
|
||
|
|
+++ b/hw/qxl.c
|
||
|
|
@@ -2035,7 +2035,11 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
||
|
|
|
||
|
|
qxl->ssd.qxl.base.sif = &qxl_interface.base;
|
||
|
|
qxl->ssd.qxl.id = qxl->id;
|
||
|
|
- qemu_spice_add_interface(&qxl->ssd.qxl.base);
|
||
|
|
+ if (qemu_spice_add_interface(&qxl->ssd.qxl.base) != 0) {
|
||
|
|
+ error_report("qxl interface %d.%d not supported by spice-server\n",
|
||
|
|
+ SPICE_INTERFACE_QXL_MAJOR, SPICE_INTERFACE_QXL_MINOR);
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl);
|
||
|
|
|
||
|
|
init_pipe_signaling(qxl);
|
||
|
|
--
|
||
|
|
1.7.12.1
|
||
|
|
|