migration: Rename instances of start

To make it easier to follow the code, rename the functions that start
the migration thread and migration coroutine to contain the word
"start".

This will give new contributors the chance of seeing the word start
and reaching the actual migration code, instead of twists and turns of
qio_channel_add_watch and qio_task_run_in_thread.

Remove all other instances of "start" and use wording more suitable to
what the current migration stage is. The transport code such as
fd_start_migration_outgoing becomes fd_connect_outgoing, the early
setup code such as qemu_start_incoming_migration becomes
qemu_setup_incoming_migration and so on.

Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
Link: https://lore.kernel.org/qemu-devel/20260123141656.6765-18-farosas@suse.de
Signed-off-by: Fabiano Rosas <farosas@suse.de>

diff --git a/migration/channel.c b/migration/channel.c
index f41333adcca73b1e468cb826584094b675f638e2..d1eec4942beb5c16cd84c2572da8a4085fb25ed0 100644 (file)
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -48,7 +48,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
         }
 
         if (migration_incoming_setup(ioc, ch, &local_err)) {
-            migration_incoming_process();
+            migration_start_incoming();
         }
     }
 out:
@@ -82,7 +82,7 @@ void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
 
     migration_ioc_register_yank(ioc);
     migration_outgoing_setup(ioc);
-    migration_connect(s);
+    migration_start_outgoing(s);
 }
 
 

diff --git a/migration/exec.c b/migration/exec.c
index d1629944dc9c08342ac7d9b8b69de2dac20ea290..c3085e803e9094df418f84210f2b6dd190107465 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -40,8 +40,7 @@ const char *exec_get_cmd_path(void)
 }
 #endif
 
-void exec_start_outgoing_migration(MigrationState *s, strList *command,
-                                   Error **errp)
+void exec_connect_outgoing(MigrationState *s, strList *command, Error **errp)
 {
     QIOChannel *ioc = NULL;
     g_auto(GStrv) argv = strv_from_str_list(command);
@@ -68,7 +67,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
     return G_SOURCE_REMOVE;
 }
 
-void exec_start_incoming_migration(strList *command, Error **errp)
+void exec_connect_incoming(strList *command, Error **errp)
 {
     QIOChannel *ioc;
     g_auto(GStrv) argv = strv_from_str_list(command);

diff --git a/migration/exec.h b/migration/exec.h
index 3107f205e34dd6bbe418ab8db08e6436cdb5ce04..e7e8e475ac7257f9f621fd7b84a7efadaa54df97 100644 (file)
--- a/migration/exec.h
+++ b/migration/exec.h
@@ -23,8 +23,7 @@
 #ifdef WIN32
 const char *exec_get_cmd_path(void);
 #endif
-void exec_start_incoming_migration(strList *host_port, Error **errp);
+void exec_connect_incoming(strList *host_port, Error **errp);
 
-void exec_start_outgoing_migration(MigrationState *s, strList *host_port,
-                                   Error **errp);
+void exec_connect_outgoing(MigrationState *s, strList *host_port, Error **errp);
 #endif

diff --git a/migration/fd.c b/migration/fd.c
index 20166fef46cda3ee4dca4510e261b41d371da8da..530aac1a5b1989958ee11dcf2594b1e2e1408395 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -50,7 +50,7 @@ static bool migration_fd_valid(int fd)
     return false;
 }
 
-void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
+void fd_connect_outgoing(MigrationState *s, const char *fdname, Error **errp)
 {
     QIOChannel *ioc;
     int fd = monitor_get_fd(monitor_cur(), fdname, errp);
@@ -85,7 +85,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
     return G_SOURCE_REMOVE;
 }
 
-void fd_start_incoming_migration(const char *fdname, Error **errp)
+void fd_connect_incoming(const char *fdname, Error **errp)
 {
     QIOChannel *ioc;
     int fd = monitor_fd_param(monitor_cur(), fdname, errp);

diff --git a/migration/fd.h b/migration/fd.h
index b901bc014eb4f519e5cb404fa3944e5ab3399d18..7211629270b07e655b84e4079608c65fd957cb8e 100644 (file)
--- a/migration/fd.h
+++ b/migration/fd.h
@@ -16,8 +16,8 @@
 
 #ifndef QEMU_MIGRATION_FD_H
 #define QEMU_MIGRATION_FD_H
-void fd_start_incoming_migration(const char *fdname, Error **errp);
+void fd_connect_incoming(const char *fdname, Error **errp);
 
-void fd_start_outgoing_migration(MigrationState *s, const char *fdname,
-                                 Error **errp);
+void fd_connect_outgoing(MigrationState *s, const char *fdname,
+                         Error **errp);
 #endif

diff --git a/migration/file.c b/migration/file.c
index 935402f36b2e1d1d90c14e1f588295acc34d59f9..b7b0fb519448f265fe46315e9b84862c8e067112 100644 (file)
--- a/migration/file.c
+++ b/migration/file.c
@@ -93,8 +93,8 @@ out:
     return ret;
 }
 
