[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 4/8] parallels: Move check of unclean image to a separate func
From: |
Alexander Ivanov |
Subject: |
[PATCH v3 4/8] parallels: Move check of unclean image to a separate function |
Date: |
Mon, 15 Aug 2022 11:02:12 +0200 |
We will add more and more checks so we need a better code structure
in parallels_co_check. Let each check performs in a separate loop
in a separate helper.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
v2: Revert the condition with s->header_unclean.
v3: Fix commit message.
block/parallels.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 6879ea4597..c53b2810cf 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -419,6 +419,25 @@ static coroutine_fn int
parallels_co_readv(BlockDriverState *bs,
return ret;
}
+static void parallels_check_unclean(BlockDriverState *bs,
+ BdrvCheckResult *res,
+ BdrvCheckMode fix)
+{
+ BDRVParallelsState *s = bs->opaque;
+
+ if (!s->header_unclean) {
+ return;
+ }
+
+ fprintf(stderr, "%s image was not closed correctly\n",
+ fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR");
+ res->corruptions++;
+ if (fix & BDRV_FIX_ERRORS) {
+ /* parallels_close will do the job right */
+ res->corruptions_fixed++;
+ s->header_unclean = false;
+ }
+}
static int coroutine_fn parallels_co_check(BlockDriverState *bs,
BdrvCheckResult *res,
@@ -436,16 +455,8 @@ static int coroutine_fn
parallels_co_check(BlockDriverState *bs,
}
qemu_co_mutex_lock(&s->lock);
- if (s->header_unclean) {
- fprintf(stderr, "%s image was not closed correctly\n",
- fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR");
- res->corruptions++;
- if (fix & BDRV_FIX_ERRORS) {
- /* parallels_close will do the job right */
- res->corruptions_fixed++;
- s->header_unclean = false;
- }
- }
+
+ parallels_check_unclean(bs, res, fix);
res->bfi.total_clusters = s->bat_size;
res->bfi.compressed_clusters = 0; /* compression is not supported */
--
2.34.1
- Re: [PATCH v3 1/8] parallels: Out of image offset in BAT leads to image inflation, (continued)
[PATCH v3 3/8] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Alexander Ivanov, 2022/08/15
[PATCH v3 5/8] parallels: Move check of cluster outside image to a separate function, Alexander Ivanov, 2022/08/15
[PATCH v3 4/8] parallels: Move check of unclean image to a separate function,
Alexander Ivanov <=
[PATCH v3 6/8] parallels: Move check of leaks to a separate function, Alexander Ivanov, 2022/08/15
[PATCH v3 7/8] parallels: Move statistic collection to a separate function, Alexander Ivanov, 2022/08/15
[PATCH v3 8/8] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD, Alexander Ivanov, 2022/08/15
Re: [PATCH v3 0/8] parallels: Refactor the code of images checks and fix a bug, Denis V. Lunev, 2022/08/16