From 95bfd60b406ed4cce708b5981d4bc3a007d0cec9 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 7 Aug 2018 14:03:59 +0200 Subject: [PATCH 06/13] block/qapi: Add 'qdev' field to query-blockstats result RH-Author: Kevin Wolf Message-id: <20180807140401.23995-2-kwolf@redhat.com> Patchwork-id: 81666 O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 1/3] block/qapi: Add 'qdev' field to query-blockstats result Bugzilla: 1612114 RH-Acked-by: John Snow RH-Acked-by: Jeffrey Cody RH-Acked-by: Markus Armbruster 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 Reviewed-by: Eric Blake (cherry picked from commit 5a9cb5a97f1e519f249d9ec482d498b78296b51d) Signed-off-by: Kevin Wolf Signed-off-by: Miroslav Rezanina --- block/qapi.c | 10 ++++++++++ qapi/block-core.json | 14 ++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index e12968f..50f867d 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); diff --git a/qapi/block-core.json b/qapi/block-core.json index 8a00bec..c6b42eb 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -867,6 +867,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. @@ -880,7 +883,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'} } @@ -942,7 +945,8 @@ # "idle_time_ns":2953431879, # "account_invalid":true, # "account_failed":false -# } +# }, +# "qdev": "/machine/unattached/device[23]" # }, # { # "device":"ide1-cd0", @@ -960,7 +964,8 @@ # "wr_merged":0, # "account_invalid":false, # "account_failed":false -# } +# }, +# "qdev": "/machine/unattached/device[24]" # }, # { # "device":"floppy0", @@ -978,7 +983,8 @@ # "wr_merged":0, # "account_invalid":false, # "account_failed":false -# } +# }, +# "qdev": "/machine/unattached/device[16]" # }, # { # "device":"sd0", -- 1.8.3.1