From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:44905)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RFncu-0005Kq-57
	for qemu-devel@nongnu.org; Mon, 17 Oct 2011 09:53:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RFnct-0000gO-3h
	for qemu-devel@nongnu.org; Mon, 17 Oct 2011 09:53:12 -0400
Received: from mail-yw0-f45.google.com ([209.85.213.45]:49477)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RFncs-0000gE-V1
	for qemu-devel@nongnu.org; Mon, 17 Oct 2011 09:53:11 -0400
Received: by ywp17 with SMTP id 17so1210662ywp.4
	for <qemu-devel@nongnu.org>; Mon, 17 Oct 2011 06:53:10 -0700 (PDT)
Message-ID: <4E9C3344.8080305@codemonkey.ws>
Date: Mon, 17 Oct 2011 08:53:08 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <cover.1318326683.git.quintela@redhat.com>
	<bdca743b51412345d8f5ac257de1c6fcd21c63b8.1318326683.git.quintela@redhat.com>
In-Reply-To: <bdca743b51412345d8f5ac257de1c6fcd21c63b8.1318326683.git.quintela@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 03/36] migration: Check that migration is
 active before cancel it
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://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

On 10/11/2011 05:00 AM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela<quintela@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>   migration.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 7fd6c23..71b8aad 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -133,9 +133,9 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
>   {
>       MigrationState *s = current_migration;
>
> -    if (s)
> +    if (s&&  s->get_status(s) == MIG_STATE_ACTIVE) {
>           s->cancel(s);
> -
> +    }
>       return 0;
>   }
>