From patchwork Wed Feb 23 00:44:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84031 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 C90F2B70F8 for ; Wed, 23 Feb 2011 12:08:36 +1100 (EST) Received: from localhost ([127.0.0.1]:48712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps3DV-00053u-5C for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2011 20:08:33 -0500 Received: from [140.186.70.92] (port=36660 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qm-0002wd-5v 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 1Ps2qk-0005Kk-RE for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2qk-0005Kb-F0 for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:02 -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 p1N0j1Vs025951 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:45:01 -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 p1N0ig36026523; Tue, 22 Feb 2011 19:45:00 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 01:44:28 +0100 Message-Id: <03353a90bb08ef0f82e1caa0a294524d0ea2baa0.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 14/22] migration: Remove get_status() accessor 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 only used inside migration.c, and fields on that struct are accessed all around the place on that file. Signed-off-by: Juan Quintela --- migration.c | 16 +++++----------- migration.h | 1 - 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/migration.c b/migration.c index dfe6a96..2b873fa 100644 --- a/migration.c +++ b/migration.c @@ -90,7 +90,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) int ret; if (current_migration && - current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) { + current_migration->state == MIG_STATE_ACTIVE) { monitor_printf(mon, "migration already in progress\n"); return -1; } @@ -135,7 +135,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = current_migration; - if (s && s->get_status(s) == MIG_STATE_ACTIVE) + if (s && s->state == MIG_STATE_ACTIVE) s->cancel(s); return 0; @@ -234,7 +234,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data) if (current_migration) { MigrationState *s = current_migration; - switch (s->get_status(current_migration)) { + switch (s->state) { case MIG_STATE_NONE: /* no migration has happened ever */ break; @@ -375,7 +375,7 @@ static void migrate_fd_put_ready(void *opaque) } else { migrate_fd_completed(s); } - if (s->get_status(s) != MIG_STATE_COMPLETED) { + if (s->state != MIG_STATE_COMPLETED) { if (old_vm_running) { vm_start(); } @@ -383,11 +383,6 @@ static void migrate_fd_put_ready(void *opaque) } } -static int migrate_fd_get_status(MigrationState *s) -{ - return s->state; -} - static void migrate_fd_cancel(MigrationState *s) { if (s->state != MIG_STATE_ACTIVE) @@ -442,7 +437,7 @@ void remove_migration_state_change_notifier(Notifier *notify) int get_migration_state(void) { if (current_migration) { - return migrate_fd_get_status(current_migration); + return current_migration->state; } else { return MIG_STATE_ERROR; } @@ -477,7 +472,6 @@ static MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limi MigrationState *s = qemu_mallocz(sizeof(*s)); s->cancel = migrate_fd_cancel; - s->get_status = migrate_fd_get_status; s->blk = blk; s->shared = inc; s->mon = NULL; diff --git a/migration.h b/migration.h index 5455d8b..58a6e06 100644 --- a/migration.h +++ b/migration.h @@ -37,7 +37,6 @@ struct MigrationState int (*close)(MigrationState*); int (*write)(MigrationState*, const void *, size_t); void (*cancel)(MigrationState *s); - int (*get_status)(MigrationState *s); void *opaque; int blk; int shared;