From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36663 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PheLe-0004ct-Jr for qemu-devel@nongnu.org; Tue, 25 Jan 2011 03:34:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PheLJ-0001fZ-4F for qemu-devel@nongnu.org; Tue, 25 Jan 2011 03:33:58 -0500 Received: from smtp1.tech.numericable.fr ([82.216.111.37]:40312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PheLI-0001fL-Vc for qemu-devel@nongnu.org; Tue, 25 Jan 2011 03:33:37 -0500 From: Corentin Chary Date: Tue, 25 Jan 2011 09:33:27 +0100 Message-Id: <1295944407-19680-3-git-send-email-corentin.chary@gmail.com> In-Reply-To: <1295902845-29807-3-git-send-email-aliguori@us.ibm.com> References: <1295902845-29807-3-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 2/2] vnc: qemu can die if the client is disconnected while updating screen List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Corentin Chary , qemu-devel@nongnu.org From: Corentin Chary agraf reported that qemu_mutex_destroy(vs->output_mutex) was failing in vnc_disconnect_finish() when the vnc client was disconnected while updating the screen. It's because vnc_worker_thread_loop() tries to unlock the mutex while not locked. Signed-off-by: Corentin Chary --- ui/vnc-jobs-async.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c index 6e9cf08..0b5d750 100644 --- a/ui/vnc-jobs-async.c +++ b/ui/vnc-jobs-async.c @@ -227,6 +227,10 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) if (job->vs->csock == -1) { vnc_unlock_display(job->vs->vd); + /* output mutex must be locked before going to + * disconnected: + */ + vnc_lock_output(job->vs); goto disconnected; } -- 1.7.3.4