From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com,
eblake@redhat.com, stefanha@redhat.com, berto@igalia.com,
andrey.drobyshev@virtuozzo.com, den@virtuozzo.com
Subject: [PATCH v3 01/12] qcow2: make function update_refcount_discard() global
Date: Fri, 13 Sep 2024 19:39:31 +0300 [thread overview]
Message-ID: <20240913163942.423050-2-andrey.drobyshev@virtuozzo.com> (raw)
In-Reply-To: <20240913163942.423050-1-andrey.drobyshev@virtuozzo.com>
We are going to need it for discarding separate subclusters. The
function itself doesn't do anything with the refcount tables, it simply
adds a discard request to the queue, so rename it to qcow2_queue_discard().
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
block/qcow2-refcount.c | 8 ++++----
block/qcow2.h | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 0266542cee..2026f5fa21 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -754,8 +754,8 @@ void qcow2_process_discards(BlockDriverState *bs, int ret)
}
}
-static void update_refcount_discard(BlockDriverState *bs,
- uint64_t offset, uint64_t length)
+void qcow2_queue_discard(BlockDriverState *bs, uint64_t offset,
+ uint64_t length)
{
BDRVQcow2State *s = bs->opaque;
Qcow2DiscardRegion *d, *p, *next;
@@ -902,7 +902,7 @@ update_refcount(BlockDriverState *bs, int64_t offset, int64_t length,
}
if (s->discard_passthrough[type]) {
- update_refcount_discard(bs, cluster_offset, s->cluster_size);
+ qcow2_queue_discard(bs, cluster_offset, s->cluster_size);
}
}
}
@@ -3619,7 +3619,7 @@ qcow2_discard_refcount_block(BlockDriverState *bs, uint64_t discard_block_offs)
/* discard refblock from the cache if refblock is cached */
qcow2_cache_discard(s->refcount_block_cache, refblock);
}
- update_refcount_discard(bs, discard_block_offs, s->cluster_size);
+ qcow2_queue_discard(bs, discard_block_offs, s->cluster_size);
return 0;
}
diff --git a/block/qcow2.h b/block/qcow2.h
index a9e3481c6e..197bdcdf53 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -891,6 +891,8 @@ int coroutine_fn qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *re
BdrvCheckMode fix);
void GRAPH_RDLOCK qcow2_process_discards(BlockDriverState *bs, int ret);
+void qcow2_queue_discard(BlockDriverState *bs, uint64_t offset,
+ uint64_t length);
int GRAPH_RDLOCK
qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset,
--
2.39.3
next prev parent reply other threads:[~2024-09-13 16:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 16:39 [PATCH v3 00/12] qcow2: make subclusters discardable Andrey Drobyshev
2024-09-13 16:39 ` Andrey Drobyshev [this message]
2024-09-13 16:39 ` [PATCH v3 02/12] qcow2: simplify L2 entries accounting for discard-no-unref Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 03/12] qcow2: put discard requests in the common queue when discard-no-unref enabled Andrey Drobyshev
2025-04-08 7:34 ` Jean-Louis Dupond
2024-09-13 16:39 ` [PATCH v3 04/12] block/file-posix: add trace event for fallocate() calls Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 05/12] iotests/common.rc: add disk_usage function Andrey Drobyshev
2025-04-11 17:48 ` Eric Blake
2025-04-14 9:47 ` Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 06/12] iotests/290: add test case to check 'discard-no-unref' option behavior Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 07/12] qcow2: add get_sc_range_info() helper for working with subcluster ranges Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 08/12] qcow2: zeroize the entire cluster when there're no non-zero subclusters Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 09/12] qcow2: make subclusters discardable Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 10/12] qcow2: zero_l2_subclusters: fall through to discard operation when requested Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 11/12] iotests/271: add test cases for subcluster-based discard/unmap Andrey Drobyshev
2024-09-13 16:39 ` [PATCH v3 12/12] qcow2: add discard-subclusters option Andrey Drobyshev
2024-09-16 6:29 ` Andrey Drobyshev
2024-09-30 14:24 ` [PATCH v3 00/12] qcow2: make subclusters discardable Andrey Drobyshev
2024-10-09 14:55 ` Andrey Drobyshev
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=20240913163942.423050-2-andrey.drobyshev@virtuozzo.com \
--to=andrey.drobyshev@virtuozzo.com \
--cc=berto@igalia.com \
--cc=den@virtuozzo.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).