From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbVEI-0004Sw-1M for qemu-devel@nongnu.org; Mon, 04 Jun 2012 07:13:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbVEF-00061R-T9 for qemu-devel@nongnu.org; Mon, 04 Jun 2012 07:13:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbVEF-00060i-Ky for qemu-devel@nongnu.org; Mon, 04 Jun 2012 07:13:43 -0400 From: Kevin Wolf Date: Mon, 4 Jun 2012 13:13:26 +0200 Message-Id: <1338808409-19501-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1338808409-19501-1-git-send-email-kwolf@redhat.com> References: <1338808409-19501-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 09/12] qemu-img check: Print fixed clusters and recheck List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org When any inconsistencies have been fixed, print the statistics and run another check to make sure everything is correct now. Signed-off-by: Kevin Wolf --- block.h | 2 ++ block/qed-check.c | 2 ++ qemu-img.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/block.h b/block.h index 61b7e8e..f8200eb 100644 --- a/block.h +++ b/block.h @@ -187,6 +187,8 @@ typedef struct BdrvCheckResult { int corruptions; int leaks; int check_errors; + int corruptions_fixed; + int leaks_fixed; BlockFragInfo bfi; } BdrvCheckResult; diff --git a/block/qed-check.c b/block/qed-check.c index 94327ff..5edf607 100644 --- a/block/qed-check.c +++ b/block/qed-check.c @@ -87,6 +87,7 @@ static unsigned int qed_check_l2_table(QEDCheck *check, QEDTable *table) if (!qed_check_cluster_offset(s, offset)) { if (check->fix) { table->offsets[i] = 0; + check->result->corruptions_fixed++; } else { check->result->corruptions++; } @@ -127,6 +128,7 @@ static int qed_check_l1_table(QEDCheck *check, QEDTable *table) /* Clear invalid offset */ if (check->fix) { table->offsets[i] = 0; + check->result->corruptions_fixed++; } else { check->result->corruptions++; } diff --git a/qemu-img.c b/qemu-img.c index c45ff62..9336c86 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -425,6 +425,16 @@ static int img_check(int argc, char **argv) return 1; } + if (result.corruptions_fixed || result.leaks_fixed) { + printf("The following inconsistencies were found and repaired:\n\n" + " %d leaked clusters\n" + " %d corruptions\n\n" + "Double checking the fixed image now...\n", + result.leaks_fixed, + result.corruptions_fixed); + ret = bdrv_check(bs, &result, 0); + } + if (!(result.corruptions || result.leaks || result.check_errors)) { printf("No errors were found on the image.\n"); } else { -- 1.7.6.5