[PULL 02/14] migration/savevm.c: reorder usage and assertion of mis->from_src_file
Michael Tokarev <[email protected]>
| Newsgroups | org.nongnu.qemu-trivial,org.nongnu.qemu-devel |
|---|---|
| Message-ID | <[email protected]> |
From: Sergei Heifetz <[email protected]> Reorder the code so the assertion of mis->from_src_file occurs before the call to migration_ioc_unregister_yank_from_file, which dereferences it in qemu_file_get_ioc. Fixes: 39675ffffb3394 ("migration: Move the yank unregister of channel_close out") Signed-off-by: Sergei Heifetz <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Reviewed-by: Peter Xu <[email protected]> Reviewed-by: Michael Tokarev <[email protected]> Signed-off-by: Michael Tokarev <[email protected]> --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 197c89e0e6..dd58f2a705 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2875,13 +2875,14 @@ static bool postcopy_pause_incoming(MigrationIncomingState *mis) assert(migrate_postcopy_ram()); + assert(mis->from_src_file); + /* * Unregister yank with either from/to src would work, since ioc behind it * is the same */ migration_ioc_unregister_yank_from_file(mis->from_src_file); - assert(mis->from_src_file); qemu_file_shutdown(mis->from_src_file); qemu_fclose(mis->from_src_file); mis->from_src_file = NULL; -- 2.47.3