[Spice-devel] [PATCH 06/15] Change reds_handle_migrate_data() to take RedsState arg

[Frediano Ziglio]

> 
> From: Jonathon Jongsma <jjongsma at redhat.com>
> 
> ---
>  server/main-channel.c | 2 +-
>  server/reds.c         | 3 ++-
>  server/reds.h         | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/server/main-channel.c b/server/main-channel.c
> index f584aff..802187b 100644
> --- a/server/main-channel.c
> +++ b/server/main-channel.c
> @@ -514,7 +514,7 @@ static int
> main_channel_handle_migrate_data(RedChannelClient *rcc,
>          spice_error("bad header");
>          return FALSE;
>      }
> -    return reds_handle_migrate_data(mcc, (SpiceMigrateDataMain *)(header +
> 1), size);
> +    return reds_handle_migrate_data(reds, mcc, (SpiceMigrateDataMain
> *)(header + 1), size);
>  }
>  
>  void main_channel_push_init(MainChannelClient *mcc,
> diff --git a/server/reds.c b/server/reds.c
> index 2959fe3..a3636fc 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -1334,7 +1334,8 @@ static int reds_agent_state_restore(RedsState *reds,
> SpiceMigrateDataMain *mig_d
>   * attached only after the vm is started. It might be attached before or
>   after
>   * the migration data has reached the server.
>   */
> -int reds_handle_migrate_data(MainChannelClient *mcc, SpiceMigrateDataMain
> *mig_data, uint32_t size)
> +int reds_handle_migrate_data(RedsState *reds, MainChannelClient *mcc,
> +                             SpiceMigrateDataMain *mig_data, uint32_t size)
>  {
>      VDIPortState *agent_state = &reds->agent_state;
>  
> diff --git a/server/reds.h b/server/reds.h
> index c4500a8..75dc720 100644
> --- a/server/reds.h
> +++ b/server/reds.h
> @@ -101,7 +101,7 @@ void reds_release_agent_data_buffer(RedsState *reds,
> uint8_t *buf);
>  void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void
>  *message, size_t size);
>  void reds_on_main_migrate_connected(RedsState *reds, int seamless); //should
>  be called when all the clients
>                                                     // are connected to the
>                                                     target
> -int reds_handle_migrate_data(MainChannelClient *mcc,
> +int reds_handle_migrate_data(RedsState *recs, MainChannelClient *mcc,
>                               SpiceMigrateDataMain *mig_data, uint32_t size);
>  void reds_on_main_mouse_mode_request(RedsState *reds, void *message, size_t
>  size);
>  /* migration dest side: returns whether it can support seamless migration

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

Frediano