openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

throttle: Make throttle_conflicting() set errp 

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:55 +02:00 committed by Kevin Wolf
parent 3c9242f5ae
commit 6921b18095
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockdev.c
View File

@ -345,9 +345,7 @@ static bool parse_stats_intervals(BlockAcctStats *stats, QList *intervals,
static bool check_throttle_config(ThrottleConfig *cfg, Error **errp)
{
if (throttle_conflicting(cfg)) {
error_setg(errp, "bps/iops/max total values and read/write values"
" cannot be used at the same time");
if (throttle_conflicting(cfg, errp)) {
return false;
}

2
include/qemu/throttle.h
View File

@ -106,7 +106,7 @@ bool throttle_timers_are_initialized(ThrottleTimers *tt);
/* configuration */
bool throttle_enabled(ThrottleConfig *cfg);
bool throttle_conflicting(ThrottleConfig *cfg);
bool throttle_conflicting(ThrottleConfig *cfg, Error **errp);
bool throttle_is_valid(ThrottleConfig *cfg);

12
tests/test-throttle.c
View File

@ -255,31 +255,31 @@ static void test_conflicts_for_one_set(bool is_max,
int write)
{
memset(&cfg, 0, sizeof(cfg));
g_assert(!throttle_conflicting(&cfg));
g_assert(!throttle_conflicting(&cfg, NULL));
set_cfg_value(is_max, total, 1);
set_cfg_value(is_max, read, 1);
g_assert(throttle_conflicting(&cfg));
g_assert(throttle_conflicting(&cfg, NULL));
memset(&cfg, 0, sizeof(cfg));
set_cfg_value(is_max, total, 1);
set_cfg_value(is_max, write, 1);
g_assert(throttle_conflicting(&cfg));
g_assert(throttle_conflicting(&cfg, NULL));
memset(&cfg, 0, sizeof(cfg));
set_cfg_value(is_max, total, 1);
set_cfg_value(is_max, read, 1);
set_cfg_value(is_max, write, 1);
g_assert(throttle_conflicting(&cfg));
g_assert(throttle_conflicting(&cfg, NULL));
memset(&cfg, 0, sizeof(cfg));
set_cfg_value(is_max, total, 1);
g_assert(!throttle_conflicting(&cfg));
g_assert(!throttle_conflicting(&cfg, NULL));
memset(&cfg, 0, sizeof(cfg));
set_cfg_value(is_max, read, 1);
set_cfg_value(is_max, write, 1);
g_assert(!throttle_conflicting(&cfg));
g_assert(!throttle_conflicting(&cfg, NULL));
}
static void test_conflicting_config(void)

11
util/throttle.c
View File

@ -252,8 +252,9 @@ bool throttle_enabled(ThrottleConfig *cfg)
*
* @cfg: the throttling configuration to inspect
* @ret: true if any conflict detected else false
* @errp: error object
*/
bool throttle_conflicting(ThrottleConfig *cfg)
bool throttle_conflicting(ThrottleConfig *cfg, Error **errp)
{
bool bps_flag, ops_flag;
bool bps_max_flag, ops_max_flag;
@ -274,7 +275,13 @@ bool throttle_conflicting(ThrottleConfig *cfg)
(cfg->buckets[THROTTLE_OPS_READ].max ||
cfg->buckets[THROTTLE_OPS_WRITE].max);
return bps_flag || ops_flag || bps_max_flag || ops_max_flag;
if (bps_flag || ops_flag || bps_max_flag || ops_max_flag) {
error_setg(errp, "bps/iops/max total values and read/write values"
" cannot be used at the same time");
return true;
}
return false;
}
/* check if a throttling configuration is valid