Re: [Qemu-devel] [PULL v3 00/28] ivshmem deprecation, qtests, typedefs and gnu99

[Philippe Mathieu-Daudé]

On 1/21/19 3:43 PM, Peter Maydell wrote:
> On Thu, 17 Jan 2019 at 13:38, Thomas Huth <address@hidden> wrote:
>>
>>  Hi Peter!
>>
>> The following changes since commit 6f2f34177a25bffd6fd92a05e6e66c8d22d97094:
>>
>>   Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
>> staging (2019-01-15 18:32:57 +0000)
>>
>> are available in the git repository at:
>>
>>   https://gitlab.com/huth/qemu.git tags/pull-request-2019-01-17
>>
>> for you to fetch changes up to 3f0832c85380321ef697d64342b389648f8abb1c:
>>
>>   tests/hexloader-test: Don't pass -nographic to the QEMU under test 
>> (2019-01-17 14:25:12 +0100)
>>
>> ----------------------------------------------------------------
>> - Remove deprecated "ivshmem" legacy device
>> - Bug fix for vhost-user-test
>> - Use more CONFIG Makefile switches for qtests
>> - Get rid of global_qtests in some more qtests
>> - typedef cleanups
>> - Fixes for compiling with Clang
>> - Force C standard to gnu99
>> ----------------------------------------------------------------
> 
> I gave this another run now the ipmi-bt test has been
> disabled. It gets this compile failure on clang builds:
> 
> In file included from
> /home/petmay01/linaro/qemu-for-merges/hw/net/vhost_net.c:21:
> /home/petmay01/linaro/qemu-for-merges/include/hw/virtio/virtio-net.h:189:3:
> error: redefinition of typedef 'VirtIONet' is a C11 feature
> [-Werror,-Wtypedef-redefinition]
> } VirtIONet;

Oh this got introduced by 2974e916df8:
"virtio-net: support RSC v4/v6 tcp traffic for Windows HCK".

Thomas I'm afraid you'll have to rebase and add a new fix :/

>   ^
> /home/petmay01/linaro/qemu-for-merges/include/hw/virtio/virtio-net.h:110:26:
> note: previous definition is here
> typedef struct VirtIONet VirtIONet;
>                          ^
> 1 error generated.
> 
> thanks
> -- PMM
>