aboutsummaryrefslogtreecommitdiff
path: root/migration/socket.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/socket.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/socket.c')
-rw-r--r--migration/socket.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/migration/socket.c b/migration/socket.c
index 3a8232d..e090097 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -79,12 +79,10 @@ static void socket_outgoing_migration(QIOTask *task,
if (qio_task_propagate_error(task, &err)) {
trace_migration_socket_outgoing_error(error_get_pretty(err));
- migrate_fd_error(data->s, err);
- error_free(err);
} else {
trace_migration_socket_outgoing_connected(data->hostname);
- migration_channel_connect(data->s, sioc, data->hostname);
}
+ migration_channel_connect(data->s, sioc, data->hostname, err);
object_unref(OBJECT(sioc));
}