Received: from eggs.gnu.org ([2001:4830:134:3::10]:36350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVdST-0002HK-Sn for qemu-devel@nongnu.org; Mon, 23 Jan 2017 07:10:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVdSO-0005DX-KT for qemu-devel@nongnu.org; Mon, 23 Jan 2017 07:10:49 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:37879 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 1cVdSO-0005A9-97 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 07:10:44 -0500 From: Vladimir Sementsov-Ogievskiy Date: Mon, 23 Jan 2017 15:10:34 +0300 Message-Id: <20170123121036.4823-23-vsementsov@virtuozzo.com> In-Reply-To: <20170123121036.4823-1-vsementsov@virtuozzo.com> References: <20170123121036.4823-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 22/24] block/dirty-bitmap: deep release dirty bitmaps 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 its storage on bdrv_release_dirty_bitmap. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 21 ++++++++++++++++++--- include/block/block_int.h | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 775181c9ab..0977df6309 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -297,7 +297,8 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs) static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, - bool only_named) + bool only_named, + bool deep) { BdrvDirtyBitmap *bm, *next; QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) { @@ -305,6 +306,19 @@ static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs, assert(!bm->active_iterators); assert(!bdrv_dirty_bitmap_frozen(bm)); assert(!bm->meta); + + if (deep && bm->persistent && bs->drv && + bs->drv->bdrv_remove_persistent_dirty_bitmap) + { + Error *local_err = NULL; + bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, bm->name, + &local_err); + if (local_err != NULL) { + error_report_err(local_err); + } + } + + QLIST_REMOVE(bm, list); hbitmap_free(bm->bitmap); g_free(bm->name); @@ -322,16 +336,17 @@ static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs, void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) { - bdrv_do_release_matching_dirty_bitmap(bs, bitmap, false); + bdrv_do_release_matching_dirty_bitmap(bs, bitmap, false, true); } /** * Release all named dirty bitmaps attached to a BDS (for use in bdrv_close()). * There must not be any frozen bitmaps attached. + * This function do not remove persistent bitmaps from the storage. */ void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs) { - bdrv_do_release_matching_dirty_bitmap(bs, NULL, true); + bdrv_do_release_matching_dirty_bitmap(bs, NULL, true, false); } void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap) diff --git a/include/block/block_int.h b/include/block/block_int.h index b38b3aa198..3e080d6d68 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -326,6 +326,9 @@ struct BlockDriver { Error **errp); bool (*bdrv_can_store_new_dirty_bitmap)(BlockDriverState *bs, const char *name, uint32_t granularity, Error **errp); + void (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, + const char *name, + Error **errp); QLIST_ENTRY(BlockDriver) list; }; -- 2.11.0