qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: den@virtuozzo.com, michael.roth@amd.com, kkostiuk@redhat.com,
	marcandre.lureau@gmail.com
Subject: [PATCH v11 06/12] parallels: Move check of unclean image to a separate function
Date: Mon, 24 Apr 2023 11:16:20 +0200	[thread overview]
Message-ID: <20230424091626.195590-7-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20230424091626.195590-1-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>
---
 block/parallels.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/block/parallels.c b/block/parallels.c
index 7f076db001..4f14bac616 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.34.1



  parent reply	other threads:[~2023-04-24  9:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-24  9:16 [PATCH v11 00/12] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 01/12] parallels: Out of image offset in BAT leads to image inflation Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 02/12] parallels: Fix high_off calculation in parallels_co_check() Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 03/12] parallels: Fix image_end_offset and data_end after out-of-image check Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 04/12] parallels: create parallels_set_bat_entry_helper() to assign BAT value Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 05/12] parallels: Use generic infrastructure for BAT writing in parallels_co_check() Alexander Ivanov
2023-04-24  9:16 ` Alexander Ivanov [this message]
2023-04-24  9:16 ` [PATCH v11 07/12] parallels: Move check of cluster outside image to a separate function Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 08/12] parallels: Fix statistics calculation Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 09/12] parallels: Move check of leaks to a separate function Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 10/12] parallels: Move statistic collection " Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 11/12] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2023-04-24  9:16 ` [PATCH v11 12/12] parallels: Incorrect condition in out-of-image check Alexander Ivanov
2023-04-24  9:29 ` [PATCH v11 00/12] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
  -- strict thread matches above, loose matches on Subject: below --
2023-04-24  9:31 Alexander Ivanov
2023-04-24  9:31 ` [PATCH v11 06/12] parallels: Move check of unclean image to a separate function Alexander Ivanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230424091626.195590-7-alexander.ivanov@virtuozzo.com \
    --to=alexander.ivanov@virtuozzo.com \
    --cc=den@virtuozzo.com \
    --cc=kkostiuk@redhat.com \
    --cc=marcandre.lureau@gmail.com \
    --cc=michael.roth@amd.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).