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>
This commit is contained in:
Leonid Bloch 2018-09-26 19:04:42 +03:00 committed by Kevin Wolf
parent b6a95c6d10
commit 657ada52ab

View File

@ -834,10 +834,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
(uint64_t)DEFAULT_L2_CACHE_CLUSTERS (uint64_t)DEFAULT_L2_CACHE_CLUSTERS
* s->cluster_size); * 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) || if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
*l2_cache_entry_size > s->cluster_size || *l2_cache_entry_size > s->cluster_size ||