From patchwork Wed Feb 23 00:44:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84032 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 AE13BB7105 for ; Wed, 23 Feb 2011 12:09:24 +1100 (EST) Received: from localhost ([127.0.0.1]:49443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps3EH-0005Uc-Kz for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2011 20:09:21 -0500 Received: from [140.186.70.92] (port=36674 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qn-0002xD-5a for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ps2ql-0005L2-SV for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2ql-0005Kq-K4 for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:03 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0j2jI018742 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:45:02 -0500 Received: from trasno.mitica (ovpn-113-108.phx2.redhat.com [10.3.113.108]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0ig37026523; Tue, 22 Feb 2011 19:45:01 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 01:44:29 +0100 Message-Id: <54e6039bde828eed6f3cd10e60333aaa90d16033.1298421307.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 15/22] 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 2b873fa..92bff01 100644 --- a/migration.c +++ b/migration.c @@ -131,12 +131,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; } @@ -471,7 +471,6 @@ static MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limi { 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 58a6e06..6477b51 100644 --- a/migration.h +++ b/migration.h @@ -36,7 +36,6 @@ struct MigrationState int (*get_error)(MigrationState*); int (*close)(MigrationState*); int (*write)(MigrationState*, const void *, size_t); - void (*cancel)(MigrationState *s); void *opaque; int blk; int shared;