diff options
author | Alberto Garcia <berto@igalia.com> | 2015-11-04 15:15:36 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-11-11 16:25:47 +0100 |
commit | a0d64a61db602696f4f1895a890c65eda5b3b618 (patch) | |
tree | a448fb1c4f0a3b60b0fb09f0bd81beab9ef748db /block | |
parent | 5ac724184c286b367525035eabf4b8bb4a386c54 (diff) | |
download | qemu-a0d64a61db602696f4f1895a890c65eda5b3b618.zip qemu-a0d64a61db602696f4f1895a890c65eda5b3b618.tar.gz qemu-a0d64a61db602696f4f1895a890c65eda5b3b618.tar.bz2 |
throttle: Use bs->throttle_state instead of bs->io_limits_enabled
There are two ways to check for I/O limits in a BlockDriverState:
- bs->throttle_state: if this pointer is not NULL, it means that this
BDS is member of a throttling group, its ThrottleTimers structure
has been initialized and its I/O limits are ready to be applied.
- bs->io_limits_enabled: if true it means that the throttle_state
pointer is valid _and_ the limits are currently enabled.
The latter is used in several places to check whether a BDS has I/O
limits configured, but what it really checks is whether requests
are being throttled or not. For example, io_limits_enabled can be
temporarily set to false in cases like bdrv_read_unthrottled() without
otherwise touching the throtting configuration of that BDS.
This patch replaces bs->io_limits_enabled with bs->throttle_state in
all cases where what we really want to check is the existence of I/O
limits, not whether they are currently enabled or not.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/qapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qapi.c b/block/qapi.c index ec0f513..89d4274 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -64,7 +64,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockDriverState *bs, Error **errp) info->backing_file_depth = bdrv_get_backing_file_depth(bs); info->detect_zeroes = bs->detect_zeroes; - if (bs->io_limits_enabled) { + if (bs->throttle_state) { ThrottleConfig cfg; throttle_group_get_config(bs, &cfg); |