|
 |
9bac43 |
From 11a0ca31dff62ede8b272420cc527f8e4dd102a7 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
9bac43 |
Date: Mon, 5 Feb 2018 11:09:59 +0100
|
|
|
9bac43 |
Subject: [PATCH 05/20] ui: remove unreachable code in vnc_update_client
|
|
|
9bac43 |
MIME-Version: 1.0
|
|
|
9bac43 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9bac43 |
Content-Transfer-Encoding: 8bit
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
9bac43 |
Message-id: <20180205111012.6210-5-berrange@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78875
|
|
|
9bac43 |
O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 04/17] ui: remove unreachable code in vnc_update_client
|
|
|
9bac43 |
Bugzilla: 1527404
|
|
|
9bac43 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
A previous commit:
|
|
|
9bac43 |
|
|
|
9bac43 |
commit 5a8be0f73d6f60ff08746377eb09ca459f39deab
|
|
|
9bac43 |
Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
Date: Wed Jul 13 12:21:20 2016 +0200
|
|
|
9bac43 |
|
|
|
9bac43 |
vnc: make sure we finish disconnect
|
|
|
9bac43 |
|
|
|
9bac43 |
Added a check for vs->disconnecting at the very start of the
|
|
|
9bac43 |
vnc_update_client method. This means that the very next "if"
|
|
|
9bac43 |
statement check for !vs->disconnecting always evaluates true,
|
|
|
9bac43 |
and is thus redundant. This in turn means the vs->disconnecting
|
|
|
9bac43 |
check at the very end of the method never evaluates true, and
|
|
|
9bac43 |
is thus unreachable code.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
|
|
9bac43 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
9bac43 |
Message-id: 20171218191228.31018-3-berrange@redhat.com
|
|
|
9bac43 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit c53df961617736f94731d94b62c2954c261d2bae)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
ui/vnc.c | 6 +-----
|
|
|
9bac43 |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
9bac43 |
index 6ed738b..1d2b3a8 100644
|
|
|
9bac43 |
--- a/ui/vnc.c
|
|
|
9bac43 |
+++ b/ui/vnc.c
|
|
|
9bac43 |
@@ -969,7 +969,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
vs->has_dirty += has_dirty;
|
|
|
9bac43 |
- if (vs->need_update && !vs->disconnecting) {
|
|
|
9bac43 |
+ if (vs->need_update) {
|
|
|
9bac43 |
VncDisplay *vd = vs->vd;
|
|
|
9bac43 |
VncJob *job;
|
|
|
9bac43 |
int y;
|
|
|
9bac43 |
@@ -1030,10 +1030,6 @@ static int vnc_update_client(VncState *vs, int has_dirty)
|
|
|
9bac43 |
return n;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
- if (vs->disconnecting) {
|
|
|
9bac43 |
- vnc_disconnect_finish(vs);
|
|
|
9bac43 |
- }
|
|
|
9bac43 |
-
|
|
|
9bac43 |
return 0;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|