From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebQlP-0002nw-T1 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 07:54:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebQlL-000779-Sq for qemu-devel@nongnu.org; Tue, 16 Jan 2018 07:54:51 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:31368 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebQlL-00076R-Hq for qemu-devel@nongnu.org; Tue, 16 Jan 2018 07:54:47 -0500 From: Vladimir Sementsov-Ogievskiy Date: Tue, 16 Jan 2018 15:54:24 +0300 Message-Id: <20180116125427.18540-4-vsementsov@virtuozzo.com> In-Reply-To: <20180116125427.18540-1-vsementsov@virtuozzo.com> References: <20180116125427.18540-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH v2 3/6] qapi: add block-dirty-bitmap-enable/disable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: eblake@redhat.com, armbru@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, famz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, nshirokovskiy@virtuozzo.com, mnestratov@virtuozzo.com Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 42 ++++++++++++++++++++++++++++++++++++++++++ blockdev.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 827254db22..b3851ee760 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1672,6 +1672,48 @@ 'data': 'BlockDirtyBitmap' } ## +# @block-dirty-bitmap-enable: +# +# Enable dirty bitmap, so that it will continue tracking disk changes. +# +# Returns: nothing on success +# If @node is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explanation +# +# Since: 2.12 +# +# Example: +# +# -> { "execute": "block-dirty-bitmap-enable", +# "arguments": { "node": "drive0", "name": "bitmap0" } } +# <- { "return": {} } +# +## + { 'command': 'block-dirty-bitmap-enable', + 'data': 'BlockDirtyBitmap' } + +## +# @block-dirty-bitmap-disable: +# +# Disable dirty bitmap, so that it will stop tracking disk changes. +# +# Returns: nothing on success +# If @node is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explanation +# +# Since: 2.12 +# +# Example: +# +# -> { "execute": "block-dirty-bitmap-disable", +# "arguments": { "node": "drive0", "name": "bitmap0" } } +# <- { "return": {} } +# +## + { 'command': 'block-dirty-bitmap-disable', + 'data': 'BlockDirtyBitmap' } + +## # @BlockDirtyBitmapSha256: # # SHA256 hash of dirty bitmap data diff --git a/blockdev.c b/blockdev.c index 8068cbd606..997a6f514c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2821,6 +2821,48 @@ void qmp_block_dirty_bitmap_clear(const char *node, const char *name, bdrv_clear_dirty_bitmap(bitmap, NULL); } +void qmp_block_dirty_bitmap_enable(const char *node, const char *name, + Error **errp) +{ + BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; + + bitmap = block_dirty_bitmap_lookup(node, name, &bs, errp); + if (!bitmap || !bs) { + return; + } + + if (bdrv_dirty_bitmap_frozen(bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently frozen and cannot be enabled", + name); + return; + } + + bdrv_enable_dirty_bitmap(bitmap); +} + +void qmp_block_dirty_bitmap_disable(const char *node, const char *name, + Error **errp) +{ + BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; + + bitmap = block_dirty_bitmap_lookup(node, name, &bs, errp); + if (!bitmap || !bs) { + return; + } + + if (bdrv_dirty_bitmap_frozen(bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently frozen and cannot be disabled", + name); + return; + } + + bdrv_disable_dirty_bitmap(bitmap); +} + BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node, const char *name, Error **errp) -- 2.11.1