aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenchao Xia <wenchaoqemu@gmail.com>2014-06-24 16:33:57 -0700
committerLuiz Capitulino <lcapitulino@redhat.com>2014-06-27 09:27:55 -0400
commit82d72d9d235c341e0b32ed1a1eb5e544d3b3a895 (patch)
tree1a379d348d418c708caa91a0ad263c72948fb9b7
parentd4cba13bdf251baeedb36b87c1e9f6766773e380 (diff)
qapi: move event defines
Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--Makefile2
-rw-r--r--qapi-schema.json5
-rw-r--r--qapi/event.json (renamed from qapi-event.json)0
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 145adb68a2..1eea0c418f 100644
--- a/Makefile
+++ b/Makefile
@@ -248,7 +248,7 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
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-event.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-schema.json b/qapi-schema.json
index e7727a1153..37c218994e 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -8,6 +8,9 @@
# QAPI block definitions
{ 'include': 'qapi/block.json' }
+# QAPI event definitions
+{ 'include': 'qapi/event.json' }
+
##
# LostTickPolicy:
#
@@ -3398,5 +3401,3 @@
##
{ 'enum': 'GuestPanicAction',
'data': [ 'pause' ] }
-
-{ 'include': 'qapi-event.json' }
diff --git a/qapi-event.json b/qapi/event.json
index e7a47f9927..e7a47f9927 100644
--- a/qapi-event.json
+++ b/qapi/event.json