|
 |
9bac43 |
From 5f140826bcb807ea47063b0b65d62b8ebc4a2c7f Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
9bac43 |
Date: Mon, 5 Feb 2018 11:09:58 +0100
|
|
|
9bac43 |
Subject: [PATCH 04/20] ui: remove 'sync' parameter from 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-4-berrange@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78878
|
|
|
9bac43 |
O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 03/17] ui: remove 'sync' parameter from 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 |
There is only one caller of vnc_update_client and that always passes false
|
|
|
9bac43 |
for the 'sync' parameter.
|
|
|
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-2-berrange@redhat.com
|
|
|
9bac43 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit 6af998db05aec9af95a06f84ad94f1b96785e667)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
ui/vnc.c | 11 +++--------
|
|
|
9bac43 |
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
9bac43 |
index 1275bba..6ed738b 100644
|
|
|
9bac43 |
--- a/ui/vnc.c
|
|
|
9bac43 |
+++ b/ui/vnc.c
|
|
|
9bac43 |
@@ -596,7 +596,7 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp)
|
|
|
9bac43 |
3) resolutions > 1024
|
|
|
9bac43 |
*/
|
|
|
9bac43 |
|
|
|
9bac43 |
-static int vnc_update_client(VncState *vs, int has_dirty, bool sync);
|
|
|
9bac43 |
+static int vnc_update_client(VncState *vs, int has_dirty);
|
|
|
9bac43 |
static void vnc_disconnect_start(VncState *vs);
|
|
|
9bac43 |
|
|
|
9bac43 |
static void vnc_colordepth(VncState *vs);
|
|
|
9bac43 |
@@ -961,7 +961,7 @@ static int find_and_clear_dirty_height(VncState *vs,
|
|
|
9bac43 |
return h;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
-static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
|
|
|
9bac43 |
+static int vnc_update_client(VncState *vs, int has_dirty)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
if (vs->disconnecting) {
|
|
|
9bac43 |
vnc_disconnect_finish(vs);
|
|
|
9bac43 |
@@ -1025,9 +1025,6 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
vnc_job_push(job);
|
|
|
9bac43 |
- if (sync) {
|
|
|
9bac43 |
- vnc_jobs_join(vs);
|
|
|
9bac43 |
- }
|
|
|
9bac43 |
vs->force_update = 0;
|
|
|
9bac43 |
vs->has_dirty = 0;
|
|
|
9bac43 |
return n;
|
|
|
9bac43 |
@@ -1035,8 +1032,6 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
|
|
|
9bac43 |
|
|
|
9bac43 |
if (vs->disconnecting) {
|
|
|
9bac43 |
vnc_disconnect_finish(vs);
|
|
|
9bac43 |
- } else if (sync) {
|
|
|
9bac43 |
- vnc_jobs_join(vs);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
return 0;
|
|
|
9bac43 |
@@ -2863,7 +2858,7 @@ static void vnc_refresh(DisplayChangeListener *dcl)
|
|
|
9bac43 |
vnc_unlock_display(vd);
|
|
|
9bac43 |
|
|
|
9bac43 |
QTAILQ_FOREACH_SAFE(vs, &vd->clients, next, vn) {
|
|
|
9bac43 |
- rects += vnc_update_client(vs, has_dirty, false);
|
|
|
9bac43 |
+ rects += vnc_update_client(vs, has_dirty);
|
|
|
9bac43 |
/* vs might be free()ed here */
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|