Re: [Qemu-devel] [PATCH v1 02/72] qapi: Extract VersionInfo definition in qapi/common.json

[Eric Blake]

On 05/31/2014 05:50 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet 
> ---
>  qapi-schema.json | 26 --
>  qapi/common.json | 27 +++
>  2 files changed, 27 insertions(+), 26 deletions(-)

Why the difference in line counts?


> +   'package': 'str'} }
> +
> 

Ah, because you ended the file in a trailing blank line.  git can be set
up to have a commit hook that flags trailing blank lines, but as it is
cosmetic and probably transient based on the rest of the series, I can
overlook it.

Reviewed-by: Eric Blake 

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



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH v1 02/72] qapi: Extract VersionInfo definition in qapi/common.json

[Benoît Canet]

Signed-off-by: Benoit Canet 
---
 qapi-schema.json | 26 --
 qapi/common.json | 27 +++
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 366a507..915bd69 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -110,32 +110,6 @@
 { 'command': 'query-name', 'returns': 'NameInfo' }
 
 ##
-# @VersionInfo:
-#
-# A description of QEMU's version.
-#
-# @qemu.major:  The major version of QEMU
-#
-# @qemu.minor:  The minor version of QEMU
-#
-# @qemu.micro:  The micro version of QEMU.  By current convention, a micro
-#   version of 50 signifies a development branch.  A micro version
-#   greater than or equal to 90 signifies a release candidate for
-#   the next minor version.  A micro version of less than 50
-#   signifies a stable release.
-#
-# @package: QEMU will always set this field to an empty string.  Downstream
-#   versions of QEMU should set this to a non-empty string.  The
-#   exact format depends on the downstream however it highly
-#   recommended that a unique name is used.
-#
-# Since: 0.14.0
-##
-{ 'type': 'VersionInfo',
-  'data': {'qemu': {'major': 'int', 'minor': 'int', 'micro': 'int'},
-   'package': 'str'} }
-
-##
 # @query-version:
 #
 # Returns the current version of QEMU.
diff --git a/qapi/common.json b/qapi/common.json
index 37f63a4..36c625b 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -27,3 +27,30 @@
 { 'enum': 'ErrorClass',
   'data': [ 'GenericError', 'CommandNotFound', 'DeviceEncrypted',
 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }
+
+##
+# @VersionInfo:
+#
+# A description of QEMU's version.
+#
+# @qemu.major:  The major version of QEMU
+#
+# @qemu.minor:  The minor version of QEMU
+#
+# @qemu.micro:  The micro version of QEMU.  By current convention, a micro
+#   version of 50 signifies a development branch.  A micro version
+#   greater than or equal to 90 signifies a release candidate for
+#   the next minor version.  A micro version of less than 50
+#   signifies a stable release.
+#
+# @package: QEMU will always set this field to an empty string.  Downstream
+#   versions of QEMU should set this to a non-empty string.  The
+#   exact format depends on the downstream however it highly
+#   recommended that a unique name is used.
+#
+# Since: 0.14.0
+##
+{ 'type': 'VersionInfo',
+  'data': {'qemu': {'major': 'int', 'minor': 'int', 'micro': 'int'},
+   'package': 'str'} }
+
-- 
1.9.1