From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCs-0000HF-LL for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQfCm-0001Eo-CK for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCm-0001Ei-3B for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:53:00 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 25 Feb 2015 16:51:39 +0000 Message-Id: <1424883128-9841-17-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 16/45] Add migration-capability boolean for postcopy-ram. 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" Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake --- include/migration/migration.h | 1 + migration/migration.c | 9 +++++++++ qapi-schema.json | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 751caa0..f94af5b 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -177,6 +177,7 @@ void migrate_add_blocker(Error *reason); */ void migrate_del_blocker(Error *reason); +bool migrate_postcopy_ram(void); bool migrate_rdma_pin_all(void); bool migrate_zero_blocks(void); diff --git a/migration/migration.c b/migration/migration.c index 4592060..434864a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -663,6 +663,15 @@ bool migrate_rdma_pin_all(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL]; } +bool migrate_postcopy_ram(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_X_POSTCOPY_RAM]; +} + bool migrate_auto_converge(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index e16f8eb..a8af1cb 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -494,10 +494,15 @@ # @auto-converge: If enabled, QEMU will automatically throttle down the guest # to speed up convergence of RAM migration. (since 1.6) # +# @x-postcopy-ram: Start executing on the migration target before all of RAM has +# been migrated, pulling the remaining pages along as needed. NOTE: If +# the migration fails during postcopy the VM will fail. (since 2.3) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks'] } + 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', + 'x-postcopy-ram'] } ## # @MigrationCapabilityStatus -- 2.1.0