From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4o5T-0005xF-Ld for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4o5Q-0000ic-1m for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:27:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4o5P-0000iP-Ti for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:27:19 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 16 Jun 2015 11:26:21 +0100 Message-Id: <1434450415-11339-9-git-send-email-dgilbert@redhat.com> In-Reply-To: <1434450415-11339-1-git-send-email-dgilbert@redhat.com> References: <1434450415-11339-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v7 08/42] 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, liang.z.li@intel.com, luis@cs.umu.se, amit.shah@redhat.com, pbonzini@redhat.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 | 4 +--- include/qemu/typedefs.h | 1 + migration/migration.c | 2 +- migration/savevm.c | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index b3a7f75..414c5cf 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -41,10 +41,7 @@ struct MigrationParams { bool shared; }; -typedef struct MigrationState MigrationState; - typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; - /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *file; @@ -115,6 +112,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 fc7c70e..8403856 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 b04b457..3cd7f4b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -489,7 +489,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/migration/savevm.c b/migration/savevm.c index 2091882..aaf8c5c 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -903,6 +903,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.4.3