This fixes the crash we've been seing recently in migration-test. The first patch is a cleanup to have only one place calling qemu_loadvm_state_cleanup() and the second patch reorders the cleanup calls to make multifd_recv_cleanup() run first and stop the recv threads.
CI run: https://gitlab.com/farosas/qemu/-/pipelines/1453038652 Fabiano Rosas (2): migration/savevm: Remove extra load cleanup calls migration/multifd: Fix rb->receivedmap cleanup race migration/migration.c | 1 + migration/migration.h | 1 - migration/savevm.c | 11 ----------- 3 files changed, 1 insertion(+), 12 deletions(-) -- 2.35.3