mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-31 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

migration: Move return path cleanup to main migration thread

Browse Source 
Now that the return path thread is allowed to finish during a paused
migration, we can move the cleanup of the QEMUFiles to the main
migration thread.

Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230918172822.19052-9-farosas@suse.de>
(cherry picked from commit 36e9aab3c5)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Fabiano Rosas
2023-09-18 14:28:22 -03:00
committed by Michael Tokarev
parent dec7785fab
commit 4ade907b30
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
migration/migration.c
View File

@ -98,6 +98,7 @@ static int migration_maybe_pause(MigrationState *s,
int *current_active_state, int *current_active_state,
int new_state); int new_state);
static void migrate_fd_cancel(MigrationState *s); static void migrate_fd_cancel(MigrationState *s);
static int await_return_path_close_on_source(MigrationState *s);
static bool migration_needs_multiple_sockets(void) static bool migration_needs_multiple_sockets(void)
{ {
@ -1178,6 +1179,12 @@ static void migrate_fd_cleanup(MigrationState *s)
qemu_fclose(tmp); qemu_fclose(tmp);
} }
/*
* We already cleaned up to_dst_file, so errors from the return
* path might be due to that, ignore them.
*/
await_return_path_close_on_source(s);
assert(!migration_is_active(s)); assert(!migration_is_active(s));
if (s->state == MIGRATION_STATUS_CANCELLING) { if (s->state == MIGRATION_STATUS_CANCELLING) {
@ -1986,7 +1993,6 @@ out:
} }
trace_source_return_path_thread_end(); trace_source_return_path_thread_end();
migration_release_dst_files(ms);
rcu_unregister_thread(); rcu_unregister_thread();
return NULL; return NULL;
} }
@ -2040,6 +2046,9 @@ static int await_return_path_close_on_source(MigrationState *ms)
ret = ms->rp_state.error; ret = ms->rp_state.error;
ms->rp_state.error = false; ms->rp_state.error = false;
migration_release_dst_files(ms);
trace_migration_return_path_end_after(ret); trace_migration_return_path_end_after(ret);
return ret; return ret;
} }