Re: [PULL 0/6] QAPI patches for 2019-12-17

[Markus Armbruster]

Peter Maydell <address@hidden> writes:

> On Tue, 17 Dec 2019 at 08:16, Markus Armbruster <address@hidden> wrote:
>>
>> The following changes since commit cb88904a54903ef6ba21a68a61d9cd51e2166304:
>>
>>   Merge remote-tracking branch 
>> 'remotes/amarkovic/tags/mips-queue-dec-16-2019' into staging (2019-12-16 
>> 14:07:56 +0000)
>>
>> are available in the Git repository at:
>>
>>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2019-12-17
>>
>> for you to fetch changes up to 328add3012e0b642134afedcd53660c30c758866:
>>
>>   qapi: Simplify QAPISchemaModularCVisitor (2019-12-17 08:09:28 +0100)
>>
>> ----------------------------------------------------------------
>> QAPI patches for 2019-12-17
>>
>> ----------------------------------------------------------------
>> Markus Armbruster (6):
>>       qapi: Tweak "command returns a nice type" check for clarity
>>       tests/Makefile.include: Fix missing test-qapi-emit-events.[ch]
>>       qapi: Generate command registration stuff into separate files
>>       qapi: Proper intermediate representation for modules
>>       qapi: Fix code generation for empty modules
>>       qapi: Simplify QAPISchemaModularCVisitor
>
> Build failures:
>
> OSX:
> In file included from In file included from qapi/qapi-types-block.c:15:
> In file included from
> /Users/pm215/src/qemu-for-merges/build/all/qapi/qapi-types-block.h:17:
> In file included from
> /Users/pm215/src/qemu-for-merges/build/all/qapi/qapi-types-block-core.h:18:
> /Users/pm215/src/qemu-for-merges/build/all/qapi/qapi-types-crypto.h:176:33:
> error: field has incomplete type 'QCryptoBlockOptionsQCow' (aka
> 'struct QCryptoBlockOptionsQCow')
> qapi/qapi-types-block-core.c:15:
> In file included from
> /Users/pm215/src/qemu-for-merges/build/all/qapi/qapi-types-block-core.h:18:
> /Users/pm215/src/qemu-for-merges/build/all/qapi/qapi-types-crypto.h:176:33:
> error: field has incomplete type 'QCryptoBlockOptionsQCow' (aka
> 'struct QCryptoBlockOptionsQCow')
>         QCryptoBlockOptionsQCow qcow;
>         QCryptoBlockOptionsQCow qcow;                                ^
>
>                                 ^

Perplexing.  None of the files involved gets changed by this pull
request.  My qapi-types-crypto.h has

    typedef struct QCryptoBlockOptionsQCow QCryptoBlockOptionsQCow;
    [...]
    struct QCryptoBlockOptionsQCow {
        bool has_key_secret;
        char *key_secret;
    };
    [...]
    struct QCryptoBlockOpenOptions {
        /* Members inherited from QCryptoBlockOptionsBase: */
        QCryptoBlockFormat format;
        /* Own members: */
        union { /* union tag is @format */
            QCryptoBlockOptionsQCow qcow;
            QCryptoBlockOptionsLUKS luks;
        } u;
    };

before and after.  May I see yours?

[More errors snipped, they're similar]