On Thu, Nov 5, 2015 at 10:15 AM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote: > From: Marc-André Lureau <marcandre.lureau@xxxxxxxxx> > > --- > server/display-channel.h | 32 ++++++++++++++++++++++++++++++++ > server/red_worker.c | 32 -------------------------------- > 2 files changed, 32 insertions(+), 32 deletions(-) > > diff --git a/server/display-channel.h b/server/display-channel.h > index c4c55ff..48e28a6 100644 > --- a/server/display-channel.h > +++ b/server/display-channel.h > @@ -327,4 +327,36 @@ MonitorsConfig* monitors_config_new (QXLHead *h > MonitorsConfig * monitors_config_ref (MonitorsConfig *config); > void monitors_config_unref (MonitorsConfig *config); > > +struct DisplayChannel { > + CommonChannel common; // Must be the first thing > + > + MonitorsConfig *monitors_config; > + > + uint32_t num_renderers; > + uint32_t renderers[RED_RENDERER_LAST]; > + uint32_t renderer; > + > + int enable_jpeg; > + int jpeg_quality; > + int enable_zlib_glz_wrap; > + int zlib_level; > + > + RedCompressBuf *free_compress_bufs; > + > +#ifdef RED_STATISTICS > + uint64_t *cache_hits_counter; > + uint64_t *add_to_cache_counter; > + uint64_t *non_cache_counter; > +#endif > +#ifdef COMPRESS_STAT > + stat_info_t lz_stat; > + stat_info_t glz_stat; > + stat_info_t quic_stat; > + stat_info_t jpeg_stat; > + stat_info_t zlib_glz_stat; > + stat_info_t jpeg_alpha_stat; > + stat_info_t lz4_stat; > +#endif > +}; > + > #endif /* DISPLAY_CHANNEL_H_ */ > diff --git a/server/red_worker.c b/server/red_worker.c > index 480f2ca..40ae8b3 100644 > --- a/server/red_worker.c > +++ b/server/red_worker.c > @@ -343,38 +343,6 @@ struct RedGlzDrawable { > pthread_mutex_t glz_dictionary_list_lock = PTHREAD_MUTEX_INITIALIZER; > Ring glz_dictionary_list = {&glz_dictionary_list, &glz_dictionary_list}; > > -struct DisplayChannel { > - CommonChannel common; // Must be the first thing > - > - MonitorsConfig *monitors_config; > - > - uint32_t num_renderers; > - uint32_t renderers[RED_RENDERER_LAST]; > - uint32_t renderer; > - > - int enable_jpeg; > - int jpeg_quality; > - int enable_zlib_glz_wrap; > - int zlib_level; > - > - RedCompressBuf *free_compress_bufs; > - > -#ifdef RED_STATISTICS > - uint64_t *cache_hits_counter; > - uint64_t *add_to_cache_counter; > - uint64_t *non_cache_counter; > -#endif > -#ifdef COMPRESS_STAT > - stat_info_t lz_stat; > - stat_info_t glz_stat; > - stat_info_t quic_stat; > - stat_info_t jpeg_stat; > - stat_info_t zlib_glz_stat; > - stat_info_t jpeg_alpha_stat; > - stat_info_t lz4_stat; > -#endif > -}; > - > typedef struct _Drawable _Drawable; > struct _Drawable { > union { > -- > 2.4.3 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/spice-devel I would add "to display channel" in the git commit log. (worker: move DisplayChannel struct to display channel". ACK (with or without my suggestion)! _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel