[Qemu-devel] [PATCH] qapi: Add "backing" and "file" to BlockStats

[Fam Zheng]

Currently there is no way to query BlockStats of the backing chain. This
adds "backing" and "file" fields into BlockStats to make it possible.

The old optional field "parent", which has the information for "file",
is kept there for backward compatibility, as an alias for "file".
However field name "file" is more consistent with "file" option name in
the block device configuration interface.

Signed-off-by: Fam Zheng <address@hidden>
---
 block/qapi.c     |  7 +++++++
 qapi-schema.json | 15 +++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/block/qapi.c b/block/qapi.c
index a32cb79..858650e 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -316,6 +316,13 @@ BlockStats *bdrv_query_stats(const BlockDriverState *bs)
     if (bs->file) {
         s->has_parent = true;
         s->parent = bdrv_query_stats(bs->file);
+        s->has_file = true;
+        s->file = bdrv_query_stats(bs->file);
+    }
+
+    if (bs->backing_hd) {
+        s->has_backing = true;
+        s->backing = bdrv_query_stats(bs->backing_hd);
     }
 
     return s;
diff --git a/qapi-schema.json b/qapi-schema.json
index f27c48a..c3c8aec 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1022,15 +1022,22 @@
 #
 # @stats:  A @BlockDeviceStats for the device.
 #
-# @parent: #optional This may point to the backing block device if this is a
-#          a virtual block device.  If it's a backing block, this will point
-#          to the backing file is one is present.
+# @file:   #optional This may point to the file block device if present.
+#          (Since 2.0)
+#
+# @backing: #optional This may point to the backing block device if present.
+#           (Since 2.0)
+#
+# @parent: #optional An alias of @file for backward comatibility. (Since
+#          0.14.0)
 #
 # Since: 0.14.0
 ##
 { 'type': 'BlockStats',
   'data': {'*device': 'str', 'stats': 'BlockDeviceStats',
-           '*parent': 'BlockStats'} }
+           '*parent': 'BlockStats',
+           '*file': 'BlockStats',
+           '*backing': 'BlockStats'} }
 
 ##
 # @query-blockstats:
-- 
1.8.5.3