Re: [Qemu-devel] [PATCH v2 00/11] qapi doc generation (whole version, squashed)

[Markus Armbruster]

Markus Armbruster <address@hidden> writes:

> Marc-André Lureau <address@hidden> writes:
>
>> Hi,
>>
>> Add a qapi2texi script to generate the documentation from the qapi
>> schemas. Build various new documentation targets for it: pdf, man,
>> txt. The 7th patch in this series is a squashed version of the
>> documentation move from qmp-commands.txt to the schemas. The whole
>> version (not sent on the ML to avoid spamming) is in the following git
>> branch: https://github.com/elmarco/qemu/commits/qapi-doc
>
> I apologize for the delay in review, in particular since parts of this
> series rot rather quickly.
>
> You already rebased your git branch to commit 4387f56 on master.  The
> branch has PATCH 07 split.  The branch doesn't rebase cleanly to current
> master, but the conflicts are all in the shards of PATCH 07.
>
> For review, I applied the patches as sent to current master (commit
> ede0cbe).  Two patches conflict.  PATCH 07 "(SQUASHED) qmp-commands docs
> move to schema" I simply skipped.  PATCH 11 "build-sys: make and install
> the generated schema docs" conflicts with commit 78e8779 "qemu-doc:
> merge qemu-tech and qemu-doc", but it's easy enough to resolve, and you
> already did it in your git branch.

Actually, needs a conflict resolution fix:

diff --git a/Makefile b/Makefile
index 8cf1e38..24d5fb8 100644
--- a/Makefile
+++ b/Makefile
@@ -627,8 +627,8 @@ qemu-ga-qapi.7: qemu-ga-qapi.texi
 
 dvi: qemu-doc.dvi qemu-qapi.dvi qemu-ga-qapi.dvi
 html: qemu-doc.html qemu-qapi.html qemu-ga-qapi.html
-info: qemu-doc.info qemu-tech.info qemu-qapi.info qemu-ga-qapi.info
-pdf: qemu-doc.pdf qemu-tech.pdf qemu-qapi.pdf qemu-ga-qapi.pdf
+info: qemu-doc.info qemu-qapi.info qemu-ga-qapi.info
+pdf: qemu-doc.pdf qemu-qapi.pdf qemu-ga-qapi.pdf
 
 qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
        qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \


> Next: actual review the patches.