From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKmQV-0001jm-Rh for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKmQS-0005La-CI for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:11 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:31918 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 1dKmQS-0005IR-0E for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:08 -0400 From: Vladimir Sementsov-Ogievskiy Date: Tue, 13 Jun 2017 17:03:57 +0300 Message-Id: <20170613140358.81651-30-vsementsov@virtuozzo.com> In-Reply-To: <20170613140358.81651-1-vsementsov@virtuozzo.com> References: <20170613140358.81651-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH v21 29/30] qmp: block-dirty-bitmap-remove: remove persistent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, eblake@redhat.com, jsnow@redhat.com, famz@redhat.com, den@openvz.org, stefanha@redhat.com, vsementsov@virtuozzo.com, pbonzini@redhat.com Remove persistent bitmap from the storage on block-dirty-bitmap-remove. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Reviewed-by: John Snow --- blockdev.c | 10 ++++++++++ qapi/block-core.json | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index e3dbef7427..7ec75524a8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2801,6 +2801,7 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name, AioContext *aio_context; BlockDriverState *bs; BdrvDirtyBitmap *bitmap; + Error *local_err = NULL; bitmap = block_dirty_bitmap_lookup(node, name, &bs, &aio_context, errp); if (!bitmap || !bs) { @@ -2813,6 +2814,15 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name, name); goto out; } + + if (bdrv_dirty_bitmap_get_persistance(bitmap)) { + bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + goto out; + } + } + bdrv_dirty_bitmap_make_anon(bitmap); bdrv_release_dirty_bitmap(bs, bitmap); diff --git a/qapi/block-core.json b/qapi/block-core.json index 3dd9f92e5a..37f35a1811 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1600,7 +1600,8 @@ # @block-dirty-bitmap-remove: # # Stop write tracking and remove the dirty bitmap that was created -# with block-dirty-bitmap-add. +# with block-dirty-bitmap-add. If the bitmap is persistent, remove it from its +# storage too. # # Returns: nothing on success # If @node is not a valid block device or node, DeviceNotFound -- 2.11.1