aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2016-02-18 12:26:58 +0200
committerKevin Wolf <kwolf@redhat.com>2016-02-22 14:08:05 +0100
commit6f9b6d57ae3cd8a5f82e06f79d22e7a591116b5b (patch)
treea8dfcc76b81dbad772de99e1655f36b19abe061b
parent03ba36c83d136a9d039b56f0a834e65676b58c22 (diff)
downloadqemu-6f9b6d57ae3cd8a5f82e06f79d22e7a591116b5b.zip
qemu-6f9b6d57ae3cd8a5f82e06f79d22e7a591116b5b.tar.gz
qemu-6f9b6d57ae3cd8a5f82e06f79d22e7a591116b5b.tar.bz2
throttle: Set always an average value when setting a maximum value
When testing the ranges of valid values, set_cfg_value() creates sometimes invalid throttling configurations by setting bucket.max while leaving bucket.avg uninitialized. While this doesn't break the current tests, it will as soon as we unify all functions that check the validity of the throttling configuration. This patch ensures that the value of bucket.avg is valid when setting bucket.max. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--tests/test-throttle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index 0e7c7e0..3e208a8 100644
--- a/tests/test-throttle.c
+++ b/tests/test-throttle.c
@@ -222,6 +222,8 @@ static void set_cfg_value(bool is_max, int index, int value)
{
if (is_max) {
cfg.buckets[index].max = value;
+ /* If max is set, avg should never be 0 */
+ cfg.buckets[index].avg = MAX(cfg.buckets[index].avg, 1);
} else {
cfg.buckets[index].avg = value;
}