[Spice-devel] [PATCH 04/15] Change reds_marshall_migrate_data() to take RedsState arg

[Frediano Ziglio]

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 a06ffc1..f584aff 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -492,7 +492,7 @@ static void main_channel_marshall_migrate_data_item(RedChannelClient *rcc,
                                                     SpiceMarshaller *m, PipeItem *item)
 {
     red_channel_client_init_send_data(rcc, SPICE_MSG_MIGRATE_DATA, item);
-    reds_marshall_migrate_data(m); // TODO: from reds split. ugly separation.
+    reds_marshall_migrate_data(reds, m); // TODO: from reds split. ugly separation.
 }
 
 static int main_channel_handle_migrate_data(RedChannelClient *rcc,
diff --git a/server/reds.c b/server/reds.c
index 7b1ca70..b3f853b 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1178,7 +1178,7 @@ void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc)
     }
 }
 
-void reds_marshall_migrate_data(SpiceMarshaller *m)
+void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m)
 {
     SpiceMigrateDataMain mig_data;
     VDIPortState *agent_state = &reds->agent_state;
diff --git a/server/reds.h b/server/reds.h
index e4eca0a..c4500a8 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -85,7 +85,7 @@ void reds_client_disconnect(RedsState *reds, RedClient *client);
 
 // Temporary (?) for splitting main channel
 typedef struct MainMigrateData MainMigrateData;
-void reds_marshall_migrate_data(SpiceMarshaller *m);
+void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m);
 void reds_fill_channels(RedsState *reds, SpiceMsgChannels *channels_info);
 int reds_get_n_channels(RedsState *reds);
 #ifdef RED_STATISTICS
-- 
2.4.3