On 16 February 2017 at 14:31, Paolo Bonzini <pbonz...@redhat.com> wrote: > The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58: > > Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into > staging (2017-02-14 09:55:48 +0000) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 395d41a549f69f4ec603afa3d3ade1e2005777d5: > > target-i386: correctly propagate retaddr into SVM helpers (2017-02-16 > 15:30:49 +0100) > > ---------------------------------------------------------------- > * GUEST_PANICKED improvements (Anton) > * vCont gdbstub rewrite (Claudio) > * Fix CPU creation with -device (Liyang) > * Logging fixes for pty chardevs (Ed) > * Makefile "move if changed" fix (Lin) > * First part of cpu_exec refactoring (me) > * SVM emulation fix (me) > * apic_delivered fix (Pavel) > * "info ioapic" fix (Peter) > * qemu-nbd socket activation (Richard) > * QOMification of mcf_uart (Thomas)
Fails to build on 32-bit ARM: /home/petmay01/qemu/target/i386/svm_helper.c:63:6: error: conflicting types for 'cpu_v mexit' void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, ^ In file included from /home/petmay01/qemu/target/i386/svm_helper.c:21:0: /home/petmay01/qemu/target/i386/cpu.h:1625:6: note: previous declaration of 'cpu_vmexit' was here void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, ^ /home/petmay01/qemu/rules.mak:69: recipe for target 'target/i386/svm_helper.o' failed The problem is in the bit of the prototype the error message doesn't quote: Prototype in cpu.h: void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, uintptr_t retaddr); svm_helper.c stub version; void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, uint64_t retaddr) svm_helper.c real version: void cpu_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1, uintptr_t retaddr) On 32-bit uintptr_t and uint64_t aren't the same thing. thanks -- PMM