diff mbox series

[v2,6/7] migration: allow cancel to unpause

Message ID 20171018170138.19078-7-dgilbert@redhat.com
State New
Headers show
Series migration: pause-before-switchover | expand

Commit Message

Dr. David Alan Gilbert Oct. 18, 2017, 5:01 p.m. UTC 
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

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 <dgilbert@redhat.com>
---
 migration/migration.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/migration/migration.c b/migration/migration.c
index c9a3ee9efd..3d36d5e2b9 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);