[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/13] block: Convert throttle_group_get_name() t
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 04/13] block: Convert throttle_group_get_name() to BlockBackend |
Date: |
Fri, 22 Apr 2016 19:42:33 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 2 +-
block/io.c | 2 +-
block/qapi.c | 2 +-
block/throttle-groups.c | 12 ++++++------
include/block/throttle-groups.h | 2 +-
tests/test-throttle.c | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 34798a4..57cf536 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1569,7 +1569,7 @@ void blk_update_root_state(BlockBackend *blk)
throttle_group_unref(blk->root_state.throttle_state);
}
if (blk->root->bs->throttle_state) {
- const char *name = throttle_group_get_name(blk->root->bs);
+ const char *name = throttle_group_get_name(blk);
blk->root_state.throttle_group = g_strdup(name);
blk->root_state.throttle_state = throttle_group_incref(name);
} else {
diff --git a/block/io.c b/block/io.c
index 2e7af98..fbf7f31 100644
--- a/block/io.c
+++ b/block/io.c
@@ -101,7 +101,7 @@ void bdrv_io_limits_update_group(BlockDriverState *bs,
const char *group)
}
/* this bs is a part of the same group than the one we want */
- if (!g_strcmp0(throttle_group_get_name(bs), group)) {
+ if (!g_strcmp0(throttle_group_get_name(bs->blk), group)) {
return;
}
diff --git a/block/qapi.c b/block/qapi.c
index c5f6ba6..a3e514d 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -118,7 +118,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
info->iops_size = cfg.op_size;
info->has_group = true;
- info->group = g_strdup(throttle_group_get_name(bs));
+ info->group = g_strdup(throttle_group_get_name(bs->blk));
}
info->write_threshold = bdrv_write_threshold_get(bs);
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 1e6e2e5..e50ccaa 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -133,16 +133,16 @@ void throttle_group_unref(ThrottleState *ts)
qemu_mutex_unlock(&throttle_groups_lock);
}
-/* Get the name from a BlockDriverState's ThrottleGroup. The name (and
- * the pointer) is guaranteed to remain constant during the lifetime
- * of the group.
+/* Get the name from a BlockBackend's ThrottleGroup. The name (and the pointer)
+ * is guaranteed to remain constant during the lifetime of the group.
*
- * @bs: a BlockDriverState that is member of a throttling group
+ * @blk: a BlockBackend that is member of a throttling group
* @ret: the name of the group.
*/
-const char *throttle_group_get_name(BlockDriverState *bs)
+const char *throttle_group_get_name(BlockBackend *blk)
{
- ThrottleGroup *tg = container_of(bs->throttle_state, ThrottleGroup, ts);
+ ThrottleGroup *tg = container_of(blk_bs(blk)->throttle_state,
+ ThrottleGroup, ts);
return tg->name;
}
diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h
index b9114ee..bd55a34 100644
--- a/include/block/throttle-groups.h
+++ b/include/block/throttle-groups.h
@@ -28,7 +28,7 @@
#include "qemu/throttle.h"
#include "block/block_int.h"
-const char *throttle_group_get_name(BlockDriverState *bs);
+const char *throttle_group_get_name(BlockBackend *blk);
ThrottleState *throttle_group_incref(const char *name);
void throttle_group_unref(ThrottleState *ts);
diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index beaa2a3..1a322f1 100644
--- a/tests/test-throttle.c
+++ b/tests/test-throttle.c
@@ -598,8 +598,8 @@ static void test_groups(void)
g_assert(bdrv2->throttle_state != NULL);
g_assert(bdrv3->throttle_state != NULL);
- g_assert(!strcmp(throttle_group_get_name(bdrv1), "bar"));
- g_assert(!strcmp(throttle_group_get_name(bdrv2), "foo"));
+ g_assert(!strcmp(throttle_group_get_name(blk1), "bar"));
+ g_assert(!strcmp(throttle_group_get_name(blk2), "foo"));
g_assert(bdrv1->throttle_state == bdrv3->throttle_state);
/* Setting the config of a group member affects the whole group */
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/13] block: Move I/O throttling to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 01/13] block: Make sure throttled BDSes always have a BB, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 02/13] block: Introduce BlockBackendPublic, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 04/13] block: Convert throttle_group_get_name() to BlockBackend,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 03/13] block: throttle-groups: Use BlockBackend pointers internally, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 06/13] block: Move actual I/O throttling to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 05/13] block: Move throttling fields from BDS to BB, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 07/13] block: Move I/O throttling configuration functions to BlockBackend, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 08/13] block: Introduce BdrvChild.opaque, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 09/13] block: Drain throttling queue with BdrvChild callback, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 10/13] block: Decouple throttling from BlockDriverState, Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 12/13] Revert "block: Forbid I/O throttling on nodes with multiple parents for 2.6", Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 11/13] block: Remove bdrv_move_feature_fields(), Kevin Wolf, 2016/04/22
- [Qemu-devel] [PATCH v2 13/13] block: Don't check throttled reqs in bdrv_requests_pending(), Kevin Wolf, 2016/04/22