On 29 June 2018 at 21:07, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > Fix the --disable-tcg breakage introduced by 8bca9a03ec60d: > > $ configure --disable-tcg > [...] > $ make -C i386-softmmu exec.o > make: Entering directory 'i386-softmmu' > CC exec.o > In file included from source/qemu/exec.c:62:0: > source/qemu/include/exec/ram_addr.h:96:6: error: conflicting types for > ‘tb_invalidate_phys_range’ > void tb_invalidate_phys_range(ram_addr_t start, ram_addr_t end); > ^~~~~~~~~~~~~~~~~~~~~~~~ > In file included from source/qemu/exec.c:24:0: > source/qemu/include/exec/exec-all.h:309:6: note: previous declaration of > ‘tb_invalidate_phys_range’ was here > void tb_invalidate_phys_range(target_ulong start, target_ulong end); > ^~~~~~~~~~~~~~~~~~~~~~~~ > source/qemu/exec.c:1043:6: error: conflicting types for > ‘tb_invalidate_phys_addr’ > void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs > attrs) > ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from source/qemu/exec.c:24:0: > source/qemu/include/exec/exec-all.h:308:6: note: previous declaration of > ‘tb_invalidate_phys_addr’ was here > void tb_invalidate_phys_addr(target_ulong addr); > ^~~~~~~~~~~~~~~~~~~~~~~ > make: *** [source/qemu/rules.mak:69: exec.o] Error 1 > make: Leaving directory 'i386-softmmu' > > Tested to build x86_64-softmmu and i386-softmmu targets. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Thanks; applied to master as a build fix. (I've also added a notcg config to my test set for merge builds.) -- PMM
