On 15/08/2017 01:15, Paolo Bonzini wrote:
> 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: adema...@redhat.com
> Cc: kra...@redhat.com
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Hmm, Gerd is on vacation but perhaps Marc-André can ack it? Or just
revert the mutex->initialized patch for 2.10 (commit c096358e74,
"qemu-thread: Assert locks are initialized before using", 2017-07-04).
Paolo
> ---
> 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) {
>
