[Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Frediano Ziglio]

This fields points to an old interface that is no more
used in the current code.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 hw/display/qxl.c           | 1 -
 include/ui/spice-display.h | 1 -
 ui/spice-display.c         | 2 --
 3 files changed, 4 deletions(-)

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 99365c3e8f..b9fa067f6e 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -518,7 +518,6 @@ static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
     PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
 
     trace_qxl_interface_attach_worker(qxl->id);
-    qxl->ssd.worker = qxl_worker;
 }
 
 static void interface_set_compression_level(QXLInstance *sin, int level)
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index aaf2019889..6b5c73b21c 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -86,7 +86,6 @@ struct SimpleSpiceDisplay {
     DisplayChangeListener dcl;
     void *buf;
     int bufsize;
-    QXLWorker *worker;
     QXLInstance qxl;
     uint32_t unique;
     pixman_image_t *surface;
diff --git a/ui/spice-display.c b/ui/spice-display.c
index ad1ceafb3f..85a72fe76a 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -519,7 +519,6 @@ static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
     SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
 
     dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);
-    ssd->worker = qxl_worker;
 }
 
 static void interface_set_compression_level(QXLInstance *sin, int level)
@@ -1028,7 +1027,6 @@ static void qemu_spice_display_init_one(QemuConsole *con)
 
     ssd->qxl.base.sif = &dpy_interface.base;
     qemu_spice_add_display_interface(&ssd->qxl, con);
-    assert(ssd->worker);
     qemu_spice_create_host_memslot(ssd);
 
     register_displaychangelistener(&ssd->dcl);
-- 
2.14.3

[Qemu-devel] [PATCH 2/4] spice: remove unused watch list

[Frediano Ziglio]

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 ui/spice-core.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index ea04dc69b5..85b9ea2127 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -92,9 +92,7 @@ struct SpiceWatch {
     int event_mask;
     SpiceWatchFunc func;
     void *opaque;
-    QTAILQ_ENTRY(SpiceWatch) next;
 };
