Re: [Qemu-devel] [PATCH] qapi: make the json schema files more regular.

[Eric Blake]

On 09/21/2016 11:00 PM, David Anderson wrote:
> This makes it easier to parse the schema file for tool generation:
> each paragraph is either a non-docstring comment, or a docstring
> immediately followed by a Python dict describing an API item.
> 
> Signed-off-by: David Anderson <address@hidden>
> ---
>  qapi-schema.json     | 3 +--
>  qapi/block-core.json | 5 -----
>  2 files changed, 1 insertion(+), 7 deletions(-)

Related to the work Marc-Andre is already doing, but fine to take now.

Reviewed-by: Eric Blake <address@hidden>

> 
> diff --git a/qapi-schema.json b/qapi-schema.json
> index e507061..edd803f 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -752,6 +752,7 @@
>              'cpu-throttle-increment': 'int',
>              'tls-creds': 'str',
>              'tls-hostname': 'str'} }
> +
>  ##
>  # @query-migrate-parameters
>  #
> @@ -4115,7 +4116,6 @@
>  #
>  # Since 1.6
>  ##
> -
>  { 'struct': 'RxFilterInfo',
>    'data': {
>      'name':               'str',
> @@ -4335,7 +4335,6 @@
>  #
>  # Since: 2.1
>  ##
> -
>  { 'struct': 'Memdev',
>    'data': {
>      'size':       'size',
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 24223fd..e12fbd3 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -25,7 +25,6 @@
>  # Since: 1.3
>  #
>  ##
> -
>  { 'struct': 'SnapshotInfo',
>    'data': { 'id': 'str', 'name': 'str', 'vm-state-size': 'int',
>              'date-sec': 'int', 'date-nsec': 'int',
> @@ -81,7 +80,6 @@
>  #
>  # Since: 1.7
>  ##
> -
>  { 'union': 'ImageInfoSpecific',
>    'data': {
>        'qcow2': 'ImageInfoSpecificQCow2',
> @@ -129,7 +127,6 @@
>  # Since: 1.3
>  #
>  ##
> -
>  { 'struct': 'ImageInfo',
>    'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool',
>             '*actual-size': 'int', 'virtual-size': 'int',
> @@ -181,7 +178,6 @@
>  # Since: 1.4
>  #
>  ##
> -
>  { 'struct': 'ImageCheck',
>    'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int',
>             '*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 
> 'int',
> @@ -518,7 +514,6 @@
>  #
>  # Since: 2.5
>  ##
> -
>  { 'struct': 'BlockDeviceTimedStats',
>    'data': { 'interval_length': 'int', 'min_rd_latency_ns': 'int',
>              'max_rd_latency_ns': 'int', 'avg_rd_latency_ns': 'int',
> 

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

signature.asc
Description: OpenPGP digital signature