From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1uO0-00008P-Dd for qemu-devel@nongnu.org; Wed, 02 Nov 2016 08:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1uNs-0005Av-40 for qemu-devel@nongnu.org; Wed, 02 Nov 2016 08:11:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34081) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c1uNr-0005AB-UV for qemu-devel@nongnu.org; Wed, 02 Nov 2016 08:11:12 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50E2B19D241 for ; Wed, 2 Nov 2016 12:11:11 +0000 (UTC) From: Markus Armbruster References: <20160925181836.18293-1-marcandre.lureau@redhat.com> <87shrjmoyz.fsf@dusky.pond.sub.org> Date: Wed, 02 Nov 2016 13:11:09 +0100 In-Reply-To: <87shrjmoyz.fsf@dusky.pond.sub.org> (Markus Armbruster's message of "Wed, 26 Oct 2016 11:36:20 +0200") Message-ID: <87r36uqdya.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 00/11] qapi doc generation (whole version, squashed) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org Markus Armbruster writes: > Marc-Andr=C3=A9 Lureau 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 =20 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 =20 qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \ qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.tex= i \ > Next: actual review the patches.