[Spice-devel] [PATCH spice-server v2 12/12] display-channel: Inline red_migrate_display function

[Jonathon Jongsma]

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Tue, 2019-03-26 at 19:10 +0000, Frediano Ziglio wrote:
> The only caller only called that function.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/display-channel.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/server/display-channel.c b/server/display-channel.c
> index 7b833e4c..9f3555e5 100644
> --- a/server/display-channel.c
> +++ b/server/display-channel.c
> @@ -2633,8 +2633,10 @@ static void
> display_channel_disconnect(RedChannelClient *rcc)
>      red_channel_client_disconnect(rcc);
>  }
>  
> -static void red_migrate_display(DisplayChannel *display,
> RedChannelClient *rcc)
> +static void display_channel_migrate(RedChannelClient *rcc)
>  {
> +    DisplayChannel *display =
> DISPLAY_CHANNEL(red_channel_client_get_channel(rcc));
> +
>      /* We need to stop the streams, and to send upgrade_items to the
> client.
>       * Otherwise, (1) the client might display lossy regions that we
> don't track
>       * (streams are not part of the migration data) (2)
> streams_timeout may occur
> @@ -2651,12 +2653,6 @@ static void red_migrate_display(DisplayChannel
> *display, RedChannelClient *rcc)
>      }
>  }
>  
> -static void display_channel_migrate(RedChannelClient *rcc)
> -{
> -    DisplayChannel *display =
> DISPLAY_CHANNEL(red_channel_client_get_channel(rcc));
> -    red_migrate_display(display, rcc);
> -}
> -
>  void display_channel_set_image_compression(DisplayChannel *display,
>                                             SpiceImageCompression
> image_compression)
>  {