From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi4Gx-0006ii-Ub for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yi4Gu-0002i8-5D for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi4Gt-0002i3-VY for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:12 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 14 Apr 2015 18:03:49 +0100 Message-Id: <1429031053-4454-24-git-send-email-dgilbert@redhat.com> In-Reply-To: <1429031053-4454-1-git-send-email-dgilbert@redhat.com> References: <1429031053-4454-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v6 23/47] 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, david@gibson.dropbear.id.au, yayanghy@cn.fujitsu.com 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 e3389dc..1b9a535 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -48,8 +48,6 @@ enum mig_rp_message_type { MIG_RP_MSG_PONG, /* Response to a PING; data (seq: be32 ) */ }; -typedef struct MigrationState MigrationState; - typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; typedef enum { @@ -148,6 +146,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 b72a4c7..45284b2 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -500,7 +500,7 @@ bool migration_has_failed(MigrationState *s) s->state == MIGRATION_STATUS_FAILED); } -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 1e940af..c281d1b 100644 --- a/savevm.c +++ b/savevm.c @@ -988,6 +988,8 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) .blk = 0, .shared = 0 }; + MigrationState *ms = migrate_init(¶ms); + ms->file = f; if (qemu_savevm_state_blocked(errp)) { return -EINVAL; -- 2.1.0