From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4XS6-0006F3-Ax for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4XS2-0004Sy-Oq for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:26 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:31524 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 1c4XS2-0004Rq-C5 for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:22 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 9 Nov 2016 21:17:56 +0300 Message-Id: <1478715476-132280-22-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> References: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 21/21] qcow2-bitmap: refcounts 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 Calculate refcounts for qcow2 bitmaps. It is needed for qcow2's qemu-img check implementation. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-bitmap.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2-refcount.c | 6 +++++ block/qcow2.h | 3 +++ 3 files changed, 82 insertions(+) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 166111f..ed4a950 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1154,3 +1154,76 @@ common_errp: name, bdrv_get_device_or_node_name(bs), reason); return false; } + +int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + void **refcount_table, + int64_t *refcount_table_size) +{ + int ret; + BDRVQcow2State *s = bs->opaque; + Qcow2BitmapList *bm_list; + Qcow2Bitmap *bm; + + ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, refcount_table_size, + s->bitmap_directory_offset, + s->bitmap_directory_size); + if (ret < 0) { + return ret; + } + + bm_list = bitmap_list_load(bs, s->bitmap_directory_offset, + s->bitmap_directory_size, NULL); + if (bm_list == NULL) { + res->corruptions++; + return -EINVAL; + } + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { + uint64_t *bitmap_table = NULL; + int i; + + ret = qcow2_inc_refcounts_imrt(bs, res, + refcount_table, refcount_table_size, + bm->table_offset, + bm->table_size * sizeof(uint64_t)); + if (ret < 0) { + goto out; + } + + ret = bitmap_table_load(bs, bm, &bitmap_table); + if (ret < 0) { + res->corruptions++; + goto out; + } + + for (i = 0; i < bm->table_size; ++i) { + uint64_t entry = bitmap_table[i]; + uint64_t offset = entry & BME_TABLE_ENTRY_OFFSET_MASK; + + if (check_table_entry(entry, s->cluster_size) < 0) { + res->corruptions++; + ret = -EINVAL; + continue; + } + + if (offset == 0) { + continue; + } + + ret = qcow2_inc_refcounts_imrt(bs, res, + refcount_table, refcount_table_size, + offset, s->cluster_size); + if (ret < 0) { + g_free(bitmap_table); + goto out; + } + } + + g_free(bitmap_table); + } + +out: + bitmap_list_free(bm_list); + + return ret; +} diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 14a736d..cdb74ba 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1846,6 +1846,12 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, return ret; } + /* bitmaps */ + ret = qcow2_check_bitmaps_refcounts(bs, res, refcount_table, nb_clusters); + if (ret < 0) { + return ret; + } + return check_refblocks(bs, res, fix, rebuild, refcount_table, nb_clusters); } diff --git a/block/qcow2.h b/block/qcow2.h index 7331d46..8ac504a 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -626,5 +626,8 @@ bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs, const char *name, uint32_t granularity, Error **errp); +int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + void **refcount_table, + int64_t *refcount_table_size); #endif -- 1.8.3.1