From: Kevin Wolf <kwolf@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Subject: Re: [PATCH] block/export: fix QAPI doc indentation style violation
Date: Thu, 1 Oct 2020 15:27:57 +0200 [thread overview]
Message-ID: <20201001132757.GA41938@linux.fritz.box> (raw)
In-Reply-To: <20201001131439.386431-1-stefanha@redhat.com>
Am 01.10.2020 um 15:14 hat Stefan Hajnoczi geschrieben:
> Since commit a69a6d4b4d4fae2e3d2506241e22a78ff1732283
> ("scripts/qapi/parser.py: improve doc comment indent handling") the QAPI
> generator emits an error when unindented text follows "Returns:".
>
> Fix block-export.json by moving the comment to make the QAPI generator
> happy.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> Based-on: git://repo.or.cz/qemu/kevin.git block
Sorry, this is a mismerge in my patches. When resolving the conflict, I
moved the paragraph up in the wrong definition: Should have been for
nbd-server-start, but I did it for NbdServerOptions (where it is still
at the bottom in master).
I'll fix up the broken commit instead of applying this on top. And I'll
leave in the unintentional change, because it actually makes sense, too.
Kevin
next prev parent reply other threads:[~2020-10-01 13:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 13:14 [PATCH] block/export: fix QAPI doc indentation style violation Stefan Hajnoczi
2020-10-01 13:27 ` Kevin Wolf [this message]
2020-10-01 13:30 ` Philippe Mathieu-Daudé
2020-10-01 13:36 ` Peter Maydell
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=20201001132757.GA41938@linux.fritz.box \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--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).