[Spice-devel] [PATCH 02/10] server/reds: s/reds_push_migrate_data_item/reds_marshall_migrate_data_item/

Hans de Goede hdegoede at redhat.com
Wed Jan 12 23:43:44 PST 2011


Ack.

On 01/13/2011 06:01 AM, Alon Levy wrote:
> ---
>   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 7dff2b4..e42f173 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 d6397e5..d325e20 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 e1a5ab7..b5dec7e 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);


More information about the Spice-devel mailing list