On 07/20/2016 10:05 AM, Peter Maydell wrote: > On 19 July 2016 at 23:47, Max Reitz <mre...@redhat.com> wrote: >> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d: >> >> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 >> 16:40:39 +0100) >> >> are available in the git repository at: >> >> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20 >> >> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf: >> >> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 >> +0200) >> >> ---------------------------------------------------------------- >> Block patches for master >> >> ---------------------------------------------------------------- > > Fails to build on everything: > > GEN qapi-visit.h > In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.json:9: > /Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union > 'QCryptoBlockInfo' data missing 'qcow' branch
Aha. Cause is two branches developed in parallel; commit d0b18239 forces all branches of a flat union to be listed (to avoid an abort() if the user passes a branch that was not listed); solution is to expand the crypto.json addition to cover all branches, even if it means an empty type for the branches that have no additional data. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
