[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] migration: allow cancel to unpause
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 6/7] migration: allow cancel to unpause |
Date: |
Wed, 11 Oct 2017 20:13:16 +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 be03e8ff0b..fa42918270 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_PAUSE_BEFORE_DEVICE) {
+ 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 0/7] migration: pause-before-device, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 1/7] migration: Add 'pause-before-device' capability, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 2/7] migration: Add 'pause-before-device' and 'device' statuses, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 3/7] migration: Wait for semaphore before completing migration, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 4/7] migration: migrate-continue, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 5/7] migrate: HMP migate_continue, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 6/7] migration: allow cancel to unpause,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH 7/7] migration: pause-before-device for postcopy, Dr. David Alan Gilbert (git), 2017/10/11
- Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, no-reply, 2017/10/11
- Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, Daniel P. Berrange, 2017/10/12
Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, Daniel P. Berrange, 2017/10/12