Patchwork hw/qxl: exit on failure to register qxl interface

login
register
mail settings
Submitter Alon Levy
Date Oct. 3, 2012, 6:13 p.m.
Message ID <1349288038-15890-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/188874/
State New
Headers show

Comments

Alon Levy - Oct. 3, 2012, 6:13 p.m.
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>
---
 hw/qxl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 58c4643..4effb66 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -2044,7 +2044,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);