From 3f62574388cc48d3e2e2361e6e32ae1be60fbf42 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 6 Dec 2018 17:12:33 +0000 Subject: [PATCH 08/15] qcow2: Avoid duplication in setting the refcount cache size RH-Author: Kevin Wolf Message-id: <20181206171240.5674-9-kwolf@redhat.com> Patchwork-id: 83296 O-Subject: [RHEL-8.0 qemu-kvm PATCH 08/15] qcow2: Avoid duplication in setting the refcount cache size Bugzilla: 1656507 RH-Acked-by: Max Reitz RH-Acked-by: John Snow RH-Acked-by: Stefan Hajnoczi From: Leonid Bloch 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 Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 657ada52abb85140e56949f522ecec527b256450) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block/qcow2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3859112..f3b2860 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -830,10 +830,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 || -- 1.8.3.1