[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 31/39] qcow2: Update qcow2_truncate() to support
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v4 31/39] qcow2: Update qcow2_truncate() to support L2 slices |
Date: |
Mon, 5 Feb 2018 16:33:31 +0200 |
The qcow2_truncate() code is mostly independent from whether
we're using L2 slices or full L2 tables, but in full and
falloc preallocation modes new L2 tables are allocated using
qcow2_alloc_cluster_link_l2(). Therefore the code needs to be
modified to ensure that all nb_clusters that are processed in each
call can be allocated with just one L2 slice.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 78f067cae7..28050a4b3e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3260,9 +3260,9 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t
offset,
host_offset = allocation_start;
guest_offset = old_length;
while (nb_new_data_clusters) {
- int64_t guest_cluster = guest_offset >> s->cluster_bits;
- int64_t nb_clusters = MIN(nb_new_data_clusters,
- s->l2_size - guest_cluster % s->l2_size);
+ int64_t nb_clusters = MIN(
+ nb_new_data_clusters,
+ s->l2_slice_size - offset_to_l2_slice_index(s, guest_offset));
QCowL2Meta allocation = {
.offset = guest_offset,
.alloc_offset = host_offset,
--
2.11.0
- Re: [Qemu-block] [PATCH v4 34/39] qcow2: Rename l2_table in count_contiguous_clusters_unallocated(), (continued)
- [Qemu-block] [PATCH v4 02/39] qcow2: Add table size field to Qcow2Cache, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 37/39] iotests: Test valid values of l2-cache-entry-size, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 33/39] qcow2: Rename l2_table in count_contiguous_clusters(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 38/39] iotests: Test downgrading an image using a small L2 slice size, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 36/39] qcow2: Allow configuring the L2 slice size, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 32/39] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 30/39] qcow2: Update expand_zero_clusters_in_l1() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 31/39] qcow2: Update qcow2_truncate() to support L2 slices,
Alberto Garcia <=
- [Qemu-block] [PATCH v4 39/39] iotests: Add l2-cache-entry-size to iotest 137, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 22/39] qcow2: Update handle_copied() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 27/39] qcow2: Update qcow2_update_snapshot_refcount() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 28/39] qcow2: Read refcount before L2 table in expand_zero_clusters_in_l1(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 14/39] qcow2: Add offset_to_l2_slice_index(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 29/39] qcow2: Prepare expand_zero_clusters_in_l1() for adding L2 slice support, Alberto Garcia, 2018/02/05