-void file_start_outgoing_migration(MigrationState *s,
-                                   FileMigrationArgs *file_args, Error **errp)
+void file_connect_outgoing(MigrationState *s,
+                           FileMigrationArgs *file_args, Error **errp)
 {
     g_autoptr(QIOChannelFile) fioc = NULL;
     g_autofree char *filename = g_strdup(file_args->filename);
@@ -173,7 +173,7 @@ static void file_create_incoming_channels(QIOChannel *ioc, char *filename,
     }
 }
 
-void file_start_incoming_migration(FileMigrationArgs *file_args, Error **errp)
+void file_connect_incoming(FileMigrationArgs *file_args, Error **errp)
 {
     g_autofree char *filename = g_strdup(file_args->filename);
     QIOChannelFile *fioc = NULL;

diff --git a/migration/file.h b/migration/file.h
index 1a1115f7f10299c2147c3c22afedc5b4fb5a1e63..9b1e874bb7e8e2df4bb0bffd0dc833aeabe1c568 100644 (file)
--- a/migration/file.h
+++ b/migration/file.h
@@ -13,10 +13,10 @@
 #include "channel.h"
 #include "multifd.h"
 
-void file_start_incoming_migration(FileMigrationArgs *file_args, Error **errp);
+void file_connect_incoming(FileMigrationArgs *file_args, Error **errp);
 
-void file_start_outgoing_migration(MigrationState *s,
-                                   FileMigrationArgs *file_args, Error **errp);
+void file_connect_outgoing(MigrationState *s,
+                           FileMigrationArgs *file_args, Error **errp);
 int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp);
 void file_cleanup_outgoing_migration(void);
 bool file_send_channel_create(gpointer opaque, Error **errp);

diff --git a/migration/migration.c b/migration/migration.c
index 8a27d93498f45a6811f66bb1d9ab1e1f1f06dc97..24ef583d963a66169f27094cbe7abe4388733e75 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -739,7 +739,7 @@ migration_incoming_state_setup(MigrationIncomingState *mis, Error **errp)
     return true;
 }
 
-static void qemu_start_incoming_migration(const char *uri, bool has_channels,
+static void qemu_setup_incoming_migration(const char *uri, bool has_channels,
                                           MigrationChannelList *channels,
                                           Error **errp)
 {
@@ -787,18 +787,18 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
         if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
             saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
             saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
-            socket_start_incoming_migration(saddr, errp);
+            socket_connect_incoming(saddr, errp);
         } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
-            fd_start_incoming_migration(saddr->u.fd.str, errp);
+            fd_connect_incoming(saddr->u.fd.str, errp);
         }
 #ifdef CONFIG_RDMA
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
-        rdma_start_incoming_migration(&addr->u.rdma, errp);
+        rdma_connect_incoming(&addr->u.rdma, errp);
 #endif
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
-        exec_start_incoming_migration(addr->u.exec.args, errp);
+        exec_connect_incoming(addr->u.exec.args, errp);
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {
-        file_start_incoming_migration(&addr->u.file, errp);
+        file_connect_incoming(&addr->u.file, errp);
     } else {
         error_setg(errp, "unknown migration protocol: %s", uri);
     }
@@ -1011,7 +1011,7 @@ static bool postcopy_try_recover(void)
     return false;
 }
 
