aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorZhimin Feng <fengzhimin1@huawei.com>2020-01-14 17:43:09 +0800
committerJuan Quintela <quintela@redhat.com>2020-02-13 10:52:58 +0100
commit8958338b10abcb346b54a8038a491fda2db1c853 (patch)
tree35d480d328ea67fe352e36a2da8461f0ad52064c /migration
parente18e5501d8ac692d32657a3e1ef545b14e72b730 (diff)
downloadqemu-8958338b10abcb346b54a8038a491fda2db1c853.zip
qemu-8958338b10abcb346b54a8038a491fda2db1c853.tar.gz
qemu-8958338b10abcb346b54a8038a491fda2db1c853.tar.bz2
migration: Maybe VM is paused when migration is cancelled
If the migration is cancelled when it is in the completion phase, the migration state is set to MIGRATION_STATUS_CANCELLING. The VM maybe wait for the 'pause_sem' semaphore in migration_maybe_pause function, so that VM always is paused. Reported-by: Euler Robot <euler.robot@huawei.com> Signed-off-by: Zhimin Feng <fengzhimin1@huawei.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 3a21a46..1ca6be2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2797,14 +2797,22 @@ static int migration_maybe_pause(MigrationState *s,
/* This block intentionally left blank */
}
- qemu_mutex_unlock_iothread();
- migrate_set_state(&s->state, *current_active_state,
- MIGRATION_STATUS_PRE_SWITCHOVER);
- qemu_sem_wait(&s->pause_sem);
- migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER,
- new_state);
- *current_active_state = new_state;
- qemu_mutex_lock_iothread();
+ /*
+ * If the migration is cancelled when it is in the completion phase,
+ * the migration state is set to MIGRATION_STATUS_CANCELLING.
+ * So we don't need to wait a semaphore, otherwise we would always
+ * wait for the 'pause_sem' semaphore.
+ */
+ if (s->state != MIGRATION_STATUS_CANCELLING) {
+ qemu_mutex_unlock_iothread();
+ migrate_set_state(&s->state, *current_active_state,
+ MIGRATION_STATUS_PRE_SWITCHOVER);
+ qemu_sem_wait(&s->pause_sem);
+ migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER,
+ new_state);
+ *current_active_state = new_state;
+ qemu_mutex_lock_iothread();
+ }
return s->state == new_state ? 0 : -EINVAL;
}