diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-08-15 01:15:52 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-15 15:04:51 +0100 |
| commit | 47025a0193f1f910300adfa443305ccf8482ef87 (patch) | |
| tree | 54e6b97dd35c9638c02986f97120b941221488f0 /hw/display | |
| parent | 81a6a2d48a6c7543a03265bcc5c5bbb0d929d894 (diff) | |
| download | qemu-47025a0193f1f910300adfa443305ccf8482ef87.zip qemu-47025a0193f1f910300adfa443305ccf8482ef87.tar.gz qemu-47025a0193f1f910300adfa443305ccf8482ef87.tar.bz2 | |
qxl: call qemu_spice_display_init_common for secondary devices
Fixes this 2.10 regression:
$ qemu-system-x86_64 -cpu host -m 6144 -vga qxl -device qxl
qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock: Assertion `mutex->initialized' failed.
Reported-by: ademaria@redhat.com
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20170814231552.24593-1-pbonzini@redhat.com
Cc: kraxel@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 7f8c73b..ae3677f 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2054,6 +2054,7 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) uint32_t pci_device_rev; uint32_t io_size; + qemu_spice_display_init_common(&qxl->ssd); qxl->mode = QXL_MODE_UNDEFINED; qxl->generation = 1; qxl->num_memslots = NUM_MEMSLOTS; @@ -2176,7 +2177,6 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp) portio_list_add(&qxl->vga_port_list, pci_address_space_io(dev), 0x3b0); vga->con = graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl); - qemu_spice_display_init_common(&qxl->ssd); qxl_realize_common(qxl, &local_err); if (local_err) { |