Re: [Qemu-devel] [PATCH v2 3/5] qapi: Extract qapi/block-core.json definitions

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 4342 bytes --]

On 06/05/2014 05:45 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net
> ---
>  qapi-schema.json     | 1428 +-------------------------------------------------
>  qapi/block-core.json | 1406 +++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 1417 insertions(+), 1417 deletions(-)

Intra-diff for reference.  It mostly shows that the tweaks you made got
git a bit confused; since 'git diff --patience' shows a smaller diffstat of:
 qapi-schema.json     | 1406
--------------------------------------------------
 qapi/block-core.json | 1406
++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1406 insertions(+), 1406 deletions(-)

and therefore your larger stat on qapi-schema.json was due to 'git diff'
picking some lines as deletions and reinsertions instead of context to a
larger chunk of moved text.  Since I was able to apply the patch and run
the patience algorithm, I'm confident your code motion was clean.

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

$ diff -u <(sed -n 's/^-//p'  patch3) \
	  <(sed -n 's/^\+//p' patch3)
--- /dev/fd/63	2014-06-05 10:33:52.056307499 -0600
+++ /dev/fd/62	2014-06-05 10:33:52.057307497 -0600
@@ -1,5 +1,18 @@
---
--- a/qapi-schema.json
+++ b/qapi-schema.json
+# Since: 0.14.0
+# Notes: This command only exists as a stop-gap.  Its use is highly
+#        discouraged.  The semantics of this command are not guaranteed.
+#        Known limitations:
+#        o This command is stateless, this means that commands that depend
+#          on state information (such as getfd) might not work
+#       o Commands that prompt the user for data (eg. 'cont' when the
block
+#         device is encrypted) don't currently work
+{ 'command': 'human-monitor-command',
+  'data': {'command-line': 'str', '*cpu-index': 'int'},
+  'returns': 'str' }
+++ b/qapi/block-core.json
+
+##
 # @SnapshotInfo
 #
 # @id: unique snapshot id
@@ -674,24 +687,6 @@
   'data': 'BlockdevSnapshot' }

 ##
-# Since: 0.14.0
-#
-# Notes: This command only exists as a stop-gap.  Its use is highly
-#        discouraged.  The semantics of this command are not guaranteed.
-#
-#        Known limitations:
-#
-#        o This command is stateless, this means that commands that depend
-#          on state information (such as getfd) might not work
-#
-#       o Commands that prompt the user for data (eg. 'cont' when the
block
-#         device is encrypted) don't currently work
-##
-{ 'command': 'human-monitor-command',
-  'data': {'command-line': 'str', '*cpu-index': 'int'},
-  'returns': 'str' }
-
-##
 # @block-commit
 #
 # Live commit of data from overlay image nodes into backing nodes - i.e.,
@@ -793,21 +788,28 @@
 #
 # @buf-size: #optional maximum amount of data in flight from source to
 #            target (since 1.4).
+#
 # @on-source-error: #optional the action to take on an error on the
source,
 #                   default 'report'.  'stop' and 'enospc' can only be
used
 #                   if the block device supports io-status (see
BlockInfo).
+#
 # @on-target-error: #optional the action to take on an error on the
target,
 #                   default 'report' (no limitations, since this
applies to
 #                   a different block device than @device).
+#
 # Returns: nothing on success
 #          If @device is not a valid block device, DeviceNotFound
+#
 # Since 1.3
+##
 { 'command': 'drive-mirror',
   'data': { 'device': 'str', 'target': 'str', '*format': 'str',
             'sync': 'MirrorSyncMode', '*mode': 'NewImageMode',
             '*speed': 'int', '*granularity': 'uint32',
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError' } }
+
+##
 # @block_set_io_throttle:
 #
 # Change I/O throttle limits for a block drive.
@@ -1013,8 +1015,6 @@
 { 'command': 'block-job-complete', 'data': { 'device': 'str' } }

 ##
-
-##
 # @BlockdevDiscardOptions
 #
 # Determines how to handle discard requests.
@@ -1417,5 +1417,3 @@
 ##
 { 'command': 'blockdev-add', 'data': { 'options': 'BlockdevOptions' } }

--- a/qapi/block-core.json
-- 


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]