From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZA2-0000JK-Bt for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:02:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDZA0-00087y-Mh for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:02:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZA0-00087l-DS for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:02:08 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9BA27nZ023125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Oct 2011 06:02:07 -0400 From: Juan Quintela Date: Tue, 11 Oct 2011 12:00:23 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 03/36] migration: Check that migration is active before cancel it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- 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; } -- 1.7.6.4