diff --git a/block/block-backend.c b/block/block-backend.c index 2f8acbdbaf060832920b4c28a9ab6778967fffbd..964a205d38388e6720203b984bc3ecefd75d1adf 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1525,7 +1525,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 ede74c5c03f295a4e73533086deda05a20781ac9..f6fb86883aa795c9b34ce151bd06f053287f7397 100644 --- a/block/io.c +++ b/block/io.c @@ -89,7 +89,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 c5f6ba643c3df6f98521d98fc731e14f4b5ab4dc..a3e514d89b15cd4b88ae50a0823c03446b59cd47 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 1e6e2e5f4f1f94fd99b8b0935be3b4fd5666cb97..e50ccaaf7e4ade0e82fbaeb6c91849e210d51cae 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 b9114eedeb0c8caacc31b888f1cf44ca7c172126..bd55a3419471718525b8a9207955e449d2ffa3de 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 beaa2a35182e4cc67ee39cafd56c841042e12a0f..1a322f18974cc85e145bc22161d4b2ac26538866 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 */