Skip to content

Commit

Permalink
migration: rename functions to starting migrations
Browse files Browse the repository at this point in the history 
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: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric 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: Amit Shah <amit.shah@redhat.com>
  • Loading branch information
@berrange @amit3s
berrange authored and amit3s committed Jun 16, 2016
1 parent bdbba12 commit 22724f4
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 40 deletions.
26 changes: 13 additions & 13 deletions include/migration/migration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,25 +183,25 @@ 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,
QIOChannel *ioc);
void migration_channel_process_incoming(MigrationState *s,
QIOChannel *ioc);

void migration_tls_set_incoming_channel(MigrationState *s,
QIOChannel *ioc,
Error **errp);
void migration_tls_channel_process_incoming(MigrationState *s,
QIOChannel *ioc,
Error **errp);

void migration_set_outgoing_channel(MigrationState *s,
QIOChannel *ioc,
const char *hostname);
void migration_channel_connect(MigrationState *s,
QIOChannel *ioc,
const char *hostname);

void migration_tls_set_outgoing_channel(MigrationState *s,
QIOChannel *ioc,
const char *hostname,
Error **errp);
void migration_tls_channel_connect(MigrationState *s,
QIOChannel *ioc,
const char *hostname,
Error **errp);

uint64_t migrate_max_downtime(void);

Expand Down
4 changes: 2 additions & 2 deletions migration/exec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ 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));
}

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 */
}
Expand Down
4 changes: 2 additions & 2 deletions migration/fd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ 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));
}

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 */
}
Expand Down
18 changes: 9 additions & 9 deletions migration/migration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -426,8 +426,8 @@ void process_incoming_migration(QEMUFile *f)
}


void migration_set_incoming_channel(MigrationState *s,
QIOChannel *ioc)
void migration_channel_process_incoming(MigrationState *s,
QIOChannel *ioc)
{
trace_migration_set_incoming_channel(
ioc, object_get_typename(OBJECT(ioc)));
Expand All @@ -436,20 +436,20 @@ 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,
QIOChannel *ioc,
const char *hostname)
void migration_channel_connect(MigrationState *s,
QIOChannel *ioc,
const char *hostname)
{
trace_migration_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)), hostname);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions migration/rdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions migration/socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static void socket_outgoing_migration(Object *src,
migrate_fd_error(data->s, err);
} else {
trace_migration_socket_outgoing_connected(data->hostname);
migration_set_outgoing_channel(data->s, sioc, data->hostname);
migration_channel_connect(data->s, sioc, data->hostname);
}
object_unref(src);
}
Expand Down Expand Up @@ -140,8 +140,8 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,

trace_migration_socket_incoming_accepted();

migration_set_incoming_channel(migrate_get_current(),
QIO_CHANNEL(sioc));
migration_channel_process_incoming(migrate_get_current(),
QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc));

out:
Expand Down
18 changes: 9 additions & 9 deletions migration/tls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ static void migration_tls_incoming_handshake(Object *src,
error_report("%s", error_get_pretty(err));
} else {
trace_migration_tls_incoming_handshake_complete();
migration_set_incoming_channel(migrate_get_current(), ioc);
migration_channel_process_incoming(migrate_get_current(), ioc);
}
object_unref(OBJECT(ioc));
}

void migration_tls_set_incoming_channel(MigrationState *s,
QIOChannel *ioc,
Error **errp)
void migration_tls_channel_process_incoming(MigrationState *s,
QIOChannel *ioc,
Error **errp)
{
QCryptoTLSCreds *creds;
QIOChannelTLS *tioc;
Expand Down Expand Up @@ -119,16 +119,16 @@ static void migration_tls_outgoing_handshake(Object *src,
migrate_fd_error(s, err);
} else {
trace_migration_tls_outgoing_handshake_complete();
migration_set_outgoing_channel(s, ioc, NULL);
migration_channel_connect(s, ioc, NULL);
}
object_unref(OBJECT(ioc));
}


void migration_tls_set_outgoing_channel(MigrationState *s,
QIOChannel *ioc,
const char *hostname,
Error **errp)
void migration_tls_channel_connect(MigrationState *s,
QIOChannel *ioc,
const char *hostname,
Error **errp)
{
QCryptoTLSCreds *creds;
QIOChannelTLS *tioc;
Expand Down

0 comments on commit 22724f4

Please sign in to comment.