From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCq-0000En-3c for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQfCp-0001FW-0P for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCo-0001FD-NR for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:02 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 25 Feb 2015 16:51:42 +0000 Message-Id: <1424883128-9841-20-git-send-email-dgilbert@redhat.com> In-Reply-To: <1424883128-9841-1-git-send-email-dgilbert@redhat.com> References: <1424883128-9841-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v5 19/45] migrate_init: Call from savevm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, yanghy@cn.fujitsu.com, david@gibson.dropbear.id.au From: "Dr. David Alan Gilbert" Suspend to file is very much like a migrate, and it makes life easier if we have the Migration state available, so initialise it in the savevm.c code for suspending. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Gibson --- include/migration/migration.h | 3 +-- include/qemu/typedefs.h | 1 + migration/migration.c | 2 +- savevm.c | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 81cd1f2..e6a814a 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -48,8 +48,6 @@ enum mig_rpcomm_cmd { MIG_RP_CMD_PONG, /* Response to a PING; data (seq: be32 ) */ }; -typedef struct MigrationState MigrationState; - typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; typedef enum { @@ -146,6 +144,7 @@ int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); +MigrationState *migrate_init(const MigrationParams *params); bool migration_in_setup(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 6fdcbcd..611db46 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -41,6 +41,7 @@ typedef struct MemoryRegion MemoryRegion; typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationParams MigrationParams; +typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; typedef struct MouseTransformInfo MouseTransformInfo; typedef struct MSIMessage MSIMessage; diff --git a/migration/migration.c b/migration/migration.c index 957115a..2e6adca 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -493,7 +493,7 @@ bool migration_has_failed(MigrationState *s) s->state == MIG_STATE_ERROR); } -static MigrationState *migrate_init(const MigrationParams *params) +MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); int64_t bandwidth_limit = s->bandwidth_limit; diff --git a/savevm.c b/savevm.c index f65bff3..df48ba8 100644 --- a/savevm.c +++ b/savevm.c @@ -982,6 +982,8 @@ static int qemu_savevm_state(QEMUFile *f) .blk = 0, .shared = 0 }; + MigrationState *ms = migrate_init(¶ms); + ms->file = f; if (qemu_savevm_state_blocked(NULL)) { return -EINVAL; -- 2.1.0