diff options
| author | Alon Levy <alevy@redhat.com> | 2012-10-03 20:13:58 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-10-08 12:15:17 +0200 |
| commit | e25a0651f4be22099122b5e14c77c354be0aa88b (patch) | |
| tree | 5050076e4c00a68822d7b87c9f142c837ed5fc17 | |
| parent | ffe01e599f106bedf13ba0e0f6956735b1942a0c (diff) | |
| download | focaccia-qemu-e25a0651f4be22099122b5e14c77c354be0aa88b.tar.gz focaccia-qemu-e25a0651f4be22099122b5e14c77c354be0aa88b.zip | |
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>
| -rw-r--r-- | hw/qxl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/qxl.c b/hw/qxl.c index eb7707c84c..e99ed55b54 100644 --- 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); |