Commit 22724f49 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Amit Shah
Browse files

migration: rename functions to starting migrations 



Apply the following renames for starting incoming migration:

 process_incoming_migration -> migration_fd_process_incoming
 migration_set_incoming_channel -> migration_channel_process_incoming
 migration_tls_set_incoming_channel -> migration_tls_channel_process_incoming

and for starting outgoing migration:

 migration_set_outgoing_channel -> migration_channel_connect
 migration_tls_set_outgoing_channel -> migration_tls_channel_connect

Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1464776234-9910-3-git-send-email-berrange@redhat.com
Message-Id: <1464776234-9910-3-git-send-email-berrange@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent bdbba12b

include/migration/migration.h

+13 −13
Original line number Diff line number Diff line
@@ -183,22 +183,22 @@ struct MigrationState 


void migrate_set_state(int *state, int old_state, int new_state);



void process_incoming_migration(QEMUFile *f);

void migration_fd_process_incoming(QEMUFile *f);



void qemu_start_incoming_migration(const char *uri, Error **errp);



void migration_set_incoming_channel(MigrationState *s,

void migration_channel_process_incoming(MigrationState *s,

                                        QIOChannel *ioc);



void migration_tls_set_incoming_channel(MigrationState *s,

void migration_tls_channel_process_incoming(MigrationState *s,

                                            QIOChannel *ioc,

                                            Error **errp);



void migration_set_outgoing_channel(MigrationState *s,

void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname);



void migration_tls_set_outgoing_channel(MigrationState *s,

void migration_tls_channel_connect(MigrationState *s,

                                   QIOChannel *ioc,

                                   const char *hostname,

                                   Error **errp);

migration/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error 
        return;

    }



    migration_set_outgoing_channel(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -46,7 +46,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, 
                                               GIOCondition condition,

                                               gpointer opaque)

{

    migration_set_incoming_channel(migrate_get_current(), ioc);

    migration_channel_process_incoming(migrate_get_current(), ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

}

migration/fd.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** 
        return;

    }



    migration_set_outgoing_channel(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -46,7 +46,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc, 
                                             GIOCondition condition,

                                             gpointer opaque)

{

    migration_set_incoming_channel(migrate_get_current(), ioc);

    migration_channel_process_incoming(migrate_get_current(), ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

}

migration/migration.c

+9 −9
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void process_incoming_migration_co(void *opaque) 
    qemu_bh_schedule(mis->bh);

}



void process_incoming_migration(QEMUFile *f)

void migration_fd_process_incoming(QEMUFile *f)

{

    Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
@@ -426,7 +426,7 @@ void process_incoming_migration(QEMUFile *f) 
}





void migration_set_incoming_channel(MigrationState *s,

void migration_channel_process_incoming(MigrationState *s,

                                        QIOChannel *ioc)

{

    trace_migration_set_incoming_channel(
@@ -436,18 +436,18 @@ void migration_set_incoming_channel(MigrationState *s, 
        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;

        migration_tls_set_incoming_channel(s, ioc, &local_err);

        migration_tls_channel_process_incoming(s, ioc, &local_err);

        if (local_err) {

            error_report_err(local_err);

        }

    } else {

        QEMUFile *f = qemu_fopen_channel_input(ioc);

        process_incoming_migration(f);

        migration_fd_process_incoming(f);

    }

}





void migration_set_outgoing_channel(MigrationState *s,

void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname)

{
@@ -458,7 +458,7 @@ void migration_set_outgoing_channel(MigrationState *s, 
        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;

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

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

        if (local_err) {

            migrate_fd_error(s, local_err);

            error_free(local_err);

migration/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rdma, int wrid_requested, 


    while (1) {

        /*

         * Coroutine doesn't start until process_incoming_migration()

         * Coroutine doesn't start until migration_fd_process_incoming()

         * so don't yield unless we know we're running inside of a coroutine.

         */

        if (rdma->migration_started_on_destination) {
@@ -3620,7 +3620,7 @@ static void rdma_accept_incoming_migration(void *opaque) 
    }



    rdma->migration_started_on_destination = 1;

    process_incoming_migration(f);

    migration_fd_process_incoming(f);

}



void rdma_start_incoming_migration(const char *host_port, Error **errp)