diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-05 17:32:56 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-05-04 10:00:38 +0200 |
| commit | fd4144d41302d288acdb6d309f658df7a8254612 (patch) | |
| tree | b5335695ba7570a4d60d1e28c12d26e894a02105 /migration | |
| parent | 062d81f0e968fe1597474735f3ea038065027372 (diff) | |
| download | qemu-fd4144d41302d288acdb6d309f658df7a8254612.zip | |
migration: to_dst_file at that point is NULL
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 <quintela@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/socket.c | 1 | ||||
| -rw-r--r-- | migration/tls.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/migration/socket.c b/migration/socket.c index 13966f1d26..dc88812048 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 45bec44ca4..a33ecb767e 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 { |