From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dno1Q-0006g5-GJ for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dno1L-0001hz-CX for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dno1L-0001gY-4t for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED43D7EA9B for ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com [10.36.116.75]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBC3E808E6 for ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC) From: Markus Armbruster Date: Fri, 1 Sep 2017 17:37:40 +0200 Message-Id: <20170901153758.8628-30-armbru@redhat.com> In-Reply-To: <20170901153758.8628-1-armbru@redhat.com> References: <20170901153758.8628-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 29/47] qapi-schema: Make block-core.json self-contained List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Message-Id: <1503602048-12268-15-git-send-email-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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' } } =20 ## -# @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 @@ ## =20 { 'include': 'common.json' } +{ 'include': 'crypto.json' } { 'include': 'sockets.json' } =20 ## 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'] } =20 ## +# @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 --=20 2.13.5