From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nh3ga-0007Nl-FB for qemu-devel@nongnu.org; Mon, 15 Feb 2010 11:20:36 -0500 Received: from [199.232.76.173] (port=33675 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nh3ga-0007NW-0w for qemu-devel@nongnu.org; Mon, 15 Feb 2010 11:20:36 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nh3gY-0004bd-TW for qemu-devel@nongnu.org; Mon, 15 Feb 2010 11:20:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16112) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nh3gY-0004bY-Ft for qemu-devel@nongnu.org; Mon, 15 Feb 2010 11:20:34 -0500 From: Kevin Wolf Date: Mon, 15 Feb 2010 17:19:29 +0100 Message-Id: <1266250769-5816-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1266250769-5816-1-git-send-email-kwolf@redhat.com> References: <1266250769-5816-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qcow2: More checks for qemu-img check List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hch@lst.de, armbru@redhat.com, gleb@redhat.com, quintela@redhat.com Implement some more refcount block related checks Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index e7fdf64..e50fb2a 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1065,9 +1065,21 @@ int qcow2_check_refcounts(BlockDriverState *bs) for(i = 0; i < s->refcount_table_size; i++) { int64_t offset; offset = s->refcount_table[i]; + + /* Refcount blocks are cluster aligned */ + if (offset & (s->cluster_size - 1)) { + fprintf(stderr, "ERROR refcount block %d is not " + "cluster aligned; refcount table entry corrupted\n", i); + errors++; + } + if (offset != 0) { errors += inc_refcounts(bs, refcount_table, nb_clusters, offset, s->cluster_size); + if (refcount_table[offset / s->cluster_size] != 1) { + fprintf(stderr, "ERROR refcount block %d refcount=%d\n", + i, refcount_table[offset / s->cluster_size]); + } } } -- 1.6.6