diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2012-05-11 18:16:54 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-06-15 14:03:42 +0200 |
| commit | ccf34716eeda0e3ad203c8a28f01efb412c56763 (patch) | |
| tree | 46bb74acbf67d23a8586b1ce099cce15db363fc7 | |
| parent | 4534ff5426afeeae5238ba10a696cafa9a0168ee (diff) | |
qemu-img check: Print fixed clusters and recheck
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 <kwolf@redhat.com>
| -rw-r--r-- | block.h | 2 | ||||
| -rw-r--r-- | block/qed-check.c | 2 | ||||
| -rw-r--r-- | qemu-img.c | 10 |
3 files changed, 14 insertions, 0 deletions
@@ -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 94327ff5b3..5edf60775b 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 c45ff62a28..9336c86d9e 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 { |