From patchwork Wed Oct 3 18:13:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: hw/qxl: exit on failure to register qxl interface Date: Wed, 03 Oct 2012 08:13:58 -0000 From: Alon Levy X-Patchwork-Id: 188874 Message-Id: <1349288038-15890-1-git-send-email-alevy@redhat.com> To: qemu-devel@nongnu.org Cc: kraxel@redhat.com 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 --- hw/qxl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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);