On 17 December 2015 at 17:45, Paolo Bonzini <pbonz...@redhat.com> wrote: > The following changes since commit e5fbe28e5424d26fc2c25d0a7ecb927d3c80d5e8: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20151217-1' into staging (2015-12-17 > 13:38:34 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 29cd81ffe3679bec9a062505e5b0d9a12f3558a8: > > coverity: Model g_memdup() (2015-12-17 17:33:49 +0100) > > (The split irqchip and synic patches have a few changes compared to > what was posted, because they didn't compile on Windows or ARM). > > ---------------------------------------------------------------- > * KVM: synic support, split irqchip support > * memory: cleanups, optimizations, ioeventfd emulation > * SCSI: small fixes, vmw_pvscsi compatibility improvements > * qemu_log cleanups > * Coverity model improvements >
Applied to master, but I see the Travis build is now failing: https://travis-ci.org/qemu/qemu/builds/97516851 In file included from /home/travis/build/qemu/qemu/include/trace.h:4:0, from util/oslib-posix.c:58: ./trace/generated-tracers.h: In function ‘trace_user_setup_frame’: ./trace/generated-tracers.h:17455:25: error: too many arguments for format [-Werror=format-extra-args] ./trace/generated-tracers.h: In function ‘trace_user_setup_rt_frame’: ./trace/generated-tracers.h:17467:25: error: too many arguments for format [-Werror=format-extra-args] ./trace/generated-tracers.h: In function ‘trace_user_do_rt_sigreturn’: ./trace/generated-tracers.h:17479:25: error: too many arguments for format [-Werror=format-extra-args] ./trace/generated-tracers.h: In function ‘trace_user_do_sigreturn’: ./trace/generated-tracers.h:17491:25: error: too many arguments for format [-Werror=format-extra-args] ./trace/generated-tracers.h: In function ‘trace_user_s390x_restore_sigregs’: ./trace/generated-tracers.h:17551:25: error: too many arguments for format [-Werror=format-extra-args] cc1: all warnings being treated as errors (and a similar-but-different error in a different travis build). Could you have a look, please? I see the travis build is using --enable-trace-backends=ftrace, which is probably why it sees a problem and I didn't in my merge tests. thanks -- PMM