From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXkd-0004s8-GF for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:57:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwXiX-0003Bt-K3 for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:55:59 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:36687 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXiX-00037z-6s for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:53:49 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 11 Nov 2015 18:16:36 +0300 Message-Id: <1447255003-2043-7-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> References: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 06/13] 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, 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 fd018b7..6dcd50c 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -259,6 +259,7 @@ void migrate_del_blocker(Error *reason); 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 c5c977e..dd1c4f3 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1171,6 +1171,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 8c3a42a..123dbc0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -546,11 +546,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 -- 2.1.4