aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonid Bloch <lbloch@janustech.com>2018-09-26 19:04:42 +0300
committerKevin Wolf <kwolf@redhat.com>2018-10-01 12:51:12 +0200
commit657ada52abb85140e56949f522ecec527b256450 (patch)
tree48ff7c5526cdb927fb4d366e09c7e925822d8b65
parentb6a95c6d10075bb540ce50198bbe22fc0a4392c7 (diff)
downloadqemu-657ada52abb85140e56949f522ecec527b256450.zip
qemu-657ada52abb85140e56949f522ecec527b256450.tar.gz
qemu-657ada52abb85140e56949f522ecec527b256450.tar.bz2
qcow2: Avoid duplication in setting the refcount cache size
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 <lbloch@janustech.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/qcow2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index d2c07ce..cd0053b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -834,10 +834,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
(uint64_t)DEFAULT_L2_CACHE_CLUSTERS
* s->cluster_size);
}
- if (!refcount_cache_size_set) {
- *refcount_cache_size = min_refcount_cache;
- }
}
+ /* l2_cache_size and refcount_cache_size are ensured to have at least
+ * their minimum values in qcow2_update_options_prepare() */
if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
*l2_cache_entry_size > s->cluster_size ||