diff mbox

[2.1,08/36] qapi: add new schema file qapi-event.json

Message ID 1403073840-32603-9-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini June 18, 2014, 6:43 a.m. UTC
From: Wenchao Xia <wenchaoqemu@gmail.com>

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile         | 3 ++-
 qapi-event.json  | 0
 qapi-schema.json | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 qapi-event.json

Comments

Eric Blake June 19, 2014, 4:04 a.m. UTC | #1
On 06/18/2014 12:43 AM, Paolo Bonzini wrote:
> From: Wenchao Xia <wenchaoqemu@gmail.com>
> 
> Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile         | 3 ++-
>  qapi-event.json  | 0
>  qapi-schema.json | 2 ++
>  3 files changed, 4 insertions(+), 1 deletion(-)
>  create mode 100644 qapi-event.json
> 
> diff --git a/Makefile b/Makefile
> index f473cf5..7d0c8ec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -247,7 +247,8 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
>  		"  GEN   $@")
>  
>  qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
> -               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json
> +               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \
> +               $(SRC_PATH)/qapi-event.json
>  
>  qapi-types.c qapi-types.h :\
>  $(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
> diff --git a/qapi-event.json b/qapi-event.json
> new file mode 100644
> index 0000000..e69de29
> diff --git a/qapi-schema.json b/qapi-schema.json

Still didn't pick up on my suggestion of at least having a comment in
the new file; but I can live with it.
diff mbox

Patch

diff --git a/Makefile b/Makefile
index f473cf5..7d0c8ec 100644
--- a/Makefile
+++ b/Makefile
@@ -247,7 +247,8 @@  $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
 		"  GEN   $@")
 
 qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
-               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json
+               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \
+               $(SRC_PATH)/qapi-event.json
 
 qapi-types.c qapi-types.h :\
 $(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
diff --git a/qapi-event.json b/qapi-event.json
new file mode 100644
index 0000000..e69de29
diff --git a/qapi-schema.json b/qapi-schema.json
index 3d23042..26e0278 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3140,3 +3140,5 @@ 
               'btn'     : 'InputBtnEvent',
               'rel'     : 'InputMoveEvent',
               'abs'     : 'InputMoveEvent' } }
+
+{ 'include': 'qapi-event.json' }