[Spice-devel] [PATCH 10/15] Change reds_mig_target_client_free() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 05:16:42 PST 2016


> 
> From: Jonathon Jongsma <jjongsma at redhat.com>
> 
> ---
>  server/reds.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/server/reds.c b/server/reds.c
> index d57b1bf..b079e02 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -205,7 +205,7 @@ struct ChannelSecurityOptions {
>  
>  static void migrate_timeout(void *opaque);
>  static RedsMigTargetClient* reds_mig_target_client_find(RedsState *reds,
>  RedClient *client);
> -static void reds_mig_target_client_free(RedsMigTargetClient *mig_client);
> +static void reds_mig_target_client_free(RedsState *reds, RedsMigTargetClient
> *mig_client);
>  static void reds_mig_cleanup_wait_disconnect(void);
>  static void reds_mig_remove_wait_disconnect_client(RedClient *client);
>  static void reds_char_device_add_state(SpiceCharDeviceState *st);
> @@ -513,7 +513,7 @@ void reds_client_disconnect(RedsState *reds, RedClient
> *client)
>  
>      mig_client = reds_mig_target_client_find(reds, client);
>      if (mig_client) {
> -        reds_mig_target_client_free(mig_client);
> +        reds_mig_target_client_free(reds, mig_client);
>      }
>  
>      if (reds->mig_wait_disconnect) {
> @@ -1598,7 +1598,7 @@ static void
> reds_mig_target_client_add_pending_link(RedsMigTargetClient *client,
>      ring_add(&client->pending_links, &mig_link->ring_link);
>  }
>  
> -static void reds_mig_target_client_free(RedsMigTargetClient *mig_client)
> +static void reds_mig_target_client_free(RedsState *reds, RedsMigTargetClient
> *mig_client)
>  {
>      RingItem *now, *next;
>  
> @@ -1822,7 +1822,7 @@ static int reds_link_mig_target_channels(RedClient
> *client)
>          reds_channel_do_link(channel, client, mig_link->link_msg,
>          mig_link->stream);
>      }
>  
> -    reds_mig_target_client_free(mig_client);
> +    reds_mig_target_client_free(reds, mig_client);
>  
>      return TRUE;
>  }

Acked-by: Frediano Ziglio <fziglio at redhat.com>

Frediano


More information about the Spice-devel mailing list