From patchwork Tue Oct 11 10:00:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 118915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1FE4BB6F68 for ; Tue, 11 Oct 2011 21:37:55 +1100 (EST) Received: from localhost ([::1]:46372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZiV-0008Qu-LW for incoming@patchwork.ozlabs.org; Tue, 11 Oct 2011 06:37:47 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZCf-0005iu-Ab for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:05:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDZCZ-0000Vk-Dd for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:04:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZCZ-0000Va-5r for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:04:47 -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 p9BA4kXi013225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Oct 2011 06:04:46 -0400 Received: from neno.neno (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9BA1lw9021320; Tue, 11 Oct 2011 06:04:41 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 11 Oct 2011 12:00:46 +0200 Message-Id: <41744c28318760a452134bd965422ca410adf3ce.1318326684.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 26/36] migration: Remove get_status() accessor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: 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 689464d..0b7ffa7 100644 --- a/migration.c +++ b/migration.c @@ -91,7 +91,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; } @@ -136,7 +136,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; @@ -235,7 +235,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_SETUP: /* no migration has happened ever */ break; @@ -386,7 +386,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(); } @@ -394,11 +394,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) @@ -460,7 +455,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; } @@ -494,7 +489,6 @@ static MigrationState *migrate_new(Monitor *mon, int64_t bandwidth_limit, MigrationState *s = g_malloc0(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 1cdb539..b634994 100644 --- a/migration.h +++ b/migration.h @@ -39,7 +39,6 @@ struct MigrationState int (*close)(MigrationState *s); int (*write)(MigrationState *s, const void *buff, size_t size); void (*cancel)(MigrationState *s); - int (*get_status)(MigrationState *s); void *opaque; int blk; int shared;