From 6921b1809507797752b039b2892fc33bf6bccb7e Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Thu, 18 Feb 2016 12:26:55 +0200 Subject: 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 Reviewed-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- util/throttle.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'util/throttle.c') diff --git a/util/throttle.c b/util/throttle.c index c21043a8d5..564e13261e 100644 --- a/util/throttle.c +++ b/util/throttle.c @@ -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 -- cgit v1.2.3