[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for 2.10?] qxl: call qemu_spice_display_init_common
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH for 2.10?] qxl: call qemu_spice_display_init_common for secondary devices |
Date: |
Tue, 15 Aug 2017 01:15:52 +0200 |
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: address@hidden
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/display/qxl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 7f8c73b56d..ae3677fd1e 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) {
--
2.13.5
- [Qemu-devel] [PATCH for 2.10?] qxl: call qemu_spice_display_init_common for secondary devices,
Paolo Bonzini <=