[Spice-devel] [PATCH 01/15] Change reds_on_main_migrate_connected() to take RedsState arg
Frediano Ziglio
fziglio at redhat.com
Wed Jan 20 05:14:28 PST 2016
>
> From: Jonathon Jongsma <jjongsma at redhat.com>
>
> ---
> server/main-channel.c | 2 +-
> server/reds.c | 2 +-
> server/reds.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/server/main-channel.c b/server/main-channel.c
> index 9f8a861..1d949ac 100644
> --- a/server/main-channel.c
> +++ b/server/main-channel.c
> @@ -823,7 +823,7 @@ static void
> main_channel_client_handle_migrate_connected(MainChannelClient *mcc,
> spice_assert(main_channel->num_clients_mig_wait);
> spice_assert(!seamless || main_channel->num_clients_mig_wait == 1);
> if (!--main_channel->num_clients_mig_wait) {
> - reds_on_main_migrate_connected(seamless && success);
> + reds_on_main_migrate_connected(reds, seamless && success);
> }
> } else {
> if (success) {
> diff --git a/server/reds.c b/server/reds.c
> index 22ab26d..0455f45 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -1108,7 +1108,7 @@ void reds_on_main_agent_data(RedsState *reds,
> MainChannelClient *mcc, void *mess
> spice_char_device_write_buffer_add(reds->agent_state.base,
> dev_state->recv_from_client_buf);
> }
>
> -void reds_on_main_migrate_connected(int seamless)
> +void reds_on_main_migrate_connected(RedsState *reds, int seamless)
> {
> reds->src_do_seamless_migrate = seamless;
> if (reds->mig_wait_connect) {
> diff --git a/server/reds.h b/server/reds.h
> index 39fe291..5d71a41 100644
> --- a/server/reds.h
> +++ b/server/reds.h
> @@ -99,7 +99,7 @@ void reds_on_main_agent_tokens(MainChannelClient *mcc,
> uint32_t num_tokens);
> uint8_t *reds_get_agent_data_buffer(RedsState *reds, MainChannelClient *mcc,
> size_t size);
> 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(int seamless); //should be called when
> all the clients
> +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,
> SpiceMigrateDataMain *mig_data, uint32_t size);
Acked-by: Frediano Ziglio <fziglio at redhat.com>
Frediano
More information about the Spice-devel
mailing list