[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] qapi: move event defines
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 1/8] qapi: move event defines |
Date: |
Fri, 27 Jun 2014 15:41:56 -0400 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
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 --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
--
1.9.3
- [Qemu-devel] [PULL for-2.1 0/8] QMP queue, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 3/8] qapi script: clean up in scripts, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 1/8] qapi: move event defines,
Luiz Capitulino <=
- [Qemu-devel] [PULL 2/8] qapi: ignore generated event files, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 4/8] qapi event: clean up in callers, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 8/8] docs/qmp: Fix documentation of BLOCK_JOB_READY to match code, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 5/8] qmp: add qmp-events.txt back, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 6/8] virtio-serial: report frontend connection state via monitor, Luiz Capitulino, 2014/06/27
- [Qemu-devel] [PULL 7/8] char: report frontend open/closed state in 'query-chardev', Luiz Capitulino, 2014/06/27
- Re: [Qemu-devel] [PULL for-2.1 0/8] QMP queue, Peter Maydell, 2014/06/29