Commit 49d2165d authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Convert throttle_group_get_name() to BlockBackend 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 31dce3cc

block/block-backend.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

block/io.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

block/throttle-groups.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}

include/block/throttle-groups.h

+1 −1
Original line number Diff line number Diff line
@@ -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);