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 06/18] parallels: Add data_start field to BDRVParallelsState
Date: Wed, 6 Sep 2023 17:49:39 +0200 [thread overview]
Message-ID: <20230906154942.656537-7-den@openvz.org> (raw)
In-Reply-To: <20230906154942.656537-1-den@openvz.org>
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
In the next patch we will need the offset of the data area for host cluster
index calculation. Add this field and setting up code.
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 | 7 ++++---
block/parallels.h | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 8bb5d115fc..f7b44cb433 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -868,10 +868,11 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
ret = -ENOMEM;
goto fail;
}
- s->data_end = le32_to_cpu(ph.data_off);
- if (s->data_end == 0) {
- s->data_end = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE);
+ s->data_start = le32_to_cpu(ph.data_off);
+ if (s->data_start == 0) {
+ s->data_start = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE);
}
+ s->data_end = s->data_start;
if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) {
/*
* There is not enough unused space to fit to block align between BAT
diff --git a/block/parallels.h b/block/parallels.h
index f22f43f988..4e53e9572d 100644
--- a/block/parallels.h
+++ b/block/parallels.h
@@ -75,6 +75,7 @@ typedef struct BDRVParallelsState {
uint32_t *bat_bitmap;
unsigned int bat_size;
+ int64_t data_start;
int64_t data_end;
uint64_t prealloc_size;
ParallelsPreallocMode prealloc_mode;
--
2.34.1
next prev parent reply other threads:[~2023-09-06 15:51 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 ` [PULL 02/18] parallels: Fix comments formatting inside parallels driver Denis V. Lunev
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 ` Denis V. Lunev [this message]
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-7-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).