From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49987)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1Wswo3-0005rQ-Av
	for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1Wswny-0004w6-68
	for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:51 -0400
Received: from mx1.redhat.com ([209.132.183.28]:1580)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1Wswnx-0004vl-PJ
	for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:46 -0400
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri,  6 Jun 2014 18:14:01 +0200
Message-Id: <1402071243-16702-41-git-send-email-stefanha@redhat.com>
In-Reply-To: <1402071243-16702-1-git-send-email-stefanha@redhat.com>
References: <1402071243-16702-1-git-send-email-stefanha@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PULL 40/42] qapi: create two block related json
	modules
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit.canet@irqsave.net>, Peter Maydell <peter.maydell@linaro.org>, Benoit Canet <benoit@irqsave.net>, Stefan Hajnoczi <stefanha@redhat.com>

From: Beno=C3=AEt Canet <benoit.canet@irqsave.net>

qapi/block-core.json contains block definitions unrelated to emulation.

qapi/block.json is a superset of the previous and contains definitions re=
lated
to emulation.

The purpose of these extractions is to be able to hook qapi/block-core.js=
on
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>
---
 qapi-schema.json     | 3 +++
 qapi/block-core.json | 6 ++++++
 qapi/block.json      | 7 +++++++
 3 files changed, 16 insertions(+)
 create mode 100644 qapi/block-core.json
 create mode 100644 qapi/block.json

diff --git a/qapi-schema.json b/qapi-schema.json
index cc71b27..7d47f4d 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5,6 +5,9 @@
 # QAPI common definitions
 { 'include': 'qapi/common.json' }
=20
+# 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 0000000..11bd8c2
--- /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 0000000..e2b882f
--- /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' }
+
--=20
1.9.3