From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyP8-0006OC-6d for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:07:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcyOw-0005GA-2X for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:07:17 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44872 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOv-0005G6-Qe for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:07:06 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Mon, 26 Nov 2012 14:05:19 +0100 Message-Id: <1353935123-24199-21-git-send-email-benoit@irqsave.net> In-Reply-To: <1353935123-24199-1-git-send-email-benoit@irqsave.net> References: <1353935123-24199-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V3 20/24] 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 16aa8a2..9b64e37 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1013,7 +1013,14 @@ 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)) { + 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