SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/migration.c
View File

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

10
migration/multifd.c
View File

@ -663,7 +663,7 @@ static void multifd_send_cleanup_state(void)
multifd_send_state = NULL; multifd_send_state = NULL;
} }
void multifd_save_cleanup(void) void multifd_send_shutdown(void)
{ {
int i; int i;
@ -965,7 +965,7 @@ static void multifd_new_send_channel_create(gpointer opaque)
socket_send_channel_create(multifd_new_send_channel_async, opaque); socket_send_channel_create(multifd_new_send_channel_async, opaque);
} }
int multifd_save_setup(Error **errp) int multifd_send_setup(Error **errp)
{ {
int thread_count; int thread_count;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
@ -1063,7 +1063,7 @@ static void multifd_recv_terminate_threads(Error *err)
} }
} }
void multifd_load_shutdown(void) void multifd_recv_shutdown(void)
{ {
if (migrate_multifd()) { if (migrate_multifd()) {
multifd_recv_terminate_threads(NULL); multifd_recv_terminate_threads(NULL);
@ -1098,7 +1098,7 @@ static void multifd_recv_cleanup_state(void)
multifd_recv_state = NULL; multifd_recv_state = NULL;
} }
void multifd_load_cleanup(void) void multifd_recv_cleanup(void)
{ {
int i; int i;
@ -1213,7 +1213,7 @@ static void *multifd_recv_thread(void *opaque)
return NULL; return NULL;
} }
int multifd_load_setup(Error **errp) int multifd_recv_setup(Error **errp)
{ {
int thread_count; int thread_count;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();

10
migration/multifd.h
View File

@ -13,11 +13,11 @@
#ifndef QEMU_MIGRATION_MULTIFD_H #ifndef QEMU_MIGRATION_MULTIFD_H
#define QEMU_MIGRATION_MULTIFD_H #define QEMU_MIGRATION_MULTIFD_H
int multifd_save_setup(Error **errp); int multifd_send_setup(Error **errp);
void multifd_save_cleanup(void); void multifd_send_shutdown(void);
int multifd_load_setup(Error **errp); int multifd_recv_setup(Error **errp);
void multifd_load_cleanup(void); void multifd_recv_cleanup(void);
void multifd_load_shutdown(void); void multifd_recv_shutdown(void);
bool multifd_recv_all_channels_created(void); bool multifd_recv_all_channels_created(void);
void multifd_recv_new_channel(QIOChannel *ioc, Error **errp); void multifd_recv_new_channel(QIOChannel *ioc, Error **errp);
void multifd_recv_sync_main(void); void multifd_recv_sync_main(void);