From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQVOV-0000PU-V6 for qemu-devel@nongnu.org; Fri, 22 Jul 2016 04:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQVOR-0006gZ-UN for qemu-devel@nongnu.org; Fri, 22 Jul 2016 04:01:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQVOR-0006gT-OT for qemu-devel@nongnu.org; Fri, 22 Jul 2016 04:01:11 -0400 From: Amit Shah Date: Fri, 22 Jul 2016 13:30:47 +0530 Message-Id: <42da5550d6d44ea0a5e36925deba1e1b13041f42.1469174334.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL 1/7] migration: set state to post-migrate on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Peter Maydell , Juan Quintela , "Dr. David Alan Gilbert" , "Daniel P. Berrange" , Amit Shah From: "Dr. David Alan Gilbert" If a migration fails/is cancelled during the postcopy stage we currently end up with the runstate as finish-migrate, where it should be post-migrate. There's a small window in precopy where I think the same thing can happen, but I've never seen it. It rarely matters; the only postcopy case is if you restart a migration, which again is a case that rarely matters in postcopy because it's only safe to restart the migration if you know the destination hasn't been running (which you might if you started the destination with -S and hadn't got around to 'c' ing it before the postcopy failed). Even then it's a small window but potentially you could hit if there's a problem loading the devices on the destination. This corresponds to: https://bugzilla.redhat.com/show_bug.cgi?id=1355683 Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Amit Shah Message-Id: <1468601086-32117-1-git-send-email-dgilbert@redhat.com> Signed-off-by: Amit Shah --- migration/migration.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index c4e0193..955d5ee 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1837,6 +1837,10 @@ static void *migration_thread(void *opaque) } else { if (old_vm_running && !entered_postcopy) { vm_start(); + } else { + if (runstate_check(RUN_STATE_FINISH_MIGRATE)) { + runstate_set(RUN_STATE_POSTMIGRATE); + } } } qemu_bh_schedule(s->cleanup_bh); -- 2.7.4