]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
migration: Drop explicit block activation in postcopy fail path
authorPeter Xu <peterx@redhat.com>
Mon, 26 Jan 2026 21:36:13 +0000 (16:36 -0500)
committerFabiano Rosas <farosas@suse.de>
Tue, 17 Feb 2026 12:40:32 +0000 (09:40 -0300)
Postcopy (in failure path) should share with precopy on disk reactivations.
Explicit activiation should used to be fine even if called twice, but after
26f65c01ed ("migration: Do not try to start VM if disk activation fails")
we may want to avoid it and always capture failure when reactivation
happens (even if we do not expect the failure to happen).  Remove this
redundant call.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260126213614.3815900-5-peterx@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
migration/migration.c

index 8d1c294b471bc6979b37dd5927ef97bc78c11c62..a5b0561cbe027ee701e8513074973bfe2a6b4569 100644 (file)
@@ -2643,7 +2643,6 @@ fail:
     if (ms->state != MIGRATION_STATUS_CANCELLING) {
         migrate_set_state(&ms->state, ms->state, MIGRATION_STATUS_FAILED);
     }
-    migration_block_activate(NULL);
     bql_unlock();
     return -1;
 }