|
 |
26ba25 |
From 3f62574388cc48d3e2e2361e6e32ae1be60fbf42 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Thu, 6 Dec 2018 17:12:33 +0000
|
|
|
26ba25 |
Subject: [PATCH 08/15] qcow2: Avoid duplication in setting the refcount cache
|
|
|
26ba25 |
size
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20181206171240.5674-9-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 83296
|
|
|
26ba25 |
O-Subject: [RHEL-8.0 qemu-kvm PATCH 08/15] qcow2: Avoid duplication in setting the refcount cache size
|
|
|
26ba25 |
Bugzilla: 1656507
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
From: Leonid Bloch <lbloch@janustech.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
The refcount cache size does not need to be set to its minimum value in
|
|
|
26ba25 |
read_cache_sizes(), as it is set to at least its minimum value in
|
|
|
26ba25 |
qcow2_update_options_prepare().
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Leonid Bloch <lbloch@janustech.com>
|
|
|
26ba25 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
26ba25 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 657ada52abb85140e56949f522ecec527b256450)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
block/qcow2.c | 5 ++---
|
|
|
26ba25 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
26ba25 |
index 3859112..f3b2860 100644
|
|
|
26ba25 |
--- a/block/qcow2.c
|
|
|
26ba25 |
+++ b/block/qcow2.c
|
|
|
26ba25 |
@@ -830,10 +830,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
|
|
|
26ba25 |
(uint64_t)DEFAULT_L2_CACHE_CLUSTERS
|
|
|
26ba25 |
* s->cluster_size);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
- if (!refcount_cache_size_set) {
|
|
|
26ba25 |
- *refcount_cache_size = min_refcount_cache;
|
|
|
26ba25 |
- }
|
|
|
26ba25 |
}
|
|
|
26ba25 |
+ /* l2_cache_size and refcount_cache_size are ensured to have at least
|
|
|
26ba25 |
+ * their minimum values in qcow2_update_options_prepare() */
|
|
|
26ba25 |
|
|
|
26ba25 |
if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) ||
|
|
|
26ba25 |
*l2_cache_entry_size > s->cluster_size ||
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|