Message ID | 1484559200-2301-1-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 16 January 2017 at 09:33, Markus Armbruster <armbru@redhat.com> wrote: > This is Marc-André's "[PATCH v8 00/21] qapi doc generation (whole > version, squashed)" with a few commit messages tweaked, and "[PATCH v8 > 14/21] (SQUASHED) move doc to schema" unsquashed into 161 patches. > > We did all the respins with in this squashed form to reduce noise. > However, since the unsquashed form is better suited for review, and > probably nicer if we have to revisit this part of the work down the > road, I'm proposing to merge this unsquashed. > > If you want me to post the unsquashed patches, I'm happy to redo this > pull request. > > If you'd rather pull the squashed version, likewise. > > I'm afraid this is a bit of a doc conflict magnet. The sooner we can > get it in, the easier for Marc-André and me. > > v2: > * Rebased (v1 conflicts with commit e1ff3c6) > * test-qapi.py tweaked to avoid trailing empty lines in .out > > The following changes since commit b6af8ea60282df514f87d32e36afd1c9aeee28c8: > > Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging (2017-01-13 14:38:21 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-01-16 > > for you to fetch changes up to 56e8bdd46a8a42d89b0afea9da83ae7679cc0439: > > build-sys: add qapi doc generation targets (2017-01-16 10:11:43 +0100) > > ---------------------------------------------------------------- > QAPI patches for 2017-01-16 This seems to trigger some warnings from older makeinfo versions: On the Fedora 20 ppc64be box and Ubuntu 14.04.5 LTS aarch64 box (Ubuntu: makeinfo (GNU texinfo) 5.2; Fedora: makeinfo (GNU texinfo) 5.1) /home/pm215/qemu/docs/qemu-ga-ref.texi:41: warning: undefined flag: VERSION /home/pm215/qemu/docs/qemu-ga-ref.texi:41: warning: undefined flag: VERSION /home/pm215/qemu/docs/qemu-qmp-ref.texi:41: warning: undefined flag: VERSION /home/pm215/qemu/docs/qemu-qmp-ref.texi:41: warning: undefined flag: VERSION On OSX (makeinfo (GNU texinfo) 4.8): ./qemu-options.texi:60: warning: unlikely character [ in @var. ./qemu-options.texi:60: warning: unlikely character ] in @var. ./qemu-options.texi:61: warning: unlikely character [ in @var. ./qemu-options.texi:61: warning: unlikely character ] in @var. (OSX also has the long standing warning /Users/pm215/src/qemu-for-merges/qemu-doc.texi:7: warning: unrecognized encoding name `UTF-8'. but you can ignore that since it's been that way for years and is because osx's makeinfo is ancient.) thanks -- PMM