From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVz9-0001qw-9I for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVz4-0005Di-SR for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:55 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59634 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVz4-0005Ce-If for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:50 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Mar 2013 15:49:39 +0100 Message-Id: <1363358986-8360-26-git-send-email-benoit@irqsave.net> In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V7 25/32] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Benoit Canet --- block/qcow2-refcount.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index ffb8d3a..7a53983 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1029,7 +1029,19 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res, PRIx64 ": %s\n", l2_entry, strerror(-refcount)); goto fail; } - if ((refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) { + /* QCOW_OFLAG_COPIED is not garanteed to be here when + * refcount == 1 when dedup is enabled since it would be + * too expensive to set it back everytime refcount is + * decremented to 1. + */ + if (!s->has_dedup && + (refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) { + fprintf(stderr, "ERROR OFLAG_COPIED: offset=%" + PRIx64 " refcount=%d\n", l2_entry, refcount); + res->corruptions++; + } + if (s->has_dedup && refcount > 1 && + ((l2_entry & QCOW_OFLAG_COPIED) != 0)) { fprintf(stderr, "ERROR OFLAG_COPIED: offset=%" PRIx64 " refcount=%d\n", l2_entry, refcount); res->corruptions++; -- 1.7.10.4