diff options
author | Leonardo Bras <leobras@redhat.com> | 2023-02-10 03:36:28 -0300 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2023-02-13 03:44:44 +0100 |
commit | e5bac1f525472d6042a4cdba31dda5825cde0086 (patch) | |
tree | d120569aceec723b6b3117e8ffd9508bfdf6e4a2 /migration/multifd.c | |
parent | 5655aab0794b5c82e61683cab215c5f745be8af3 (diff) | |
download | qemu-e5bac1f525472d6042a4cdba31dda5825cde0086.zip qemu-e5bac1f525472d6042a4cdba31dda5825cde0086.tar.gz qemu-e5bac1f525472d6042a4cdba31dda5825cde0086.tar.bz2 |
migration/multifd: Change multifd_load_cleanup() signature and usage
Since it's introduction in commit f986c3d256 ("migration: Create multifd
migration threads"), multifd_load_cleanup() never returned any value
different than 0, neither set up any error on errp.
Even though, on process_incoming_migration_bh() an if clause uses it's
return value to decide on setting autostart = false, which will never
happen.
In order to simplify the codebase, change multifd_load_cleanup() signature
to 'void multifd_load_cleanup(void)', and for every usage remove error
handling or decision made based on return value != 0.
Fixes: b5eea99ec2 ("migration: Add yank feature")
Reported-by: Li Xiaohui <xiaohli@redhat.com>
Signed-off-by: Leonardo Bras <leobras@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/multifd.c')
-rw-r--r-- | migration/multifd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index 99a5983..cac8496 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -1013,12 +1013,12 @@ static void multifd_recv_terminate_threads(Error *err) } } -int multifd_load_cleanup(Error **errp) +void multifd_load_cleanup(void) { int i; if (!migrate_use_multifd()) { - return 0; + return; } multifd_recv_terminate_threads(NULL); for (i = 0; i < migrate_multifd_channels(); i++) { @@ -1058,8 +1058,6 @@ int multifd_load_cleanup(Error **errp) multifd_recv_state->params = NULL; g_free(multifd_recv_state); multifd_recv_state = NULL; - - return 0; } void multifd_recv_sync_main(void) |