[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] parallels: Move check of unclean image to a separate functi
From: |
Hanna Czenczek |
Subject: |
[PULL 10/17] parallels: Move check of unclean image to a separate function |
Date: |
Mon, 5 Jun 2023 17:45:34 +0200 |
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
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>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20230424093147.197643-7-alexander.ivanov@virtuozzo.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
block/parallels.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index fa8a56a948..94b7408b6b 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -420,6 +420,25 @@ parallels_co_readv(BlockDriverState *bs, int64_t
sector_num, int nb_sectors,
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 GRAPH_RDLOCK
parallels_co_check(BlockDriverState *bs, BdrvCheckResult *res,
@@ -437,16 +456,8 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult
*res,
}
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.40.1
- Re: [PULL 02/17] block: Collapse padded I/O vecs exceeding IOV_MAX, (continued)
[PULL 06/17] parallels: Fix high_off calculation in parallels_co_check(), Hanna Czenczek, 2023/06/05
[PULL 04/17] iotests/iov-padding: New test, Hanna Czenczek, 2023/06/05
[PULL 11/17] parallels: Move check of cluster outside image to a separate function, Hanna Czenczek, 2023/06/05
[PULL 10/17] parallels: Move check of unclean image to a separate function,
Hanna Czenczek <=
[PULL 12/17] parallels: Fix statistics calculation, Hanna Czenczek, 2023/06/05
[PULL 07/17] parallels: Fix image_end_offset and data_end after out-of-image check, Hanna Czenczek, 2023/06/05
[PULL 17/17] qcow2: add discard-no-unref option, Hanna Czenczek, 2023/06/05
[PULL 15/17] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD, Hanna Czenczek, 2023/06/05
[PULL 09/17] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Hanna Czenczek, 2023/06/05
[PULL 08/17] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Hanna Czenczek, 2023/06/05
[PULL 13/17] parallels: Move check of leaks to a separate function, Hanna Czenczek, 2023/06/05
[PULL 14/17] parallels: Move statistic collection to a separate function, Hanna Czenczek, 2023/06/05
[PULL 16/17] parallels: Incorrect condition in out-of-image check, Hanna Czenczek, 2023/06/05
Re: [PULL 00/17] Block patches, Richard Henderson, 2023/06/05