From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X37VS-0007tK-44 for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X37VL-0008Rn-0J for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X37VK-0008Q1-Ne for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:34 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 4 Jul 2014 18:41:30 +0100 Message-Id: <1404495717-4239-20-git-send-email-dgilbert@redhat.com> In-Reply-To: <1404495717-4239-1-git-send-email-dgilbert@redhat.com> References: <1404495717-4239-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 19/46] 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, lilei@linux.vnet.ibm.com, quintela@redhat.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 --- include/migration/migration.h | 1 + include/qemu/typedefs.h | 1 + migration.c | 2 +- savevm.c | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 6c0e990..cf66921 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -138,6 +138,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 0f79b5c..8539de6 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -16,6 +16,7 @@ struct Monitor; typedef struct Monitor Monitor; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationParams MigrationParams; +typedef struct MigrationState MigrationState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; diff --git a/migration.c b/migration.c index 67cdfd6..eac12ab 100644 --- a/migration.c +++ b/migration.c @@ -442,7 +442,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 7c5cdba..843443f 100644 --- a/savevm.c +++ b/savevm.c @@ -941,6 +941,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; -- 1.9.3