migration/multifd: Stick with send/recv on function names

Most of the multifd code uses send/recv to represent the two sides, but
some rare cases use save/load.

Since send/recv is the majority, replacing the save/load use cases to use
send/recv globally.  Now we reach a consensus on the naming.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-22-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Peter Xu 2024-02-02 18:28:55 +08:00
parent 5e6ea8a1d6
commit cde85c37ca
3 changed files with 16 additions and 16 deletions

View file

@ -312,7 +312,7 @@ void migration_incoming_state_destroy(void)
{
struct MigrationIncomingState *mis = migration_incoming_get_current();
multifd_load_cleanup();
multifd_recv_cleanup();
compress_threads_load_cleanup();
if (mis->to_src_file) {
@ -663,7 +663,7 @@ static void process_incoming_migration_bh(void *opaque)
trace_vmstate_downtime_checkpoint("dst-precopy-bh-announced");
multifd_load_shutdown();
multifd_recv_shutdown();
dirty_bitmap_mig_before_vm_start();
@ -760,7 +760,7 @@ fail:
MIGRATION_STATUS_FAILED);
qemu_fclose(mis->from_src_file);
multifd_load_cleanup();
multifd_recv_cleanup();
compress_threads_load_cleanup();
exit(EXIT_FAILURE);
@ -886,7 +886,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
default_channel = !mis->from_src_file;
}
if (multifd_load_setup(errp) != 0) {
if (multifd_recv_setup(errp) != 0) {
return;
}
@ -1332,7 +1332,7 @@ static void migrate_fd_cleanup(MigrationState *s)
}
bql_lock();
multifd_save_cleanup();
multifd_send_shutdown();
qemu_mutex_lock(&s->qemu_file_lock);
tmp = s->to_dst_file;
s->to_dst_file = NULL;
@ -3630,7 +3630,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
return;
}
if (multifd_save_setup(&local_err) != 0) {
if (multifd_send_setup(&local_err) != 0) {
migrate_set_error(s, local_err);
error_report_err(local_err);
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,