summary refs log tree commit diff stats
path: root/migration/migration.c
diff options
context:
space:
mode:
authorLongpeng(Mike) <longpeng2@huawei.com>2020-11-05 17:17:26 +0800
committerDr. David Alan Gilbert <dgilbert@redhat.com>2020-11-12 15:52:20 +0000
commit6ba11211bd616237d028fb5d27f8576fc8cf7b1c (patch)
tree2796e5b696d91cae0453ea2065d25be655e55684 /migration/migration.c
parent9e8424088c5648959e4c5d715290e6cfa96df087 (diff)
downloadfocaccia-qemu-6ba11211bd616237d028fb5d27f8576fc8cf7b1c.tar.gz
focaccia-qemu-6ba11211bd616237d028fb5d27f8576fc8cf7b1c.zip
migration: handle CANCELLING state in migration_completion()
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) <longpeng2@huawei.com>
Message-Id: <20201105091726.148-1-longpeng2@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c
index f696e22fab..87a9b59f83 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -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;
     }
 
     /*