diff mbox

[PULL,1/8] qapi: move event defines

Message ID 1403898123-22963-2-git-send-email-lcapitulino@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino June 27, 2014, 7:41 p.m. UTC 
From: Wenchao Xia <wenchaoqemu@gmail.com>

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 Makefile                           | 2 +-
 qapi-schema.json                   | 5 +++--
 qapi-event.json => qapi/event.json | 0
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename qapi-event.json => qapi/event.json (100%)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 145adb6..1eea0c4 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 e7727a1..37c2189 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