Re: [PATCH v2 00/30] Configurable policy for handling deprecated interfaces
On Wed, 4 Mar 2020 at 08:18, Markus Armbruster <armbru(a)redhat.com> wrote:
Peter Maydell <peter.maydell(a)linaro.org> writes:
> How much do you think this is likely to affect the
> generate-rst-from-qapi-docs series? I'd really like
> that to go in for this release, but this looks like
> it's shaping up to be a big conflict :-(
I paused reviewing your series to post this one, because "I'd really
like that to go in for this release" :)
My series touches 21 existing commented definitions in qapi/, six more
in tests/qapi-schema/doc-good.json, and adds new module
qapi/compat.json. Consolidated diff appended.
Rule of thumb for reducing conflict resolution labor: the bigger manual
change goes first. Yours is bigger, but I don't remember how manual it
is.
We got pretty much all the manual changes I needed into
master already, so all that's left really is the script parts.
The conflicts would basically be where this series affects
the generate-docs parts of the scripts -- any changes here
to doc.py are basically dead-code-walking and would need
to be done over again in the equivalent code for rust generation.
But looking at the diffstat
scripts/qapi/doc.py | 16 +-
so hopefully it won't be too bad.
thanks
-- PMM