From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 13 Jul 2016 10:21:20 +0000 (+0200)
Subject: vnc: make sure we finish disconnect
X-Git-Tag: v2.6.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ef7abeccf527029c3b2e70ec585f1788fa2e007;p=thirdparty%2Fqemu.git

vnc: make sure we finish disconnect

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 <kraxel@redhat.com>
Message-id: 1468405280-2571-1-git-send-email-kraxel@redhat.com
(cherry picked from commit 5a8be0f73d6f60ff08746377eb09ca459f39deab)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/ui/vnc.c b/ui/vnc.c
index f28d2c96547..59bbacba76a 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1035,6 +1035,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->ioc != NULL) {
         VncDisplay *vd = vs->vd;