summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2010-11-04 14:21:08 +0200
committerAlon Levy <alevy@redhat.com>2011-01-13 06:56:53 +0200
commitcdfa261dbb617214d371ae136c5bd005a452dabf (patch)
tree8b389844f74b8157ba3d75eec72483ea4633960a
parent685f82a48e1c4aea3344d49786b94b1015423047 (diff)
downloadspice-cdfa261dbb617214d371ae136c5bd005a452dabf.tar.gz
spice-cdfa261dbb617214d371ae136c5bd005a452dabf.tar.xz
spice-cdfa261dbb617214d371ae136c5bd005a452dabf.zip
server/reds: s/reds_push_migrate_data_item/reds_marshall_migrate_data_item/
-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 7dff2b47..e42f1734 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -431,7 +431,7 @@ static void main_channel_push_migrate_data_item(MainChannel *main_chan)
SpiceMarshaller *m = item->m;
MainMigrateData *data = (MainMigrateData *)spice_marshaller_reserve_space(m, sizeof(MainMigrateData));
- reds_push_migrate_data_item(m, data); // TODO: from reds split. ugly separation.
+ reds_marshall_migrate_data_item(m, data); // TODO: from reds split. ugly separation.
data->serial = main_chan->serial;
data->ping_id = main_chan->ping_id;
main_channel_push_pipe_item(main_chan, item);
diff --git a/server/reds.c b/server/reds.c
index d6397e52..d325e202 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1105,7 +1105,7 @@ typedef struct WriteQueueInfo {
uint32_t len;
} WriteQueueInfo;
-void reds_push_migrate_data_item(SpiceMarshaller *m, MainMigrateData *data)
+void reds_marshall_migrate_data_item(SpiceMarshaller *m, MainMigrateData *data)
{
VDIPortState *state = &reds->agent_state;
int buf_index;
diff --git a/server/reds.h b/server/reds.h
index e1a5ab7a..b5dec7e0 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -97,7 +97,7 @@ void reds_disconnect(void);
// Temporary (?) for splitting main channel
typedef struct MainMigrateData MainMigrateData;
-void reds_push_migrate_data_item(SpiceMarshaller *m, MainMigrateData *data);
+void reds_marshall_migrate_data_item(SpiceMarshaller *m, MainMigrateData *data);
void reds_fill_channels(SpiceMsgChannels *channels_info);
void reds_fill_mig_switch(SpiceMsgMainMigrationSwitchHost *migrate);
void reds_mig_release(void);