[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 3/8] qcow2: Avoid duplication in setting the refc
From: |
Leonid Bloch |
Subject: |
[Qemu-devel] [PATCH v6 3/8] qcow2: Avoid duplication in setting the refcount cache size |
Date: |
Fri, 10 Aug 2018 00:53:02 +0300 |
The refcount cache size does not need to be set to its minimum value in
read_cache_sizes(), as it is set to at least its minimum value in
qcow2_update_options_prepare().
Signed-off-by: Leonid Bloch <address@hidden>
---
block/qcow2.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 3f4abc394e..a8b65189fc 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -829,16 +829,13 @@ static void read_cache_sizes(BlockDriverState *bs,
QemuOpts *opts,
*l2_cache_size = combined_cache_size - *refcount_cache_size;
}
}
- } else {
- if (!l2_cache_size_set) {
- *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE,
- (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
- * s->cluster_size);
- }
- if (!refcount_cache_size_set) {
- *refcount_cache_size = min_refcount_cache;
- }
+ } else if (!l2_cache_size_set) {
+ *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE,
+ (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
+ * s->cluster_size);
}
+ /* If refcount-cache-size is not specified, it will be set to minimum
+ * in qcow2_update_options_prepare(). No need to set it here. */
if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
*l2_cache_entry_size > s->cluster_size ||
--
2.17.1
- [Qemu-devel] [PATCH v6 0/8] qcow2: Take the image size into account when allocating the L2 cache, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 1/8] qcow2: Options' documentation fixes, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 2/8] qcow2: Cosmetic changes, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 3/8] qcow2: Avoid duplication in setting the refcount cache size,
Leonid Bloch <=
- [Qemu-devel] [PATCH v6 4/8] qcow2: Assign the L2 cache relatively to the image size, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 6/8] qcow2: Resize the cache upon image resizing, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 5/8] qcow2: Increase the default upper limit on the L2 cache size, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 7/8] qcow2: Set the default cache-clean-interval to 10 minutes, Leonid Bloch, 2018/08/09
- [Qemu-devel] [PATCH v6 8/8] qcow2: Explicit number replaced by a constant, Leonid Bloch, 2018/08/09