From: Markus Armbruster <armbru@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-devel@nongnu.org, "Michael Roth" <mdroth@linux.vnet.ibm.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Max Reitz" <mreitz@redhat.com>, "John Snow" <jsnow@redhat.com>
Subject: Re: [PATCH v2 08/30] qapi: Use ':' after @argument in doc comments
Date: Fri, 14 Feb 2020 14:28:47 +0100 [thread overview]
Message-ID: <87sgjduwkw.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <87h7ztwcdn.fsf@dusky.pond.sub.org> (Markus Armbruster's message of "Fri, 14 Feb 2020 14:02:12 +0100")
Markus Armbruster <armbru@redhat.com> writes:
> Peter Maydell <peter.maydell@linaro.org> writes:
>
>> Some qapi doc comments have forgotten the ':' after the
>> @argument, like this:
>>
>> # @filename Filename for the new image file
>> # @size Size of the virtual disk in bytes
>>
>> The result is that these are parsed as part of the body
>> text and appear as a run-on line:
>> filename Filename for the new image file size Size of the virtual disk in bytes"
>> followed by
>> filename: string
>> Not documented
>> size: int
>> Not documented
>>
>> in the 'Members' section.
>>
>> Correct the formatting.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
> The title sounds like it's just a tweak, but it actually fixes bugs in
> the generated documentation. Suggest to change the title to
>
> qapi: Fix incorrect "Not documented" claims in QMP documentation
>
> R-by stands regardless.
Forgot to mention:
[...]
>> @@ -4645,17 +4645,17 @@
>> #
>> # Driver specific image creation options for vhdx.
>> #
>> -# @file Node to create the image format on
>> -# @size Size of the virtual disk in bytes
>> -# @log-size Log size in bytes, must be a multiple of 1 MB
>> -# (default: 1 MB)
>> -# @block-size Block size in bytes, must be a multiple of 1 MB and not
>> -# larger than 256 MB (default: automatically choose a block
>> -# size depending on the image size)
>> -# @subformat vhdx subformat (default: dynamic)
>> -# @block-state-zero Force use of payload blocks of type 'ZERO'. Non-standard,
>> -# but default. Do not set to 'off' when using 'qemu-img
>> -# convert' with subformat=dynamic.
>> +# @file: Node to create the image format on
>> +# @size: Size of the virtual disk in bytes
>> +# @log-size: Log size in bytes, must be a multiple of 1 MB
>> +# (default: 1 MB)
>> +# @block-size: Block size in bytes, must be a multiple of 1 MB and not
>> +# larger than 256 MB (default: automatically choose a block
>> +# size depending on the image size)
>> +# @subformat: vhdx subformat (default: dynamic)
>> +# @block-state-zero: Force use of payload blocks of type 'ZERO'. Non-standard,
>> +# but default. Do not set to 'off' when using 'qemu-img
>> +# convert' with subformat=dynamic.
>> #
>> # Since: 2.12
>> ##
Kevin dislikes the loss of visual alignment here. I dislike the
formatting before and after the patch. I suggested a new style:
# @file:
# Node to create the image format on
#
# @size:
# Size of the virtual disk in bytes
#
# @log-size:
# Log size in bytes, must be a multiple of 1 MB (default: 1 MB)
#
# @block-size:
# Block size in bytes, must be a multiple of 1 MB and not larger
# than 256 MB (default: automatically choose a block size depending
# on the image size)
#
# @subformat:
# vhdx subformat (default: dynamic)
#
# @block-state-zero:
# Force use of payload blocks of type 'ZERO'. Non-standard, but
# default. Do not set to 'off' when using 'qemu-img convert' with
# subformat=dynamic.
Nobody disliked this style. Peter reports his code already supports it,
but objects to converting to it in his series. Okay; we can convert
later. More churn, but the individual patches / series are simpler.
next prev parent reply other threads:[~2020-02-14 13:34 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 17:56 [PATCH v2 00/30] Convert QAPI doc comments to generate rST instead of texinfo Peter Maydell
2020-02-13 17:56 ` [PATCH v2 01/30] configure: Allow user to specify sphinx-build binary Peter Maydell
2020-02-14 6:33 ` Markus Armbruster
2020-02-14 9:21 ` Peter Maydell
2020-02-14 12:20 ` Markus Armbruster
2020-02-14 12:39 ` Peter Maydell
2020-02-14 17:18 ` Markus Armbruster
2020-02-14 17:36 ` Peter Maydell
2020-02-15 10:37 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 02/30] configure: Check that sphinx-build is using Python 3 Peter Maydell
2020-02-13 17:56 ` [PATCH v2 03/30] Makefile: Fix typo in dependency list for interop manpages Peter Maydell
2020-02-13 17:56 ` [PATCH v2 04/30] qga/qapi-schema.json: Fix missing '-' in GuestDiskBusType doc comment Peter Maydell
2020-02-13 17:56 ` [PATCH v2 05/30] qga/qapi-schema.json: Fix indent level on doc comments Peter Maydell
2020-02-14 12:36 ` Markus Armbruster
2020-02-14 12:40 ` Peter Maydell
2020-02-14 14:26 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 06/30] qga/qapi-schema.json: minor format fixups for rST Peter Maydell
2020-02-14 12:46 ` Markus Armbruster
2020-02-14 14:33 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 07/30] qapi/block-core.json: Use literal block for ascii art Peter Maydell
2020-02-13 22:59 ` Aleksandar Markovic
2020-02-15 20:56 ` Philippe Mathieu-Daudé
2020-02-15 21:01 ` Aleksandar Markovic
2020-02-17 0:44 ` Philippe Mathieu-Daudé
2020-02-17 5:53 ` Samuel Thibault
2020-02-14 12:53 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 08/30] qapi: Use ':' after @argument in doc comments Peter Maydell
2020-02-14 13:02 ` Markus Armbruster
2020-02-14 13:28 ` Markus Armbruster [this message]
2020-02-13 17:56 ` [PATCH v2 09/30] qapi: Fix indent level on doc comments in json files Peter Maydell
2020-02-14 13:45 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 10/30] qapi: Remove hardcoded tabs Peter Maydell
2020-02-13 17:56 ` [PATCH v2 11/30] qapi/ui.json: Put input-send-event body text in the right place Peter Maydell
2020-02-13 17:56 ` [PATCH v2 12/30] qapi/ui.json: Avoid `...' texinfo style quoting Peter Maydell
2020-02-13 17:56 ` [PATCH v2 13/30] qapi/block-core.json: Use explicit bulleted lists Peter Maydell
2020-02-13 17:56 ` [PATCH v2 14/30] qapi/ui.json: " Peter Maydell
2020-02-14 14:20 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 15/30] qapi/{block, misc, tmp, net}.json: " Peter Maydell
2020-02-14 14:23 ` Markus Armbruster
2020-02-14 14:28 ` Peter Maydell
2020-02-14 15:46 ` Markus Armbruster
2020-02-14 15:48 ` Peter Maydell
2020-02-13 17:56 ` [PATCH v2 16/30] qapi: Add blank lines before " Peter Maydell
2020-02-14 14:33 ` Markus Armbruster
2020-02-14 16:02 ` Markus Armbruster
2020-02-14 16:16 ` Peter Maydell
2020-02-14 17:11 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 17/30] qapi/migration.json: Replace _this_ with *this* Peter Maydell
2020-02-13 19:02 ` Philippe Mathieu-Daudé
2020-02-14 14:35 ` Markus Armbruster
2020-02-13 17:56 ` [PATCH v2 18/30] qapi: Delete all the "foo: dropped in n.n" notes Peter Maydell
2020-02-14 6:55 ` Markus Armbruster
2020-02-14 15:13 ` Markus Armbruster
2020-02-14 15:20 ` Peter Maydell
2020-02-13 17:56 ` [PATCH v2 19/30] qapi/qapi-schema.json: Put headers in their own doc-comment blocks Peter Maydell
2020-02-13 17:56 ` [PATCH v2 20/30] qapi/machine.json: Escape a literal '*' in doc comment Peter Maydell
2020-02-13 19:01 ` Philippe Mathieu-Daudé
2020-02-13 17:56 ` [PATCH v2 21/30] tests/qapi/doc-good.json: Clean up markup Peter Maydell
2020-02-13 17:56 ` [PATCH v2 22/30] scripts/qapi: Move doc-comment whitespace stripping to doc.py Peter Maydell
2020-02-13 17:56 ` [PATCH v2 23/30] scripts/qapi/parser.py: improve doc comment indent handling Peter Maydell
2020-02-13 17:56 ` [PATCH v2 24/30] docs/sphinx: Add new qapi-doc Sphinx extension Peter Maydell
2020-02-13 17:56 ` [PATCH v2 25/30] docs/interop: Convert qemu-ga-ref to rST Peter Maydell
2020-02-13 17:56 ` [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref " Peter Maydell
2020-02-17 15:10 ` Peter Maydell
2020-02-13 17:56 ` [PATCH v2 27/30] qapi: Use rST markup for literal blocks Peter Maydell
2020-02-13 17:56 ` [PATCH v2 28/30] qga/qapi-schema.json: Add some headings Peter Maydell
2020-02-13 17:56 ` [PATCH v2 29/30] scripts/qapi: Remove texinfo generation support Peter Maydell
2020-02-13 17:56 ` [PATCH v2 30/30] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions Peter Maydell
2020-02-13 20:51 ` [PATCH v2 00/30] Convert QAPI doc comments to generate rST instead of texinfo no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgjduwkw.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).