diff mbox

[v1,20/72] qapi: Extract BlockStats definition into qapi/block-core.json

Message ID 1401537111-10221-21-git-send-email-benoit.canet@irqsave.net
State New
Headers show

Commit Message

Benoît Canet May 31, 2014, 11:50 a.m. UTC 
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 qapi-schema.json     | 22 ----------------------
 qapi/block-core.json | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

Comments

Eric Blake June 2, 2014, 2:56 p.m. UTC | #1 
On 05/31/2014 05:50 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  qapi-schema.json     | 22 ----------------------
>  qapi/block-core.json | 22 ++++++++++++++++++++++
>  2 files changed, 22 insertions(+), 22 deletions(-)

7-20: Reviewed-by: Eric Blake <eblake@redhat.com>

And yes, I really do think this is too fine of a split.  It would have
been faster for me to do a review of a single patch covering all structs
moved to block-core.json in one go than it is to review lots of tiny
piecemeal patches (as I mentioned in the RFC, it is very easy to do a
review-by-sed for large code motion patches, as long as the code moved
maintains its relative ordering between the old and new files:
https://lists.gnu.org/archive/html/qemu-devel/2014-05/msg06116.html -
what I was complaining about there was that you had one patch with
changes intermixed into three files, so the code motion no longer had a
relative ordering between deletion and insertion lines).
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index dd2b52a..5d22e55 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -664,28 +664,6 @@ 
 { 'command': 'query-iothreads', 'returns': ['IOThreadInfo'] }
 
 ##
-# @BlockStats:
-#
-# Statistics of a virtual block device or a block backing device.
-#
-# @device: #optional If the stats are for a virtual block device, the name
-#          corresponding to the virtual block device.
-#
-# @stats:  A @BlockDeviceStats for the device.
-#
-# @parent: #optional This describes the file block device if it has one.
-#
-# @backing: #optional This describes the backing block device if it has one.
-#           (Since 2.0)
-#
-# Since: 0.14.0
-##
-{ 'type': 'BlockStats',
-  'data': {'*device': 'str', 'stats': 'BlockDeviceStats',
-           '*parent': 'BlockStats',
-           '*backing': 'BlockStats'} }
-
-##
 # @query-blockstats:
 #
 # Query the @BlockStats for all virtual block devices.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 81bd2bb..fddcb5f 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -391,3 +391,25 @@ 
            'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
            'rd_total_time_ns': 'int', 'wr_highest_offset': 'int' } }
 
+##
+# @BlockStats:
+#
+# Statistics of a virtual block device or a block backing device.
+#
+# @device: #optional If the stats are for a virtual block device, the name
+#          corresponding to the virtual block device.
+#
+# @stats:  A @BlockDeviceStats for the device.
+#
+# @parent: #optional This describes the file block device if it has one.
+#
+# @backing: #optional This describes the backing block device if it has one.
+#           (Since 2.0)
+#
+# Since: 0.14.0
+##
+{ 'type': 'BlockStats',
+  'data': {'*device': 'str', 'stats': 'BlockDeviceStats',
+           '*parent': 'BlockStats',
+           '*backing': 'BlockStats'} }
+