Commit 688a3dcb authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent cce8040b

migration/channel.c

+16 −16
Original line number Diff line number Diff line
@@ -55,29 +55,29 @@ void migration_channel_process_incoming(QIOChannel *ioc) 
 * @s: Current migration state

 * @ioc: Channel to which we are connecting

 * @hostname: Where we want to connect

 * @error: Error indicating failure to connect, free'd here

 */

void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname)

                               const char *hostname,

                               Error *error)

{

    trace_migration_set_outgoing_channel(

        ioc, object_get_typename(OBJECT(ioc)), hostname);

        ioc, object_get_typename(OBJECT(ioc)), hostname, error);



    if (!error) {

        if (s->parameters.tls_creds &&

            *s->parameters.tls_creds &&

            !object_dynamic_cast(OBJECT(ioc),

                                 TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;

        migration_tls_channel_connect(s, ioc, hostname, &local_err);

        if (local_err) {

            migrate_fd_error(s, local_err);

            error_free(local_err);

        }

            migration_tls_channel_connect(s, ioc, hostname, &error);

        } else {

            QEMUFile *f = qemu_fopen_channel_output(ioc);



            s->to_dst_file = f;



        migrate_fd_connect(s, NULL);

        }

    }

    migrate_fd_connect(s, error);

    error_free(error);

}

migration/channel.h

+2 −1
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ void migration_channel_process_incoming(QIOChannel *ioc); 


void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname);

                               const char *hostname,

                               Error *error_in);

#endif

migration/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error 
    }



    qio_channel_set_name(ioc, "migration-exec-outgoing");

    migration_channel_connect(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL, NULL);

    object_unref(OBJECT(ioc));

}

migration/fd.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** 
    }



    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-outgoing");

    migration_channel_connect(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL, NULL);

    object_unref(OBJECT(ioc));

}

migration/socket.c

+1 −3
Original line number Diff line number Diff line
@@ -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));

}