From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2dFE-0000UO-03 for qemu-devel@nongnu.org; Fri, 04 Nov 2016 08:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2dF8-0006Wv-BT for qemu-devel@nongnu.org; Fri, 04 Nov 2016 08:05:15 -0400 Received: from mx6-phx2.redhat.com ([209.132.183.39]:55045) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c2dF8-0006V6-3m for qemu-devel@nongnu.org; Fri, 04 Nov 2016 08:05:10 -0400 Date: Fri, 4 Nov 2016 08:05:07 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <86826981.3787186.1478261107823.JavaMail.zimbra@redhat.com> In-Reply-To: <87eg33mdtc.fsf@dusky.pond.sub.org> References: <20160925181836.18293-1-marcandre.lureau@redhat.com> <20160925181836.18293-4-marcandre.lureau@redhat.com> <87eg33mdtc.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 03/11] qapi: fix missing symbol @prefix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-devel@nongnu.org ----- Original Message ----- > Marc-Andr=C3=A9 Lureau writes: >=20 > > Signed-off-by: Marc-Andr=C3=A9 Lureau > > --- > > qapi-schema.json | 4 ++-- > > qapi/block-core.json | 4 ++-- > > qapi/crypto.json | 36 ++++++++++++++++++------------------ > > 3 files changed, 22 insertions(+), 22 deletions(-) > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > index f07ffd7..3091993 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -4526,7 +4526,7 @@ > > { 'include': 'qapi/rocker.json' } > > =20 > > ## > > -# ReplayMode: > > +# @ReplayMode: > > # > > # Mode of the replay subsystem. > > # > > @@ -4594,7 +4594,7 @@ > > { 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] } > > =20 > > ## > > -# CpuInstanceProperties > > +# @CpuInstanceProperties > > # > > # List of properties to be used for hotplugging a CPU instance, > > # it should be passed by management with device_add command when >=20 > The example in qapi-code-gen.txt has a colon after the symbol name: >=20 > ## > # @BlockStats: >=20 > The text doesn't mention it. Tne schema uses colons inconsistently, as > visible above. Let's enforce colons. Ok, it's a bit more tricky though, because we have documentation that uses = @arg inside text to refer to various symbols (args, commands etc). I've fix= ed all @symbol: (for sections and members), but I don't see an easy way to = enforce this without conflicting with the @arg syntax. >=20 > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > index cf8e980..73f4180 100644 > > --- a/qapi/block-core.json > > +++ b/qapi/block-core.json > > @@ -1149,7 +1149,7 @@ > > 'data': 'DriveMirror' } > > =20 > > ## > > -# DriveMirror > > +# @DriveMirror > > # > > # A set of parameters describing drive mirror setup. > > # > > @@ -1373,7 +1373,7 @@ > > 'data': 'BlockIOThrottle' } > > =20 > > ## > > -# BlockIOThrottle > > +# @BlockIOThrottle > > # > > # A set of parameters describing block throttling. > > # > > diff --git a/qapi/crypto.json b/qapi/crypto.json > > index 6933b13..4ac3034 100644 > > --- a/qapi/crypto.json > > +++ b/qapi/crypto.json > > @@ -3,7 +3,7 @@ > > # QAPI crypto definitions > > =20 > > ## > > -# QCryptoTLSCredsEndpoint: > > +# @QCryptoTLSCredsEndpoint: > > # > > # The type of network endpoint that will be using the credentials. > > # Most types of credential require different setup / structures > > @@ -22,7 +22,7 @@ > > =20 > > =20 > > ## > > -# QCryptoSecretFormat: > > +# @QCryptoSecretFormat: > > # > > # The data format that the secret is provided in > > # > > @@ -36,7 +36,7 @@ > > =20 > > =20 > > ## > > -# QCryptoHashAlgorithm: > > +# @QCryptoHashAlgorithm: > > # > > # The supported algorithms for computing content digests > > # > > @@ -55,7 +55,7 @@ > > =20 > > =20 > > ## > > -# QCryptoCipherAlgorithm: > > +# @QCryptoCipherAlgorithm: > > # > > # The supported algorithms for content encryption ciphers > > # > > @@ -82,7 +82,7 @@ > > =20 > > =20 > > ## > > -# QCryptoCipherMode: > > +# @QCryptoCipherMode: > > # > > # The supported modes for content encryption ciphers > > # > > @@ -97,7 +97,7 @@ > > =20 > > =20 > > ## > > -# QCryptoIVGenAlgorithm: > > +# @QCryptoIVGenAlgorithm: > > # > > # The supported algorithms for generating initialization > > # vectors for full disk encryption. The 'plain' generator > > @@ -115,7 +115,7 @@ > > 'data': ['plain', 'plain64', 'essiv']} > > =20 > > ## > > -# QCryptoBlockFormat: > > +# @QCryptoBlockFormat: > > # > > # The supported full disk encryption formats > > # > > @@ -130,7 +130,7 @@ > > 'data': ['qcow', 'luks']} > > =20 > > ## > > -# QCryptoBlockOptionsBase: > > +# @QCryptoBlockOptionsBase: > > # > > # The common options that apply to all full disk > > # encryption formats > > @@ -143,7 +143,7 @@ > > 'data': { 'format': 'QCryptoBlockFormat' }} > > =20 > > ## > > -# QCryptoBlockOptionsQCow: > > +# @QCryptoBlockOptionsQCow: > > # > > # The options that apply to QCow/QCow2 AES-CBC encryption format > > # > > @@ -157,7 +157,7 @@ > > 'data': { '*key-secret': 'str' }} > > =20 > > ## > > -# QCryptoBlockOptionsLUKS: > > +# @QCryptoBlockOptionsLUKS: > > # > > # The options that apply to LUKS encryption format > > # > > @@ -171,7 +171,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockCreateOptionsLUKS: > > +# @QCryptoBlockCreateOptionsLUKS: > > # > > # The options that apply to LUKS encryption format initialization > > # > > @@ -201,7 +201,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockOpenOptions: > > +# @QCryptoBlockOpenOptions: > > # > > # The options that are available for all encryption formats > > # when opening an existing volume > > @@ -216,7 +216,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockCreateOptions: > > +# @QCryptoBlockCreateOptions: > > # > > # The options that are available for all encryption formats > > # when initializing a new volume > > @@ -231,7 +231,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockInfoBase: > > +# @QCryptoBlockInfoBase: > > # > > # The common information that applies to all full disk > > # encryption formats > > @@ -245,7 +245,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockInfoLUKSSlot: > > +# @QCryptoBlockInfoLUKSSlot: > > # > > # Information about the LUKS block encryption key > > # slot options > > @@ -265,7 +265,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockInfoLUKS: > > +# @QCryptoBlockInfoLUKS: > > # > > # Information about the LUKS block encryption options > > # > > @@ -293,7 +293,7 @@ > > 'slots': [ 'QCryptoBlockInfoLUKSSlot' ] }} > > =20 > > ## > > -# QCryptoBlockInfoQCow: > > +# @QCryptoBlockInfoQCow: > > # > > # Information about the QCow block encryption options > > # > > @@ -304,7 +304,7 @@ > > =20 > > =20 > > ## > > -# QCryptoBlockInfo: > > +# @QCryptoBlockInfo: > > # > > # Information about the block encryption options > > # >=20 > Additionally, there are a few lines that don't match the symbol the > symbol being defined: >=20 > diff --git a/qapi-schema.json b/qapi-schema.json > index 0cc9ee6..104cc62 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1079,7 +1079,7 @@ > '*service': 'str', '*auth': 'str', '*clients': > ['VncClientInfo']} } >=20 > ## > -# @VncPriAuth: > +# @VncPrimaryAuth: > # > # vnc primary authentication method. > # > @@ -3889,7 +3889,7 @@ > 'data': { 'passthrough' : 'TPMPassthroughOptions' } } >=20 > ## > -# @TpmInfo: > +# @TPMInfo: > # > # Information about the TPM > # > diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json > index 09c9728..07a449b 100644 > --- a/qga/qapi-schema.json > +++ b/qga/qapi-schema.json > @@ -378,7 +378,7 @@ > 'data': { 'handle': 'int' } } >=20 > ## > -# @GuestFsFreezeStatus > +# @GuestFsfreezeStatus > # > # An enumeration of filesystem freeze states > # >=20 > The parser should flag such nonsense. >=20 Done