From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5TG0-0005lz-Od for qemu-devel@nongnu.org; Fri, 20 Oct 2017 05:06:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5TFw-0004DQ-Vx for qemu-devel@nongnu.org; Fri, 20 Oct 2017 05:06:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5TFw-0004DF-Pg for qemu-devel@nongnu.org; Fri, 20 Oct 2017 05:06:16 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 20 Oct 2017 10:05:55 +0100 Message-Id: <20171020090556.18631-7-dgilbert@redhat.com> In-Reply-To: <20171020090556.18631-1-dgilbert@redhat.com> References: <20171020090556.18631-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/7] migration: allow cancel to unpause List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kwolf@redhat.com, jdenemar@redhat.com, wangjie88@huawei.com, quintela@redhat.com, peterx@redhat.com, mreitz@redhat.com Cc: berrange@redhat.com, eblake@redhat.com, fuweiwei2@huawei.com From: "Dr. David Alan Gilbert" 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 Reviewed-by: Peter Xu --- 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