From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAh4b-0005WG-Jr for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAh4a-000654-OP for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAh4a-00064j-9U for qemu-devel@nongnu.org; Thu, 02 Jul 2015 12:10:48 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0CEA1374A12 for ; Thu, 2 Jul 2015 16:10:48 +0000 (UTC) From: Juan Quintela Date: Thu, 2 Jul 2015 18:10:08 +0200 Message-Id: <1435853415-23545-21-git-send-email-quintela@redhat.com> In-Reply-To: <1435853415-23545-1-git-send-email-quintela@redhat.com> References: <1435853415-23545-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 20/27] migration: ensure we start in NONE state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 1e34aa5..5c1233f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -694,7 +694,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, error_setg(errp, QERR_MIGRATION_ACTIVE); return; } - if (runstate_check(RUN_STATE_INMIGRATE)) { error_setg(errp, "Guest is waiting for an incoming migration"); return; @@ -709,6 +708,12 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } + /* We are starting a new migration, so we want to start in a clean + state. This change is only needed if previous migration + failed/was cancelled. We don't use migrate_set_state() because + we are setting the initial state, not changing it. */ + s->state = MIGRATION_STATUS_NONE; + s = migrate_init(¶ms); if (strstart(uri, "tcp:", &p)) { -- 2.4.3