From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51341 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhPAG-0004ju-Us for qemu-devel@nongnu.org; Mon, 24 Jan 2011 11:21:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhPA3-0005op-RN for qemu-devel@nongnu.org; Mon, 24 Jan 2011 11:21:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhPA3-0005oY-KZ for qemu-devel@nongnu.org; Mon, 24 Jan 2011 11:20:59 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0OGKw8X023553 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 Jan 2011 11:20:59 -0500 From: Gerd Hoffmann Date: Mon, 24 Jan 2011 17:20:47 +0100 Message-Id: <1295886049-30548-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1295886049-30548-1-git-send-email-kraxel@redhat.com> References: <1295886049-30548-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] qxl: locking fix List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann One spice worker call lacks the unlock/relock calls, which may lead to deadlocks, add them. Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index dcea65d..fe4212b 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) -- 1.7.1