summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-16 16:56:01 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:43 +0100
commit99657fdbf33e30e9624575f27d9389428ad4e845 (patch)
tree7e45ac771869f4a2c2f942aaa19ab3e4557f372f
parent9ecf060e79c2624caec2a687efc684e88e44f3d2 (diff)
downloadspice-99657fdbf33e30e9624575f27d9389428ad4e845.tar.gz
spice-99657fdbf33e30e9624575f27d9389428ad4e845.tar.xz
spice-99657fdbf33e30e9624575f27d9389428ad4e845.zip
Change reds_on_migrate_dst_set_seamless() to take RedsState arg
-rw-r--r--server/main-channel.c2
-rw-r--r--server/reds.c2
-rw-r--r--server/reds.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/server/main-channel.c b/server/main-channel.c
index 6c271cb5..fab8822d 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -856,7 +856,7 @@ static void main_channel_client_handle_migrate_connected(MainChannelClient *mcc,
void main_channel_client_handle_migrate_dst_do_seamless(MainChannelClient *mcc,
uint32_t src_version)
{
- if (reds_on_migrate_dst_set_seamless(mcc, src_version)) {
+ if (reds_on_migrate_dst_set_seamless(reds, mcc, src_version)) {
mcc->seamless_mig_dst = TRUE;
red_channel_client_pipe_add_empty_msg(&mcc->base,
SPICE_MSG_MAIN_MIGRATE_DST_SEAMLESS_ACK);
diff --git a/server/reds.c b/server/reds.c
index 1c092a21..270a34f1 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1757,7 +1757,7 @@ static int reds_link_mig_target_channels(RedsState *reds, RedClient *client)
return TRUE;
}
-int reds_on_migrate_dst_set_seamless(MainChannelClient *mcc, uint32_t src_version)
+int reds_on_migrate_dst_set_seamless(RedsState *reds, MainChannelClient *mcc, uint32_t src_version)
{
/* seamless migration is not supported with multiple clients*/
if (reds->allow_multiple_clients || src_version > SPICE_MIGRATION_PROTOCOL_VERSION) {
diff --git a/server/reds.h b/server/reds.h
index 0d320730..8cc13605 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -109,7 +109,7 @@ int reds_handle_migrate_data(RedsState *recs, MainChannelClient *mcc,
void reds_on_main_mouse_mode_request(RedsState *reds, void *message, size_t size);
/* migration dest side: returns whether it can support seamless migration
* with the given src migration protocol version */
-int reds_on_migrate_dst_set_seamless(MainChannelClient *mcc, uint32_t src_version);
+int reds_on_migrate_dst_set_seamless(RedsState *reds, MainChannelClient *mcc, uint32_t src_version);
void reds_on_client_semi_seamless_migrate_complete(RedClient *client);
void reds_on_client_seamless_migrate_complete(RedClient *client);
void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc);