[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC
From: |
Alberto Garcia |
Subject: |
[RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC |
Date: |
Sun, 22 Dec 2019 12:36:54 +0100 |
When dealing with subcluster types there is a new value called
QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC that has no equivalent in
QCow2ClusterType.
This patch handles that value in all places where subcluster types
are processed.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 9277d680ef..1d3da0ccf6 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1985,7 +1985,8 @@ static int coroutine_fn
qcow2_co_block_status(BlockDriverState *bs,
*pnum = bytes;
if ((type == QCOW2_SUBCLUSTER_NORMAL ||
- type == QCOW2_SUBCLUSTER_ZERO_ALLOC) && !s->crypto) {
+ type == QCOW2_SUBCLUSTER_ZERO_ALLOC ||
+ type == QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) && !s->crypto) {
*map = cluster_offset | offset_into_cluster(s, offset);
*file = s->data_file->bs;
status |= BDRV_BLOCK_OFFSET_VALID;
@@ -1993,7 +1994,8 @@ static int coroutine_fn
qcow2_co_block_status(BlockDriverState *bs,
if (type == QCOW2_SUBCLUSTER_ZERO_PLAIN ||
type == QCOW2_SUBCLUSTER_ZERO_ALLOC) {
status |= BDRV_BLOCK_ZERO;
- } else if (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN) {
+ } else if (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN &&
+ type != QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) {
status |= BDRV_BLOCK_DATA;
}
if (s->metadata_preallocation && (status & BDRV_BLOCK_DATA) &&
@@ -2163,6 +2165,7 @@ static coroutine_fn int
qcow2_co_preadv_task(BlockDriverState *bs,
g_assert_not_reached();
case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part */
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
@@ -2236,7 +2239,8 @@ static coroutine_fn int
qcow2_co_preadv_part(BlockDriverState *bs,
if (type == QCOW2_SUBCLUSTER_ZERO_PLAIN ||
type == QCOW2_SUBCLUSTER_ZERO_ALLOC ||
- (type == QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backing))
+ (type == QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backing) ||
+ (type == QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC && !bs->backing))
{
qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);
} else {
@@ -3750,6 +3754,7 @@ static coroutine_fn int
qcow2_co_pwrite_zeroes(BlockDriverState *bs,
return -ENOTSUP;
}
if (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN &&
+ type != QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC &&
type != QCOW2_SUBCLUSTER_ZERO_PLAIN &&
type != QCOW2_SUBCLUSTER_ZERO_ALLOC) {
qemu_co_mutex_unlock(&s->lock);
@@ -3822,6 +3827,7 @@ qcow2_co_copy_range_from(BlockDriverState *bs,
switch (type) {
case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
if (bs->backing && bs->backing->bs) {
int64_t backing_length = bdrv_getlength(bs->backing->bs);
if (src_offset >= backing_length) {
--
2.20.1
- [RFC PATCH v3 07/27] qcow2: Add subcluster-related fields to BDRVQcow2State, (continued)
- [RFC PATCH v3 07/27] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 17/27] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 10/27] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 01/27] qcow2: Add calculate_l2_meta(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 24/27] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 11/27] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 03/27] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 27/27] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 21/27] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC,
Alberto Garcia <=
- [RFC PATCH v3 19/27] qcow2: Add subcluster support to expand_zero_clusters_in_l1(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 22/27] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 08/27] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 06/27] qcow2: Add dummy has_subclusters() function, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 02/27] qcow2: Split cluster_needs_cow() out of count_cow_clusters(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 23/27] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 14/27] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 26/27] qcow2: Add subcluster support to qcow2_measure(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 09/27] qcow2: Add l2_entry_size(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 05/27] qcow2: Document the Extended L2 Entries feature, Alberto Garcia, 2019/12/22