aboutsummaryrefslogtreecommitdiff
path: root/block/qapi.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/qapi.c')
-rw-r--r--block/qapi.c33
1 files changed, 27 insertions, 6 deletions
diff --git a/block/qapi.c b/block/qapi.c
index 95b2e2d..d2b18ee 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -64,7 +64,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
info->backing_file = g_strdup(bs->backing_file);
}
- info->backing_file_depth = bdrv_get_backing_file_depth(bs);
info->detect_zeroes = bs->detect_zeroes;
if (blk && blk_get_public(blk)->throttle_state) {
@@ -125,6 +124,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
bs0 = bs;
p_image_info = &info->image;
+ info->backing_file_depth = 0;
while (1) {
Error *local_err = NULL;
bdrv_query_image_info(bs0, p_image_info, &local_err);
@@ -133,13 +133,21 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
qapi_free_BlockDeviceInfo(info);
return NULL;
}
+
if (bs0->drv && bs0->backing) {
+ info->backing_file_depth++;
bs0 = bs0->backing->bs;
(*p_image_info)->has_backing_image = true;
p_image_info = &((*p_image_info)->backing_image);
} else {
break;
}
+
+ /* Skip automatically inserted nodes that the user isn't aware of for
+ * query-block (blk != NULL), but not for query-named-block-nodes */
+ while (blk && bs0 && bs0->drv && bs0->implicit) {
+ bs0 = backing_bs(bs0);
+ }
}
return info;
@@ -324,6 +332,11 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
BlockDriverState *bs = blk_bs(blk);
char *qdev;
+ /* Skip automatically inserted nodes that the user isn't aware of */
+ while (bs && bs->drv && bs->implicit) {
+ bs = backing_bs(bs);
+ }
+
info->device = g_strdup(blk_name(blk));
info->type = g_strdup("unknown");
info->locked = blk_dev_is_medium_locked(blk);
@@ -434,8 +447,8 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)
}
}
-static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,
- bool query_backing)
+static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
+ bool blk_level)
{
BlockStats *s = NULL;
@@ -446,6 +459,14 @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,
return s;
}
+ /* Skip automatically inserted nodes that the user isn't aware of in
+ * a BlockBackend-level command. Stay at the exact node for a node-level
+ * command. */
+ while (blk_level && bs->drv && bs->implicit) {
+ bs = backing_bs(bs);
+ assert(bs);
+ }
+
if (bdrv_get_node_name(bs)[0]) {
s->has_node_name = true;
s->node_name = g_strdup(bdrv_get_node_name(bs));
@@ -455,12 +476,12 @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,
if (bs->file) {
s->has_parent = true;
- s->parent = bdrv_query_bds_stats(bs->file->bs, query_backing);
+ s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);
}
- if (query_backing && bs->backing) {
+ if (blk_level && bs->backing) {
s->has_backing = true;
- s->backing = bdrv_query_bds_stats(bs->backing->bs, query_backing);
+ s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level);
}
return s;