Re: [Qemu-devel] [PULL v2 00/11] Net patches

[Peter Maydell]

On 28 February 2015 at 02:07, Stefan Hajnoczi <address@hidden> wrote:
> v2:
>  * Squash in Jiri's fix for rocker format string specifiers [Peter]
>  * Squash in Windows build fix [Peter]
>  * Both build fixes are described in "rocker: add new rocker switch device"

Still hasn't fixed all the build errors, I'm afraid:

In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:24,
                 from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.c:19:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_world.h:24:
error: redefinition of typedef 'RockerTlv'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_hw.h:143:
error: previous declaration of 'RockerTlv' was here
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.c:19:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:71:
error: redefinition of typedef 'World'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_world.h:22:
error: previous declaration of 'World' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:72:
error: redefinition of typedef 'Rocker'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_world.h:23:
error: previous declaration of 'Rocker' was here
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.c:21:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.h:25:
error: redefinition of typedef 'Rocker'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:72:
error: previous declaration of 'Rocker' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.h:27:
error: redefinition of typedef 'World'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:71:
error: previous declaration of 'World' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.c:42:
error: redefinition of typedef 'FpPort'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.h:26:
error: previous declaration of 'FpPort' was here
make: *** [hw/net/rocker/rocker_fp.o] Error 1

(similarly for other types like DescRing and DescInfo).

-- PMM