diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-04-07 18:33:31 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-12 15:22:07 +0200 |
| commit | a72f641407f4a59c3adb710a821736166a484b7f (patch) | |
| tree | 5cafa18b3a027171f74ec3c88a5e2f55e5740c61 | |
| parent | 733bbc8ceaeeb771da55662cccd915afeb78cd01 (diff) | |
block: move restarting of throttled reqs to block/throttle-groups.c
We want to remove throttled_reqs from block/io.c. This is the easy
part---hide the handling of throttled_reqs during disable/enable of
throttling within throttle-groups.c.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/io.c | 15 | ||||
| -rw-r--r-- | block/throttle-groups.c | 14 | ||||
| -rw-r--r-- | include/block/throttle-groups.h | 1 |
3 files changed, 16 insertions, 14 deletions
diff --git a/block/io.c b/block/io.c index 691baa69e7..9201b89c35 100644 --- a/block/io.c +++ b/block/io.c @@ -62,28 +62,15 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, void bdrv_set_io_limits(BlockDriverState *bs, ThrottleConfig *cfg) { - int i; - throttle_group_config(bs, cfg); - - for (i = 0; i < 2; i++) { - qemu_co_enter_next(&bs->throttled_reqs[i]); - } } static void bdrv_start_throttled_reqs(BlockDriverState *bs) { bool enabled = bs->io_limits_enabled; - int i; bs->io_limits_enabled = false; - - for (i = 0; i < 2; i++) { - while (qemu_co_enter_next(&bs->throttled_reqs[i])) { - ; - } - } - + throttle_group_restart_bs(bs); bs->io_limits_enabled = enabled; } diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 4920e09495..b796f6b9fa 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -313,6 +313,17 @@ void coroutine_fn throttle_group_co_io_limits_intercept(BlockDriverState *bs, qemu_mutex_unlock(&tg->lock); } +void throttle_group_restart_bs(BlockDriverState *bs) +{ + int i; + + for (i = 0; i < 2; i++) { + while (qemu_co_enter_next(&bs->throttled_reqs[i])) { + ; + } + } +} + /* Update the throttle configuration for a particular group. Similar * to throttle_config(), but guarantees atomicity within the * throttling group. @@ -335,6 +346,9 @@ void throttle_group_config(BlockDriverState *bs, ThrottleConfig *cfg) } throttle_config(ts, tt, cfg); qemu_mutex_unlock(&tg->lock); + + qemu_co_enter_next(&bs->throttled_reqs[0]); + qemu_co_enter_next(&bs->throttled_reqs[1]); } /* Get the throttle configuration from a particular group. Similar to diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h index aba28f30b6..395f72d444 100644 --- a/include/block/throttle-groups.h +++ b/include/block/throttle-groups.h @@ -38,6 +38,7 @@ void throttle_group_get_config(BlockDriverState *bs, ThrottleConfig *cfg); void throttle_group_register_bs(BlockDriverState *bs, const char *groupname); void throttle_group_unregister_bs(BlockDriverState *bs); +void throttle_group_restart_bs(BlockDriverState *bs); void coroutine_fn throttle_group_co_io_limits_intercept(BlockDriverState *bs, unsigned int bytes, |