diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-03-22 20:20:29 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-19 16:45:31 +0200 |
| commit | 79c719b755134da3dd2ba2a63a9a7db765f68e53 (patch) | |
| tree | 8978ce44a5d0e8c3061bf699b03cf06c1b1710a9 | |
| parent | 7c8eece45b10fc9b716850345118ed6fa8d17887 (diff) | |
| download | focaccia-qemu-79c719b755134da3dd2ba2a63a9a7db765f68e53.tar.gz focaccia-qemu-79c719b755134da3dd2ba2a63a9a7db765f68e53.zip | |
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: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/qapi.c | 6 | ||||
| -rw-r--r-- | tests/qemu-iotests/096 | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/block/qapi.c b/block/qapi.c index b0d8d6b71e..5594f74d17 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -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); diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 index e34204b8ff..aeeb3753cf 100644 --- a/tests/qemu-iotests/096 +++ b/tests/qemu-iotests/096 @@ -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) |