On 11 January 2017 at 19:34, Paolo Bonzini <pbonz...@redhat.com> wrote: > The following changes since commit 41a0e54756a9ae6b60be34bb33302a7e085fdb07: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging > (2017-01-10 10:46:21 +0000) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to af89d1b204f03e10ade3b61365c7e5c06805caee: > > Revert "win32: don't run subprocess tests on Mingw32 platform" (2017-01-11 > 20:13:12 +0100) > > ---------------------------------------------------------------- > * QOM interface fix (Eduardo) > * RTC fixes (Gaohuai, Igor) > * Memory leak fixes (Li Qiang, me) > * Ctrl-a b regression (Marc-André) > * Stubs cleanups and fixes (Leif, me) > * hxtool tweak (me) > * HAX support (Vincent) > * QemuThread, exec.c, target-i386 and SCSI fixes (Roman, Xinhua, me) > > ----------------------------------------------------------------
This failed to build on ppc64be: /home/pm215/qemu/target/ppc/kvm.c: In function ‘kvm_handle_debug’: /home/pm215/qemu/target/ppc/kvm.c:1724:9: error: implicit declaration of function ‘cpu_synchronize_s tate’ [-Werror=implicit-function-declaration] cpu_synchronize_state(cs); ^ In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:13:0, from /home/pm215/qemu/include/sysemu/kvm.h:23, from /home/pm215/qemu/include/sysemu/hw_accel.h:16, from /home/pm215/qemu/target/ppc/translate_init.c:27, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:320:0: error: "KVM_INTERRUPT_SET" redefined [-Wer ror] #define KVM_INTERRUPT_SET -1U ^ In file included from /home/pm215/qemu/target/ppc/translate_init.c:24:0, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/target/ppc/kvm_ppc.h:319:0: note: this is the location of the previous definition #define KVM_INTERRUPT_SET -1 ^ In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:13:0, from /home/pm215/qemu/include/sysemu/kvm.h:23, from /home/pm215/qemu/include/sysemu/hw_accel.h:16, from /home/pm215/qemu/target/ppc/translate_init.c:27, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:321:0: error: "KVM_INTERRUPT_UNSET" redefined [-Werror] #define KVM_INTERRUPT_UNSET -2U ^ In file included from /home/pm215/qemu/target/ppc/translate_init.c:24:0, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/target/ppc/kvm_ppc.h:323:0: note: this is the location of the previous definition #define KVM_INTERRUPT_UNSET -2 ^ In file included from /home/pm215/qemu/linux-headers/linux/kvm.h:13:0, from /home/pm215/qemu/include/sysemu/kvm.h:23, from /home/pm215/qemu/include/sysemu/hw_accel.h:16, from /home/pm215/qemu/target/ppc/translate_init.c:27, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/build/all/linux-headers/asm/kvm.h:322:0: error: "KVM_INTERRUPT_SET_LEVEL" redefined [-Werror] #define KVM_INTERRUPT_SET_LEVEL -3U ^ In file included from /home/pm215/qemu/target/ppc/translate_init.c:24:0, from /home/pm215/qemu/target/ppc/translate.c:6786: /home/pm215/qemu/target/ppc/kvm_ppc.h:327:0: note: this is the location of the previous definition #define KVM_INTERRUPT_SET_LEVEL -3 ^ thanks -- PMM