From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xa6yS-0000Pi-SE for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xa6yL-0001Wc-OJ for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:49:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xa6yL-0001WR-GV for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:48:53 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 3 Oct 2014 18:47:26 +0100 Message-Id: <1412358473-31398-21-git-send-email-dgilbert@redhat.com> In-Reply-To: <1412358473-31398-1-git-send-email-dgilbert@redhat.com> References: <1412358473-31398-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v4 20/47] 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, lilei@linux.vnet.ibm.com, quintela@redhat.com, cristian.klein@cs.umu.se, amit.shah@redhat.com, yanghy@cn.fujitsu.com From: "Dr. David Alan Gilbert" Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake --- include/migration/migration.h | 1 + migration.c | 9 +++++++++ qapi-schema.json | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index ff47987..0d9f62d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -173,6 +173,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.c b/migration.c index ee6db1d..527423e 100644 --- a/migration.c +++ b/migration.c @@ -658,6 +658,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 2e9e261..cdf5290 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -494,10 +494,14 @@ # @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.2) +# # 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 -- 1.9.3