Re: [PATCH v2] qapi/machine: Place the 'Notes' tag after the 'Since' tag

[Markus Armbruster]

Philippe Mathieu-Daudé <address@hidden> writes:

> This fixes when adding a 'Since' tag:
>
>   In file included from qapi/qapi-schema.json:105:
>   qapi/machine.json:25:1: '@arch:' can't follow 'Notes' section

I'm confused.  This error is detected in scripts/qapi/parser.py, and it
is fatal.  Is the build broken for you?  It isn't for me.  Moreover,
where is @arch?  I can't see it anywhere close to the two spots the
patch patches.

>
> Reviewed-by: Liam Merwick <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> v2: Fix another occurrence in CpuInstanceProperties (Liam Merwick)
> ---
>  qapi/machine.json | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 6c11e3cf3a..3d8b5324f3 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -16,11 +16,11 @@
>  # individual target constants are not documented here, for the time
>  # being.
>  #
> +# Since: 3.0
> +#
>  # Notes: The resulting QMP strings can be appended to the "qemu-system-"
>  #        prefix to produce the corresponding QEMU executable name. This
>  #        is true even for "qemu-system-x86_64".
> -#
> -# Since: 3.0
>  ##
>  { 'enum' : 'SysEmuTarget',
>    'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
> @@ -820,13 +820,13 @@
>  # @die-id: die number within node/board the CPU belongs to (Since 4.1)
>  # @core-id: core number within die the CPU belongs to# @thread-id: thread 
> number within core the CPU belongs to
>  #
> +# Since: 2.7
> +#
>  # Note: currently there are 5 properties that could be present
>  #       but management should be prepared to pass through other
>  #       properties with device_add command to allow for future
>  #       interface extension. This also requires the filed names to be kept in
>  #       sync with the properties passed to -device/device_add.
> -#
> -# Since: 2.7
>  ##
>  { 'struct': 'CpuInstanceProperties',
>    'data': { '*node-id': 'int',