From patchwork Fri Sep 30 10:53:23 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: 676975 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 3slphS0KZhz9ryQ for ; Fri, 30 Sep 2016 21:13:12 +1000 (AEST) Received: from localhost ([::1]:43257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpvka-0004zW-Mb for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2016 07:13:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpvRm-0003Ze-Mk for qemu-devel@nongnu.org; Fri, 30 Sep 2016 06:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpvRi-00009c-EI for qemu-devel@nongnu.org; Fri, 30 Sep 2016 06:53:41 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:15078 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpvRi-00005O-2U for qemu-devel@nongnu.org; Fri, 30 Sep 2016 06:53:38 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u8UArVlk029823; Fri, 30 Sep 2016 13:53:33 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 30 Sep 2016 13:53:23 +0300 Message-Id: <1475232808-4852-18-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1475232808-4852-1-git-send-email-vsementsov@virtuozzo.com> References: <1475232808-4852-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/22] 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 | 22 ++++++++++++++++++++-- qapi/block-core.json | 7 ++++++- qmp-commands.hx | 5 ++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index ec0ec75..00da7a1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1992,6 +1992,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) { @@ -2696,6 +2697,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; @@ -2729,10 +2731,26 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, if (!has_persistent) { persistent = false; } + if (!has_autoload) { + autoload = false; + } + + if (autoload && !persistent) { + error_setg(errp, "Autoload flag must be used only for persistent" + "bitmaps"); + goto out; + } bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); - if (bitmap != NULL) { - bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + if (bitmap == NULL) { + goto out; + } + + if (persistent) { + bdrv_dirty_bitmap_set_persistance(bitmap, true); + if (autoload) { + bdrv_dirty_bitmap_set_autoload(bitmap, true); + } } out: diff --git a/qapi/block-core.json b/qapi/block-core.json index 2bf56cd..087a681 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1239,11 +1239,16 @@ # corresponding block device on it's close. Default is false. # For block-dirty-bitmap-add. (Since 2.8) # +# @autoload: #optional the bitmap will be autoloaded on it's storage image +# open. This flag is only for persistent bitmap and needed to inform +# block driver that bitmap should be autoloaded on the next image +# open. Default is false. For block-dirty-bitmap-add. (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 diff --git a/qmp-commands.hx b/qmp-commands.hx index 434b418..8f4e841 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1441,7 +1441,7 @@ EQMP { .name = "block-dirty-bitmap-add", - .args_type = "node:B,name:s,granularity:i?,persistent:b?", + .args_type = "node:B,name:s,granularity:i?,persistent:b?,autoload:b?", .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_add, }, @@ -1461,6 +1461,9 @@ Arguments: - "persistent": bitmap will be saved to corresponding block device on it's close. Block driver should maintain persistent bitmaps (json-bool, optional, default false) (Since 2.8) +- "autoload": only for persistent bitmaps. Bitmap will be autoloaded on it's + storage image open. (json-bool, optional, default false) + (Since 2.8) Example: