From patchwork Wed Nov 9 18:17:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 692919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tDZvT4DZcz9t1b for ; Thu, 10 Nov 2016 05:48:37 +1100 (AEDT) Received: from localhost ([::1]:41850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4XvG-0006zE-Uo for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2016 13:48:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4XS6-0006FC-CR for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4XS2-0004Se-Jp for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:26 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:35364 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 1c4XS2-0004Ra-8U for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:22 -0500 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id uA9IIEg5018302; Wed, 9 Nov 2016 21:18:17 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 9 Nov 2016 21:17:52 +0300 Message-Id: <1478715476-132280-18-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> References: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 17/21] qmp: add autoload parameter to block-dirty-bitmap-add X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Optional. Default is false. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- blockdev.c | 18 ++++++++++++++++-- docs/qmp-commands.txt | 4 ++++ qapi/block-core.json | 6 +++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index de372ed..db2bdbb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1962,6 +1962,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common, qmp_block_dirty_bitmap_add(action->node, action->name, action->has_granularity, action->granularity, action->has_persistent, action->persistent, + action->has_autoload, action->autoload, &local_err); if (!local_err) { @@ -2690,6 +2691,7 @@ out: void qmp_block_dirty_bitmap_add(const char *node, const char *name, bool has_granularity, uint32_t granularity, bool has_persistent, bool persistent, + bool has_autoload, bool autoload, Error **errp) { AioContext *aio_context; @@ -2723,6 +2725,15 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, if (!has_persistent) { persistent = false; } + if (!has_autoload) { + autoload = false; + } + + if (has_autoload && !persistent) { + error_setg(errp, "Autoload flag must be used only for persistent " + "bitmaps"); + goto out; + } if (persistent && !bdrv_can_store_dirty_bitmap(bs, name, granularity, errp)) { @@ -2730,10 +2741,13 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, } bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); - if (bitmap != NULL) { - bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + if (bitmap == NULL) { + goto out; } + bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + bdrv_dirty_bitmap_set_autoload(bitmap, autoload); + out: aio_context_release(aio_context); } diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index bfb5df6..13e9635 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -1008,6 +1008,10 @@ Arguments: - "persistent": bitmap will be saved to the corresponding block device image file on its close. For now only Qcow2 disks support persistent bitmaps. (json-bool, optional, default false) (Since 2.8) +- "autoload": the bitmap will be automatically loaded when the image it is + stored in is opened. This flag may only be specified for + persistent bitmaps (json-bool, optional, default false) + (Since 2.8) Example: diff --git a/qapi/block-core.json b/qapi/block-core.json index 134e77e..2c33a30 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1235,11 +1235,15 @@ # corresponding block device image file on its close. Default is # false. (Since 2.8) # +# @autoload: #optional the bitmap will be automatically loaded when the image +# it is stored in is opened. This flag may only be specified for +# persistent bitmaps. Default is false. (Since 2.8) +# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool' } } + '*persistent': 'bool', '*autoload': 'bool' } } ## # @block-dirty-bitmap-add