]> git.proxmox.com Git - qemu.git/commitdiff
hw/qxl: exit on failure to register qxl interface
authorAlon Levy <alevy@redhat.com>
Wed, 3 Oct 2012 18:13:58 +0000 (20:13 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 8 Oct 2012 10:15:17 +0000 (12:15 +0200)
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

index eb7707c84c4346925d303834b6ebdea5fef61caa..e99ed55b5443ec7073b8269b500a47bb153b9168 100644 (file)
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -2037,7 +2037,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);