[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on
From: |
Cédric Le Goater |
Subject: |
[PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source() |
Date: |
Wed, 7 Feb 2024 14:33:46 +0100 |
close_return_path_on_source() retrieves the migration error from the
the QEMUFile '->to_dst_file' to know if a shutdown is required. This
shutdown is required to exit the return-path thread. However, in
migrate_fd_cleanup(), '->to_dst_file' is cleaned up before calling
close_return_path_on_source() and the shutdown is never performed,
leaving the source and destination waiting for an event to occur.
Avoid relying on '->to_dst_file' and use migrate_has_error() instead.
Suggested-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
migration/migration.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index
d5f705ceef4c925589aa49335969672c0d761fa2..5f55af3d7624750ca416c4177781241b3e291e5d
100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2372,8 +2372,7 @@ static bool close_return_path_on_source(MigrationState
*ms)
* cause it to unblock if it's stuck waiting for the destination.
*/
WITH_QEMU_LOCK_GUARD(&ms->qemu_file_lock) {
- if (ms->to_dst_file && ms->rp_state.from_dst_file &&
- qemu_file_get_error(ms->to_dst_file)) {
+ if (migrate_has_error(ms) && ms->rp_state.from_dst_file) {
qemu_file_shutdown(ms->rp_state.from_dst_file);
}
}
--
2.43.0
- Re: [PATCH 08/14] vfio: Use new Error** argument in vfio_save_setup(), (continued)
[PATCH 09/14] vfio: Add Error** argument to .vfio_save_config() handler, Cédric Le Goater, 2024/02/07
[PATCH 10/14] vfio: Also trace event failures in vfio_save_complete_precopy(), Cédric Le Goater, 2024/02/07
[PATCH 11/14] vfio: Extend vfio_set_migration_error() with Error* argument, Cédric Le Goater, 2024/02/07
[PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(),
Cédric Le Goater <=
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Peter Xu, 2024/02/08
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Fabiano Rosas, 2024/02/08
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Cédric Le Goater, 2024/02/08
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Fabiano Rosas, 2024/02/08
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Cédric Le Goater, 2024/02/12
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Fabiano Rosas, 2024/02/14
- Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Cédric Le Goater, 2024/02/16
Re: [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source(), Peter Xu, 2024/02/22
[RFC PATCH 14/14] migration: Fix return-path thread exit, Cédric Le Goater, 2024/02/07