From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 21 Jan 2011 09:32:03 +0000 (+0100)
Subject: qxl: locking fix
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=17268d54be2e15b0d8ccfc4102bc48c84299b027;p=qemu.git

qxl: locking fix

One spice worker call lacks the unlock/relock calls,
which may lead to deadlocks, add them.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/qxl.c b/hw/qxl.c
index dcea65d982..fe4212bff0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -866,7 +866,9 @@ static void qxl_destroy_primary(PCIQXLDevice *d)
     dprint(d, 1, "%s\n", __FUNCTION__);
 
     d->mode = QXL_MODE_UNDEFINED;
+    qemu_mutex_unlock_iothread();
     d->ssd.worker->destroy_primary_surface(d->ssd.worker, 0);
+    qemu_mutex_lock_iothread();
 }
 
 static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm)