From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=41327 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PsA8W-0000bn-Ke
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 03:31:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <tamura.yoshiaki@gmail.com>) id 1PsA8U-0007IV-Gm
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 03:31:52 -0500
Received: from mail-ww0-f53.google.com ([74.125.82.53]:35169)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <tamura.yoshiaki@gmail.com>) id 1PsA8U-0007IH-Cf
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 03:31:50 -0500
Received: by wwb17 with SMTP id 17so52120wwb.10
	for <qemu-devel@nongnu.org>; Wed, 23 Feb 2011 00:31:49 -0800 (PST)
MIME-Version: 1.0
Sender: tamura.yoshiaki@gmail.com
In-Reply-To: <ee720c4f6ed4af5b06a40402be78a6f6a6259217.1298421307.git.quintela@redhat.com>
References: <cover.1298421307.git.quintela@redhat.com>
	<ee720c4f6ed4af5b06a40402be78a6f6a6259217.1298421307.git.quintela@redhat.com>
Date: Wed, 23 Feb 2011 17:31:49 +0900
Message-ID: <AANLkTi=SDigLiq9uKtc6Sf4Ut-js-WTTY7TEwtgxm5Ef@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH 08/22] migration: Check that migration is
	active before cancel it
From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Juan Quintela <quintela@redhat.com>
Cc: qemu-devel@nongnu.org

2011/2/23 Juan Quintela <quintela@redhat.com>:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> =A0migration.c | =A0 =A02 +-
> =A01 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 397a0b9..55f58c8 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -138,7 +138,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdic=
t, QObject **ret_data)
> =A0{
> =A0 =A0 MigrationState *s =3D current_migration;
>
> - =A0 =A0if (s)
> + =A0 =A0if (s && s->get_status(s) =3D=3D MIG_STATE_ACTIVE)
> =A0 =A0 =A0 =A0 s->cancel(s);
>
> =A0 =A0 return 0;

Why don't you remove *s again?

Yoshi

> --
> 1.7.4
>
>
>