]> Git Repo - qemu.git/commitdiff
migration: handle CANCELLING state in migration_completion()
authorLongpeng(Mike) <[email protected]>
Thu, 5 Nov 2020 09:17:26 +0000 (17:17 +0800)
committerDr. David Alan Gilbert <[email protected]>
Thu, 12 Nov 2020 15:52:20 +0000 (15:52 +0000)
The following sequence may cause the VM abort during migration:

1. RUN_STATE_RUNNING,MIGRATION_STATUS_ACTIVE

2. before call migration_completion(), we send migrate_cancel
   QMP command, the state machine is changed to:
     RUN_STATE_RUNNING,MIGRATION_STATUS_CANCELLING

3. call migration_completion(), and the state machine is
   switch to: RUN_STATE_RUNNING,MIGRATION_STATUS_COMPLETED

4. call migration_iteration_finish(), because the migration
   status is COMPLETED, so it will try to set the runstate
   to POSTMIGRATE, but RUNNING-->POSTMIGRATE is an invalid
   transition, so abort().

The migration_completion() should not change the migration state
to COMPLETED if it is already changed to CANCELLING.

Signed-off-by: Longpeng(Mike) <[email protected]>
Message-Id: <20201105091726[email protected]>
Reviewed-by: Dr. David Alan Gilbert <[email protected]>
Signed-off-by: Dr. David Alan Gilbert <[email protected]>
migration/migration.c

index f696e22faba36c2f578ef1c8eb29c4439cd697da..87a9b59f83f4677308ab184ad56f922c19a4a2b9 100644 (file)
@@ -3061,6 +3061,8 @@ static void migration_completion(MigrationState *s)
 
         qemu_savevm_state_complete_postcopy(s->to_dst_file);
         trace_migration_completion_postcopy_end_after_complete();
+    } else if (s->state == MIGRATION_STATUS_CANCELLING) {
+        goto fail;
     }
 
     /*
This page took 0.028254 seconds and 4 git commands to generate.