On 13 November 2015 at 07:58, Stefan Hajnoczi <stefa...@redhat.com> wrote: > v3: > * Include "exec/log.h" from translate-a64.c [Peter] > > v2: > * Add missing log.py file [Peter] > > The following changes since commit 74fcbd22d20a2fbc1a47a7b00cce5bf98fd7be5f: > > hw/misc: Add support for ADC controller in Xilinx Zynq 7000 (2015-11-12 > 21:30:42 +0000) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git tags/tracing-pull-request > > for you to fetch changes up to de332788d7c626fce31f6baebab807df5a7410e1: > > log: add "-d trace:PATTERN" (2015-11-13 15:52:57 +0800)
w32 fails to build with the same 'ssize_t vs signed size_t for %zd' thing that hit somebody else's changes earlier this week: In file included from /home/petmay01/linaro/qemu-for-merges/include/trace.h:4, from /home/petmay01/linaro/qemu-for-merges/util/oslib-win32.c:38: ./trace/generated-tracers.h: In function ‘trace_virtio_console_flush_buf’: ./trace/generated-tracers.h:240: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 8 has type ‘ssize_t’ CC util/bitops.o ./trace/generated-tracers.h: In function ‘trace_usb_ohci_iso_td_so’: ./trace/generated-tracers.h:2784: warning: format ‘%zu’ expects type ‘size_t’, but argument 11 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_usb_ohci_iso_td_data_overrun’: ./trace/generated-tracers.h:2796: warning: format ‘%zu’ expects type ‘size_t’, but argument 7 has type ‘ssize_t’ CC util/hbitmap.o CC util/fifo8.o ./trace/generated-tracers.h: In function ‘trace_spice_vmc_write’: ./trace/generated-tracers.h:6492: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 6 has type ‘ssize_t’ CC util/acl.o CC util/error.o ./trace/generated-tracers.h: In function ‘trace_v9fs_read_return’: ./trace/generated-tracers.h:10344: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_v9fs_readdir_return’: ./trace/generated-tracers.h:10368: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_v9fs_write_return’: ./trace/generated-tracers.h:10392: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ CC util/qemu-error.o CC util/id.o CC util/iov.o cc1: warnings being treated as errors In file included from /home/petmay01/linaro/qemu-for-merges/include/trace.h:4, from /home/petmay01/linaro/qemu-for-merges/util/hbitmap.c:18: ./trace/generated-tracers.h: In function ‘trace_virtio_console_flush_buf’: ./trace/generated-tracers.h:240: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 8 has type ‘ssize_t’ CC util/qemu-config.o ./trace/generated-tracers.h: In function ‘trace_usb_ohci_iso_td_so’: ./trace/generated-tracers.h:2784: warning: format ‘%zu’ expects type ‘size_t’, but argument 11 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_usb_ohci_iso_td_data_overrun’: ./trace/generated-tracers.h:2796: warning: format ‘%zu’ expects type ‘size_t’, but argument 7 has type ‘ssize_t’ make: *** [util/oslib-win32.o] Error 1 make: *** Waiting for unfinished jobs.... ./trace/generated-tracers.h: In function ‘trace_spice_vmc_write’: ./trace/generated-tracers.h:6492: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 6 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_v9fs_read_return’: ./trace/generated-tracers.h:10344: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_v9fs_readdir_return’: ./trace/generated-tracers.h:10368: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ ./trace/generated-tracers.h: In function ‘trace_v9fs_write_return’: ./trace/generated-tracers.h:10392: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 9 has type ‘ssize_t’ make: *** [util/hbitmap.o] Error 1 make: Leaving directory `/home/petmay01/linaro/qemu-for-merges/build/w32' I also now get a handful of extra warnings in the 'make check' output: /aarch64/qom/xilinx-zynq-a9: OK /aarch64/qom/xlnx-ep108: WARNING: RAM size 8000000 is small for EP108OK /aarch64/qom/vexpress-a9: OK (note the missing newline...) TEST: tests/qom-test... (pid=19738) /microblaze/qom/none: OK /microblaze/qom/petalogix-s3adsp1800: Invalid MicroBlaze version number: (null) OK /microblaze/qom/petalogix-ml605: Invalid MicroBlaze version number: (null) OK thanks -- PMM