From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPPS8-0001eO-CG for qemu-devel@nongnu.org; Tue, 19 Jul 2016 03:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPPS4-0005GJ-5Q for qemu-devel@nongnu.org; Tue, 19 Jul 2016 03:28:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPPS3-0005Ep-Vm for qemu-devel@nongnu.org; Tue, 19 Jul 2016 03:28:24 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50A91445CE for ; Tue, 19 Jul 2016 07:28:22 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 19 Jul 2016 09:28:16 +0200 Message-Id: <1468913298-23781-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1468913298-23781-1-git-send-email-kraxel@redhat.com> References: <1468913298-23781-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/3] vnc: make sure we finish disconnect List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann It may happen that vnc connections linger in disconnecting state forever because VncState happens to be in a state where vnc_update_client() exists early and never reaches the vnc_disconnect_finish() call at the bottom of the function. Fix that by doing an additinal check at the start of the function. https://bugzilla.redhat.com/show_bug.cgi?id=1352799 Signed-off-by: Gerd Hoffmann Message-id: 1468405280-2571-1-git-send-email-kraxel@redhat.com --- ui/vnc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index e3f857c..3ce3a5b 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1024,6 +1024,11 @@ static int find_and_clear_dirty_height(VncState *vs, static int vnc_update_client(VncState *vs, int has_dirty, bool sync) { + if (vs->disconnecting) { + vnc_disconnect_finish(vs); + return 0; + } + vs->has_dirty += has_dirty; if (vs->need_update && !vs->disconnecting) { VncDisplay *vd = vs->vd; -- 1.8.3.1