From: "Denis V. Lunev" <den@openvz.org>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, stefanha@gmail.com,
Alexander Ivanov <alexander.ivanov@virtuozzo.com>,
"Denis V . Lunev" <den@openvz.org>
Subject: [PULL 02/18] parallels: Fix comments formatting inside parallels driver
Date: Wed, 6 Sep 2023 17:49:35 +0200 [thread overview]
Message-ID: <20230906154942.656537-3-den@openvz.org> (raw)
In-Reply-To: <20230906154942.656537-1-den@openvz.org>
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
This patch is technically necessary as git patch rendering could result
in moving some code from one place to the another and that hits
checkpatch.pl warning. This problem specifically happens within next
series.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 18e34aef28..c7b2ed5a54 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -188,7 +188,8 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
idx = sector_num / s->tracks;
to_allocate = DIV_ROUND_UP(sector_num + *pnum, s->tracks) - idx;
- /* This function is called only by parallels_co_writev(), which will never
+ /*
+ * This function is called only by parallels_co_writev(), which will never
* pass a sector_num at or beyond the end of the image (because the block
* layer never passes such a sector_num to that function). Therefore, idx
* is always below s->bat_size.
@@ -196,7 +197,8 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
* exceed the image end. Therefore, idx + to_allocate cannot exceed
* s->bat_size.
* Note that s->bat_size is an unsigned int, therefore idx + to_allocate
- * will always fit into a uint32_t. */
+ * will always fit into a uint32_t.
+ */
assert(idx < s->bat_size && idx + to_allocate <= s->bat_size);
space = to_allocate * s->tracks;
@@ -230,13 +232,15 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
}
}
- /* Try to read from backing to fill empty clusters
+ /*
+ * Try to read from backing to fill empty clusters
* FIXME: 1. previous write_zeroes may be redundant
* 2. most of data we read from backing will be rewritten by
* parallels_co_writev. On aligned-to-cluster write we do not need
* this read at all.
* 3. it would be good to combine write of data from backing and new
- * data into one write call */
+ * data into one write call.
+ */
if (bs->backing) {
int64_t nb_cow_sectors = to_allocate * s->tracks;
int64_t nb_cow_bytes = nb_cow_sectors << BDRV_SECTOR_BITS;
@@ -864,8 +868,10 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
s->data_end = ROUND_UP(bat_entry_off(s->bat_size), BDRV_SECTOR_SIZE);
}
if (s->data_end < s->header_size) {
- /* there is not enough unused space to fit to block align between BAT
- and actual data. We can't avoid read-modify-write... */
+ /*
+ * There is not enough unused space to fit to block align between BAT
+ * and actual data. We can't avoid read-modify-write...
+ */
s->header_size = size;
}
--
2.34.1
next prev parent reply other threads:[~2023-09-06 15:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-06 15:49 [PULL 00/18] Parallels format driver Denis V. Lunev
2023-09-06 15:49 ` [PULL 01/18] MAINTAINERS: add tree to keep parallels format driver changes Denis V. Lunev
2023-09-06 15:49 ` Denis V. Lunev [this message]
2023-09-06 15:49 ` [PULL 03/18] parallels: Incorrect data end calculation in parallels_open() Denis V. Lunev
2023-09-06 15:49 ` [PULL 04/18] parallels: Check if data_end greater than the file size Denis V. Lunev
2023-09-06 15:49 ` [PULL 05/18] parallels: Add "explicit" argument to parallels_check_leak() Denis V. Lunev
2023-09-06 15:49 ` [PULL 06/18] parallels: Add data_start field to BDRVParallelsState Denis V. Lunev
2023-09-06 15:49 ` [PULL 07/18] parallels: Add checking and repairing duplicate offsets in BAT Denis V. Lunev
2023-09-06 15:49 ` [PULL 08/18] parallels: Image repairing in parallels_open() Denis V. Lunev
2023-09-06 15:49 ` [PULL 09/18] parallels: Use bdrv_co_getlength() in parallels_check_outside_image() Denis V. Lunev
2023-09-06 15:54 ` [PULL 10/18] parallels: Add data_off check Denis V. Lunev
2023-09-06 15:54 ` [PULL 11/18] parallels: Add data_off repairing to parallels_open() Denis V. Lunev
2023-09-06 15:54 ` [PULL 12/18] iotests: Add out-of-image check test for parallels format Denis V. Lunev
2023-09-06 15:54 ` [PULL 13/18] iotests: Add leak " Denis V. Lunev
2023-09-06 15:54 ` [PULL 14/18] iotests: Add test for BAT entries duplication check Denis V. Lunev
2023-09-06 15:54 ` [PULL 15/18] iotests: Refactor tests of parallels images checks (131) Denis V. Lunev
2023-09-06 15:54 ` [PULL 16/18] iotests: Fix cluster size in parallels images tests (131) Denis V. Lunev
2023-09-06 15:54 ` [PULL 17/18] iotests: Fix test 131 after repair was added to parallels_open() Denis V. Lunev
2023-09-06 15:54 ` [PULL 18/18] iotests: Add test for data_off check Denis V. Lunev
2023-09-07 15:43 ` [PULL 00/18] Parallels format driver Stefan Hajnoczi
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=20230906154942.656537-3-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
/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).