On Tue, Apr 25, 2017 at 12:17:58PM +0200, Juan Quintela wrote:
> We have just arrived as:
>
> migration.c: qemu_migrate()
> ....
> s = migrate_init() <- puts it to NULL
> ....
> {tcp,unix}_start_outgoing_migration ->
> socket_outgoing_migration
> migration_channel_connect()
> sets to_dst_file
>
> if tls is enabled, we do another round through
> migrate_channel_tls_connect(), but we only set it up if there is no
> error. So we don't need the assignation. I am removing it to remove
> in the follwing patches the knowledge about MigrationState in that two
> files.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Peter Xu <pet...@redhat.com>
> ---
> migration/socket.c | 1 -
> migration/tls.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/migration/socket.c b/migration/socket.c
> index 13966f1..dc88812 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -79,7 +79,6 @@ static void socket_outgoing_migration(QIOTask *task,
>
> if (qio_task_propagate_error(task, &err)) {
> trace_migration_socket_outgoing_error(error_get_pretty(err));
> - data->s->to_dst_file = NULL;
> migrate_fd_error(data->s, err);
> error_free(err);
> } else {
> diff --git a/migration/tls.c b/migration/tls.c
> index 45bec44..a33ecb7 100644
> --- a/migration/tls.c
> +++ b/migration/tls.c
> @@ -116,7 +116,6 @@ static void migration_tls_outgoing_handshake(QIOTask
> *task,
>
> if (qio_task_propagate_error(task, &err)) {
> trace_migration_tls_outgoing_handshake_error(error_get_pretty(err));
> - s->to_dst_file = NULL;
> migrate_fd_error(s, err);
> error_free(err);
> } else {
> --
> 2.9.3
>
--
Peter Xu