-void migration_incoming_process(void)
+void migration_start_incoming(void)
 {
     if (postcopy_try_recover()) {
         return;
@@ -1968,7 +1968,7 @@ void qmp_migrate_incoming(const char *uri, bool has_channels,
     mis->exit_on_error =
         has_exit_on_error ? exit_on_error : INMIGRATE_DEFAULT_EXIT_ON_ERROR;
 
-    qemu_start_incoming_migration(uri, has_channels, channels, &local_err);
+    qemu_setup_incoming_migration(uri, has_channels, channels, &local_err);
 
     if (local_err) {
         yank_unregister_instance(MIGRATION_YANK_INSTANCE);
@@ -2015,7 +2015,7 @@ void qmp_migrate_recover(const char *uri, Error **errp)
      * only re-setup the migration stream and poke existing migration
      * to continue using that newly established channel.
      */
-    qemu_start_incoming_migration(uri, false, NULL, errp);
+    qemu_setup_incoming_migration(uri, false, NULL, errp);
 }
 
 void qmp_migrate_pause(Error **errp)
@@ -2332,18 +2332,18 @@ static void qmp_migrate_finish(MigrationAddress *addr, Error **errp)
         if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
             saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
             saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
-            socket_start_outgoing_migration(s, saddr, &local_err);
+            socket_connect_outgoing(s, saddr, &local_err);
         } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
-            fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
+            fd_connect_outgoing(s, saddr->u.fd.str, &local_err);
         }
 #ifdef CONFIG_RDMA
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
-        rdma_start_outgoing_migration(s, &addr->u.rdma, &local_err);
+        rdma_connect_outgoing(s, &addr->u.rdma, &local_err);
 #endif
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
-        exec_start_outgoing_migration(s, addr->u.exec.args, &local_err);
+        exec_connect_outgoing(s, addr->u.exec.args, &local_err);
     } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {
-        file_start_outgoing_migration(s, &addr->u.file, &local_err);
+        file_connect_outgoing(s, &addr->u.file, &local_err);
     } else {
         error_setg(&local_err, "uri is not a valid migration protocol");
     }
@@ -4024,7 +4024,7 @@ fail_setup:
     return NULL;
 }
 
-void migration_connect(MigrationState *s)
+void migration_start_outgoing(MigrationState *s)
 {
     Error *local_err = NULL;
     uint64_t rate_limit;

diff --git a/migration/migration.h b/migration/migration.h
index b55cc4061358ca7f8994e504e637a85caa3d5b12..c4ea57d80a423a5022cac0ec1e7e1c2d78b848e4 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -539,7 +539,8 @@ void migration_connect_error_propagate(MigrationState *s, Error *error);
 void migrate_error_propagate(MigrationState *s, Error *error);
 bool migrate_has_error(MigrationState *s);
 
-void migration_connect(MigrationState *s);
+void migration_start_outgoing(MigrationState *s);
+void migration_start_incoming(void);
 
 int migration_call_notifiers(MigrationEventType type, Error **errp);
 

diff --git a/migration/rdma.c b/migration/rdma.c
index 98a6cebb1703986716b161b1bf8d587450c6a77f..4d63fd723b364ac65ceb7fc2e2ae24c22f09ab63 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3881,17 +3881,16 @@ static void rdma_accept_incoming_migration(void *opaque)
 
     rdma->migration_started_on_destination = 1;
     migration_incoming_setup(ioc, CH_MAIN, &error_abort);
-    migration_incoming_process();
+    migration_start_incoming();
 }
 
-void rdma_start_incoming_migration(InetSocketAddress *host_port,
-                                   Error **errp)
+void rdma_connect_incoming(InetSocketAddress *host_port, Error **errp)
 {
     MigrationState *s = migrate_get_current();
     int ret;
     RDMAContext *rdma;
 
-    trace_rdma_start_incoming_migration();
+    trace_rdma_connect_incoming();
 
     /* Avoid ram_block_discard_disable(), cannot change during migration. */
     if (ram_block_discard_is_required()) {
@@ -3909,7 +3908,7 @@ void rdma_start_incoming_migration(InetSocketAddress *host_port,
         goto err;
     }
 
-    trace_rdma_start_incoming_migration_after_dest_init();
+    trace_rdma_connect_incoming_after_dest_init();
 
     ret = rdma_listen(rdma->listen_id, 5);
 
@@ -3918,7 +3917,7 @@ void rdma_start_incoming_migration(InetSocketAddress *host_port,
         goto cleanup_rdma;
     }
 
-    trace_rdma_start_incoming_migration_after_rdma_listen();
+    trace_rdma_connect_incoming_after_rdma_listen();
     s->rdma_migration = true;
     qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
                         NULL, (void *)(intptr_t)rdma);
@@ -3933,8 +3932,8 @@ err:
     g_free(rdma);
 }
 
