On 23 February 2015 at 23:40, Stefan Hajnoczi <stefa...@redhat.com> wrote:
> The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7:
>
> Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into
> staging (2015-02-13 11:44:50 +0000)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 9b4e37ada83a0602df60670f4197a97be5c4e74d:
>
> rocker: timestamp on the debug logs helps correlate with events in the VM
> (2015-02-23 09:47:03 +0000)
Doesn't build on 32 bit, I'm afraid:
CC hw/net/rocker/rocker.o
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_io_writel?:
/root/qemu/hw/net/rocker/rocker.c:779:21: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:819:9: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_io_writeq?:
/root/qemu/hw/net/rocker/rocker.c:839:21: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:839:21: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 3 has type
?uint64_t? [-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:857:17: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:857:17: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 3 has type
?uint64_t? [-Werror=format]
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_mmio_write?:
/root/qemu/hw/net/rocker/rocker.c:949:13: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 3 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:949:13: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 5 has type
?uint64_t? [-Werror=format]
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_io_readl?:
/root/qemu/hw/net/rocker/rocker.c:1021:21: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:1075:9: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_io_readq?:
/root/qemu/hw/net/rocker/rocker.c:1097:21: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c:1125:9: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 2 has type ?hwaddr?
[-Werror=format]
/root/qemu/hw/net/rocker/rocker.c: In function ?rocker_mmio_read?:
/root/qemu/hw/net/rocker/rocker.c:1135:13: error: format ?%lx? expects
argument of type ?long unsigned int?, but argument 3 has type ?hwaddr?
[-Werror=format]
cc1: all warnings being treated as errors
(Apologies for the mangling of smart-quotes into "?" somewhere
along the line.)
Lots of errors in the Windows build too:
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:27:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.h:22:23:
error: arpa/inet.h: No such file or directory
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.c:27:
/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.c:27:
/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.c:29:
/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.h:48:
error: expected declaration specifiers or '...' before 'uint'
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:30:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_desc.h:23:
error: redefinition of typedef 'Rocker'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.h:25:
error: previous declaration of 'Rocker' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_desc.h:25:
error: redefinition of typedef 'DescInfo'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_world.h:25:
error: previous declaration of 'DescInfo' was here
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:33:
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.h:20:
error: redefinition of typedef 'Rocker'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_desc.h:23:
error: previous declaration of 'Rocker' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.h:21:
error: redefinition of typedef 'World'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_fp.h:27:
error: previous declaration of 'World' was here
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:68:
error: redefinition of typedef 'Rocker'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.h:20:
error: previous declaration of 'Rocker' was here
cc1: warnings being treated as errors
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c: In
function 'rocker_io_writel':
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:779:
warning: format '%lx' expects type 'long unsigned int', but argument 2
has type 'hwaddr'
/home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:819:
warning: format '%lx' expects type 'long unsigned int', but argument 2
has type 'hwaddr'
(there are more, but I expect most of them are fallout from that attempt
to include arpa/inet.h.)
-- PMM
