From: Paolo Bonzini <pbonzini@redhat.com>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: "Michal Prívozník" <mprivozn@redhat.com>,
qemu-devel@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>
Subject: Re: [PULL v8 00/86] Misc QEMU patches for 2020-09-24
Date: Fri, 2 Oct 2020 20:45:40 +0200 [thread overview]
Message-ID: <2be76d12-695b-363f-c74b-f1b461aec3df@redhat.com> (raw)
In-Reply-To: <20201002182457.GE7303@habkost.net>
On 02/10/20 20:24, Eduardo Habkost wrote:
> On Fri, Oct 02, 2020 at 06:27:35PM +0200, Paolo Bonzini wrote:
>> On 02/10/20 17:58, Michal Prívozník wrote:
>>>>
>>>
>>> cd442a45db60a1a72fcf980c24bd1227f13f8a87 is the first bad commit
>>>
>>> Sorry for noticing this earlier, but is this known? The build starts
>>> failing for me after this commit:
>>>
>>> /usr/bin/sphinx-build -Dversion=5.1.50 -Drelease= -W
>>> -Ddepfile=docs/devel.d -Ddepfile_stamp=docs/devel.stamp -b html -d
>>> /home/zippy/work/qemu/qemu.git/build/docs/devel.p
>>> /home/zippy/work/qemu/qemu.git/docs/devel
>>> /home/zippy/work/qemu/qemu.git/build/docs/devel
>>> Running Sphinx v3.2.1
>>> building [mo]: targets for 0 po files that are out of date
>>> building [html]: targets for 20 source files that are out of date
>>> updating environment: [new config] 20 added, 0 changed, 0 removed
>>> reading sources... [100%] testing
>>
>> No, this is new. It works with older versions of Sphinx (I have 2.2.2
>> despite being on Fedora 32 which is pretty recent).
>>
>> For now Sphinx 3 is not supported by kerneldoc, we probably should apply
>> a patch like
>>
>> https://www.spinics.net/lists/linux-doc/msg83277.html
>
> We already have Sphinx 3.x hacks inside our fork of kernel-doc,
> see commit 152d1967f650 ("kernel-doc: Use c:struct for Sphinx 3.0
> and later").
>
> If we want to keep deviating from upstream kernel-doc, the
> following patch seems to work. Do we want to?
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> diff --git a/scripts/kernel-doc b/scripts/kernel-doc
> index 40ad782e342..03b49380426 100755
> --- a/scripts/kernel-doc
> +++ b/scripts/kernel-doc
> @@ -838,6 +838,13 @@ sub output_function_rst(%) {
> $lineprefix = "";
> output_highlight_rst($args{'purpose'});
> $start = "\n\n**Syntax**\n\n ``";
> + } elsif ($args{'functiontype'} eq "") {
> + # this is a macro, Sphinx 3.x requires c:macro::
> + if ((split(/\./, $sphinx_version))[0] >= 3) {
> + print ".. c:macro:: ";
> + } else {
> + print ".. c:function:: ";
> + }
> } else {
> print ".. c:function:: ";
> }
>>
>> Paolo
>>
>
I can try sending these to upstream Linux, too.
Paolo
next prev parent reply other threads:[~2020-10-02 18:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 19:58 [PULL v8 00/86] Misc QEMU patches for 2020-09-24 Paolo Bonzini
2020-09-30 19:58 ` [PULL 29/86] meson: move libudev test Paolo Bonzini
2020-10-01 16:19 ` Peter Maydell
2020-10-01 16:55 ` Paolo Bonzini
2020-10-01 18:51 ` Peter Maydell
2020-10-01 19:15 ` Paolo Bonzini
2020-09-30 19:58 ` [PULL 30/86] meson: move libmpathpersist test Paolo Bonzini
2020-09-30 19:58 ` [PULL 31/86] meson: extend libmpathpersist test for static linking Paolo Bonzini
2020-10-01 14:28 ` [PULL v8 00/86] Misc QEMU patches for 2020-09-24 Peter Maydell
2020-10-01 15:41 ` 罗勇刚(Yonggang Luo)
2020-10-02 15:58 ` Michal Prívozník
2020-10-02 16:22 ` Eduardo Habkost
2020-10-02 17:26 ` Michal Prívozník
2020-10-02 17:30 ` Paolo Bonzini
2020-10-02 17:55 ` Eduardo Habkost
2020-10-02 16:27 ` Paolo Bonzini
2020-10-02 17:01 ` Eduardo Habkost
2020-10-02 18:24 ` Eduardo Habkost
2020-10-02 18:45 ` Paolo Bonzini [this message]
2020-10-02 18:52 ` Peter Maydell
2020-10-07 10:57 ` Michal Privoznik
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=2be76d12-695b-363f-c74b-f1b461aec3df@redhat.com \
--to=pbonzini@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mprivozn@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).