aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoƮt Canet <benoit.canet@irqsave.net>2014-06-05 13:45:30 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-06-06 16:25:48 +0200
commit5db15096d047f0ec92bd5f1680343ea7acbed4e5 (patch)
treee8af29bee78274618251237cda36c0a150004b26
parentd34bda716a7da18ee6f239ce81240ce063ac844e (diff)
qapi: create two block related json modules
qapi/block-core.json contains block definitions unrelated to emulation. qapi/block.json is a superset of the previous and contains definitions related to emulation. The purpose of these extractions is to be able to hook qapi/block-core.json generated code on qemu-nbd. Signed-off-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--qapi-schema.json3
-rw-r--r--qapi/block-core.json6
-rw-r--r--qapi/block.json7
3 files changed, 16 insertions, 0 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index cc71b27822..7d47f4dff4 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5,6 +5,9 @@
# QAPI common definitions
{ 'include': 'qapi/common.json' }
+# QAPI block definitions
+{ 'include': 'qapi/block.json' }
+
##
# LostTickPolicy:
#
diff --git a/qapi/block-core.json b/qapi/block-core.json
new file mode 100644
index 0000000000..11bd8c2b3d
--- /dev/null
+++ b/qapi/block-core.json
@@ -0,0 +1,6 @@
+# -*- Mode: Python -*-
+#
+# QAPI block core definitions (vm unrelated)
+
+# QAPI common definitions
+{ 'include': 'common.json' }
diff --git a/qapi/block.json b/qapi/block.json
new file mode 100644
index 0000000000..e2b882f120
--- /dev/null
+++ b/qapi/block.json
@@ -0,0 +1,7 @@
+# -*- Mode: Python -*-
+#
+# QAPI block definitions (vm related)
+
+# QAPI block core definitions
+{ 'include': 'block-core.json' }
+