aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@suse.de>2023-09-18 14:28:16 -0300
committerStefan Hajnoczi <stefanha@redhat.com>2023-09-27 13:58:02 -0400
commit28a8347281e24c2e7bba6d3301472eda41d4c096 (patch)
tree6744fa85c00ff75532b934c7e0d798bebc8f3141 /migration
parentcf02f29e1e3843784630d04783e372fa541a77e5 (diff)
migration: Fix possible race when setting rp_state.error
We don't need to set the rp_state.error right after a shutdown because qemu_file_shutdown() always sets the QEMUFile error, so the return path thread would have seen it and set the rp error itself. Setting the error outside of the thread is also racy because the thread could clear it after we set it. 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-3-farosas@suse.de>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 3ee1e6b0d6..d426b69ada 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2074,7 +2074,6 @@ static int await_return_path_close_on_source(MigrationState *ms)
* waiting for the destination.
*/
qemu_file_shutdown(ms->rp_state.from_dst_file);
- mark_source_rp_bad(ms);
}
trace_await_return_path_close_on_source_joining();
qemu_thread_join(&ms->rp_state.rp_thread);