diff options
author | Alberto Garcia <berto@igalia.com> | 2015-10-21 21:36:05 +0300 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-23 18:18:23 +0200 |
commit | d87d01e16a0e59a6af9634162cf0ded142b43e0d (patch) | |
tree | a73b53d521ec360334716d4ace5cb99b43e899e0 | |
parent | bd745e238bb9432f40c875b6b4ad96a3d90e16a0 (diff) | |
download | qemu-d87d01e16a0e59a6af9634162cf0ded142b43e0d.zip qemu-d87d01e16a0e59a6af9634162cf0ded142b43e0d.tar.gz qemu-d87d01e16a0e59a6af9634162cf0ded142b43e0d.tar.bz2 |
throttle: Remove throttle_group_lock/unlock()
The group throttling code was always meant to handle its locking
internally. However, bdrv_swap() was touching the ThrottleGroup
structure directly and therefore needed an API for that.
Now that bdrv_swap() no longer exists there's no need for the
throttle_group_lock() API anymore.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | block/throttle-groups.c | 31 | ||||
-rw-r--r-- | include/block/throttle-groups.h | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 20cb216..3419af7 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -33,8 +33,7 @@ * its own locking. * * This locking is however handled internally in this file, so it's - * mostly transparent to outside users (but see the documentation in - * throttle_groups_lock()). + * transparent to outside users. * * The whole ThrottleGroup structure is private and invisible to * outside users, that only use it through its ThrottleState. @@ -468,34 +467,6 @@ void throttle_group_unregister_bs(BlockDriverState *bs) bs->throttle_state = NULL; } -/* Acquire the lock of this throttling group. - * - * You won't normally need to use this. None of the functions from the - * ThrottleGroup API require you to acquire the lock since all of them - * deal with it internally. - * - * This should only be used in exceptional cases when you want to - * access the protected fields of a BlockDriverState directly - * (e.g. bdrv_swap()). - * - * @bs: a BlockDriverState that is member of the group - */ -void throttle_group_lock(BlockDriverState *bs) -{ - ThrottleGroup *tg = container_of(bs->throttle_state, ThrottleGroup, ts); - qemu_mutex_lock(&tg->lock); -} - -/* Release the lock of this throttling group. - * - * See the comments in throttle_group_lock(). - */ -void throttle_group_unlock(BlockDriverState *bs) -{ - ThrottleGroup *tg = container_of(bs->throttle_state, ThrottleGroup, ts); - qemu_mutex_unlock(&tg->lock); -} - static void throttle_groups_init(void) { qemu_mutex_init(&throttle_groups_lock); diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h index f3b75b3..aba28f3 100644 --- a/include/block/throttle-groups.h +++ b/include/block/throttle-groups.h @@ -43,7 +43,4 @@ void coroutine_fn throttle_group_co_io_limits_intercept(BlockDriverState *bs, unsigned int bytes, bool is_write); -void throttle_group_lock(BlockDriverState *bs); -void throttle_group_unlock(BlockDriverState *bs); - #endif |