Commit 79c719b7 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Don't return throttling info in query-named-block-nodes 



query-named-block-nodes should not return information that is related
to the attached BlockBackend rather than the node itself, so throttling
information needs to be removed from it.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 7c8eece4

block/qapi.c

+3 −3
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, 
    info->backing_file_depth = bdrv_get_backing_file_depth(bs);

    info->detect_zeroes = bs->detect_zeroes;



    if (bs->blk && blk_get_public(bs->blk)->throttle_state) {

    if (blk && blk_get_public(blk)->throttle_state) {

        ThrottleConfig cfg;



        throttle_group_get_config(bs->blk, &cfg);

        throttle_group_get_config(blk, &cfg);



        info->bps     = cfg.buckets[THROTTLE_BPS_TOTAL].avg;

        info->bps_rd  = cfg.buckets[THROTTLE_BPS_READ].avg;
@@ -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->blk));

        info->group = g_strdup(throttle_group_get_name(blk));

    }



    info->write_threshold = bdrv_write_threshold_get(bs);

tests/qemu-iotests/096

+2 −1
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ class TestLiveSnapshot(iotests.QMPTestCase): 
        os.remove(self.target_img)



    def checkConfig(self, active_layer):

        result = self.vm.qmp('query-named-block-nodes')

        result = self.vm.qmp('query-block')

        for r in result['return']:

            r = r['inserted']

            if r['node-name'] == active_layer:

                self.assertEqual(r['group'], self.group)

                self.assertEqual(r['iops'], self.iops)