aboutsummaryrefslogtreecommitdiff
path: root/migration/tls.c
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2017-12-15 17:16:55 +0000
committerDr. David Alan Gilbert <dgilbert@redhat.com>2018-02-06 10:55:12 +0000
commit688a3dcba980bf01344a1ae2bc37fea44c6014ac (patch)
tree2e42c331dedfab3743e5b3e7323b3805844c673c /migration/tls.c
parentcce8040bb0ea6ff56d8882aeb0a0435a61901d93 (diff)
downloadqemu-688a3dcba980bf01344a1ae2bc37fea44c6014ac.zip
qemu-688a3dcba980bf01344a1ae2bc37fea44c6014ac.tar.gz
qemu-688a3dcba980bf01344a1ae2bc37fea44c6014ac.tar.bz2
migration: Route errors down through migration_channel_connect
Route async errors (especially from sockets) down through migration_channel_connect and on to migrate_fd_connect where they can be cleaned up. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/tls.c')
-rw-r--r--migration/tls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/migration/tls.c b/migration/tls.c
index 026a008..a29b35b 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -118,11 +118,10 @@ 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));
- migrate_fd_error(s, err);
} else {
trace_migration_tls_outgoing_handshake_complete();
- migration_channel_connect(s, ioc, NULL);
}
+ migration_channel_connect(s, ioc, NULL, err);
object_unref(OBJECT(ioc));
}