[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/13] block/qapi: Add 'qdev' field to query-blocksta
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/13] block/qapi: Add 'qdev' field to query-blockstats result |
Date: |
Mon, 30 Jul 2018 17:09:56 +0200 |
Like for query-block, the client needs to identify which BlockBackend
the returned data is for. Anonymous BlockBackends are identified by the
device model they are attached to. Add a 'qdev' field that contains the
qdev ID or QOM path of the attached device model.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qapi/block-core.json | 14 ++++++++++----
block/qapi.c | 10 ++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index d40d5ecc3b..5b9084a394 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -866,6 +866,9 @@
#
# @node-name: The node name of the device. (Since 2.3)
#
+# @qdev: The qdev ID, or if no ID is assigned, the QOM path of the block
+# device. (since 3.0)
+#
# @stats: A @BlockDeviceStats for the device.
#
# @parent: This describes the file block device if it has one.
@@ -879,7 +882,7 @@
# Since: 0.14.0
##
{ 'struct': 'BlockStats',
- 'data': {'*device': 'str', '*node-name': 'str',
+ 'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str',
'stats': 'BlockDeviceStats',
'*parent': 'BlockStats',
'*backing': 'BlockStats'} }
@@ -941,7 +944,8 @@
# "idle_time_ns":2953431879,
# "account_invalid":true,
# "account_failed":false
-# }
+# },
+# "qdev": "/machine/unattached/device[23]"
# },
# {
# "device":"ide1-cd0",
@@ -959,7 +963,8 @@
# "wr_merged":0,
# "account_invalid":false,
# "account_failed":false
-# }
+# },
+# "qdev": "/machine/unattached/device[24]"
# },
# {
# "device":"floppy0",
@@ -977,7 +982,8 @@
# "wr_merged":0,
# "account_invalid":false,
# "account_failed":false
-# }
+# },
+# "qdev": "/machine/unattached/device[16]"
# },
# {
# "device":"sd0",
diff --git a/block/qapi.c b/block/qapi.c
index e12968fec8..50f867d634 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -597,11 +597,21 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
BlockStatsList *info = g_malloc0(sizeof(*info));
AioContext *ctx = blk_get_aio_context(blk);
BlockStats *s;
+ char *qdev;
aio_context_acquire(ctx);
s = bdrv_query_bds_stats(blk_bs(blk), true);
s->has_device = true;
s->device = g_strdup(blk_name(blk));
+
+ qdev = blk_get_attached_dev_id(blk);
+ if (qdev && *qdev) {
+ s->has_qdev = true;
+ s->qdev = qdev;
+ } else {
+ g_free(qdev);
+ }
+
bdrv_query_blk_stats(s->stats, blk);
aio_context_release(ctx);
--
2.13.6
- [Qemu-devel] [PULL 00/13] Block layer patches, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 01/13] qcow: fix a reference leak, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 02/13] qcow2: A grammar fix in conflicting cache sizing error message, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 04/13] docs: Describe using images in writing iotests, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 03/13] file-posix: Handle EINTR in preallocation=full write, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 07/13] qemu-img: Add -C option for convert with copy offloading, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 12/13] block/qapi: Include anonymous BBs in query-blockstats, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 06/13] Revert "qemu-img: Document copy offloading implications with -S and -c", Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 05/13] iotests: Don't lock /dev/null in 226, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 11/13] block/qapi: Add 'qdev' field to query-blockstats result,
Kevin Wolf <=
- [Qemu-devel] [PULL 08/13] iotests: Add test for 'qemu-img convert -C' compatibility, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 10/13] file-posix: Fix write_zeroes with unmap on block devices, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 09/13] block: Fix documentation for BDRV_REQ_MAY_UNMAP, Kevin Wolf, 2018/07/30
- [Qemu-devel] [PULL 13/13] qemu-iotests: Test query-blockstats with -drive and -blockdev, Kevin Wolf, 2018/07/30
- Re: [Qemu-devel] [PULL 00/13] Block layer patches, Peter Maydell, 2018/07/31