[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.10 04/15] throttle: Make throttle_is_valid() a
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.10 04/15] throttle: Make throttle_is_valid() a bit less verbose |
Date: |
Thu, 31 Aug 2017 09:21:59 +0100 |
From: Alberto Garcia <address@hidden>
Use a pointer to the bucket instead of repeating cfg->buckets[i] all
the time. This makes the code more concise and will help us expand the
checks later and save a few line breaks.
Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
util/throttle.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/util/throttle.c b/util/throttle.c
index 9a6bda813c..bde56fe3de 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -324,32 +324,31 @@ bool throttle_is_valid(ThrottleConfig *cfg, Error **errp)
}
for (i = 0; i < BUCKETS_COUNT; i++) {
- if (cfg->buckets[i].avg < 0 ||
- cfg->buckets[i].max < 0 ||
- cfg->buckets[i].avg > THROTTLE_VALUE_MAX ||
- cfg->buckets[i].max > THROTTLE_VALUE_MAX) {
+ LeakyBucket *bkt = &cfg->buckets[i];
+ if (bkt->avg < 0 || bkt->max < 0 ||
+ bkt->avg > THROTTLE_VALUE_MAX || bkt->max > THROTTLE_VALUE_MAX) {
error_setg(errp, "bps/iops/max values must be within [0, %lld]",
THROTTLE_VALUE_MAX);
return false;
}
- if (!cfg->buckets[i].burst_length) {
+ if (!bkt->burst_length) {
error_setg(errp, "the burst length cannot be 0");
return false;
}
- if (cfg->buckets[i].burst_length > 1 && !cfg->buckets[i].max) {
+ if (bkt->burst_length > 1 && !bkt->max) {
error_setg(errp, "burst length set without burst rate");
return false;
}
- if (cfg->buckets[i].max && !cfg->buckets[i].avg) {
+ if (bkt->max && !bkt->avg) {
error_setg(errp, "bps_max/iops_max require corresponding"
" bps/iops values");
return false;
}
- if (cfg->buckets[i].max && cfg->buckets[i].max < cfg->buckets[i].avg) {
+ if (bkt->max && bkt->max < bkt->avg) {
error_setg(errp, "bps_max/iops_max cannot be lower than bps/iops");
return false;
}
--
2.13.5
- [Qemu-devel] [PULL for-2.10 00/15] Block patches, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 01/15] nvme: Fix get/set number of queues feature, again, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 02/15] throttle: Fix wrong variable name in the header documentation, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 03/15] throttle: Update the throttle_fix_bucket() documentation, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 04/15] throttle: Make throttle_is_valid() a bit less verbose,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.10 05/15] throttle: Remove throttle_fix_bucket() / throttle_unfix_bucket(), Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 06/15] throttle: Make LeakyBucket.avg and LeakyBucket.max integer types, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 07/15] throttle: Make burst_length 64bit and add range checks, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 08/15] throttle: Test the valid range of config values, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 09/15] oslib-posix: Print errors before aborting on qemu_alloc_stack(), Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 10/15] misc: Remove unused Error variables, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 12/15] docker.py: Python 2.6 argparse compatibility, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 13/15] tests: migration/guestperf Python 2.6 argparse compatibility, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 14/15] qemu-doc: Add UUID support in initiator name, Stefan Hajnoczi, 2017/08/31
- [Qemu-devel] [PULL for-2.10 11/15] scripts: add argparse module for Python 2.6 compatibility, Stefan Hajnoczi, 2017/08/31