From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAEgR-0005Qy-Up for qemu-devel@nongnu.org; Wed, 01 Jul 2015 05:52:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAEgN-0000HP-TK for qemu-devel@nongnu.org; Wed, 01 Jul 2015 05:51:59 -0400 Received: from [59.151.112.132] (port=63392 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAEgN-0000Fh-Gk for qemu-devel@nongnu.org; Wed, 01 Jul 2015 05:51:55 -0400 Message-ID: <5593B835.5030502@cn.fujitsu.com> Date: Wed, 1 Jul 2015 17:51:49 +0800 From: Yang Hongyang MIME-Version: 1.0 References: <1435740693-10839-1-git-send-email-quintela@redhat.com> <1435740693-10839-9-git-send-email-quintela@redhat.com> In-Reply-To: <1435740693-10839-9-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/12] migration: ensure we start in NONE state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com On 07/01/2015 04:51 PM, Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > migration/migration.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/migration/migration.c b/migration/migration.c > index cfcc227..c5b778b 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -693,7 +693,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > error_setg(errp, QERR_MIGRATION_ACTIVE); > return; > } > - suspicious blank line removal? > if (runstate_check(RUN_STATE_INMIGRATE)) { > error_setg(errp, "Guest is waiting for an incoming migration"); > return; > @@ -708,6 +707,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)) { > -- Thanks, Yang.