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 v7 3/8] parallels: Add "explicit" argument to parallels_check_leak()
Date: Sat, 1 Jul 2023 12:07:54 +0200 [thread overview]
Message-ID: <20230701100759.261007-4-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20230701100759.261007-1-alexander.ivanov@virtuozzo.com>
In the on of the next patches we need to repair leaks without changing
leaks and leaks_fixed info in res. Also we don't want to print any warning
about leaks. Add "explicit" argument to skip info changing if the argument
is false.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 40a26908db..3cff25e3a4 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -484,7 +484,7 @@ parallels_check_outside_image(BlockDriverState *bs, BdrvCheckResult *res,
static int coroutine_fn GRAPH_RDLOCK
parallels_check_leak(BlockDriverState *bs, BdrvCheckResult *res,
- BdrvCheckMode fix)
+ BdrvCheckMode fix, bool explicit)
{
BDRVParallelsState *s = bs->opaque;
int64_t size;
@@ -499,10 +499,13 @@ parallels_check_leak(BlockDriverState *bs, BdrvCheckResult *res,
if (size > res->image_end_offset) {
int64_t count;
count = DIV_ROUND_UP(size - res->image_end_offset, s->cluster_size);
- fprintf(stderr, "%s space leaked at the end of the image %" PRId64 "\n",
- fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR",
- size - res->image_end_offset);
- res->leaks += count;
+ if (explicit) {
+ fprintf(stderr,
+ "%s space leaked at the end of the image %" PRId64 "\n",
+ fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR",
+ size - res->image_end_offset);
+ res->leaks += count;
+ }
if (fix & BDRV_FIX_LEAKS) {
Error *local_err = NULL;
@@ -517,7 +520,9 @@ parallels_check_leak(BlockDriverState *bs, BdrvCheckResult *res,
res->check_errors++;
return ret;
}
- res->leaks_fixed += count;
+ if (explicit) {
+ res->leaks_fixed += count;
+ }
}
}
@@ -570,7 +575,7 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult *res,
return ret;
}
- ret = parallels_check_leak(bs, res, fix);
+ ret = parallels_check_leak(bs, res, fix, true);
if (ret < 0) {
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2023-07-01 10:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-01 10:07 [PATCH v7 0/8] parallels: Add duplication check, repair at open, fix bugs Alexander Ivanov
2023-07-01 10:07 ` [PATCH v7 1/8] parallels: Incorrect data end calculation in parallels_open() Alexander Ivanov
2023-07-01 10:07 ` [PATCH v7 2/8] parallels: Check if data_end greater than the file size Alexander Ivanov
2023-07-17 16:20 ` Denis V. Lunev
2023-07-01 10:07 ` Alexander Ivanov [this message]
2023-07-17 16:20 ` [PATCH v7 3/8] parallels: Add "explicit" argument to parallels_check_leak() Denis V. Lunev
2023-07-01 10:07 ` [PATCH v7 4/8] parallels: Add data_start field to BDRVParallelsState Alexander Ivanov
2023-07-17 16:21 ` Denis V. Lunev
2023-07-01 10:07 ` [PATCH v7 5/8] parallels: Add checking and repairing duplicate offsets in BAT Alexander Ivanov
2023-07-17 16:43 ` Denis V. Lunev
2023-07-01 10:07 ` [PATCH v7 6/8] parallels: Image repairing in parallels_open() Alexander Ivanov
2023-07-17 16:45 ` Denis V. Lunev
2023-07-01 10:07 ` [PATCH v7 7/8] parallels: Use bdrv_co_getlength() in parallels_check_outside_image() Alexander Ivanov
2023-07-17 16:49 ` Denis V. Lunev
2023-07-01 10:07 ` [PATCH v7 8/8] parallels: Add data_off check Alexander Ivanov
2023-07-17 17:25 ` 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=20230701100759.261007-4-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 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).