summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-16 16:41:32 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:43 +0100
commit85a6a5381c528474cdeed4132545715ec1e1ad01 (patch)
tree0bdd7ddfa3a0e3c1c206659f662e820c658d5940
parent79276e3791d799d5f7b6b412c913f8b7afe322f0 (diff)
downloadspice-85a6a5381c528474cdeed4132545715ec1e1ad01.tar.gz
spice-85a6a5381c528474cdeed4132545715ec1e1ad01.tar.xz
spice-85a6a5381c528474cdeed4132545715ec1e1ad01.zip
Change reds_marshall_migrate_data() 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 8a50aff7..dc4dab58 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -499,7 +499,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 9da0c1ad..3097759d 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1123,7 +1123,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 c975d2da..b3a62b1f 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -87,7 +87,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