Except for block-core.json, the sub-schemas are self-contained: if
they use a symbol defined in another sub-schema, they include that
sub-schema. To check, feed the sub-schema to qapi2texi (or any other
QAPI generator) along with the pragma from qapi-schema.json.
Fix up things to make block-core.json self-contained, too.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <1503602048-12268-15-git-send-email-arm...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
qapi-schema.json | 14 --------------
qapi/block-core.json | 1 +
qapi/common.json | 14 ++++++++++++++
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 4964d927bd..80c15dade3 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2816,20 +2816,6 @@
'data': { 'info': 'ACPIOSTInfo' } }
##
-# @IoOperationType:
-#
-# An enumeration of the I/O operation types
-#
-# @read: read operation
-#
-# @write: write operation
-#
-# Since: 2.1
-##
-{ 'enum': 'IoOperationType',
- 'data': [ 'read', 'write' ] }
-
-##
# @rtc-reset-reinjection:
#
# This command will reset the RTC interrupt reinjection backlog.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 5379674292..f4caa5c21b 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -5,6 +5,7 @@
##
{ 'include': 'common.json' }
+{ 'include': 'crypto.json' }
{ 'include': 'sockets.json' }
##
diff --git a/qapi/common.json b/qapi/common.json
index e2c58564d8..fc72d7ec3d 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -132,6 +132,20 @@
{ 'command': 'query-commands', 'returns': ['CommandInfo'] }
##
+# @IoOperationType:
+#
+# An enumeration of the I/O operation types
+#
+# @read: read operation
+#
+# @write: write operation
+#
+# Since: 2.1
+##
+{ 'enum': 'IoOperationType',
+ 'data': [ 'read', 'write' ] }
+
+##
# @OnOffAuto:
#
# An enumeration of three options: on, off, and auto
--
2.13.5
