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