From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LuoeD-0001CK-E4 for qemu-devel@nongnu.org; Fri, 17 Apr 2009 10:02:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Luoe8-000191-F0 for qemu-devel@nongnu.org; Fri, 17 Apr 2009 10:02:28 -0400 Received: from [199.232.76.173] (port=47599 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Luoe8-00018t-6B for qemu-devel@nongnu.org; Fri, 17 Apr 2009 10:02:24 -0400 Received: from mo-p05-ob.rzone.de ([81.169.146.180]:44056) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Luoe6-0005p2-VR for qemu-devel@nongnu.org; Fri, 17 Apr 2009 10:02:23 -0400 From: kwolf@redhat.com Date: Fri, 17 Apr 2009 16:01:56 +0200 Message-Id: <1239976920-4912-1-git-send-email-kwolf@redhat.com> In-Reply-To: <1239969879-5611-1-git-send-email-kwolf@redhat.com> References: <1239969879-5611-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 1/5] qcow2: Fix warnings in check_refcount() Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf From: Kevin Wolf This code is currently only compiled when DEBUG_ALLOC is defined, so you usually don't see compiler warnings on it. This patch series wants to enable the code, so fix the format string warnings first. While we're at it, let's print error messages to stderr. Signed-off-by: Kevin Wolf --- block-qcow2.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/block-qcow2.c b/block-qcow2.c index 985214f..231b12f 100644 --- a/block-qcow2.c +++ b/block-qcow2.c @@ -2583,10 +2583,12 @@ static void inc_refcounts(BlockDriverState *bs, cluster_offset += s->cluster_size) { k = cluster_offset >> s->cluster_bits; if (k < 0 || k >= refcount_table_size) { - printf("ERROR: invalid cluster offset=0x%llx\n", cluster_offset); + fprintf(stderr, "ERROR: invalid cluster offset=0x%" PRIx64 "\n", + cluster_offset); } else { if (++refcount_table[k] == 0) { - printf("ERROR: overflow cluster offset=0x%llx\n", cluster_offset); + fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64 + "\n", cluster_offset); } } } @@ -2623,8 +2625,8 @@ static int check_refcounts_l1(BlockDriverState *bs, if (check_copied) { refcount = get_refcount(bs, (l2_offset & ~QCOW_OFLAG_COPIED) >> s->cluster_bits); if ((refcount == 1) != ((l2_offset & QCOW_OFLAG_COPIED) != 0)) { - printf("ERROR OFLAG_COPIED: l2_offset=%llx refcount=%d\n", - l2_offset, refcount); + fprintf(stderr, "ERROR OFLAG_COPIED: l2_offset=%" PRIx64 + " refcount=%d\n", l2_offset, refcount); } } l2_offset &= ~QCOW_OFLAG_COPIED; @@ -2635,8 +2637,9 @@ static int check_refcounts_l1(BlockDriverState *bs, if (offset != 0) { if (offset & QCOW_OFLAG_COMPRESSED) { if (offset & QCOW_OFLAG_COPIED) { - printf("ERROR: cluster %lld: copied flag must never be set for compressed clusters\n", - offset >> s->cluster_bits); + fprintf(stderr, "ERROR: cluster %" PRId64 ": " + "copied flag must never be set for compressed " + "clusters\n", offset >> s->cluster_bits); offset &= ~QCOW_OFLAG_COPIED; } nb_csectors = ((offset >> s->csize_shift) & @@ -2649,8 +2652,8 @@ static int check_refcounts_l1(BlockDriverState *bs, if (check_copied) { refcount = get_refcount(bs, (offset & ~QCOW_OFLAG_COPIED) >> s->cluster_bits); if ((refcount == 1) != ((offset & QCOW_OFLAG_COPIED) != 0)) { - printf("ERROR OFLAG_COPIED: offset=%llx refcount=%d\n", - offset, refcount); + fprintf(stderr, "ERROR OFLAG_COPIED: offset=%" + PRIx64 " refcount=%d\n", offset, refcount); } } offset &= ~QCOW_OFLAG_COPIED; @@ -2670,7 +2673,7 @@ static int check_refcounts_l1(BlockDriverState *bs, qemu_free(l2_table); return 0; fail: - printf("ERROR: I/O error in check_refcounts_l1\n"); + fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n"); qemu_free(l1_table); qemu_free(l2_table); return -EIO; @@ -2722,7 +2725,7 @@ static void check_refcounts(BlockDriverState *bs) refcount1 = get_refcount(bs, i); refcount2 = refcount_table[i]; if (refcount1 != refcount2) - printf("ERROR cluster %d refcount=%d reference=%d\n", + fprintf(stderr, "ERROR cluster %d refcount=%d reference=%d\n", i, refcount1, refcount2); } -- 1.6.0.6