From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHfgN-0006tw-0g for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHfgG-0005P7-Ra for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHfgG-0005P3-Ir for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:00 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7DL1xPk021734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Aug 2014 17:01:59 -0400 From: Max Reitz Date: Wed, 13 Aug 2014 23:01:44 +0200 Message-Id: <1407963710-4942-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1407963710-4942-1-git-send-email-mreitz@redhat.com> References: <1407963710-4942-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] qcow2: Factor out refcount comparison for check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Put the code for comparing the calculated refcounts against the on-disk refcounts during qemu-img check into an own function. Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 91 ++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 39 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 9793c27..d1da8d5 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1629,46 +1629,22 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } /* - * Checks an image for refcount consistency. - * - * Returns 0 if no errors are found, the number of errors in case the image is - * detected as corrupted, and -errno when an internal error occurred. + * Compares the actual reference count for each cluster in the image against the + * refcount as reported by the refcount structures on-disk. */ -int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, - BdrvCheckMode fix) +static void compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix, int64_t *highest_cluster, + uint16_t *refcount_table, int64_t nb_clusters) { BDRVQcowState *s = bs->opaque; - int64_t size, i, highest_cluster, nb_clusters; - int refcount1, refcount2; - uint16_t *refcount_table = NULL; - int ret; - - size = bdrv_getlength(bs->file); - if (size < 0) { - res->check_errors++; - return size; - } - - nb_clusters = size_to_clusters(s, size); - if (nb_clusters > INT_MAX) { - res->check_errors++; - return -EFBIG; - } - - res->bfi.total_clusters = - size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); - - ret = calculate_refcounts(bs, res, fix, &refcount_table, &nb_clusters); - if (ret < 0) { - goto fail; - } + int64_t i; + int refcount1, refcount2, ret; - /* compare ref counts */ - for (i = 0, highest_cluster = 0; i < nb_clusters; i++) { + for (i = 0, *highest_cluster = 0; i < nb_clusters; i++) { refcount1 = get_refcount(bs, i); if (refcount1 < 0) { fprintf(stderr, "Can't get refcount for cluster %" PRId64 ": %s\n", - i, strerror(-refcount1)); + i, strerror(-refcount1)); res->check_errors++; continue; } @@ -1676,11 +1652,10 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, refcount2 = refcount_table[i]; if (refcount1 > 0 || refcount2 > 0) { - highest_cluster = i; + *highest_cluster = i; } if (refcount1 != refcount2) { - /* Check if we're allowed to fix the mismatch */ int *num_fixed = NULL; if (refcount1 > refcount2 && (fix & BDRV_FIX_LEAKS)) { @@ -1690,10 +1665,10 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } fprintf(stderr, "%s cluster %" PRId64 " refcount=%d reference=%d\n", - num_fixed != NULL ? "Repairing" : - refcount1 < refcount2 ? "ERROR" : - "Leaked", - i, refcount1, refcount2); + num_fixed != NULL ? "Repairing" : + refcount1 < refcount2 ? "ERROR" : + "Leaked", + i, refcount1, refcount2); if (num_fixed) { ret = update_refcount(bs, i << s->cluster_bits, 1, @@ -1713,6 +1688,44 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } } } +} + +/* + * Checks an image for refcount consistency. + * + * Returns 0 if no errors are found, the number of errors in case the image is + * detected as corrupted, and -errno when an internal error occurred. + */ +int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix) +{ + BDRVQcowState *s = bs->opaque; + int64_t size, highest_cluster, nb_clusters; + uint16_t *refcount_table = NULL; + int ret; + + size = bdrv_getlength(bs->file); + if (size < 0) { + res->check_errors++; + return size; + } + + nb_clusters = size_to_clusters(s, size); + if (nb_clusters > INT_MAX) { + res->check_errors++; + return -EFBIG; + } + + res->bfi.total_clusters = + size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); + + ret = calculate_refcounts(bs, res, fix, &refcount_table, &nb_clusters); + if (ret < 0) { + goto fail; + } + + compare_refcounts(bs, res, fix, &highest_cluster, refcount_table, + nb_clusters); /* check OFLAG_COPIED */ ret = check_oflag_copied(bs, res, fix); -- 2.0.3