From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUI28-0003tk-Hw for qemu-devel@nongnu.org; Fri, 12 Feb 2016 13:01:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUI27-0007Jy-JF for qemu-devel@nongnu.org; Fri, 12 Feb 2016 13:01:32 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:29275 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUI27-0007I6-6b for qemu-devel@nongnu.org; Fri, 12 Feb 2016 13:01:31 -0500 From: Vladimir Sementsov-Ogievskiy Date: Fri, 12 Feb 2016 21:00:30 +0300 Message-Id: <1455300040-109726-8-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1455300040-109726-1-git-send-email-vsementsov@virtuozzo.com> References: <1455300040-109726-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 07/17] qapi: add dirty-bitmaps migration capability List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, vsementsov@virtuozzo.com, famz@redhat.com, lirans@il.ibm.com, quintela@redhat.com, dgilbert@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, amit.shah@redhat.com, den@openvz.org, jsnow@redhat.com Reviewed-by: John Snow Reviewed-by: Eric Blake Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/migration/migration.h | 1 + migration/migration.c | 9 +++++++++ qapi-schema.json | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 3ec88ab..582a527 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -299,6 +299,7 @@ void migrate_del_blocker(Error *reason); bool migrate_postcopy(void); bool migrate_postcopy_ram(void); bool migrate_zero_blocks(void); +bool migrate_dirty_bitmaps(void); bool migrate_auto_converge(void); diff --git a/migration/migration.c b/migration/migration.c index fb04780..31993e9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1175,6 +1175,15 @@ int migrate_decompress_threads(void) return s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS]; } +bool migrate_dirty_bitmaps(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS]; +} + bool migrate_use_events(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index b3038b2..5aff3ac 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -544,11 +544,13 @@ # been migrated, pulling the remaining pages along as needed. NOTE: If # the migration fails during postcopy the VM will fail. (since 2.5) # +# @dirty-bitmaps: If enabled, QEMU will migrate named dirty bitmaps. (since 2.6) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress', 'events', 'x-postcopy-ram'] } + 'compress', 'events', 'x-postcopy-ram', 'dirty-bitmaps'] } ## # @MigrationCapabilityStatus -- 1.8.3.1