aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-07-13 12:21:20 +0200
committerGerd Hoffmann <kraxel@redhat.com>2016-07-15 12:00:06 +0200
commit5a8be0f73d6f60ff08746377eb09ca459f39deab (patch)
tree60b0c827a59895920f91d7c1412c6c0634755af0
parent14c7d99333e4a474c65bdae6f99aa8837e8078e6 (diff)
downloadqemu-5a8be0f73d6f60ff08746377eb09ca459f39deab.zip
qemu-5a8be0f73d6f60ff08746377eb09ca459f39deab.tar.gz
qemu-5a8be0f73d6f60ff08746377eb09ca459f39deab.tar.bz2
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
-rw-r--r--ui/vnc.c5
1 files changed, 5 insertions, 0 deletions
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;