From: Wenchao Xia <wenchaoqemu@gmail.com>
Date: Tue, 24 Jun 2014 23:33:57 +0000 (-0700)
Subject: qapi: move event defines
X-Git-Tag: v2.1.0-rc0~18^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82d72d9d235c341e0b32ed1a1eb5e544d3b3a895;p=thirdparty%2Fqemu.git

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

diff --git a/Makefile b/Makefile
index 145adb68a26..1eea0c418f1 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 e7727a1153b..37c218994e2 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
similarity index 100%
rename from qapi-event.json
rename to qapi/event.json