From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7P2F-0002bg-En for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:55:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7P2C-00053z-JL for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:55:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c7P2C-00052Q-A5 for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:55:32 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 819671C13C2 for ; Thu, 17 Nov 2016 15:55:31 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 17 Nov 2016 19:54:54 +0400 Message-Id: <20161117155504.21843-8-marcandre.lureau@redhat.com> In-Reply-To: <20161117155504.21843-1-marcandre.lureau@redhat.com> References: <20161117155504.21843-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 07/17] qapi: use one symbol per line List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= The documentation parser we are going to add only handles a single symbol per line. Signed-off-by: Marc-Andr=C3=A9 Lureau --- qapi-schema.json | 10 +++++++--- qapi/block-core.json | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 6ea6e2e..2ea012e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3610,15 +3610,19 @@ ## # @QKeyCode: # +# @unmapped: since 2.0 +# @pause: since 2.0 +# @ro: since 2.4 +# @kp_comma: since 2.4 +# @kp_equals: since 2.6 +# @power: since 2.6 +# # An enumeration of key name. # # This is used by the send-key command. # # Since: 1.3.0 # -# 'unmapped' and 'pause' since 2.0 -# 'ro' and 'kp_comma' since 2.4 -# 'kp_equals' and 'power' since 2.6 ## { 'enum': 'QKeyCode', 'data': [ 'unmapped', diff --git a/qapi/block-core.json b/qapi/block-core.json index 33bc93a..96d0859 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1712,9 +1712,13 @@ # # Drivers that are supported in block device operations. # -# @host_device, @host_cdrom: Since 2.1 +# @host_device: Since 2.1 +# @host_cdrom: Since 2.1 # @gluster: Since 2.7 -# @nbd, @nfs, @replication, @ssh: Since 2.8 +# @nbd: Since 2.8 +# @nfs: Since 2.8 +# @replication: Since 2.8 +# @ssh: Since 2.8 # # Since: 2.0 ## --=20 2.10.0