On 9 October 2015 at 10:13, Stefan Hajnoczi <stefa...@redhat.com> wrote: > The following changes since commit 1d27b91723c252d9a97151dc1959cfd89c5816cb: > > Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20151007.0' > into staging (2015-10-08 16:50:34 +0100) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to b22b254b8b61705517756060bd8e83edd30b9987: > > sdhci.c: Limit the maximum block size (2015-10-09 09:45:04 +0100) > > ---------------------------------------------------------------- > > ---------------------------------------------------------------- > > Alistair Francis (1): > sdhci.c: Limit the maximum block size > > Kevin O'Connor (1): > sdhci: Pass drive parameter to sdhci-pci via qdev property > > Paolo Bonzini (1): > block: switch from g_slice allocator to malloc > > Pierre Morel (1): > virtio dataplane: adapt dataplane for virtio Version 1 > > Stefan Hajnoczi (1): > virtio-blk: use blk_io_plug/unplug for Linux AIO batching
Compiler warnings on OSX: /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:84:23: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:84:29: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:97:23: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:97:29: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:110:23: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/dataplane/vring.c:110:29: warning: format specifies type 'unsigned long' but the argument has type 'hwaddr' (aka 'unsigned long long') [-Wformat] size, addr); ^~~~ 6 warnings generated. Same problem, w32 build: /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c: In function ‘vring_setup’: /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:84: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 2 has type ‘hwaddr’ /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:84: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 3 has type ‘hwaddr’ /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:97: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 2 has type ‘hwaddr’ /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:97: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 3 has type ‘hwaddr’ /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:110: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 2 has type ‘hwaddr’ /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:110: warning: format ‘%16lx’ expects type ‘long unsigned int’, but argument 3 has type ‘hwaddr’ make[1]: *** [hw/virtio/dataplane/vring.o] Error 1 thanks -- PMM