[Spice-devel] [PATCH 03/15] Change reds_on_main_channel_migrate() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Tue Jan 19 06:29:36 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 685e578..a06ffc1 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -1157,7 +1157,7 @@ uint64_t main_channel_client_get_roundtrip_ms(MainChannelClient *mcc)
 
 static void main_channel_client_migrate(RedChannelClient *rcc)
 {
-    reds_on_main_channel_migrate(SPICE_CONTAINEROF(rcc, MainChannelClient, base));
+    reds_on_main_channel_migrate(reds, SPICE_CONTAINEROF(rcc, MainChannelClient, base));
     red_channel_client_default_migrate(rcc);
 }
 
diff --git a/server/reds.c b/server/reds.c
index e3e0c97..7b1ca70 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1138,7 +1138,7 @@ void reds_on_main_mouse_mode_request(RedsState *reds, void *message, size_t size
  * Push partial agent data, even if not all the chunk was consumend,
  * in order to avoid the roundtrip (src-server->client->dest-server)
  */
-void reds_on_main_channel_migrate(MainChannelClient *mcc)
+void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc)
 {
     VDIPortState *agent_state = &reds->agent_state;
     uint32_t read_data_len;
diff --git a/server/reds.h b/server/reds.h
index 6f20128..e4eca0a 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -109,7 +109,7 @@ void reds_on_main_mouse_mode_request(RedsState *reds, void *message, size_t size
 int reds_on_migrate_dst_set_seamless(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(MainChannelClient *mcc);
+void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc);
 void reds_on_char_device_state_destroy(SpiceCharDeviceState *dev);
 
 void reds_set_client_mm_time_latency(RedClient *client, uint32_t latency);
-- 
2.4.3



More information about the Spice-devel mailing list