[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] block: Don't return throttling info in query-na
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 8/9] block: Don't return throttling info in query-named-block-nodes |
Date: |
Tue, 22 Mar 2016 20:36:36 +0100 |
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 <address@hidden>
---
block/qapi.c | 6 +++---
tests/qemu-iotests/096 | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index 0a222f6..d167e67 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -66,10 +66,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;
@@ -117,7 +117,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 e34204b..aeeb375 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)
--
1.8.3.1
- [Qemu-devel] [PATCH 2/9] block: User BdrvChild callback for device name, (continued)
- [Qemu-devel] [PATCH 2/9] block: User BdrvChild callback for device name, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 1/9] block: Use BdrvChild callbacks for change_media/resize, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 5/9] block: Avoid BDS.blk in bdrv_next(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 6/9] block: Remove bdrv_move_feature_fields(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 3/9] block jobs: Use BdrvChild callbacks for iostatus operations, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 8/9] block: Don't return throttling info in query-named-block-nodes,
Kevin Wolf <=
- [Qemu-devel] [PATCH 7/9] block: Avoid bs->blk in bdrv_next(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 4/9] block: Remove bdrv_aio_multiwrite(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 9/9] block: Remove BlockDriverState.blk, Kevin Wolf, 2016/03/22
- Re: [Qemu-devel] [PATCH 0/9] block: Remove BlockDriverState.blk, Paolo Bonzini, 2016/03/22