qapi-schema: Make block-core.json self-contained

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 <[email protected]>
Message-Id: <1503602048[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>

diff --git a/qapi-schema.json b/qapi-schema.json
index 4964d927bd989d4ef59290260bbaa6e5f3878e97..80c15dade36fcd7f6f98ad9931061d26062a13e2 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2815,20 +2815,6 @@
 { 'event': 'ACPI_DEVICE_OST',
      '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:
 #

diff --git a/qapi/block-core.json b/qapi/block-core.json
index 53796742920dee250e729fef37467177ee9a41f3..f4caa5c21b7f65fa387ef0f0c5e13a2ff9882501 100644 (file)
--- 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 e2c58564d8479486388402bbd71fd5cd3f620b2c..fc72d7ec3d7ab63ecb442c92ae66bb04fd9cf144 100644 (file)
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -131,6 +131,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:
 #