From patchwork Thu Nov 5 18:10:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 540562 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CD72A140311 for ; Fri, 6 Nov 2015 05:20:34 +1100 (AEDT) Received: from localhost ([::1]:34136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP9E-0005Tn-Vj for incoming@patchwork.ozlabs.org; Thu, 05 Nov 2015 13:20:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP11-0007FI-A4 for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuP10-0003iY-7E for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP10-0003iU-0s for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:02 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 903878F50F; Thu, 5 Nov 2015 18:12:01 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-116-77.ams2.redhat.com [10.36.116.77]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA5IBN1x025766; Thu, 5 Nov 2015 13:11:59 -0500 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Thu, 5 Nov 2015 18:10:40 +0000 Message-Id: <1446747083-18205-14-git-send-email-dgilbert@redhat.com> In-Reply-To: <1446747083-18205-1-git-send-email-dgilbert@redhat.com> References: <1446747083-18205-1-git-send-email-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, liang.z.li@intel.com, luis@cs.umu.se, bharata@linux.vnet.ibm.com, amit.shah@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v9 13/56] migrate_init: Call from savevm 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 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 Reviewed-by: Juan Quintela Reviewd-by: Amit Shah --- 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 51bc348..82cc3a6 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -42,10 +42,7 @@ struct MigrationParams { bool shared; }; -typedef struct MigrationState MigrationState; - typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; - /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *from_src_file; @@ -116,6 +113,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 e4b8520..ac5b240 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -43,6 +43,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 6fef544..82efbeb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -682,7 +682,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 638aa1f..9dc57d3 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -922,6 +922,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;