[Spice-devel] [PATCH 09/15] Change reds_mig_target_client_find() to take RedsState arg

[Frediano Ziglio]

> 
> From: Jonathon Jongsma <jjongsma at redhat.com>
> 
> ---
>  server/reds.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/server/reds.c b/server/reds.c
> index e713cf4..d57b1bf 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -204,7 +204,7 @@ struct ChannelSecurityOptions {
>  };
>  
>  static void migrate_timeout(void *opaque);
> -static RedsMigTargetClient* reds_mig_target_client_find(RedClient *client);
> +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_cleanup_wait_disconnect(void);
>  static void reds_mig_remove_wait_disconnect_client(RedClient *client);
> @@ -511,7 +511,7 @@ void reds_client_disconnect(RedsState *reds, RedClient
> *client)
>      // TODO: we need to handle agent properly for all clients!!!! (e.g., cut
>      and paste, how?)
>      // We shouldn't initialize the agent when there are still clients
>      connected
>  
> -    mig_client = reds_mig_target_client_find(client);
> +    mig_client = reds_mig_target_client_find(reds, client);
>      if (mig_client) {
>          reds_mig_target_client_free(mig_client);
>      }
> @@ -1568,7 +1568,7 @@ static void reds_mig_target_client_add(RedsState *reds,
> RedClient *client)
>  
>  }
>  
> -static RedsMigTargetClient* reds_mig_target_client_find(RedClient *client)
> +static RedsMigTargetClient* reds_mig_target_client_find(RedsState *reds,
> RedClient *client)
>  {
>      RingItem *item;
>  
> @@ -1797,7 +1797,7 @@ static int reds_link_mig_target_channels(RedClient
> *client)
>      RingItem *item;
>  
>      spice_info("%p", client);
> -    mig_client = reds_mig_target_client_find(client);
> +    mig_client = reds_mig_target_client_find(reds, client);
>      if (!mig_client) {
>          spice_info("Error: mig target client was not found");
>          return FALSE;
> @@ -1902,7 +1902,7 @@ static void reds_handle_other_links(RedLinkInfo *link)
>      reds_info_new_channel(link, link_mess->connection_id);
>      reds_stream_remove_watch(link->stream);
>  
> -    mig_client = reds_mig_target_client_find(client);
> +    mig_client = reds_mig_target_client_find(reds, client);
>      /*
>       * In semi-seamless migration, we activate the channels only
>       * after migration is completed. Since, the session starts almost from

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

Frediano