-void rdma_start_outgoing_migration(void *opaque,
-                            InetSocketAddress *host_port, Error **errp)
+void rdma_connect_outgoing(void *opaque,
+                           InetSocketAddress *host_port, Error **errp)
 {
     MigrationState *s = opaque;
     RDMAContext *rdma_return_path = NULL;
@@ -3958,7 +3957,7 @@ void rdma_start_outgoing_migration(void *opaque,
         goto err;
     }
 
-    trace_rdma_start_outgoing_migration_after_rdma_source_init();
+    trace_rdma_connect_outgoing_after_rdma_source_init();
     ret = qemu_rdma_connect(rdma, false, errp);
 
     if (ret < 0) {
@@ -3991,11 +3990,11 @@ void rdma_start_outgoing_migration(void *opaque,
         rdma_return_path->is_return_path = true;
     }
 
-    trace_rdma_start_outgoing_migration_after_rdma_connect();
+    trace_rdma_connect_outgoing_after_rdma_connect();
 
     s->rdma_migration = true;
     migration_outgoing_setup(rdma_new_output(rdma));
-    migration_connect(s);
+    migration_start_outgoing(s);
     return;
 return_path_err:
     qemu_rdma_cleanup(rdma);

diff --git a/migration/rdma.h b/migration/rdma.h
index f74f16a4599ebeff18674fcde1a45c296d15366d..170c25cf44aaad55039628429ec6fed33dc939c9 100644 (file)
--- a/migration/rdma.h
+++ b/migration/rdma.h
@@ -21,10 +21,10 @@
 
 #include "system/memory.h"
 
-void rdma_start_outgoing_migration(void *opaque, InetSocketAddress *host_port,
-                                   Error **errp);
+void rdma_connect_outgoing(void *opaque, InetSocketAddress *host_port,
+                           Error **errp);
 
-void rdma_start_incoming_migration(InetSocketAddress *host_port, Error **errp);
+void rdma_connect_incoming(InetSocketAddress *host_port, Error **errp);
 
 /*
  * Constants used by rdma return codes

diff --git a/migration/socket.c b/migration/socket.c
index f94959828f8814cf3def5367fa0b0eb56286e67a..f57f1a8e7c6d9fbcb508a274b786daf7fef140c0 100644 (file)
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -80,9 +80,8 @@ fail:
     migration_connect_error_propagate(data->s, err);
 }
 
-void socket_start_outgoing_migration(MigrationState *s,
-                                     SocketAddress *saddr,
-                                     Error **errp)
+void socket_connect_outgoing(MigrationState *s, SocketAddress *saddr,
+                             Error **errp)
 {
     QIOChannelSocket *sioc = qio_channel_socket_new();
     struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
@@ -140,8 +139,7 @@ socket_incoming_migration_end(void *opaque)
     object_unref(OBJECT(listener));
 }
 
-void socket_start_incoming_migration(SocketAddress *saddr,
-                                     Error **errp)
+void socket_connect_incoming(SocketAddress *saddr, Error **errp)
 {
     QIONetListener *listener = qio_net_listener_new();
     MigrationIncomingState *mis = migration_incoming_get_current();

diff --git a/migration/socket.h b/migration/socket.h
index 04ebbe95a1329195e11787f27c85a0847fe997ef..f0c89b64c7120946d8600e3e7207f12e1b1a52ff 100644 (file)
--- a/migration/socket.h
+++ b/migration/socket.h
@@ -23,10 +23,10 @@
 
 void socket_send_channel_create(QIOTaskFunc f, void *data);
 
-void socket_start_incoming_migration(SocketAddress *saddr, Error **errp);
+void socket_connect_incoming(SocketAddress *saddr, Error **errp);
 
-void socket_start_outgoing_migration(MigrationState *s,
-                                     SocketAddress *saddr, Error **errp);
+void socket_connect_outgoing(MigrationState *s,
+                             SocketAddress *saddr, Error **errp);
 void socket_cleanup_outgoing_migration(void);
 
 #endif

diff --git a/migration/trace-events b/migration/trace-events
index cbf10d0b63c65d7ba2ad52aa297eaa712c17ca15..91d7506634c9f110e8f0b5f9183728058fe6542a 100644 (file)
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -271,11 +271,11 @@ rdma_registration_handle_wait(void) ""
 rdma_registration_start(uint64_t flags) "%" PRIu64
 rdma_registration_stop(uint64_t flags) "%" PRIu64
 rdma_registration_stop_ram(void) ""
-rdma_start_incoming_migration(void) ""
-rdma_start_incoming_migration_after_dest_init(void) ""
-rdma_start_incoming_migration_after_rdma_listen(void) ""
-rdma_start_outgoing_migration_after_rdma_connect(void) ""
-rdma_start_outgoing_migration_after_rdma_source_init(void) ""
+rdma_connect_incoming(void) ""
+rdma_connect_incoming_after_dest_init(void) ""
+rdma_connect_incoming_after_rdma_listen(void) ""
+rdma_connect_outgoing_after_rdma_connect(void) ""
+rdma_connect_outgoing_after_rdma_source_init(void) ""
 
 # postcopy-ram.c
 postcopy_discard_send_finish(const char *ramblock, int nwords, int ncmds) "%s mask words sent=%d in %d commands"