Merge remote-tracking branch 'qemu/master'
commit982ee2b7b5b84ee225f624ae6bd5996f3f0046a6
authorStefan Weil <sw@weilnetz.de>
Tue, 3 Jan 2017 09:23:12 +0000 (3 10:23 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 3 Jan 2017 09:23:12 +0000 (3 10:23 +0100)
treedf21be148a9f5524de33a7e6dcebac0a82ff1787
parentf5659322f4a50ebf99573f302455500c3b5f32c0
parentdbe2b65566e76d3c3a0c3358285c0336ac61e757
Merge remote-tracking branch 'qemu/master'

# Conflicts:
# hw/ppc/pnv_xscom.c
# target-m68k/op_helper.c
# target/i386/helper.h

Fix also some include paths (needed for new directory structure).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
52 files changed:
Makefile
Makefile.target
configure
disas/cris.c
exec.c
hw/i386/kvm/apic.c
hw/mips/ar7.c
hw/ppc/pnv_xscom.c
include/exec/cpu-all.h
include/hw/arm/arm.h
include/qemu/main-loop.h
include/sysemu/hax.h
linux-user/main.c
rules.mak
target/alpha/mem_helper.c
target/arm/cpu.c
target/arm/cpu.h
target/arm/helper.c
target/arm/op_helper.c
target/arm/translate.c
target/cris/cpu.h
target/cris/op_helper.c
target/cris/translate.c
target/i386/Makefile.objs
target/i386/cpu.h
target/i386/hax-all.c
target/i386/hax-darwin.c
target/i386/hax-darwin.h
target/i386/hax-i386.h
target/i386/hax-interface.h
target/i386/hax-mem.c
target/i386/hax-windows.c
target/i386/hax-windows.h
target/i386/helper.c
target/i386/helper.h
target/i386/kvm.c
target/i386/misc_helper.c
target/i386/seg_helper.c
target/i386/svm_helper.c
target/i386/translate.c
target/m68k/op_helper.c
target/m68k/translate.c
target/microblaze/mmu.c
target/microblaze/op_helper.c
target/mips/cpu.h
target/mips/helper.c
target/mips/op_helper.c
target/ppc/excp_helper.c
target/ppc/mmu-hash64.c
target/ppc/translate_init.c
target/s390x/gdbstub.c
target/sh4/op_helper.c