| Message ID | 20181225140449.15786-4-fli@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-4.0,v9,01/16] Fix segmentation fault when qemu_signal_init fails | expand |
Fei Li <fli@suse.com> writes: > Always call migrate_set_error() to set the error state without relying > on whether multifd_save_cleanup() succeeds. As the passed &local_err > is never used in multifd_save_cleanup(), remove it. And make the > function be: void multifd_save_cleanup(void). > > Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Fei Li <fli@suse.com> > Reviewed-by: Juan Quintela <quintela@redhat.com> The commit message is confusing. Suggest: migration: multifd_save_cleanup() can't fail, simplify multifd_save_cleanup() takes an Error ** argument and returns an error code even though it can't actually fail. Its callers dutifully check for failure. Remove the useless argument and return value, and simplify the callers. I think multifd_load_cleanup() has exactly the same issue. Should we clean it up, too? Juan, what do you think?
> 在 2019年1月8日，00:50，Markus Armbruster <armbru@redhat.com> 写道： > > Fei Li <fli@suse.com> writes: > >> Always call migrate_set_error() to set the error state without relying >> on whether multifd_save_cleanup() succeeds. As the passed &local_err >> is never used in multifd_save_cleanup(), remove it. And make the >> function be: void multifd_save_cleanup(void). >> >> Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> >> Signed-off-by: Fei Li <fli@suse.com> >> Reviewed-by: Juan Quintela <quintela@redhat.com> > > The commit message is confusing. Suggest: > > migration: multifd_save_cleanup() can't fail, simplify > > multifd_save_cleanup() takes an Error ** argument and returns an > error code even though it can't actually fail. Its callers > dutifully check for failure. Remove the useless argument and return > value, and simplify the callers. Nice, thanks for the clearer comment. :) Have a nice day Fei > > I think multifd_load_cleanup() has exactly the same issue. Should we > clean it up, too? Juan, what do you think?
diff --git a/migration/migration.c b/migration/migration.c index 24cb4b9d0d..5d322eb9d6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1386,7 +1386,6 @@ static void migrate_fd_cleanup(void *opaque) qemu_savevm_state_cleanup(); if (s->to_dst_file) { - Error *local_err = NULL; QEMUFile *tmp; trace_migrate_fd_cleanup(); @@ -1397,9 +1396,7 @@ static void migrate_fd_cleanup(void *opaque) } qemu_mutex_lock_iothread(); - if (multifd_save_cleanup(&local_err) != 0) { - error_report_err(local_err); - } + multifd_save_cleanup(); qemu_mutex_lock(&s->qemu_file_lock); tmp = s->to_dst_file; s->to_dst_file = NULL; diff --git a/migration/ram.c b/migration/ram.c index 1671dedc97..435a8d2946 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -917,13 +917,12 @@ static void multifd_send_terminate_threads(Error *err) } } -int multifd_save_cleanup(Error **errp) +void multifd_save_cleanup(void) { int i; - int ret = 0; if (!migrate_use_multifd()) { - return 0; + return; } multifd_send_terminate_threads(NULL); for (i = 0; i < migrate_multifd_channels(); i++) { @@ -953,7 +952,6 @@ int multifd_save_cleanup(Error **errp) multifd_send_state->pages = NULL; g_free(multifd_send_state); multifd_send_state = NULL; - return ret; } static void multifd_send_sync_main(void) @@ -1071,9 +1069,8 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) Error *local_err = NULL; if (qio_task_propagate_error(task, &local_err)) { - if (multifd_save_cleanup(&local_err) != 0) { - migrate_set_error(migrate_get_current(), local_err); - } + migrate_set_error(migrate_get_current(), local_err); + multifd_save_cleanup(); } else { p->c = QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); diff --git a/migration/ram.h b/migration/ram.h index 046d3074be..936177b3e9 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -43,7 +43,7 @@ uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_total(void); int multifd_save_setup(void); -int multifd_save_cleanup(Error **errp); +void multifd_save_cleanup(void); int multifd_load_setup(void); int multifd_load_cleanup(Error **errp); bool multifd_recv_all_channels_created(void);