-static QTAILQ_HEAD(, SpiceWatch) watches = QTAILQ_HEAD_INITIALIZER(watches);
 
 static void watch_read(void *opaque)
 {
@@ -131,7 +129,6 @@ static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *
     watch->fd     = fd;
     watch->func   = func;
     watch->opaque = opaque;
-    QTAILQ_INSERT_TAIL(&watches, watch, next);
 
     watch_update_mask(watch, event_mask);
     return watch;
@@ -140,7 +137,6 @@ static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *
 static void watch_remove(SpiceWatch *watch)
 {
     qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
-    QTAILQ_REMOVE(&watches, watch, next);
     g_free(watch);
 }
 
-- 
2.14.3

[Qemu-devel] [PATCH 3/4] spice: remove only written event_mask field

[Frediano Ziglio]

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 ui/spice-core.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 85b9ea2127..6d579faaae 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -89,7 +89,6 @@ static void timer_remove(SpiceTimer *timer)
 
 struct SpiceWatch {
     int fd;
-    int event_mask;
     SpiceWatchFunc func;
     void *opaque;
 };
@@ -111,11 +110,10 @@ static void watch_update_mask(SpiceWatch *watch, int event_mask)
     IOHandler *on_read = NULL;
     IOHandler *on_write = NULL;
 
-    watch->event_mask = event_mask;
-    if (watch->event_mask & SPICE_WATCH_EVENT_READ) {
+    if (event_mask & SPICE_WATCH_EVENT_READ) {
         on_read = watch_read;
     }
-    if (watch->event_mask & SPICE_WATCH_EVENT_WRITE) {
+    if (event_mask & SPICE_WATCH_EVENT_WRITE) {
         on_write = watch_write;
     }
     qemu_set_fd_handler(watch->fd, on_read, on_write, watch);
-- 
2.14.3

[Qemu-devel] [PATCH 4/4] spice: remove unused timer list

[Frediano Ziglio]

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 ui/spice-core.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 6d579faaae..2baf0c7120 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -55,9 +55,7 @@ static QemuThread me;
 
 struct SpiceTimer {
     QEMUTimer *timer;
-    QTAILQ_ENTRY(SpiceTimer) next;
 };
-static QTAILQ_HEAD(, SpiceTimer) timers = QTAILQ_HEAD_INITIALIZER(timers);
 
 static SpiceTimer *timer_add(SpiceTimerFunc func, void *opaque)
 {
@@ -65,7 +63,6 @@ static SpiceTimer *timer_add(SpiceTimerFunc func, void *opaque)
 
     timer = g_malloc0(sizeof(*timer));
     timer->timer = timer_new_ms(QEMU_CLOCK_REALTIME, func, opaque);
-    QTAILQ_INSERT_TAIL(&timers, timer, next);
     return timer;
 }
 
@@ -83,7 +80,6 @@ static void timer_remove(SpiceTimer *timer)
 {
     timer_del(timer->timer);
     timer_free(timer->timer);
-    QTAILQ_REMOVE(&timers, timer, next);
     g_free(timer);
 }
 
-- 
2.14.3

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Frediano Ziglio]

ping the series

> 
> This fields points to an old interface that is no more
> used in the current code.
> 
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
> ---
>  hw/display/qxl.c           | 1 -
>  include/ui/spice-display.h | 1 -
>  ui/spice-display.c         | 2 --
>  3 files changed, 4 deletions(-)
> 
> diff --git a/hw/display/qxl.c b/hw/display/qxl.c
> index 99365c3e8f..b9fa067f6e 100644
> --- a/hw/display/qxl.c
> +++ b/hw/display/qxl.c
> @@ -518,7 +518,6 @@ static void interface_attach_worker(QXLInstance *sin,
> QXLWorker *qxl_worker)
>      PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
>  
>      trace_qxl_interface_attach_worker(qxl->id);
> -    qxl->ssd.worker = qxl_worker;
>  }
>  
>  static void interface_set_compression_level(QXLInstance *sin, int level)
> diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
> index aaf2019889..6b5c73b21c 100644
> --- a/include/ui/spice-display.h
> +++ b/include/ui/spice-display.h
> @@ -86,7 +86,6 @@ struct SimpleSpiceDisplay {
>      DisplayChangeListener dcl;
>      void *buf;
>      int bufsize;
> -    QXLWorker *worker;
>      QXLInstance qxl;
>      uint32_t unique;
>      pixman_image_t *surface;
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index ad1ceafb3f..85a72fe76a 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -519,7 +519,6 @@ static void interface_attach_worker(QXLInstance *sin,
> QXLWorker *qxl_worker)
>      SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
>  
>      dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);
> -    ssd->worker = qxl_worker;
>  }
>  
>  static void interface_set_compression_level(QXLInstance *sin, int level)
> @@ -1028,7 +1027,6 @@ static void qemu_spice_display_init_one(QemuConsole
> *con)
>  
>      ssd->qxl.base.sif = &dpy_interface.base;
>      qemu_spice_add_display_interface(&ssd->qxl, con);
> -    assert(ssd->worker);
>      qemu_spice_create_host_memslot(ssd);
>  
>      register_displaychangelistener(&ssd->dcl);

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Frediano Ziglio]

ping

> 
> ping the series
> 
> > 
> > This fields points to an old interface that is no more
> > used in the current code.
> > 
> > Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
> > ---
> >  hw/display/qxl.c           | 1 -
> >  include/ui/spice-display.h | 1 -
> >  ui/spice-display.c         | 2 --
> >  3 files changed, 4 deletions(-)
> > 
> > diff --git a/hw/display/qxl.c b/hw/display/qxl.c
> > index 99365c3e8f..b9fa067f6e 100644
> > --- a/hw/display/qxl.c
> > +++ b/hw/display/qxl.c
> > @@ -518,7 +518,6 @@ static void interface_attach_worker(QXLInstance *sin,
> > QXLWorker *qxl_worker)
> >      PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
> >  
> >      trace_qxl_interface_attach_worker(qxl->id);
> > -    qxl->ssd.worker = qxl_worker;
> >  }
> >  
> >  static void interface_set_compression_level(QXLInstance *sin, int level)
> > diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
> > index aaf2019889..6b5c73b21c 100644
> > --- a/include/ui/spice-display.h
> > +++ b/include/ui/spice-display.h
> > @@ -86,7 +86,6 @@ struct SimpleSpiceDisplay {
> >      DisplayChangeListener dcl;
> >      void *buf;
> >      int bufsize;
> > -    QXLWorker *worker;
> >      QXLInstance qxl;
> >      uint32_t unique;
> >      pixman_image_t *surface;
> > diff --git a/ui/spice-display.c b/ui/spice-display.c
> > index ad1ceafb3f..85a72fe76a 100644
> > --- a/ui/spice-display.c
> > +++ b/ui/spice-display.c
> > @@ -519,7 +519,6 @@ static void interface_attach_worker(QXLInstance *sin,
> > QXLWorker *qxl_worker)
> >      SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
> >  
> >      dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);
> > -    ssd->worker = qxl_worker;
> >  }
> >  
> >  static void interface_set_compression_level(QXLInstance *sin, int level)
> > @@ -1028,7 +1027,6 @@ static void qemu_spice_display_init_one(QemuConsole
> > *con)
> >  
> >      ssd->qxl.base.sif = &dpy_interface.base;
> >      qemu_spice_add_display_interface(&ssd->qxl, con);
> > -    assert(ssd->worker);
> >      qemu_spice_create_host_memslot(ssd);
> >  
> >      register_displaychangelistener(&ssd->dcl);
> 
> 

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Frediano Ziglio]

