From patchwork Wed Feb 23 21:47:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D30AB71EF for ; Thu, 24 Feb 2011 10:28:22 +1100 (EST) Received: from localhost ([127.0.0.1]:59685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsN5g-00052a-O7 for incoming@patchwork.ozlabs.org; Wed, 23 Feb 2011 17:21:49 -0500 Received: from [140.186.70.92] (port=35549 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsMZ5-0000KZ-OJ for qemu-devel@nongnu.org; Wed, 23 Feb 2011 16:48:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PsMZ1-0005Cx-Oc for qemu-devel@nongnu.org; Wed, 23 Feb 2011 16:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PsMZ1-0005Co-EG for qemu-devel@nongnu.org; Wed, 23 Feb 2011 16:48:03 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1NLm2Dd031964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 23 Feb 2011 16:48:02 -0500 Received: from trasno.mitica (ovpn-113-97.phx2.redhat.com [10.3.113.97]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1NLlhC6020923; Wed, 23 Feb 2011 16:48:01 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 22:47:23 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is used only in one place Signed-off-by: Juan Quintela --- migration.c | 9 ++++----- migration.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/migration.c b/migration.c index c1732e5..dba9034 100644 --- a/migration.c +++ b/migration.c @@ -132,12 +132,12 @@ free_migrate_state: return -1; } +static void migrate_fd_cancel(MigrationState *s); + int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) { - MigrationState *s = current_migration; - - if (s && s->state == MIG_STATE_ACTIVE) { - s->cancel(s); + if (current_migration) { + migrate_fd_cancel(current_migration); } return 0; } @@ -478,7 +478,6 @@ static MigrationState *migrate_create_state(Monitor *mon, { MigrationState *s = qemu_mallocz(sizeof(*s)); - s->cancel = migrate_fd_cancel; s->blk = blk; s->shared = inc; s->mon = NULL; diff --git a/migration.h b/migration.h index 7016710..347e7e8 100644 --- a/migration.h +++ b/migration.h @@ -38,7 +38,6 @@ struct MigrationState int (*get_error)(MigrationState *s); int (*close)(MigrationState *s); int (*write)(MigrationState *s, const void *buffer, size_t size); - void (*cancel)(MigrationState *s); void *opaque; int blk; int shared;