[Spice-devel] [PATCH 07/16] worker: remove some unnecessary inline

Pavel Grunt pgrunt at redhat.com
Thu Nov 26 23:57:01 PST 2015


Acked-by: Pavel Grunt <pgrunt at redhat.com>

On Thu, 2015-11-26 at 16:06 +0000, Frediano Ziglio wrote:
> From: Marc-André Lureau <marcandre.lureau at gmail.com>
> 
> ---
>  server/dcc-send.c   | 10 +++++-----
>  server/red_worker.c |  8 ++++----
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/server/dcc-send.c b/server/dcc-send.c
> index 634084a..2340252 100644
> --- a/server/dcc-send.c
> +++ b/server/dcc-send.c
> @@ -191,9 +191,9 @@ static PipeItem *dcc_get_tail(DisplayChannelClient *dcc)
>      return (PipeItem*)ring_get_tail(&RED_CHANNEL_CLIENT(dcc)->pipe);
>  }
>  
> -static inline void red_display_add_image_to_pixmap_cache(RedChannelClient
> *rcc,
> -                                                         SpiceImage *image,
> SpiceImage *io_image,
> -                                                         int is_lossy)
> +static void red_display_add_image_to_pixmap_cache(RedChannelClient *rcc,
> +                                                  SpiceImage *image,
> SpiceImage *io_image,
> +                                                  int is_lossy)
>  {
>      DisplayChannel *display_channel = SPICE_CONTAINEROF(rcc->channel,
> DisplayChannel, common.base);
>      DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> @@ -1650,8 +1650,8 @@ static void
> red_lossy_marshall_qxl_draw_text(RedChannelClient *rcc,
>      }
>  }
>  
> -static inline int red_marshall_stream_data(RedChannelClient *rcc,
> -                  SpiceMarshaller *base_marshaller, Drawable *drawable)
> +static int red_marshall_stream_data(RedChannelClient *rcc,
> +                                    SpiceMarshaller *base_marshaller,
> Drawable *drawable)
>  {
>      DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
>      DisplayChannel *display = DCC_TO_DC(dcc);
> diff --git a/server/red_worker.c b/server/red_worker.c
> index d51e347..49a8dbc 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -416,7 +416,7 @@ static int red_process_commands(RedWorker *worker,
> uint32_t max_pipe_size, int *
>      return n;
>  }
>  
> -static inline void red_push(RedWorker *worker)
> +static void red_push(RedWorker *worker)
>  {
>      if (worker->cursor_channel) {
>          red_channel_push(RED_CHANNEL(worker->cursor_channel));
> @@ -455,7 +455,7 @@ static void red_migrate_display(DisplayChannel *display,
> RedChannelClient *rcc)
>      }
>  }
>  
> -static inline void flush_display_commands(RedWorker *worker)
> +static void flush_display_commands(RedWorker *worker)
>  {
>      RedChannel *display_red_channel = RED_CHANNEL(worker->display_channel);
>  
> @@ -499,7 +499,7 @@ static inline void flush_display_commands(RedWorker
> *worker)
>      }
>  }
>  
> -static inline void flush_cursor_commands(RedWorker *worker)
> +static void flush_cursor_commands(RedWorker *worker)
>  {
>      RedChannel *cursor_red_channel = RED_CHANNEL(worker->cursor_channel);
>  
> @@ -545,7 +545,7 @@ static inline void flush_cursor_commands(RedWorker
> *worker)
>  // TODO: on timeout, don't disconnect all channels immediatly - try to
> disconnect the slowest ones
>  // first and maybe turn timeouts to several timeouts in order to disconnect
> channels gradually.
>  // Should use disconnect or shutdown?
> -static inline void flush_all_qxl_commands(RedWorker *worker)
> +static void flush_all_qxl_commands(RedWorker *worker)
>  {
>      flush_display_commands(worker);
>      flush_cursor_commands(worker);


More information about the Spice-devel mailing list