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) {
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);
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;
{
BlockInfo *info = g_malloc0(sizeof(*info));
BlockDriverState *bs = blk_bs(blk);
+
+ /* 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);
}
}
-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;
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));
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;
visit_type_ImageInfoSpecific(v, NULL, &info_spec, &error_abort);
visit_complete(v, &obj);
- assert(qobject_type(obj) == QTYPE_QDICT);
data = qdict_get(qobject_to_qdict(obj), "data");
dump_qobject(func_fprintf, f, 1, data);
qobject_decref(obj);