From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdwXs-0002rV-03 for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:10:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdwXl-0003bq-UB for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:10:43 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:20976 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 1cdwXl-0003Yt-IN for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:10:37 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 15 Feb 2017 13:10:29 +0300 Message-Id: <1487153430-17260-25-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1487153430-17260-1-git-send-email-vsementsov@virtuozzo.com> References: <1487153430-17260-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH v15 24/25] 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 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/blockdev.c b/blockdev.c index c41b791..a365cdf 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2767,6 +2767,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) { @@ -2779,6 +2780,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); -- 1.8.3.1