From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpQ-00033P-If for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVpI-0007F5-MC for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:04 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43259 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpI-0007Ek-CW for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:26:56 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 16 Jan 2013 17:24:47 +0100 Message-Id: <1358353497-5292-27-git-send-email-benoit@irqsave.net> In-Reply-To: <1358353497-5292-1-git-send-email-benoit@irqsave.net> References: <1358353497-5292-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V5 26/36] 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, pbonzini@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 34a6a04..f7a283a 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1003,7 +1003,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