From nobody Thu May 2 17:32:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596446041; cv=none; d=zohomail.com; s=zohoarc; b=HJbXwTW2vebAs6NoYcTepUuen7yVTpjntiyhnS5U1vrhl1FtN+fUGYNPyK8yHM4f1JAr55ZiX6njRcZe+GlnhAkjFnfCfi7Ko+H+UD49tDaFj40zCoTKXckwJ2LFiTz03dzqsWmxfKD4y8YsQCLXYqPfNADe9QbvnY7mFdZIon0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596446041; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wtnr2H4Of/V470GKi1MzOiFj9IlFWITEKpHRVULWbmU=; b=J+iLzYoPIpjRJ4N08kts9mS7dnv9pMvQI8GUgfAd0/GWkE/M7xQ1F1MOpNeUrjMtZUWrZc8sHDpR33vq5TmXYTfGP1eWoJpyQQB0XwM0sEPj1weawPFBUIfjmAGlttubZLNBH6amXoQKvRgsb4y79XLbAw5zknpywFh/XRtPiws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596446041165734.1288391373909; Mon, 3 Aug 2020 02:14:01 -0700 (PDT) Received: from localhost ([::1]:40856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2WXf-0001KA-Vw for importer@patchew.org; Mon, 03 Aug 2020 05:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2WUe-0005gY-BJ for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51244 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k2WUc-0003sC-GH for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:51 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-t29u3lwmNf2VVjtY76rygA-1; Mon, 03 Aug 2020 05:10:45 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 430B919057A1; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 150AE7B41F; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9E5F81132921; Mon, 3 Aug 2020 11:10:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596445849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wtnr2H4Of/V470GKi1MzOiFj9IlFWITEKpHRVULWbmU=; b=ZguPHPAxdV4C0+dgp4detCs10FmB/DxQCjWwsWsDu9vSUDcmjy6Ooz2914YVu1xAuGas4r Q139fEuJrOEb9Z+UKbGlv8vlEYtZnLJrBi3FYPL6IcEU+WtKU7ELA3UEIlRvMSPbPz/7Ov BXWtgdC+rW1Yc1CxaZ4Ud/NrrNswUAc= X-MC-Unique: t29u3lwmNf2VVjtY76rygA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/3] qapi/machine.json: Fix missing newline in doc comment Date: Mon, 3 Aug 2020 11:10:40 +0200 Message-Id: <20200803091042.2920218-2-armbru@redhat.com> In-Reply-To: <20200803091042.2920218-1-armbru@redhat.com> References: <20200803091042.2920218-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/03 01:24:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Peter Maydell In commit 176d2cda0dee9f4 we added the @die-id field to the CpuInstanceProperties struct, but in the process accidentally removed the newline between the doc-comment lines for @core-id and @thread-id. Put the newline back in; this fixes a misformatting in the generated HTML QMP reference manual. Signed-off-by: Peter Maydell Message-Id: <20200729191019.19168-1-peter.maydell@linaro.org> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- qapi/machine.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qapi/machine.json b/qapi/machine.json index f59144023c..daede5ab14 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -825,7 +825,8 @@ # @node-id: NUMA node ID the CPU belongs to # @socket-id: socket number within node/board the CPU belongs to # @die-id: die number within node/board the CPU belongs to (Since 4.1) -# @core-id: core number within die the CPU belongs to# @thread-id: thread = number within core the CPU belongs to +# @core-id: core number within die the CPU belongs to +# @thread-id: thread number within core the CPU belongs to # # Note: currently there are 5 properties that could be present # but management should be prepared to pass through other --=20 2.26.2 From nobody Thu May 2 17:32:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596446058; cv=none; d=zohomail.com; s=zohoarc; b=VHTA0MJexxfxE0TRrE4RP3oKTDPrNeKX2yOYT4vUYmMG4wBWLLv9Yeeuwx/joOmTDbwCuzuL/hb2pFQVsT1XwdrrG2FA3M2IIaPT1LNva74wLX3JLJfnZDMHfKg/JbENr32xmv5TpH4hm1D7qdCux8yBkXfbbM/9n5r0AvjQ4UQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596446058; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RrQEaxPOeVZseWSQXSdJ/uARN9jCT5zoOq48tnsCUS0=; b=eVxiOyuOQNVgxpJsmT84JjUjWYKZjNVWntyUCMxt4gjphkRlo/a++CvnU4yjZRScFJ7SijwFLLG37wIgKQ51hBkM6Yt1abau3scW1MpQu9/eYGSMJ1UXzel/HGsqarZLq8CPwukMU3CwRazt2M2lM9g0h1roi1dDiVoZaDeWiZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596446057995971.4188820872909; Mon, 3 Aug 2020 02:14:17 -0700 (PDT) Received: from localhost ([::1]:42080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2WXw-0001on-Je for importer@patchew.org; Mon, 03 Aug 2020 05:14:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2WUc-0005di-CN for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58100 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k2WUa-0003rR-Bl for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-334-ukoDqsY3NHSyOGIvro0u6A-1; Mon, 03 Aug 2020 05:10:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47AE78017FB; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 192501001B0B; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A1D5F1132922; Mon, 3 Aug 2020 11:10:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596445847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RrQEaxPOeVZseWSQXSdJ/uARN9jCT5zoOq48tnsCUS0=; b=VM8VqnnwOXw9X6UjDA41+dRppY3eMjZsEgexzJbTLYOTu3k1ltNW4xZXvEEEESbxyWjYTx tEUwrxpg7GbuXu3HNPUwPeJgzm9xtcfxMoRokKirneTYJHFBL7ZQQjKvcbSgVi3LScvzrZ N8eu2zkqv31/Or9ywVWOFJHuz50cP28= X-MC-Unique: ukoDqsY3NHSyOGIvro0u6A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/3] qapi: Delete unwanted indentation of top-level expressions Date: Mon, 3 Aug 2020 11:10:41 +0200 Message-Id: <20200803091042.2920218-3-armbru@redhat.com> In-Reply-To: <20200803091042.2920218-1-armbru@redhat.com> References: <20200803091042.2920218-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/03 01:24:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20200730091656.2633334-1-armbru@redhat.com> Reviewed-by: Eric Blake [One more line de-indented] --- qapi/block-core.json | 26 +++++++++++++------------- qapi/ui.json | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index ab7bf3c612..49edb4fdae 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1847,9 +1847,9 @@ # # Since: 4.0 ## - { 'enum': 'BlockPermission', - 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', - 'graph-mod' ] } +{ 'enum': 'BlockPermission', + 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', + 'graph-mod' ] } ## # @XDbgBlockGraphEdge: # @@ -2155,8 +2155,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-enable', - 'data': 'BlockDirtyBitmap' } +{ 'command': 'block-dirty-bitmap-enable', + 'data': 'BlockDirtyBitmap' } =20 ## # @block-dirty-bitmap-disable: @@ -2176,8 +2176,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-disable', - 'data': 'BlockDirtyBitmap' } +{ 'command': 'block-dirty-bitmap-disable', + 'data': 'BlockDirtyBitmap' } =20 ## # @block-dirty-bitmap-merge: @@ -2208,8 +2208,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-merge', - 'data': 'BlockDirtyBitmapMerge' } +{ 'command': 'block-dirty-bitmap-merge', + 'data': 'BlockDirtyBitmapMerge' } =20 ## # @BlockDirtyBitmapSha256: @@ -2220,8 +2220,8 @@ # # Since: 2.10 ## - { 'struct': 'BlockDirtyBitmapSha256', - 'data': {'sha256': 'str'} } +{ 'struct': 'BlockDirtyBitmapSha256', + 'data': {'sha256': 'str'} } =20 ## # @x-debug-block-dirty-bitmap-sha256: @@ -2235,8 +2235,8 @@ # # Since: 2.10 ## - { 'command': 'x-debug-block-dirty-bitmap-sha256', - 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } +{ 'command': 'x-debug-block-dirty-bitmap-sha256', + 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } =20 ## # @blockdev-mirror: diff --git a/qapi/ui.json b/qapi/ui.json index e16e98a060..1568cfeaad 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1081,8 +1081,8 @@ # Since: 3.0 # ## - { 'enum' : 'DisplayGLMode', - 'data' : [ 'off', 'on', 'core', 'es' ] } +{ 'enum' : 'DisplayGLMode', + 'data' : [ 'off', 'on', 'core', 'es' ] } =20 ## # @DisplayCurses: --=20 2.26.2 From nobody Thu May 2 17:32:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596446059; cv=none; d=zohomail.com; s=zohoarc; b=YuRs2EmteuR0YpfHFtKlGNyuvY2700UEt1Tm2AdymhGWqcR0xfQ4aAVjFaSEHSQfoLbEY4kwENmKK935MCy/q0eZfTgwknBsvptOmpVWCwQgScK+rr1U4J0Hc/5NoecIRSRvpDwu94sFU5eaXtwO56AdzEstqmBJEA1L+4t8ImY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596446059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0GpL3ogciI/n4T7k92fQm4SYVHYnZDZtL3oxTvwDlDE=; b=YKWMPTS/w106TwISR5IHgDECnv8YPHA5+D6kOfKcB7rTOkqixeL5v5gGR5NltPTXiQUntflc5TOJT117kjO3IIGLqC8sh46pDfkySH9JsZQEPvWKCDZQbCVfvhoNV6k79F0PfHNOcIfjulKyOVixQLttDqWoWd1mfB31Genwybk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159644605958142.31698661455914; Mon, 3 Aug 2020 02:14:19 -0700 (PDT) Received: from localhost ([::1]:42148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2WXy-0001qV-7i for importer@patchew.org; Mon, 03 Aug 2020 05:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2WUd-0005fi-RS for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23795 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k2WUb-0003rq-Ei for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:51 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-xK2DZI-xMyeHe8nIVyyrGg-1; Mon, 03 Aug 2020 05:10:45 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7651819057A2; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DB438AD1C; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A673E11328A3; Mon, 3 Aug 2020 11:10:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596445848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0GpL3ogciI/n4T7k92fQm4SYVHYnZDZtL3oxTvwDlDE=; b=MsAcUDKe3V7iPZDS9swn28or97cjibUHqrOnjohLEclf5uJHZ+8K3r6/m7j/z9kKReSNQS io1qbK/djOCHwNhKyaZoCthmZ8ZlKARBQeYZJhK53dZ/b/7LIsdkSX9wLOrJYufa5NxLTv pbt7Nd00rFhQvly0MZwZq7hLxpQKElY= X-MC-Unique: xK2DZI-xMyeHe8nIVyyrGg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/3] schemas: Add vim modeline Date: Mon, 3 Aug 2020 11:10:42 +0200 Message-Id: <20200803091042.2920218-4-armbru@redhat.com> In-Reply-To: <20200803091042.2920218-1-armbru@redhat.com> References: <20200803091042.2920218-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/03 02:09:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Andrea Bolognani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Andrea Bolognani The various schemas included in QEMU use a JSON-based format which is, however, strictly speaking not valid JSON. As a consequence, when vim tries to apply syntax highlight rules for JSON (as guessed from the file name), the result is an unreadable mess which mostly consist of red markers pointing out supposed errors in, well, pretty much everything. Using Python syntax highlighting produces much better results, and in fact these files already start with specially-formatted comments that instruct Emacs to process them as if they were Python files. This commit adds the equivalent special comments for vim. Signed-off-by: Andrea Bolognani Message-Id: <20200729185024.121766-1-abologna@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Signed-off-by: Markus Armbruster --- docs/interop/firmware.json | 1 + docs/interop/vhost-user.json | 1 + qapi/authz.json | 1 + qapi/block-core.json | 1 + qapi/block.json | 1 + qapi/char.json | 1 + qapi/common.json | 1 + qapi/control.json | 1 + qapi/crypto.json | 1 + qapi/dump.json | 1 + qapi/error.json | 1 + qapi/introspect.json | 1 + qapi/job.json | 1 + qapi/machine-target.json | 1 + qapi/machine.json | 1 + qapi/migration.json | 1 + qapi/misc-target.json | 1 + qapi/misc.json | 1 + qapi/net.json | 1 + qapi/qapi-schema.json | 1 + qapi/qdev.json | 1 + qapi/qom.json | 1 + qapi/rdma.json | 1 + qapi/rocker.json | 1 + qapi/run-state.json | 1 + qapi/sockets.json | 1 + qapi/tpm.json | 1 + qapi/transaction.json | 1 + qapi/ui.json | 1 + qga/qapi-schema.json | 1 + storage-daemon/qapi/qapi-schema.json | 1 + tests/qapi-schema/doc-good.json | 2 ++ tests/qapi-schema/include/sub-module.json | 1 + tests/qapi-schema/qapi-schema-test.json | 1 + tests/qapi-schema/sub-sub-module.json | 1 + 35 files changed, 36 insertions(+) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 240f565397..989f10b626 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # Copyright (C) 2018 Red Hat, Inc. # diff --git a/docs/interop/vhost-user.json b/docs/interop/vhost-user.json index ef8ac5941f..feb5fe58ca 100644 --- a/docs/interop/vhost-user.json +++ b/docs/interop/vhost-user.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # Copyright (C) 2018 Red Hat, Inc. # diff --git a/qapi/authz.json b/qapi/authz.json index 1c836a3abd..f3e9745426 100644 --- a/qapi/authz.json +++ b/qapi/authz.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # QAPI authz definitions =20 diff --git a/qapi/block-core.json b/qapi/block-core.json index 49edb4fdae..197bdc1c36 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D=3D Block core (VM unrelated) diff --git a/qapi/block.json b/qapi/block.json index 2ddbfa8306..c54a393cf3 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D Block devices diff --git a/qapi/char.json b/qapi/char.json index daceb20f84..8aeedf96b2 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/common.json b/qapi/common.json index 7b9cbcd97b..716712d4b3 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D Common data types diff --git a/qapi/control.json b/qapi/control.json index 6b816bb61f..de51e9916c 100644 --- a/qapi/control.json +++ b/qapi/control.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/crypto.json b/qapi/crypto.json index 5a68e0db25..bb7930d332 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/dump.json b/qapi/dump.json index a1eed7b15c..f7c4267e3f 100644 --- a/qapi/dump.json +++ b/qapi/dump.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/qapi/error.json b/qapi/error.json index 3fad08f506..94a6502de9 100644 --- a/qapi/error.json +++ b/qapi/error.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D QMP errors diff --git a/qapi/introspect.json b/qapi/introspect.json index b1aabd4cfd..944bb87a20 100644 --- a/qapi/introspect.json +++ b/qapi/introspect.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # Copyright (C) 2015 Red Hat, Inc. # diff --git a/qapi/job.json b/qapi/job.json index c48a0c3e34..280c2f76f1 100644 --- a/qapi/job.json +++ b/qapi/job.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D=3D Background jobs diff --git a/qapi/machine-target.json b/qapi/machine-target.json index f2c82949d8..698850cc78 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/qapi/machine.json b/qapi/machine.json index daede5ab14..481b1f07ec 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/qapi/migration.json b/qapi/migration.json index d5000558c6..ea53b23dca 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/misc-target.json b/qapi/misc-target.json index dee3b45930..1e561fa97b 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/misc.json b/qapi/misc.json index 149c925246..9d32820dc1 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/net.json b/qapi/net.json index 558d520a2f..ddb113e5e5 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 43b0ba0dea..f03ff91ceb 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython ## # =3D Introduction # diff --git a/qapi/qdev.json b/qapi/qdev.json index f4ed9735c4..13254529bf 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/qapi/qom.json b/qapi/qom.json index 8abe998962..0b0b92944b 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/qapi/rdma.json b/qapi/rdma.json index b58105b1b6..a1d2175a8b 100644 --- a/qapi/rdma.json +++ b/qapi/rdma.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/rocker.json b/qapi/rocker.json index 52597db491..b48e49a89b 100644 --- a/qapi/rocker.json +++ b/qapi/rocker.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D Rocker switch device diff --git a/qapi/run-state.json b/qapi/run-state.json index 2e22907740..7cc9f96a5b 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/sockets.json b/qapi/sockets.json index cbd6ef35d0..c0c640a5b0 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 ## # =3D Socket data types diff --git a/qapi/tpm.json b/qapi/tpm.json index dc1f081739..6a10c9ed8d 100644 --- a/qapi/tpm.json +++ b/qapi/tpm.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/transaction.json b/qapi/transaction.json index b6c11158f0..15ddebdbc3 100644 --- a/qapi/transaction.json +++ b/qapi/transaction.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qapi/ui.json b/qapi/ui.json index 1568cfeaad..9d6721037f 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython # =20 ## diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 408a662ea5..b1e9ed836d 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=3Dpython =20 ## # diff --git a/storage-daemon/qapi/qapi-schema.json b/storage-daemon/qapi/qap= i-schema.json index 14f4f8fe61..6100d1f0c9 100644 --- a/storage-daemon/qapi/qapi-schema.json +++ b/storage-daemon/qapi/qapi-schema.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython =20 # Note that modules are shared with the QEMU main schema under the assumpt= ion # that the storage daemon schema is a subset of the main schema. For the s= hared diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.j= son index ddd89d1233..9da72a1f55 100644 --- a/tests/qapi-schema/doc-good.json +++ b/tests/qapi-schema/doc-good.json @@ -1,4 +1,6 @@ # -*- Mode: Python -*- +# vim: filetype=3Dpython +# # Positive QAPI doc comment tests =20 { 'pragma': { 'doc-required': true } } diff --git a/tests/qapi-schema/include/sub-module.json b/tests/qapi-schema/= include/sub-module.json index afdb267228..b9f7b9bb56 100644 --- a/tests/qapi-schema/include/sub-module.json +++ b/tests/qapi-schema/include/sub-module.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=3Dpython =20 # Sub-module of ../qapi-schema-test.json =20 diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qa= pi-schema-test.json index 6b1f05afa7..3a9f2cbb33 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=3Dpython =20 # This file is a stress test of supported qapi constructs that must # parse and compile correctly. diff --git a/tests/qapi-schema/sub-sub-module.json b/tests/qapi-schema/sub-= sub-module.json index 524ef9b83f..94f36ec0b1 100644 --- a/tests/qapi-schema/sub-sub-module.json +++ b/tests/qapi-schema/sub-sub-module.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=3Dpython =20 # Sub-module of sub-module include/sub-module.json of qapi-schema-test.json =20 --=20 2.26.2