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 with:
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:140:25:
error: use of undeclared identifier 'luks_create_opts_default'
.create_opts = &luks_create_opts_default,
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:141:23:
error: use of undeclared identifier 'luks_open_opts'; did you mean
'qcow_open_opts'?
.open_opts = &luks_open_opts,
^~~~~~~~~~~~~~
qcow_open_opts
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:44:32:
note: 'qcow_open_opts' declared here
static QCryptoBlockOpenOptions qcow_open_opts = {
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:155:25:
error: use of undeclared identifier
'luks_create_opts_aes256_cbc_plain64'
.create_opts = &luks_create_opts_aes256_cbc_plain64,
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:156:23:
error: use of undeclared identifier 'luks_open_opts'; did you mean
'qcow_open_opts'?
.open_opts = &luks_open_opts,
^~~~~~~~~~~~~~
qcow_open_opts
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:44:32:
note: 'qcow_open_opts' declared here
static QCryptoBlockOpenOptions qcow_open_opts = {
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:170:25:
error: use of undeclared identifier
'luks_create_opts_aes256_cbc_essiv'
.create_opts = &luks_create_opts_aes256_cbc_essiv,
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:171:23:
error: use of undeclared identifier 'luks_open_opts'; did you mean
'qcow_open_opts'?
.open_opts = &luks_open_opts,
^~~~~~~~~~~~~~
qcow_open_opts
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:44:32:
note: 'qcow_open_opts' declared here
static QCryptoBlockOpenOptions qcow_open_opts = {
^
/Users/pm215/src/qemu-for-merges/tests/test-crypto-block.c:350:21:
error: invalid application of 'sizeof' to an incomplete type 'struct
QCryptoBlockTestData []'
for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
^~~~~~~~~~~~~~~~~~~~~~~
/sw/include/glib-2.0/glib/gmacros.h:207:36: note: expanded from macro
'G_N_ELEMENTS'
#define G_N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
^~~~~
7 errors generated.
thanks
-- PMM
