[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 22/31] qcow2: Update discard_single_l2() to support
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH 22/31] qcow2: Update discard_single_l2() to support L2 slices |
Date: |
Thu, 12 Oct 2017 16:05:36 +0300 |
discard_single_l2() limits the number of clusters to be discarded to
the amount that fits inside an L2 table. Since we'll be loading L2
slices instead of full tables we need to update that limit.
Apart from that, this function doesn't need any additional changes, so
this patch simply updates the variable name from l2_table to l2_slice.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2-cluster.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 463b24a4fd..536077079b 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1620,7 +1620,7 @@ int qcow2_decompress_cluster(BlockDriverState *bs,
uint64_t cluster_offset)
/*
* This discards as many clusters of nb_clusters as possible at once (i.e.
- * all clusters in the same L2 table) and returns the number of discarded
+ * all clusters in the same L2 slice) and returns the number of discarded
* clusters.
*/
static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
@@ -1628,24 +1628,24 @@ static int discard_single_l2(BlockDriverState *bs,
uint64_t offset,
bool full_discard)
{
BDRVQcow2State *s = bs->opaque;
- uint64_t *l2_table;
+ uint64_t *l2_slice;
int l2_index;
int ret;
int i;
- ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
+ ret = get_cluster_table(bs, offset, &l2_slice, &l2_index);
if (ret < 0) {
return ret;
}
- /* Limit nb_clusters to one L2 table */
- nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
+ /* Limit nb_clusters to one L2 slice */
+ nb_clusters = MIN(nb_clusters, s->l2_slice_size - l2_index);
assert(nb_clusters <= INT_MAX);
for (i = 0; i < nb_clusters; i++) {
uint64_t old_l2_entry;
- old_l2_entry = be64_to_cpu(l2_table[l2_index + i]);
+ old_l2_entry = be64_to_cpu(l2_slice[l2_index + i]);
/*
* If full_discard is false, make sure that a discarded area reads back
@@ -1683,18 +1683,18 @@ static int discard_single_l2(BlockDriverState *bs,
uint64_t offset,
}
/* First remove L2 entries */
- qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
+ qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice);
if (!full_discard && s->qcow_version >= 3) {
- l2_table[l2_index + i] = cpu_to_be64(QCOW_OFLAG_ZERO);
+ l2_slice[l2_index + i] = cpu_to_be64(QCOW_OFLAG_ZERO);
} else {
- l2_table[l2_index + i] = cpu_to_be64(0);
+ l2_slice[l2_index + i] = cpu_to_be64(0);
}
/* Then decrease the refcount */
qcow2_free_any_clusters(bs, old_l2_entry, 1, type);
}
- qcow2_cache_put(s->l2_table_cache, (void **) &l2_table);
+ qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
return nb_clusters;
}
--
2.11.0
- [Qemu-block] [PATCH 28/31] qcow2: Rename l2_table in count_contiguous_clusters(), (continued)
- [Qemu-block] [PATCH 28/31] qcow2: Rename l2_table in count_contiguous_clusters(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 02/31] qcow2: Add table size field to Qcow2Cache, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 31/31] qcow2: Allow configuring the L2 slice size, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 27/31] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 30/31] qcow2: Rename l2_table in count_cow_clusters(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 26/31] qcow2: Update qcow2_truncate() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 29/31] qcow2: Rename l2_table in count_contiguous_clusters_unallocated(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 25/31] qcow2: Update expand_zero_clusters_in_l1() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 24/31] qcow2: Update qcow2_update_snapshot_refcount() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 23/31] qcow2: Update zero_single_l2() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 22/31] qcow2: Update discard_single_l2() to support L2 slices,
Alberto Garcia <=
- [Qemu-block] [PATCH 21/31] qcow2: Update handle_alloc() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 19/31] qcow2: Update qcow2_alloc_cluster_link_l2() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 20/31] qcow2: Update handle_copied() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 18/31] qcow2: Update qcow2_get_cluster_offset() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 08/31] qcow2: Remove BDS parameter from qcow2_cache_destroy(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 10/31] qcow2: Remove BDS parameter from qcow2_cache_discard(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 12/31] qcow2: Add offset_to_l1_index(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 07/31] qcow2: Remove BDS parameter from qcow2_cache_put(), Alberto Garcia, 2017/10/12
- [Qemu-block] [PATCH 16/31] qcow2: Update l2_allocate() to support L2 slices, Alberto Garcia, 2017/10/12