diff mbox series

[v1,01/13] ui: remove 'sync' parametr from vnc_update_client

Message ID 20171218191228.31018-2-berrange@redhat.com
State New
Headers show
Series Fix VNC server unbounded memory usage | expand

Commit Message

Daniel P. Berrangé Dec. 18, 2017, 7:12 p.m. UTC
There is only one caller of vnc_update_client and that always passes false
for the 'sync' parameter.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 ui/vnc.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Comments

Daniel P. Berrangé Dec. 19, 2017, 10:32 a.m. UTC | #1
Just cc'ing  qemu-devel back on the mail since it was accidentally dropped.

On Tue, Dec 19, 2017 at 07:26:29AM +0000, Darren Kenny wrote:
> Small nit on the subject s/parametr/parameter/
> 
> Otherwise, looks good.
> 
> Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
> 
> Thanks,
> 
> Darren.
> 
> On Mon, Dec 18, 2017 at 07:12:16PM +0000, Daniel P. Berrange wrote:
> > There is only one caller of vnc_update_client and that always passes false
> > for the 'sync' parameter.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > ui/vnc.c | 11 +++--------
> > 1 file changed, 3 insertions(+), 8 deletions(-)
> > 
> > diff --git a/ui/vnc.c b/ui/vnc.c
> > index 9f8d5a1b1f..7ba3297dfa 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 */
> >     }
> > 
> > -- 
> > 2.14.3
> > 
> > 

Regards,
Daniel
Gerd Hoffmann Jan. 8, 2018, 11:08 a.m. UTC | #2
On Mon, Dec 18, 2017 at 07:12:16PM +0000, Daniel P. Berrange wrote:
> There is only one caller of vnc_update_client and that always passes false
> for the 'sync' parameter.

Unused since commit 50628d3479e4f9aa97e323506856e394fe7ad7a6.
Good catch.

What is the state of this series btw (/me busy wading through my
email backlog ...) ?

cheers,
  Gerd
Daniel P. Berrangé Jan. 10, 2018, 1:55 p.m. UTC | #3
On Mon, Jan 08, 2018 at 12:08:49PM +0100, Gerd Hoffmann wrote:
> On Mon, Dec 18, 2017 at 07:12:16PM +0000, Daniel P. Berrange wrote:
> > There is only one caller of vnc_update_client and that always passes false
> > for the 'sync' parameter.
> 
> Unused since commit 50628d3479e4f9aa97e323506856e394fe7ad7a6.
> Good catch.
> 
> What is the state of this series btw (/me busy wading through my
> email backlog ...) ?

Marc-André reviewed it, but I was assuming you would want to review and
(if acceptable) queue it, since you're the designated VNC maintainer.
There's just one nit-pick in the Subject of this mail so far.

Regards,
Daniel
Gerd Hoffmann Jan. 12, 2018, 11:48 a.m. UTC | #4
> > What is the state of this series btw (/me busy wading through my
> > email backlog ...) ?
> 
> Marc-André reviewed it, but I was assuming you would want to review and
> (if acceptable) queue it, since you're the designated VNC maintainer.
> There's just one nit-pick in the Subject of this mail so far.

Ok, queued, fixed $subject tyops, test builds running ...

thanks,
  Gerd
diff mbox series

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index 9f8d5a1b1f..7ba3297dfa 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 */
     }