All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com,
	vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com
Subject: [PATCH v2 4/8] parallels: Move check of unclean image to a separate function
Date: Thu, 11 Aug 2022 17:00:40 +0200	[thread overview]
Message-ID: <20220811150044.1704013-5-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20220811150044.1704013-1-alexander.ivanov@virtuozzo.com>

v2: Revert the condition with s->header_unclean.

Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
 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



  parent reply	other threads:[~2022-08-11 15:09 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-11 15:00 [PATCH v2 0/8] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
2022-08-11 15:00 ` [PATCH v2 1/8] parallels: Out of image offset in BAT leads to image inflation Alexander Ivanov
2022-08-12 14:13   ` Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 2/8] parallels: Move BAT entry setting to a separate function Alexander Ivanov
2022-08-12 14:19   ` Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 3/8] parallels: Replace bdrv_co_pwrite_sync by bdrv_co_flush for BAT flushing Alexander Ivanov
2022-08-12 14:39   ` Denis V. Lunev
2022-08-11 15:00 ` Alexander Ivanov [this message]
2022-08-12 14:42   ` [PATCH v2 4/8] parallels: Move check of unclean image to a separate function Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 5/8] parallels: Move check of cluster outside " Alexander Ivanov
2022-08-12 14:44   ` Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 6/8] parallels: Move check of leaks " Alexander Ivanov
2022-08-12 14:47   ` Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 7/8] parallels: Move statistic collection " Alexander Ivanov
2022-08-12 14:49   ` Denis V. Lunev
2022-08-11 15:00 ` [PATCH v2 8/8] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2022-08-12 14:54   ` Denis V. Lunev
2022-08-12 14:55 ` [PATCH v2 0/8] parallels: Refactor the code of images checks and fix a bug Denis V. Lunev

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=20220811150044.1704013-5-alexander.ivanov@virtuozzo.com \
    --to=alexander.ivanov@virtuozzo.com \
    --cc=den@virtuozzo.com \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.