On 01/06/2017 23:29, Juan Quintela wrote:
> All callers were calling migrate_get_current(), so do it inside the function.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Laurent Vivier <lviv...@redhat.com>
> ---
> migration/channel.c | 5 +++--
> migration/channel.h | 3 +--
> migration/exec.c | 2 +-
> migration/fd.c | 2 +-
> migration/socket.c | 3 +--
> migration/tls.c | 2 +-
> 6 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/migration/channel.c b/migration/channel.c
> index eae1d9e..92f6f99 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -19,9 +19,10 @@
> #include "qapi/error.h"
> #include "io/channel-tls.h"
>
> -void migration_channel_process_incoming(MigrationState *s,
> - QIOChannel *ioc)
> +void migration_channel_process_incoming(QIOChannel *ioc)
> {
> + MigrationState *s = migrate_get_current();
> +
> trace_migration_set_incoming_channel(
> ioc, object_get_typename(OBJECT(ioc)));
>
> diff --git a/migration/channel.h b/migration/channel.h
> index 2e0a7e3..e4b4057 100644
> --- a/migration/channel.h
> +++ b/migration/channel.h
> @@ -18,8 +18,7 @@
>
> #include "io/channel.h"
>
> -void migration_channel_process_incoming(MigrationState *s,
> - QIOChannel *ioc);
> +void migration_channel_process_incoming(QIOChannel *ioc);
>
> void migration_channel_connect(MigrationState *s,
> QIOChannel *ioc,
> diff --git a/migration/exec.c b/migration/exec.c
> index 9077024..fc78eeb 100644
> --- a/migration/exec.c
> +++ b/migration/exec.c
> @@ -49,7 +49,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel
> *ioc,
> GIOCondition condition,
> gpointer opaque)
> {
> - migration_channel_process_incoming(migrate_get_current(), ioc);
> + migration_channel_process_incoming(ioc);
> object_unref(OBJECT(ioc));
> return FALSE; /* unregister */
> }
> diff --git a/migration/fd.c b/migration/fd.c
> index 0077a50..8a04dcd 100644
> --- a/migration/fd.c
> +++ b/migration/fd.c
> @@ -49,7 +49,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel
> *ioc,
> GIOCondition condition,
> gpointer opaque)
> {
> - migration_channel_process_incoming(migrate_get_current(), ioc);
> + migration_channel_process_incoming(ioc);
> object_unref(OBJECT(ioc));
> return FALSE; /* unregister */
> }
> diff --git a/migration/socket.c b/migration/socket.c
> index 85bfdcc..50dc8d8 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -148,8 +148,7 @@ static gboolean
> socket_accept_incoming_migration(QIOChannel *ioc,
> trace_migration_socket_incoming_accepted();
>
> qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
> - migration_channel_process_incoming(migrate_get_current(),
> - QIO_CHANNEL(sioc));
> + migration_channel_process_incoming(QIO_CHANNEL(sioc));
> object_unref(OBJECT(sioc));
>
> out:
> diff --git a/migration/tls.c b/migration/tls.c
> index bae9aca..d3abd6e 100644
> --- a/migration/tls.c
> +++ b/migration/tls.c
> @@ -74,7 +74,7 @@ static void migration_tls_incoming_handshake(QIOTask *task,
> error_report_err(err);
> } else {
> trace_migration_tls_incoming_handshake_complete();
> - migration_channel_process_incoming(migrate_get_current(), ioc);
> + migration_channel_process_incoming(ioc);
> }
> object_unref(OBJECT(ioc));
> }
>
