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 v5 02/22] parallels: Move inactivation code to a separate function
Date: Mon, 11 Mar 2024 19:18:30 +0100 [thread overview]
Message-ID: <20240311181850.73013-3-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20240311181850.73013-1-alexander.ivanov@virtuozzo.com>
We are going to add parallels image extensions storage and need a separate
function for inactivation code.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 072b1efd78..992362ce29 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1424,6 +1424,20 @@ fail:
return ret;
}
+static int GRAPH_RDLOCK parallels_inactivate(BlockDriverState *bs)
+{
+ BDRVParallelsState *s = bs->opaque;
+ int ret;
+
+ s->header->inuse = 0;
+ parallels_update_header(bs);
+
+ /* errors are ignored, so we might as well pass exact=true */
+ ret = bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, true,
+ PREALLOC_MODE_OFF, 0, NULL);
+
+ return ret;
+}
static void parallels_close(BlockDriverState *bs)
{
@@ -1432,12 +1446,7 @@ static void parallels_close(BlockDriverState *bs)
GRAPH_RDLOCK_GUARD_MAINLOOP();
if ((bs->open_flags & BDRV_O_RDWR) && !(bs->open_flags & BDRV_O_INACTIVE)) {
- s->header->inuse = 0;
- parallels_update_header(bs);
-
- /* errors are ignored, so we might as well pass exact=true */
- bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, true,
- PREALLOC_MODE_OFF, 0, NULL);
+ parallels_inactivate(bs);
}
parallels_free_used_bitmap(bs);
@@ -1476,6 +1485,7 @@ static BlockDriver bdrv_parallels = {
.bdrv_co_check = parallels_co_check,
.bdrv_co_pdiscard = parallels_co_pdiscard,
.bdrv_co_pwrite_zeroes = parallels_co_pwrite_zeroes,
+ .bdrv_inactivate = parallels_inactivate,
};
static void bdrv_parallels_init(void)
--
2.40.1
next prev parent reply other threads:[~2024-03-11 18:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 18:18 [PATCH v5 00/22] parallels: Add full dirty bitmap support Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 01/22] parallels: Set s->used_bmap to NULL in parallels_free_used_bitmap() Alexander Ivanov
2024-03-11 18:18 ` Alexander Ivanov [this message]
2024-03-11 18:18 ` [PATCH v5 03/22] parallels: Make mark_used() a global function Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 04/22] parallels: Limit search in parallels_mark_used to the last marked claster Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 05/22] parallels: Add parallels_mark_unused() helper Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 06/22] parallels: Move host clusters allocation to a separate function Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 07/22] parallels: Set data_end value in parallels_check_leak() Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 08/22] parallels: Recreate used bitmap " Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 09/22] parallels: Add a note about used bitmap in parallels_check_duplicate() Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 10/22] parallels: Create used bitmap even if checks needed Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 11/22] parallels: Add dirty bitmaps saving Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 12/22] parallels: drop dirty bitmap data if the image was not properly closed Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 13/22] parallels: Let image extensions work in RW mode Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 14/22] parallels: Preserve extensions cluster for non-transient extensions Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 15/22] parallels: Handle L1 entries equal to one Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 16/22] parallels: Make a loaded dirty bitmap persistent Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 17/22] parallels: Reverse a conditional in parallels_check_leak() to reduce indents Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 18/22] parallels: Check unused clusters in parallels_check_leak() Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 19/22] parallels: Remove unnecessary data_end field Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 20/22] tests: Add parallels images support to test 165 Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 21/22] tests: Turned on 256, 299, 304 and block-status-cache for parallels format Alexander Ivanov
2024-03-11 18:18 ` [PATCH v5 22/22] tests: Add parallels format support to image-fleecing 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=20240311181850.73013-3-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).