mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

throttle: Make throttle_max_is_missing_limit() set errp

Browse Source 
The caller does not need to set it, and this will allow us to refactor
this function later.

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>
This commit is contained in:
Alberto Garcia 2016-02-18 12:26:56 +02:00 committed by Kevin Wolf
parent 6921b18095
commit 45b2d418e0
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockdev.c
View File

@ -355,9 +355,7 @@ static bool check_throttle_config(ThrottleConfig *cfg, Error **errp)
return false; return false;
} }
if (throttle_max_is_missing_limit(cfg)) { if (throttle_max_is_missing_limit(cfg, errp)) {
error_setg(errp, "bps_max/iops_max require corresponding"
" bps/iops values");
return false; return false;
} }

2
include/qemu/throttle.h
View File

@ -110,7 +110,7 @@ bool throttle_conflicting(ThrottleConfig *cfg, Error **errp);
bool throttle_is_valid(ThrottleConfig *cfg); bool throttle_is_valid(ThrottleConfig *cfg);
bool throttle_max_is_missing_limit(ThrottleConfig *cfg); bool throttle_max_is_missing_limit(ThrottleConfig *cfg, Error **errp);
void throttle_config(ThrottleState *ts, void throttle_config(ThrottleState *ts,
ThrottleTimers *tt, ThrottleTimers *tt,

6
tests/test-throttle.c
View File

@ -338,15 +338,15 @@ static void test_max_is_missing_limit(void)
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
cfg.buckets[i].max = 100; cfg.buckets[i].max = 100;
cfg.buckets[i].avg = 0; cfg.buckets[i].avg = 0;
g_assert(throttle_max_is_missing_limit(&cfg)); g_assert(throttle_max_is_missing_limit(&cfg, NULL));
cfg.buckets[i].max = 0; cfg.buckets[i].max = 0;
cfg.buckets[i].avg = 0; cfg.buckets[i].avg = 0;
g_assert(!throttle_max_is_missing_limit(&cfg)); g_assert(!throttle_max_is_missing_limit(&cfg, NULL));
cfg.buckets[i].max = 0; cfg.buckets[i].max = 0;
cfg.buckets[i].avg = 100; cfg.buckets[i].avg = 100;
g_assert(!throttle_max_is_missing_limit(&cfg)); g_assert(!throttle_max_is_missing_limit(&cfg, NULL));
} }
} }

5
util/throttle.c
View File

@ -306,13 +306,16 @@ bool throttle_is_valid(ThrottleConfig *cfg)
/* check if bps_max/iops_max is used without bps/iops /* check if bps_max/iops_max is used without bps/iops
* @cfg: the throttling configuration to inspect * @cfg: the throttling configuration to inspect
* @errp: error object
*/ */
bool throttle_max_is_missing_limit(ThrottleConfig *cfg) bool throttle_max_is_missing_limit(ThrottleConfig *cfg, Error **errp)
{ {
int i; int i;
for (i = 0; i < BUCKETS_COUNT; i++) { for (i = 0; i < BUCKETS_COUNT; i++) {
if (cfg->buckets[i].max && !cfg->buckets[i].avg) { if (cfg->buckets[i].max && !cfg->buckets[i].avg) {
error_setg(errp, "bps_max/iops_max require corresponding"
" bps/iops values");
return true; return true;
} }
} }