From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPyqe-0000jc-T8 for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:16:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPyqb-0003jM-Ol for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:16:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPyqb-0003jG-F3 for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:16:05 -0400 References: <20160719224730.6948-1-mreitz@redhat.com> From: Eric Blake Message-ID: <578FEA13.1090001@redhat.com> Date: Wed, 20 Jul 2016 15:16:03 -0600 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="BFHeoJ7lW06EaPcUeflOSito8BpDerxUW" Subject: Re: [Qemu-devel] [PULL 0/4] Block patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Max Reitz Cc: QEMU Developers This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --BFHeoJ7lW06EaPcUeflOSito8BpDerxUW From: Eric Blake To: Peter Maydell , Max Reitz Cc: QEMU Developers Message-ID: <578FEA13.1090001@redhat.com> Subject: Re: [Qemu-devel] [PULL 0/4] Block patches References: <20160719224730.6948-1-mreitz@redhat.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 07/20/2016 10:05 AM, Peter Maydell wrote: > On 19 July 2016 at 23:47, Max Reitz wrote: >> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2= ff63d: >> >> 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 bafea5b7c26dd14895f7be64685a12645a75f4c= f: >> >> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:= 03 +0200) >> >> ---------------------------------------------------------------- >> Block patches for master >> >> ---------------------------------------------------------------- >=20 > Fails to build on everything: >=20 > 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. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --BFHeoJ7lW06EaPcUeflOSito8BpDerxUW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXj+oTAAoJEKeha0olJ0Nqo+QH/1+bhVgaccylI7zXqzHYa3EH y5e9m1IUKV5dSoNtsh83b/d3TfTvxHi198n0Vu1x1vr1/xoVTosyyvpbj3dmktw4 IGCYz+H1wQlq2JEANTMKUWEN2ygGE71SWinU9NoefwL3gad8hCIF19bn1reMl8/e n9i/SDWbUtkrNNKGjPoYgD7KVWQ0YSctlmcNYcFdbIYwShW68R+nfGOUD7UA8GzI TWAqxhCrWu0TGi4Z3pG5IlbeSQU+ywSiCcDM64xrlROmjgoPQS+1EqOugYoR/7vt hI174D1HDAst3jg8/GWuZMeMVXMRr18a5IMMSi2ogSet2P49z3fA+Yja0ieTk8Y= =Yc38 -----END PGP SIGNATURE----- --BFHeoJ7lW06EaPcUeflOSito8BpDerxUW--