From: Benoît Canet <benoit.canet@irqsave.net>
Date: Thu, 5 Jun 2014 11:45:30 +0000 (+0200)
Subject: qapi: create two block related json modules
X-Git-Tag: qemu-xen-4.6.0-rc1~400^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5db15096d047f0ec92bd5f1680343ea7acbed4e5;p=qemu-xen.git

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>
---

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' }
+