From patchwork Mon Aug 8 15:05:14 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: 9268535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1FE9D60754 for ; Mon, 8 Aug 2016 15:06:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1041225D91 for ; Mon, 8 Aug 2016 15:06:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0520F283EE; Mon, 8 Aug 2016 15:06:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9056425D91 for ; Mon, 8 Aug 2016 15:06:20 +0000 (UTC) Received: from localhost ([::1]:57987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm8B-00074V-JJ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:06:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7V-00071h-QM for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7Q-0004Tu-I0 for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:37 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:8422 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7Q-0004Qc-3Z for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:32 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZcZ001857; Mon, 8 Aug 2016 02:41:39 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:14 +0300 Message-Id: <1470668720-211300-24-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-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 23/29] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Optional. Default is false. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- blockdev.c | 22 ++++++++++++++++++++-- qapi/block-core.json | 2 +- qmp-commands.hx | 4 +++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index cf5ebb9..f2416e9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2032,6 +2032,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) { @@ -2736,6 +2737,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; @@ -2769,10 +2771,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 73c1aaf..c1d4bdf 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1225,7 +1225,7 @@ ## { '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 f7d75bb..90205c8 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1435,7 +1435,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, }, @@ -1455,6 +1455,8 @@ Arguments: - "persistent": bitmap will be saved to corresponding block device on quit. Block driver should maintain persistent bitmaps (json-bool, optional, default false) +- "autoload": only for persistent bitmaps. Bitmap will be autoloaded on it's + storage image open. (json-bool, optional, default false) Example: