From patchwork Tue Sep 20 14:19:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 115549 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 848B21007D1 for ; Wed, 21 Sep 2011 00:20:35 +1000 (EST) Received: from localhost ([::1]:56870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BT-0004Yc-VS for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 10:20:27 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BC-0004Sj-RH for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R61B6-00085X-Bl for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61B6-00085D-1u for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:04 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8KEK3IA031297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Sep 2011 10:20:03 -0400 Received: from trasno.mitica (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8KEJv9W015328; Tue, 20 Sep 2011 10:20:02 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 16:19:31 +0200 Message-Id: <10779c0dea4f90bbf92c19cccca29c0c680aabb7.1316526970.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 03/23] migration: Fold MigrationState into FdMigrationState 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 Signed-off-by: Juan Quintela --- migration-exec.c | 10 +++++----- migration-fd.c | 10 +++++----- migration-tcp.c | 10 +++++----- migration-unix.c | 10 +++++----- migration.c | 14 ++++++-------- migration.h | 23 +++++------------------ 6 files changed, 31 insertions(+), 46 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 7113ec1..21c2c63 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -92,12 +92,12 @@ FdMigrationState *exec_start_outgoing_migration(Monitor *mon, s->close = exec_close; s->get_error = file_errno; s->write = file_write; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; + s->cancel = migrate_fd_cancel; + s->get_status = migrate_fd_get_status; + s->release = migrate_fd_release; - s->mig_state.blk = blk; - s->mig_state.shared = inc; + s->blk = blk; + s->shared = inc; s->state = MIG_STATE_ACTIVE; s->mon = NULL; diff --git a/migration-fd.c b/migration-fd.c index 470cdb2..0ccf254 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -75,12 +75,12 @@ FdMigrationState *fd_start_outgoing_migration(Monitor *mon, s->get_error = fd_errno; s->write = fd_write; s->close = fd_close; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; + s->cancel = migrate_fd_cancel; + s->get_status = migrate_fd_get_status; + s->release = migrate_fd_release; - s->mig_state.blk = blk; - s->mig_state.shared = inc; + s->blk = blk; + s->shared = inc; s->state = MIG_STATE_ACTIVE; s->mon = NULL; diff --git a/migration-tcp.c b/migration-tcp.c index 1d2796a..3de928b 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -94,12 +94,12 @@ FdMigrationState *tcp_start_outgoing_migration(Monitor *mon, s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; + s->cancel = migrate_fd_cancel; + s->get_status = migrate_fd_get_status; + s->release = migrate_fd_release; - s->mig_state.blk = blk; - s->mig_state.shared = inc; + s->blk = blk; + s->shared = inc; s->state = MIG_STATE_ACTIVE; s->mon = NULL; diff --git a/migration-unix.c b/migration-unix.c index 32f1791..5d0d629 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -93,12 +93,12 @@ FdMigrationState *unix_start_outgoing_migration(Monitor *mon, s->get_error = unix_errno; s->write = unix_write; s->close = unix_close; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; + s->cancel = migrate_fd_cancel; + s->get_status = migrate_fd_get_status; + s->release = migrate_fd_release; - s->mig_state.blk = blk; - s->mig_state.shared = inc; + s->blk = blk; + s->shared = inc; s->state = MIG_STATE_ACTIVE; s->mon = NULL; diff --git a/migration.c b/migration.c index 007b162..2e42350 100644 --- a/migration.c +++ b/migration.c @@ -86,8 +86,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) const char *uri = qdict_get_str(qdict, "uri"); if (current_migration && - current_migration->mig_state.get_status(current_migration) == - MIG_STATE_ACTIVE) { + current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) { monitor_printf(mon, "migration already in progress\n"); return -1; } @@ -121,7 +120,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) } if (current_migration) { - current_migration->mig_state.release(current_migration); + current_migration->release(current_migration); } current_migration = s; @@ -133,8 +132,8 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) { FdMigrationState *s = current_migration; - if (s && s->mig_state.get_status(s) == MIG_STATE_ACTIVE) { - s->mig_state.cancel(s); + if (s && s->get_status(s) == MIG_STATE_ACTIVE) { + s->cancel(s); } return 0; } @@ -230,7 +229,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data) QDict *qdict; if (current_migration) { - MigrationState *s = ¤t_migration->mig_state; + FdMigrationState *s = current_migration; switch (s->get_status(current_migration)) { case MIG_STATE_ACTIVE: @@ -350,8 +349,7 @@ void migrate_fd_connect(FdMigrationState *s) migrate_fd_close); DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->mon, s->file, s->mig_state.blk, - s->mig_state.shared); + ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared); if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); diff --git a/migration.h b/migration.h index bbcdefb..5e3b950 100644 --- a/migration.h +++ b/migration.h @@ -23,23 +23,10 @@ #define MIG_STATE_CANCELLED 1 #define MIG_STATE_ACTIVE 2 -typedef struct MigrationState MigrationState; - typedef struct FdMigrationState FdMigrationState; -struct MigrationState -{ - /* FIXME: add more accessors to print migration info */ - void (*cancel)(FdMigrationState *s); - int (*get_status)(FdMigrationState *s); - void (*release)(FdMigrationState *s); - int blk; - int shared; -}; - struct FdMigrationState { - MigrationState mig_state; int64_t bandwidth_limit; QEMUFile *file; int fd; @@ -48,7 +35,12 @@ struct FdMigrationState int (*get_error)(struct FdMigrationState*); int (*close)(struct FdMigrationState*, bool flush); int (*write)(struct FdMigrationState*, const void *, size_t); + void (*cancel)(FdMigrationState *s); + int (*get_status)(FdMigrationState *s); + void (*release)(FdMigrationState *s); void *opaque; + int blk; + int shared; }; void process_incoming_migration(QEMUFile *f); @@ -130,11 +122,6 @@ void migrate_fd_wait_for_unfreeze(void *opaque); int migrate_fd_close(void *opaque, bool flush); -static inline FdMigrationState *migrate_to_fms(MigrationState *mig_state) -{ - return container_of(mig_state, FdMigrationState, mig_state); -} - void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); int get_migration_state(void);