[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 6/7] migration: allow cancel to unpause
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v3 6/7] migration: allow cancel to unpause |
Date: |
Wed, 18 Oct 2017 18:40:12 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
If a migration_cancel is issued during the new paused state,
kick the pause_sem to get to unpause so it can cancel.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index c9a3ee9efd..756deb3e2c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1108,6 +1108,10 @@ static void migrate_fd_cancel(MigrationState *s)
if (!migration_is_setup_or_active(old_state)) {
break;
}
+ /* If the migration is paused, kick it out of the pause */
+ if (old_state == MIGRATION_STATUS_PRE_SWITCHOVER) {
+ qemu_sem_post(&s->pause_sem);
+ }
migrate_set_state(&s->state, old_state, MIGRATION_STATUS_CANCELLING);
} while (s->state != MIGRATION_STATUS_CANCELLING);
--
2.13.6
- [Qemu-devel] [PATCH v3 2/7] migration: Add 'pre-switchover' and 'device' statuses, (continued)
- [Qemu-devel] [PATCH v3 2/7] migration: Add 'pre-switchover' and 'device' statuses, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 3/7] migration: Wait for semaphore before completing migration, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 4/7] migration: migrate-continue, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 5/7] migrate: HMP migate_continue, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 6/7] migration: allow cancel to unpause,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v3 7/7] migration: pause-before-switchover for postcopy, Dr. David Alan Gilbert (git), 2017/10/18
- Re: [Qemu-devel] [PATCH v3 0/7] migration: pause-before-switchover, Peter Xu, 2017/10/19
- Re: [Qemu-devel] [PATCH v3 0/7] migration: pause-before-switchover, Jiri Denemark, 2017/10/19