diff mbox

[v2,1/5] qapi: Extract qapi/common.json definitions

Message ID 539089E6.3070800@redhat.com
State New
Headers show

Commit Message

Eric Blake June 5, 2014, 3:16 p.m. UTC 
On 06/05/2014 05:45 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  qapi-schema.json | 87 ++----------------------------------------------------
>  qapi/common.json | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 91 insertions(+), 85 deletions(-)
>  create mode 100644 qapi/common.json

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

Much nicer.  Here's the intra-diff showing that the motion is fairly
straightforward:

$ diff -u <(sed -n 's/^-//p'  patch1) \
	  <(sed -n 's/^\+//p' patch1)
diff mbox

Patch

--- /dev/fd/63	2014-06-05 09:15:37.189091311 -0600
+++ /dev/fd/62	2014-06-05 09:15:37.190091308 -0600
@@ -1,5 +1,11 @@ 
---
--- a/qapi-schema.json
+++ b/qapi-schema.json
+# QAPI common definitions
+{ 'include': 'qapi/common.json' }
+++ b/qapi/common.json
+# -*- Mode: Python -*-
+#
+# QAPI common definitions
+
 ##
 # @ErrorClass
 #
@@ -26,6 +32,7 @@ 
   'data': [ 'GenericError', 'CommandNotFound', 'DeviceEncrypted',
             'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }

+##
 # @VersionInfo:
 #
 # A description of QEMU's version.
@@ -84,6 +91,3 @@ 
 ##
 { 'command': 'query-commands', 'returns': ['CommandInfo'] }

-##
--- /dev/null
--