Re: [Qemu-devel] [PATCH V6 07/29] qapi: add new schema file qapi-event.json

[Eric Blake <eblake@redhat.com>]

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

On 06/05/2014 06:22 AM, Wenchao Xia wrote:
> Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
> ---
>  Makefile         |   12 ++++++++----
>  qapi-schema.json |    2 ++
>  2 files changed, 10 insertions(+), 4 deletions(-)
>  create mode 100644 qapi-event.json
> 
> diff --git a/Makefile b/Makefile
> index 237657e..554fb2d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -247,22 +247,26 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
>  		"  GEN   $@")
>  
>  qapi-types.c qapi-types.h :\
> -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
> +$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi-event.json \
> +$(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

Please rebase this on top of Max's fix to add $(qapi-modules):
https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg01838.html

> diff --git a/qapi-event.json b/qapi-event.json
> new file mode 100644
> index 0000000..e69de29

Probably better to name this file qapi/event.json, to go alongside the
other sub-files we have already created.

> diff --git a/qapi-schema.json b/qapi-schema.json
> index 115d8d0..d04514a 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -4798,3 +4798,5 @@
>  ##
>  { 'enum': 'BlockErrorAction',
>    'data': [ 'ignore', 'report', 'stop' ] }
> +
> +{ 'include': 'qapi-event.json' }

Rather than putting this at the bottom of the file, would it make sense
to put it at the top next to the other 'include' directives?

-- 
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 --]