ping

> 
> ping
> 
> > 
> > ping the series
> > 
> > > 
> > > This fields points to an old interface that is no more
> > > used in the current code.
> > > 
> > > Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
> > > ---
> > >  hw/display/qxl.c           | 1 -
> > >  include/ui/spice-display.h | 1 -
> > >  ui/spice-display.c         | 2 --
> > >  3 files changed, 4 deletions(-)
> > > 
> > > diff --git a/hw/display/qxl.c b/hw/display/qxl.c
> > > index 99365c3e8f..b9fa067f6e 100644
> > > --- a/hw/display/qxl.c
> > > +++ b/hw/display/qxl.c
> > > @@ -518,7 +518,6 @@ static void interface_attach_worker(QXLInstance *sin,
> > > QXLWorker *qxl_worker)
> > >      PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
> > >  
> > >      trace_qxl_interface_attach_worker(qxl->id);
> > > -    qxl->ssd.worker = qxl_worker;
> > >  }
> > >  
> > >  static void interface_set_compression_level(QXLInstance *sin, int level)
> > > diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
> > > index aaf2019889..6b5c73b21c 100644
> > > --- a/include/ui/spice-display.h
> > > +++ b/include/ui/spice-display.h
> > > @@ -86,7 +86,6 @@ struct SimpleSpiceDisplay {
> > >      DisplayChangeListener dcl;
> > >      void *buf;
> > >      int bufsize;
> > > -    QXLWorker *worker;
> > >      QXLInstance qxl;
> > >      uint32_t unique;
> > >      pixman_image_t *surface;
> > > diff --git a/ui/spice-display.c b/ui/spice-display.c
> > > index ad1ceafb3f..85a72fe76a 100644
> > > --- a/ui/spice-display.c
> > > +++ b/ui/spice-display.c
> > > @@ -519,7 +519,6 @@ static void interface_attach_worker(QXLInstance *sin,
> > > QXLWorker *qxl_worker)
> > >      SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay,
> > >      qxl);
> > >  
> > >      dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);
> > > -    ssd->worker = qxl_worker;
> > >  }
> > >  
> > >  static void interface_set_compression_level(QXLInstance *sin, int level)
> > > @@ -1028,7 +1027,6 @@ static void qemu_spice_display_init_one(QemuConsole
> > > *con)
> > >  
> > >      ssd->qxl.base.sif = &dpy_interface.base;
> > >      qemu_spice_add_display_interface(&ssd->qxl, con);
> > > -    assert(ssd->worker);
> > >      qemu_spice_create_host_memslot(ssd);
> > >  
> > >      register_displaychangelistener(&ssd->dcl);
> > 
> > 
> 
> 

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Gerd Hoffmann]

On Sun, Dec 31, 2017 at 05:17:43AM -0500, Frediano Ziglio wrote:
> ping
> 
> > 
> > ping
> > 
> > > 
> > > ping the series
> > > 

Was on sick leave for a few weeks, back now, will process asap but will
probably take a while nevertheless due to the big backlog I have now.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Frediano Ziglio]

Thanks.
How is your hand?

Frediano

----- Original Message -----
> 
> On Sun, Dec 31, 2017 at 05:17:43AM -0500, Frediano Ziglio wrote:
> > ping
> > 
> > > 
> > > ping
> > > 
> > > > 
> > > > ping the series
> > > > 
> 
> Was on sick leave for a few weeks, back now, will process asap but will
> probably take a while nevertheless due to the big backlog I have now.
> 
> cheers,
>   Gerd
> 
> 
> 

Re: [Qemu-devel] [PATCH 1/4] spice: remove QXLWorker interface field

[Gerd Hoffmann]

On Wed, Nov 22, 2017 at 01:56:22PM +0000, Frediano Ziglio wrote:
> This fields points to an old interface that is no more
> used in the current code.

Series queued now.

thanks,
  Gerd