aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2016-02-18 12:26:55 +0200
committerKevin Wolf <kwolf@redhat.com>2016-02-22 14:08:04 +0100
commit6921b1809507797752b039b2892fc33bf6bccb7e (patch)
tree9496066fc293a88a2732242a4d68232562aef9e1 /blockdev.c
parent3c9242f5ae8ca37bb5775747e34999fe8cdfee2f (diff)
downloadqemu-6921b1809507797752b039b2892fc33bf6bccb7e.zip
qemu-6921b1809507797752b039b2892fc33bf6bccb7e.tar.gz
qemu-6921b1809507797752b039b2892fc33bf6bccb7e.tar.bz2
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 'blockdev.c')
-rw-r--r--blockdev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c
index ed97d8a..14e89de 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -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;
}