From patchwork Sat Oct 8 08:58:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 9368041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 731846075E for ; Sat, 8 Oct 2016 09:05:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64CB629997 for ; Sat, 8 Oct 2016 09:05:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55B142999E; Sat, 8 Oct 2016 09:05:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E11FD29997 for ; Sat, 8 Oct 2016 09:05:42 +0000 (UTC) Received: from localhost ([::1]:40010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsnZd-0007BN-R5 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 08 Oct 2016 05:05:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsnSf-0002OU-1b for qemu-devel@nongnu.org; Sat, 08 Oct 2016 04:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bsnSa-0007lr-4j for qemu-devel@nongnu.org; Sat, 08 Oct 2016 04:58:28 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:34991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsnSZ-0007gD-SW; Sat, 08 Oct 2016 04:58:24 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0911B40ED5; Sat, 8 Oct 2016 11:58:15 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 2B080B2C; Sat, 8 Oct 2016 11:58:14 +0300 (MSK) Received: (nullmailer pid 19253 invoked by uid 1000); Sat, 08 Oct 2016 08:58:14 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sat, 8 Oct 2016 11:58:02 +0300 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 16/26] qapi: make the json schema files more regular. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, David Anderson , Michael Tokarev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: David Anderson This makes it easier to parse the schema file for tool generation: each paragraph is either a non-docstring comment, or a docstring immediately followed by a Python dict describing an API item. Signed-off-by: David Anderson Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- qapi-schema.json | 3 +-- qapi/block-core.json | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index c3dcf11..9e47b47 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -752,6 +752,7 @@ 'cpu-throttle-increment': 'int', 'tls-creds': 'str', 'tls-hostname': 'str'} } + ## # @query-migrate-parameters # @@ -4118,7 +4119,6 @@ # # Since 1.6 ## - { 'struct': 'RxFilterInfo', 'data': { 'name': 'str', @@ -4338,7 +4338,6 @@ # # Since: 2.1 ## - { 'struct': 'Memdev', 'data': { 'size': 'size', diff --git a/qapi/block-core.json b/qapi/block-core.json index 9d797b8..4badb97 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -25,7 +25,6 @@ # Since: 1.3 # ## - { 'struct': 'SnapshotInfo', 'data': { 'id': 'str', 'name': 'str', 'vm-state-size': 'int', 'date-sec': 'int', 'date-nsec': 'int', @@ -81,7 +80,6 @@ # # Since: 1.7 ## - { 'union': 'ImageInfoSpecific', 'data': { 'qcow2': 'ImageInfoSpecificQCow2', @@ -129,7 +127,6 @@ # Since: 1.3 # ## - { 'struct': 'ImageInfo', 'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool', '*actual-size': 'int', 'virtual-size': 'int', @@ -181,7 +178,6 @@ # Since: 1.4 # ## - { 'struct': 'ImageCheck', 'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int', '*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 'int', @@ -518,7 +514,6 @@ # # Since: 2.5 ## - { 'struct': 'BlockDeviceTimedStats', 'data': { 'interval_length': 'int', 'min_rd_latency_ns': 'int', 'max_rd_latency_ns': 'int', 'avg_rd_latency_ns': 'int',