On 17 March 2016 at 15:25, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 17 March 2016 at 14:43, Daniel P. Berrange <berra...@redhat.com> wrote: >> The following changes since commit 8c4575472494a5dfedfe05e7b58ca9ce3872ad56: >> >> Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' >> into staging (2016-03-17 08:52:58 +0000) >> >> are available in the git repository at: >> >> git://github.com/berrange/qemu tags/pull-qcrypto-2016-03-17-2 >> >> for you to fetch changes up to 4bca0b8675cc1f1949f2f08bc3cd9e55d61125f1: >> >> crypto: implement the LUKS block encryption format (2016-03-17 14:41:15 >> +0000) >> >> ---------------------------------------------------------------- >> Merge QCrypto 2016/03/17 v2 >> >> ---------------------------------------------------------------- > > Now fails on OSX
Also, build failure on clang for x86-64 linux: CC tests/test-crypto-block.o /home/petmay01/linaro/qemu-for-merges/tests/test-crypto-block.c:180:23: error: implicit conversion from enumeration type 'enum QCryptoHashAlgorithm' to different enumeration type 'QCryptoCipherAlgorithm' (aka 'enum QCryptoCipherAlgorithm') [-Werror,-Wenum-conversion] .ivgen_hash = QCRYPTO_HASH_ALG_SHA256, ^~~~~~~~~~~~~~~~~~~~~~~ thanks -- PMM