[Spice-devel] [PATCH 02/15] Change reds_on_migrate_dst_set_seamless() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 05:25:14 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 802187b..9623224 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -836,7 +836,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 52fcb5e..1542123 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1827,7 +1827,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 b38a7c0..1f1b966 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -107,7 +107,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);
-- 
2.4.3



More information about the Spice-devel mailing list