diff options
| author | Alberto Garcia <berto@igalia.com> | 2016-02-18 12:26:55 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-02-22 14:08:04 +0100 |
| commit | 6921b1809507797752b039b2892fc33bf6bccb7e (patch) | |
| tree | 9496066fc293a88a2732242a4d68232562aef9e1 /util/throttle.c | |
| parent | 3c9242f5ae8ca37bb5775747e34999fe8cdfee2f (diff) | |
| download | focaccia-qemu-6921b1809507797752b039b2892fc33bf6bccb7e.tar.gz focaccia-qemu-6921b1809507797752b039b2892fc33bf6bccb7e.zip | |
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>
Diffstat (limited to 'util/throttle.c')
| -rw-r--r-- | util/throttle.c | 11 |
1 files changed, 9 insertions, 2 deletions
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 |