aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-10-11 08:56:52 +0200
committerThomas Huth <thuth@redhat.com>2016-12-20 21:52:12 +0100
commitfcf5ef2ab52c621a4617ebbef36bf43b4003f4c0 (patch)
tree2b450d96b01455df8ed908bf8f26ddc388a03380
parent82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff)
downloadqemu-arm-fcf5ef2ab52c621a4617ebbef36bf43b4003f4c0.tar.gz
Move target-* CPU file into a target/ folder
We've currently got 18 architectures in QEMU, and thus 18 target-xxx folders in the root folder of the QEMU source tree. More architectures (e.g. RISC-V, AVR) are likely to be included soon, too, so the main folder of the QEMU sources slowly gets quite overcrowded with the target-xxx folders. To disburden the main folder a little bit, let's move the target-xxx folders into a dedicated target/ folder, so that target-xxx/ simply becomes target/xxx/ instead. Acked-by: Laurent Vivier <laurent@vivier.eu> [m68k part] Acked-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> [tricore part] Acked-by: Michael Walle <michael@walle.cc> [lm32 part] Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> [s390x part] Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> [s390x part] Acked-by: Eduardo Habkost <ehabkost@redhat.com> [i386 part] Acked-by: Artyom Tarasenko <atar4qemu@gmail.com> [sparc part] Acked-by: Richard Henderson <rth@twiddle.net> [alpha part] Acked-by: Max Filippov <jcmvbkbc@gmail.com> [xtensa part] Reviewed-by: David Gibson <david@gibson.dropbear.id.au> [ppc part] Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> [cris&microblaze part] Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> [unicore32 part] Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--MAINTAINERS48
-rw-r--r--Makefile.objs10
-rw-r--r--Makefile.target4
-rw-r--r--disas/cris.c4
-rw-r--r--hw/alpha/alpha_sys.h2
-rw-r--r--hw/arm/strongarm.h2
-rw-r--r--hw/arm/virt-acpi-build.c2
-rw-r--r--hw/i386/acpi-build.c2
-rw-r--r--hw/i386/kvm/apic.c2
-rw-r--r--hw/intc/ioapic.c2
-rw-r--r--hw/misc/hyperv_testdev.c2
-rw-r--r--hw/ppc/fdt.c2
-rw-r--r--hw/ppc/pnv.c2
-rw-r--r--hw/ppc/pnv_core.c2
-rw-r--r--hw/ppc/pnv_lpc.c2
-rw-r--r--hw/ppc/pnv_xscom.c2
-rw-r--r--hw/ppc/spapr_cpu_core.c6
-rw-r--r--hw/sh4/shix.c2
-rw-r--r--include/hw/arm/arm.h2
-rw-r--r--include/hw/arm/exynos4210.h2
-rw-r--r--include/hw/arm/omap.h2
-rw-r--r--include/hw/arm/pxa.h2
-rw-r--r--include/hw/m68k/mcf.h2
-rw-r--r--include/hw/mips/cpudevs.h2
-rw-r--r--include/hw/ppc/fdt.h2
-rw-r--r--include/hw/ppc/ppc.h2
-rw-r--r--include/hw/ppc/spapr_cpu_core.h2
-rw-r--r--include/hw/sh4/sh.h2
-rw-r--r--scripts/analyze-inclusions8
-rw-r--r--target/alpha/Makefile.objs (renamed from target-alpha/Makefile.objs)0
-rw-r--r--target/alpha/STATUS (renamed from target-alpha/STATUS)0
-rw-r--r--target/alpha/cpu-qom.h (renamed from target-alpha/cpu-qom.h)0
-rw-r--r--target/alpha/cpu.c (renamed from target-alpha/cpu.c)0
-rw-r--r--target/alpha/cpu.h (renamed from target-alpha/cpu.h)0
-rw-r--r--target/alpha/fpu_helper.c (renamed from target-alpha/fpu_helper.c)0
-rw-r--r--target/alpha/gdbstub.c (renamed from target-alpha/gdbstub.c)0
-rw-r--r--target/alpha/helper.c (renamed from target-alpha/helper.c)0
-rw-r--r--target/alpha/helper.h (renamed from target-alpha/helper.h)0
-rw-r--r--target/alpha/int_helper.c (renamed from target-alpha/int_helper.c)0
-rw-r--r--target/alpha/machine.c (renamed from target-alpha/machine.c)0
-rw-r--r--target/alpha/mem_helper.c (renamed from target-alpha/mem_helper.c)0
-rw-r--r--target/alpha/sys_helper.c (renamed from target-alpha/sys_helper.c)0
-rw-r--r--target/alpha/translate.c (renamed from target-alpha/translate.c)0
-rw-r--r--target/alpha/vax_helper.c (renamed from target-alpha/vax_helper.c)0
-rw-r--r--target/arm/Makefile.objs (renamed from target-arm/Makefile.objs)0
-rw-r--r--target/arm/arch_dump.c (renamed from target-arm/arch_dump.c)0
-rw-r--r--target/arm/arm-powerctl.c (renamed from target-arm/arm-powerctl.c)0
-rw-r--r--target/arm/arm-powerctl.h (renamed from target-arm/arm-powerctl.h)0
-rw-r--r--target/arm/arm-semi.c (renamed from target-arm/arm-semi.c)0
-rw-r--r--target/arm/arm_ldst.h (renamed from target-arm/arm_ldst.h)0
-rw-r--r--target/arm/cpu-qom.h (renamed from target-arm/cpu-qom.h)0
-rw-r--r--target/arm/cpu.c (renamed from target-arm/cpu.c)0
-rw-r--r--target/arm/cpu.h (renamed from target-arm/cpu.h)0
-rw-r--r--target/arm/cpu64.c (renamed from target-arm/cpu64.c)0
-rw-r--r--target/arm/crypto_helper.c (renamed from target-arm/crypto_helper.c)0
-rw-r--r--target/arm/gdbstub.c (renamed from target-arm/gdbstub.c)0
-rw-r--r--target/arm/gdbstub64.c (renamed from target-arm/gdbstub64.c)0
-rw-r--r--target/arm/helper-a64.c (renamed from target-arm/helper-a64.c)0
-rw-r--r--target/arm/helper-a64.h (renamed from target-arm/helper-a64.h)0
-rw-r--r--target/arm/helper.c (renamed from target-arm/helper.c)0
-rw-r--r--target/arm/helper.h (renamed from target-arm/helper.h)0
-rw-r--r--target/arm/internals.h (renamed from target-arm/internals.h)2
-rw-r--r--target/arm/iwmmxt_helper.c (renamed from target-arm/iwmmxt_helper.c)0
-rw-r--r--target/arm/kvm-consts.h (renamed from target-arm/kvm-consts.h)0
-rw-r--r--target/arm/kvm-stub.c (renamed from target-arm/kvm-stub.c)0
-rw-r--r--target/arm/kvm.c (renamed from target-arm/kvm.c)0
-rw-r--r--target/arm/kvm32.c (renamed from target-arm/kvm32.c)0
-rw-r--r--target/arm/kvm64.c (renamed from target-arm/kvm64.c)0
-rw-r--r--target/arm/kvm_arm.h (renamed from target-arm/kvm_arm.h)0
-rw-r--r--target/arm/machine.c (renamed from target-arm/machine.c)0
-rw-r--r--target/arm/monitor.c (renamed from target-arm/monitor.c)0
-rw-r--r--target/arm/neon_helper.c (renamed from target-arm/neon_helper.c)0
-rw-r--r--target/arm/op_addsub.h (renamed from target-arm/op_addsub.h)0
-rw-r--r--target/arm/op_helper.c (renamed from target-arm/op_helper.c)0
-rw-r--r--target/arm/psci.c (renamed from target-arm/psci.c)0
-rw-r--r--target/arm/trace-events (renamed from target-arm/trace-events)2
-rw-r--r--target/arm/translate-a64.c (renamed from target-arm/translate-a64.c)0
-rw-r--r--target/arm/translate.c (renamed from target-arm/translate.c)0
-rw-r--r--target/arm/translate.h (renamed from target-arm/translate.h)0
-rw-r--r--target/cris/Makefile.objs (renamed from target-cris/Makefile.objs)0
-rw-r--r--target/cris/cpu-qom.h (renamed from target-cris/cpu-qom.h)0
-rw-r--r--target/cris/cpu.c (renamed from target-cris/cpu.c)0
-rw-r--r--target/cris/cpu.h (renamed from target-cris/cpu.h)0
-rw-r--r--target/cris/crisv10-decode.h (renamed from target-cris/crisv10-decode.h)0
-rw-r--r--target/cris/crisv32-decode.h (renamed from target-cris/crisv32-decode.h)0
-rw-r--r--target/cris/gdbstub.c (renamed from target-cris/gdbstub.c)0
-rw-r--r--target/cris/helper.c (renamed from target-cris/helper.c)0
-rw-r--r--target/cris/helper.h (renamed from target-cris/helper.h)0
-rw-r--r--target/cris/machine.c (renamed from target-cris/machine.c)0
-rw-r--r--target/cris/mmu.c (renamed from target-cris/mmu.c)0
-rw-r--r--target/cris/mmu.h (renamed from target-cris/mmu.h)0
-rw-r--r--target/cris/op_helper.c (renamed from target-cris/op_helper.c)0
-rw-r--r--target/cris/opcode-cris.h (renamed from target-cris/opcode-cris.h)0
-rw-r--r--target/cris/translate.c (renamed from target-cris/translate.c)0
-rw-r--r--target/cris/translate_v10.c (renamed from target-cris/translate_v10.c)0
-rw-r--r--target/i386/Makefile.objs (renamed from target-i386/Makefile.objs)0
-rw-r--r--target/i386/TODO (renamed from target-i386/TODO)0
-rw-r--r--target/i386/arch_dump.c (renamed from target-i386/arch_dump.c)0
-rw-r--r--target/i386/arch_memory_mapping.c (renamed from target-i386/arch_memory_mapping.c)0
-rw-r--r--target/i386/bpt_helper.c (renamed from target-i386/bpt_helper.c)0
-rw-r--r--target/i386/cc_helper.c (renamed from target-i386/cc_helper.c)0
-rw-r--r--target/i386/cc_helper_template.h (renamed from target-i386/cc_helper_template.h)0
-rw-r--r--target/i386/cpu-qom.h (renamed from target-i386/cpu-qom.h)0
-rw-r--r--target/i386/cpu.c (renamed from target-i386/cpu.c)0
-rw-r--r--target/i386/cpu.h (renamed from target-i386/cpu.h)0
-rw-r--r--target/i386/excp_helper.c (renamed from target-i386/excp_helper.c)0
-rw-r--r--target/i386/fpu_helper.c (renamed from target-i386/fpu_helper.c)0
-rw-r--r--target/i386/gdbstub.c (renamed from target-i386/gdbstub.c)0
-rw-r--r--target/i386/helper.c (renamed from target-i386/helper.c)0
-rw-r--r--target/i386/helper.h (renamed from target-i386/helper.h)0
-rw-r--r--target/i386/hyperv.c (renamed from target-i386/hyperv.c)0
-rw-r--r--target/i386/hyperv.h (renamed from target-i386/hyperv.h)0
-rw-r--r--target/i386/int_helper.c (renamed from target-i386/int_helper.c)0
-rw-r--r--target/i386/kvm-stub.c (renamed from target-i386/kvm-stub.c)0
-rw-r--r--target/i386/kvm.c (renamed from target-i386/kvm.c)0
-rw-r--r--target/i386/kvm_i386.h (renamed from target-i386/kvm_i386.h)0
-rw-r--r--target/i386/machine.c (renamed from target-i386/machine.c)0
-rw-r--r--target/i386/mem_helper.c (renamed from target-i386/mem_helper.c)0
-rw-r--r--target/i386/misc_helper.c (renamed from target-i386/misc_helper.c)0
-rw-r--r--target/i386/monitor.c (renamed from target-i386/monitor.c)0
-rw-r--r--target/i386/mpx_helper.c (renamed from target-i386/mpx_helper.c)0
-rw-r--r--target/i386/ops_sse.h (renamed from target-i386/ops_sse.h)0
-rw-r--r--target/i386/ops_sse_header.h (renamed from target-i386/ops_sse_header.h)0
-rw-r--r--target/i386/seg_helper.c (renamed from target-i386/seg_helper.c)0
-rw-r--r--target/i386/shift_helper_template.h (renamed from target-i386/shift_helper_template.h)0
-rw-r--r--target/i386/smm_helper.c (renamed from target-i386/smm_helper.c)0
-rw-r--r--target/i386/svm.h (renamed from target-i386/svm.h)0
-rw-r--r--target/i386/svm_helper.c (renamed from target-i386/svm_helper.c)0
-rw-r--r--target/i386/trace-events (renamed from target-i386/trace-events)2
-rw-r--r--target/i386/translate.c (renamed from target-i386/translate.c)0
-rw-r--r--target/lm32/Makefile.objs (renamed from target-lm32/Makefile.objs)0
-rw-r--r--target/lm32/README (renamed from target-lm32/README)0
-rw-r--r--target/lm32/TODO (renamed from target-lm32/TODO)0
-rw-r--r--target/lm32/cpu-qom.h (renamed from target-lm32/cpu-qom.h)0
-rw-r--r--target/lm32/cpu.c (renamed from target-lm32/cpu.c)0
-rw-r--r--target/lm32/cpu.h (renamed from target-lm32/cpu.h)0
-rw-r--r--target/lm32/gdbstub.c (renamed from target-lm32/gdbstub.c)0
-rw-r--r--target/lm32/helper.c (renamed from target-lm32/helper.c)0
-rw-r--r--target/lm32/helper.h (renamed from target-lm32/helper.h)0
-rw-r--r--target/lm32/lm32-semi.c (renamed from target-lm32/lm32-semi.c)2
-rw-r--r--target/lm32/machine.c (renamed from target-lm32/machine.c)0
-rw-r--r--target/lm32/op_helper.c (renamed from target-lm32/op_helper.c)0
-rw-r--r--target/lm32/translate.c (renamed from target-lm32/translate.c)0
-rw-r--r--target/m68k/Makefile.objs (renamed from target-m68k/Makefile.objs)0
-rw-r--r--target/m68k/cpu-qom.h (renamed from target-m68k/cpu-qom.h)0
-rw-r--r--target/m68k/cpu.c (renamed from target-m68k/cpu.c)0
-rw-r--r--target/m68k/cpu.h (renamed from target-m68k/cpu.h)0
-rw-r--r--target/m68k/gdbstub.c (renamed from target-m68k/gdbstub.c)0
-rw-r--r--target/m68k/helper.c (renamed from target-m68k/helper.c)0
-rw-r--r--target/m68k/helper.h (renamed from target-m68k/helper.h)0
-rw-r--r--target/m68k/m68k-semi.c (renamed from target-m68k/m68k-semi.c)0
-rw-r--r--target/m68k/op_helper.c (renamed from target-m68k/op_helper.c)0
-rw-r--r--target/m68k/qregs.def (renamed from target-m68k/qregs.def)0
-rw-r--r--target/m68k/translate.c (renamed from target-m68k/translate.c)0
-rw-r--r--target/microblaze/Makefile.objs (renamed from target-microblaze/Makefile.objs)0
-rw-r--r--target/microblaze/cpu-qom.h (renamed from target-microblaze/cpu-qom.h)0
-rw-r--r--target/microblaze/cpu.c (renamed from target-microblaze/cpu.c)0
-rw-r--r--target/microblaze/cpu.h (renamed from target-microblaze/cpu.h)0
-rw-r--r--target/microblaze/gdbstub.c (renamed from target-microblaze/gdbstub.c)0
-rw-r--r--target/microblaze/helper.c (renamed from target-microblaze/helper.c)0
-rw-r--r--target/microblaze/helper.h (renamed from target-microblaze/helper.h)0
-rw-r--r--target/microblaze/microblaze-decode.h (renamed from target-microblaze/microblaze-decode.h)0
-rw-r--r--target/microblaze/mmu.c (renamed from target-microblaze/mmu.c)0
-rw-r--r--target/microblaze/mmu.h (renamed from target-microblaze/mmu.h)0
-rw-r--r--target/microblaze/op_helper.c (renamed from target-microblaze/op_helper.c)0
-rw-r--r--target/microblaze/translate.c (renamed from target-microblaze/translate.c)0
-rw-r--r--target/mips/Makefile.objs (renamed from target-mips/Makefile.objs)0
-rw-r--r--target/mips/TODO (renamed from target-mips/TODO)0
-rw-r--r--target/mips/cpu-qom.h (renamed from target-mips/cpu-qom.h)0
-rw-r--r--target/mips/cpu.c (renamed from target-mips/cpu.c)0
-rw-r--r--target/mips/cpu.h (renamed from target-mips/cpu.h)0
-rw-r--r--target/mips/dsp_helper.c (renamed from target-mips/dsp_helper.c)0
-rw-r--r--target/mips/gdbstub.c (renamed from target-mips/gdbstub.c)0
-rw-r--r--target/mips/helper.c (renamed from target-mips/helper.c)0
-rw-r--r--target/mips/helper.h (renamed from target-mips/helper.h)0
-rw-r--r--target/mips/kvm.c (renamed from target-mips/kvm.c)0
-rw-r--r--target/mips/kvm_mips.h (renamed from target-mips/kvm_mips.h)0
-rw-r--r--target/mips/lmi_helper.c (renamed from target-mips/lmi_helper.c)0
-rw-r--r--target/mips/machine.c (renamed from target-mips/machine.c)0
-rw-r--r--target/mips/mips-defs.h (renamed from target-mips/mips-defs.h)0
-rw-r--r--target/mips/mips-semi.c (renamed from target-mips/mips-semi.c)0
-rw-r--r--target/mips/msa_helper.c (renamed from target-mips/msa_helper.c)0
-rw-r--r--target/mips/op_helper.c (renamed from target-mips/op_helper.c)0
-rw-r--r--target/mips/translate.c (renamed from target-mips/translate.c)0
-rw-r--r--target/mips/translate_init.c (renamed from target-mips/translate_init.c)0
-rw-r--r--target/moxie/Makefile.objs (renamed from target-moxie/Makefile.objs)0
-rw-r--r--target/moxie/cpu.c (renamed from target-moxie/cpu.c)0
-rw-r--r--target/moxie/cpu.h (renamed from target-moxie/cpu.h)0
-rw-r--r--target/moxie/helper.c (renamed from target-moxie/helper.c)0
-rw-r--r--target/moxie/helper.h (renamed from target-moxie/helper.h)0
-rw-r--r--target/moxie/machine.c (renamed from target-moxie/machine.c)0
-rw-r--r--target/moxie/machine.h (renamed from target-moxie/machine.h)0
-rw-r--r--target/moxie/mmu.c (renamed from target-moxie/mmu.c)0
-rw-r--r--target/moxie/mmu.h (renamed from target-moxie/mmu.h)0
-rw-r--r--target/moxie/translate.c (renamed from target-moxie/translate.c)0
-rw-r--r--target/openrisc/Makefile.objs (renamed from target-openrisc/Makefile.objs)0
-rw-r--r--target/openrisc/cpu.c (renamed from target-openrisc/cpu.c)0
-rw-r--r--target/openrisc/cpu.h (renamed from target-openrisc/cpu.h)0
-rw-r--r--target/openrisc/exception.c (renamed from target-openrisc/exception.c)0
-rw-r--r--target/openrisc/exception.h (renamed from target-openrisc/exception.h)0
-rw-r--r--target/openrisc/exception_helper.c (renamed from target-openrisc/exception_helper.c)0
-rw-r--r--target/openrisc/fpu_helper.c (renamed from target-openrisc/fpu_helper.c)0
-rw-r--r--target/openrisc/gdbstub.c (renamed from target-openrisc/gdbstub.c)0
-rw-r--r--target/openrisc/helper.h (renamed from target-openrisc/helper.h)0
-rw-r--r--target/openrisc/int_helper.c (renamed from target-openrisc/int_helper.c)0
-rw-r--r--target/openrisc/interrupt.c (renamed from target-openrisc/interrupt.c)0
-rw-r--r--target/openrisc/interrupt_helper.c (renamed from target-openrisc/interrupt_helper.c)0
-rw-r--r--target/openrisc/machine.c (renamed from target-openrisc/machine.c)0
-rw-r--r--target/openrisc/mmu.c (renamed from target-openrisc/mmu.c)0
-rw-r--r--target/openrisc/mmu_helper.c (renamed from target-openrisc/mmu_helper.c)0
-rw-r--r--target/openrisc/sys_helper.c (renamed from target-openrisc/sys_helper.c)0
-rw-r--r--target/openrisc/translate.c (renamed from target-openrisc/translate.c)0
-rw-r--r--target/ppc/Makefile.objs (renamed from target-ppc/Makefile.objs)0
-rw-r--r--target/ppc/STATUS (renamed from target-ppc/STATUS)0
-rw-r--r--target/ppc/arch_dump.c (renamed from target-ppc/arch_dump.c)0
-rw-r--r--target/ppc/cpu-models.c (renamed from target-ppc/cpu-models.c)0
-rw-r--r--target/ppc/cpu-models.h (renamed from target-ppc/cpu-models.h)0
-rw-r--r--target/ppc/cpu-qom.h (renamed from target-ppc/cpu-qom.h)0
-rw-r--r--target/ppc/cpu.h (renamed from target-ppc/cpu.h)0
-rw-r--r--target/ppc/dfp_helper.c (renamed from target-ppc/dfp_helper.c)0
-rw-r--r--target/ppc/excp_helper.c (renamed from target-ppc/excp_helper.c)0
-rw-r--r--target/ppc/fpu_helper.c (renamed from target-ppc/fpu_helper.c)0
-rw-r--r--target/ppc/gdbstub.c (renamed from target-ppc/gdbstub.c)0
-rw-r--r--target/ppc/helper.h (renamed from target-ppc/helper.h)0
-rw-r--r--target/ppc/helper_regs.h (renamed from target-ppc/helper_regs.h)0
-rw-r--r--target/ppc/int_helper.c (renamed from target-ppc/int_helper.c)0
-rw-r--r--target/ppc/internal.h (renamed from target-ppc/internal.h)0
-rw-r--r--target/ppc/kvm-stub.c (renamed from target-ppc/kvm-stub.c)0
-rw-r--r--target/ppc/kvm.c (renamed from target-ppc/kvm.c)0
-rw-r--r--target/ppc/kvm_ppc.h (renamed from target-ppc/kvm_ppc.h)0
-rw-r--r--target/ppc/machine.c (renamed from target-ppc/machine.c)0
-rw-r--r--target/ppc/mem_helper.c (renamed from target-ppc/mem_helper.c)0
-rw-r--r--target/ppc/mfrom_table.c (renamed from target-ppc/mfrom_table.c)0
-rw-r--r--target/ppc/mfrom_table_gen.c (renamed from target-ppc/mfrom_table_gen.c)0
-rw-r--r--target/ppc/misc_helper.c (renamed from target-ppc/misc_helper.c)0
-rw-r--r--target/ppc/mmu-hash32.c (renamed from target-ppc/mmu-hash32.c)0
-rw-r--r--target/ppc/mmu-hash32.h (renamed from target-ppc/mmu-hash32.h)0
-rw-r--r--target/ppc/mmu-hash64.c (renamed from target-ppc/mmu-hash64.c)0
-rw-r--r--target/ppc/mmu-hash64.h (renamed from target-ppc/mmu-hash64.h)0
-rw-r--r--target/ppc/mmu_helper.c (renamed from target-ppc/mmu_helper.c)0
-rw-r--r--target/ppc/monitor.c (renamed from target-ppc/monitor.c)0
-rw-r--r--target/ppc/timebase_helper.c (renamed from target-ppc/timebase_helper.c)0
-rw-r--r--target/ppc/trace-events (renamed from target-ppc/trace-events)2
-rw-r--r--target/ppc/translate.c (renamed from target-ppc/translate.c)0
-rw-r--r--target/ppc/translate/dfp-impl.inc.c (renamed from target-ppc/translate/dfp-impl.inc.c)0
-rw-r--r--target/ppc/translate/dfp-ops.inc.c (renamed from target-ppc/translate/dfp-ops.inc.c)0
-rw-r--r--target/ppc/translate/fp-impl.inc.c (renamed from target-ppc/translate/fp-impl.inc.c)0
-rw-r--r--target/ppc/translate/fp-ops.inc.c (renamed from target-ppc/translate/fp-ops.inc.c)0
-rw-r--r--target/ppc/translate/spe-impl.inc.c (renamed from target-ppc/translate/spe-impl.inc.c)0
-rw-r--r--target/ppc/translate/spe-ops.inc.c (renamed from target-ppc/translate/spe-ops.inc.c)0
-rw-r--r--target/ppc/translate/vmx-impl.inc.c (renamed from target-ppc/translate/vmx-impl.inc.c)0
-rw-r--r--target/ppc/translate/vmx-ops.inc.c (renamed from target-ppc/translate/vmx-ops.inc.c)0
-rw-r--r--target/ppc/translate/vsx-impl.inc.c (renamed from target-ppc/translate/vsx-impl.inc.c)0
-rw-r--r--target/ppc/translate/vsx-ops.inc.c (renamed from target-ppc/translate/vsx-ops.inc.c)0
-rw-r--r--target/ppc/translate_init.c (renamed from target-ppc/translate_init.c)0
-rw-r--r--target/ppc/user_only_helper.c (renamed from target-ppc/user_only_helper.c)0
-rw-r--r--target/s390x/Makefile.objs (renamed from target-s390x/Makefile.objs)2
-rw-r--r--target/s390x/arch_dump.c (renamed from target-s390x/arch_dump.c)0
-rw-r--r--target/s390x/cc_helper.c (renamed from target-s390x/cc_helper.c)0
-rw-r--r--target/s390x/cpu-qom.h (renamed from target-s390x/cpu-qom.h)0
-rw-r--r--target/s390x/cpu.c (renamed from target-s390x/cpu.c)0
-rw-r--r--target/s390x/cpu.h (renamed from target-s390x/cpu.h)0
-rw-r--r--target/s390x/cpu_features.c (renamed from target-s390x/cpu_features.c)0
-rw-r--r--target/s390x/cpu_features.h (renamed from target-s390x/cpu_features.h)0
-rw-r--r--target/s390x/cpu_features_def.h (renamed from target-s390x/cpu_features_def.h)0
-rw-r--r--target/s390x/cpu_models.c (renamed from target-s390x/cpu_models.c)0
-rw-r--r--target/s390x/cpu_models.h (renamed from target-s390x/cpu_models.h)0
-rw-r--r--target/s390x/fpu_helper.c (renamed from target-s390x/fpu_helper.c)0
-rw-r--r--target/s390x/gdbstub.c (renamed from target-s390x/gdbstub.c)0
-rw-r--r--target/s390x/gen-features.c (renamed from target-s390x/gen-features.c)0
-rw-r--r--target/s390x/helper.c (renamed from target-s390x/helper.c)0
-rw-r--r--target/s390x/helper.h (renamed from target-s390x/helper.h)0
-rw-r--r--target/s390x/insn-data.def (renamed from target-s390x/insn-data.def)0
-rw-r--r--target/s390x/insn-format.def (renamed from target-s390x/insn-format.def)0
-rw-r--r--target/s390x/int_helper.c (renamed from target-s390x/int_helper.c)0
-rw-r--r--target/s390x/interrupt.c (renamed from target-s390x/interrupt.c)0
-rw-r--r--target/s390x/ioinst.c (renamed from target-s390x/ioinst.c)0
-rw-r--r--target/s390x/kvm.c (renamed from target-s390x/kvm.c)0
-rw-r--r--target/s390x/machine.c (renamed from target-s390x/machine.c)0
-rw-r--r--target/s390x/mem_helper.c (renamed from target-s390x/mem_helper.c)0
-rw-r--r--target/s390x/misc_helper.c (renamed from target-s390x/misc_helper.c)0
-rw-r--r--target/s390x/mmu_helper.c (renamed from target-s390x/mmu_helper.c)0
-rw-r--r--target/s390x/trace-events (renamed from target-s390x/trace-events)8
-rw-r--r--target/s390x/translate.c (renamed from target-s390x/translate.c)0
-rw-r--r--target/sh4/Makefile.objs (renamed from target-sh4/Makefile.objs)0
-rw-r--r--target/sh4/README.sh4 (renamed from target-sh4/README.sh4)2
-rw-r--r--target/sh4/cpu-qom.h (renamed from target-sh4/cpu-qom.h)0
-rw-r--r--target/sh4/cpu.c (renamed from target-sh4/cpu.c)0
-rw-r--r--target/sh4/cpu.h (renamed from target-sh4/cpu.h)0
-rw-r--r--target/sh4/gdbstub.c (renamed from target-sh4/gdbstub.c)0
-rw-r--r--target/sh4/helper.c (renamed from target-sh4/helper.c)0
-rw-r--r--target/sh4/helper.h (renamed from target-sh4/helper.h)0
-rw-r--r--target/sh4/monitor.c (renamed from target-sh4/monitor.c)0
-rw-r--r--target/sh4/op_helper.c (renamed from target-sh4/op_helper.c)0
-rw-r--r--target/sh4/translate.c (renamed from target-sh4/translate.c)0
-rw-r--r--target/sparc/Makefile.objs (renamed from target-sparc/Makefile.objs)0
-rw-r--r--target/sparc/TODO (renamed from target-sparc/TODO)0
-rw-r--r--target/sparc/asi.h (renamed from target-sparc/asi.h)0
-rw-r--r--target/sparc/cc_helper.c (renamed from target-sparc/cc_helper.c)0
-rw-r--r--target/sparc/cpu-qom.h (renamed from target-sparc/cpu-qom.h)0
-rw-r--r--target/sparc/cpu.c (renamed from target-sparc/cpu.c)0
-rw-r--r--target/sparc/cpu.h (renamed from target-sparc/cpu.h)0
-rw-r--r--target/sparc/fop_helper.c (renamed from target-sparc/fop_helper.c)0
-rw-r--r--target/sparc/gdbstub.c (renamed from target-sparc/gdbstub.c)0
-rw-r--r--target/sparc/helper.c (renamed from target-sparc/helper.c)0
-rw-r--r--target/sparc/helper.h (renamed from target-sparc/helper.h)0
-rw-r--r--target/sparc/int32_helper.c (renamed from target-sparc/int32_helper.c)0
-rw-r--r--target/sparc/int64_helper.c (renamed from target-sparc/int64_helper.c)0
-rw-r--r--target/sparc/ldst_helper.c (renamed from target-sparc/ldst_helper.c)0
-rw-r--r--target/sparc/machine.c (renamed from target-sparc/machine.c)0
-rw-r--r--target/sparc/mmu_helper.c (renamed from target-sparc/mmu_helper.c)0
-rw-r--r--target/sparc/monitor.c (renamed from target-sparc/monitor.c)0
-rw-r--r--target/sparc/trace-events (renamed from target-sparc/trace-events)8
-rw-r--r--target/sparc/translate.c (renamed from target-sparc/translate.c)0
-rw-r--r--target/sparc/vis_helper.c (renamed from target-sparc/vis_helper.c)0
-rw-r--r--target/sparc/win_helper.c (renamed from target-sparc/win_helper.c)0
-rw-r--r--target/tilegx/Makefile.objs (renamed from target-tilegx/Makefile.objs)0
-rw-r--r--target/tilegx/cpu.c (renamed from target-tilegx/cpu.c)0
-rw-r--r--target/tilegx/cpu.h (renamed from target-tilegx/cpu.h)0
-rw-r--r--target/tilegx/helper.c (renamed from target-tilegx/helper.c)0
-rw-r--r--target/tilegx/helper.h (renamed from target-tilegx/helper.h)0
-rw-r--r--target/tilegx/opcode_tilegx.h (renamed from target-tilegx/opcode_tilegx.h)0
-rw-r--r--target/tilegx/simd_helper.c (renamed from target-tilegx/simd_helper.c)0
-rw-r--r--target/tilegx/spr_def_64.h (renamed from target-tilegx/spr_def_64.h)0
-rw-r--r--target/tilegx/translate.c (renamed from target-tilegx/translate.c)0
-rw-r--r--target/tricore/Makefile.objs (renamed from target-tricore/Makefile.objs)0
-rw-r--r--target/tricore/cpu-qom.h (renamed from target-tricore/cpu-qom.h)0
-rw-r--r--target/tricore/cpu.c (renamed from target-tricore/cpu.c)0
-rw-r--r--target/tricore/cpu.h (renamed from target-tricore/cpu.h)0
-rw-r--r--target/tricore/csfr.def (renamed from target-tricore/csfr.def)0
-rw-r--r--target/tricore/fpu_helper.c (renamed from target-tricore/fpu_helper.c)0
-rw-r--r--target/tricore/helper.c (renamed from target-tricore/helper.c)0
-rw-r--r--target/tricore/helper.h (renamed from target-tricore/helper.h)0
-rw-r--r--target/tricore/op_helper.c (renamed from target-tricore/op_helper.c)0
-rw-r--r--target/tricore/translate.c (renamed from target-tricore/translate.c)0
-rw-r--r--target/tricore/tricore-defs.h (renamed from target-tricore/tricore-defs.h)0
-rw-r--r--target/tricore/tricore-opcodes.h (renamed from target-tricore/tricore-opcodes.h)0
-rw-r--r--target/unicore32/Makefile.objs (renamed from target-unicore32/Makefile.objs)0
-rw-r--r--target/unicore32/cpu-qom.h (renamed from target-unicore32/cpu-qom.h)0
-rw-r--r--target/unicore32/cpu.c (renamed from target-unicore32/cpu.c)0
-rw-r--r--target/unicore32/cpu.h (renamed from target-unicore32/cpu.h)0
-rw-r--r--target/unicore32/helper.c (renamed from target-unicore32/helper.c)0
-rw-r--r--target/unicore32/helper.h (renamed from target-unicore32/helper.h)0
-rw-r--r--target/unicore32/op_helper.c (renamed from target-unicore32/op_helper.c)0
-rw-r--r--target/unicore32/softmmu.c (renamed from target-unicore32/softmmu.c)0
-rw-r--r--target/unicore32/translate.c (renamed from target-unicore32/translate.c)0
-rw-r--r--target/unicore32/ucf64_helper.c (renamed from target-unicore32/ucf64_helper.c)0
-rw-r--r--target/xtensa/Makefile.objs (renamed from target-xtensa/Makefile.objs)0
-rw-r--r--target/xtensa/core-dc232b.c (renamed from target-xtensa/core-dc232b.c)0
-rw-r--r--target/xtensa/core-dc232b/core-isa.h (renamed from target-xtensa/core-dc232b/core-isa.h)0
-rw-r--r--target/xtensa/core-dc232b/gdb-config.c (renamed from target-xtensa/core-dc232b/gdb-config.c)0
-rw-r--r--target/xtensa/core-dc233c.c (renamed from target-xtensa/core-dc233c.c)0
-rw-r--r--target/xtensa/core-dc233c/core-isa.h (renamed from target-xtensa/core-dc233c/core-isa.h)0
-rw-r--r--target/xtensa/core-dc233c/gdb-config.c (renamed from target-xtensa/core-dc233c/gdb-config.c)0
-rw-r--r--target/xtensa/core-fsf.c (renamed from target-xtensa/core-fsf.c)0
-rw-r--r--target/xtensa/core-fsf/core-isa.h (renamed from target-xtensa/core-fsf/core-isa.h)0
-rw-r--r--target/xtensa/cpu-qom.h (renamed from target-xtensa/cpu-qom.h)0
-rw-r--r--target/xtensa/cpu.c (renamed from target-xtensa/cpu.c)0
-rw-r--r--target/xtensa/cpu.h (renamed from target-xtensa/cpu.h)0
-rw-r--r--target/xtensa/gdbstub.c (renamed from target-xtensa/gdbstub.c)0
-rw-r--r--target/xtensa/helper.c (renamed from target-xtensa/helper.c)0
-rw-r--r--target/xtensa/helper.h (renamed from target-xtensa/helper.h)0
-rwxr-xr-xtarget/xtensa/import_core.sh (renamed from target-xtensa/import_core.sh)0
-rw-r--r--target/xtensa/monitor.c (renamed from target-xtensa/monitor.c)0
-rw-r--r--target/xtensa/op_helper.c (renamed from target-xtensa/op_helper.c)0
-rw-r--r--target/xtensa/overlay_tool.h (renamed from target-xtensa/overlay_tool.h)0
-rw-r--r--target/xtensa/translate.c (renamed from target-xtensa/translate.c)0
-rw-r--r--target/xtensa/xtensa-semi.c (renamed from target-xtensa/xtensa-semi.c)0
-rw-r--r--tests/tcg/xtensa/Makefile2
369 files changed, 78 insertions, 80 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a605791fc..585cd5abd7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -106,7 +106,7 @@ F: include/fpu/
Alpha
M: Richard Henderson <rth@twiddle.net>
S: Maintained
-F: target-alpha/
+F: target/alpha/
F: hw/alpha/
F: tests/tcg/alpha/
F: disas/alpha.c
@@ -115,7 +115,7 @@ ARM
M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Maintained
-F: target-arm/
+F: target/arm/
F: hw/arm/
F: hw/cpu/a*mpcore.c
F: include/hw/cpu/a*mpcore.h
@@ -126,7 +126,7 @@ F: disas/libvixl/
CRIS
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
S: Maintained
-F: target-cris/
+F: target/cris/
F: hw/cris/
F: include/hw/cris/
F: tests/tcg/cris/
@@ -135,7 +135,7 @@ F: disas/cris.c
LM32
M: Michael Walle <michael@walle.cc>
S: Maintained
-F: target-lm32/
+F: target/lm32/
F: disas/lm32.c
F: hw/lm32/
F: hw/*/lm32_*
@@ -147,13 +147,13 @@ F: tests/tcg/lm32/
M68K
M: Laurent Vivier <laurent@vivier.eu>
S: Maintained
-F: target-m68k/
+F: target/m68k/
F: disas/m68k.c
MicroBlaze
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
S: Maintained
-F: target-microblaze/
+F: target/microblaze/
F: hw/microblaze/
F: disas/microblaze.c
@@ -161,7 +161,7 @@ MIPS
M: Aurelien Jarno <aurelien@aurel32.net>
M: Yongbok Kim <yongbok.kim@imgtec.com>
S: Maintained
-F: target-mips/
+F: target/mips/
F: hw/mips/
F: hw/misc/mips_*
F: hw/intc/mips_gic.c
@@ -176,7 +176,7 @@ F: disas/mips.c
Moxie
M: Anthony Green <green@moxielogic.com>
S: Maintained
-F: target-moxie/
+F: target/moxie/
F: disas/moxie.c
F: hw/moxie/
F: default-configs/moxie-softmmu.mak
@@ -184,7 +184,7 @@ F: default-configs/moxie-softmmu.mak
OpenRISC
M: Jia Liu <proljc@gmail.com>
S: Maintained
-F: target-openrisc/
+F: target/openrisc/
F: hw/openrisc/
F: tests/tcg/openrisc/
@@ -193,7 +193,7 @@ M: David Gibson <david@gibson.dropbear.id.au>
M: Alexander Graf <agraf@suse.de>
L: qemu-ppc@nongnu.org
S: Maintained
-F: target-ppc/
+F: target/ppc/
F: hw/ppc/
F: include/hw/ppc/
F: disas/ppc.c
@@ -202,14 +202,14 @@ S390
M: Richard Henderson <rth@twiddle.net>
M: Alexander Graf <agraf@suse.de>
S: Maintained
-F: target-s390x/
+F: target/s390x/
F: hw/s390x/
F: disas/s390.c
SH4
M: Aurelien Jarno <aurelien@aurel32.net>
S: Odd Fixes
-F: target-sh4/
+F: target/sh4/
F: hw/sh4/
F: disas/sh4.c
F: include/hw/sh4/
@@ -218,7 +218,7 @@ SPARC
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
M: Artyom Tarasenko <atar4qemu@gmail.com>
S: Maintained
-F: target-sparc/
+F: target/sparc/
F: hw/sparc/
F: hw/sparc64/
F: disas/sparc.c
@@ -226,7 +226,7 @@ F: disas/sparc.c
UniCore32
M: Guan Xuetao <gxt@mprc.pku.edu.cn>
S: Maintained
-F: target-unicore32/
+F: target/unicore32/
F: hw/unicore32/
F: include/hw/unicore32/
@@ -235,7 +235,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
M: Richard Henderson <rth@twiddle.net>
M: Eduardo Habkost <ehabkost@redhat.com>
S: Maintained
-F: target-i386/
+F: target/i386/
F: hw/i386/
F: disas/i386.c
@@ -243,14 +243,14 @@ Xtensa
M: Max Filippov <jcmvbkbc@gmail.com>
W: http://wiki.osll.spb.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
S: Maintained
-F: target-xtensa/
+F: target/xtensa/
F: hw/xtensa/
F: tests/tcg/xtensa/
TriCore
M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
S: Maintained
-F: target-tricore/
+F: target/tricore/
F: hw/tricore/
F: include/hw/tricore/
@@ -269,26 +269,26 @@ ARM
M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Maintained
-F: target-arm/kvm.c
+F: target/arm/kvm.c
MIPS
M: James Hogan <james.hogan@imgtec.com>
S: Maintained
-F: target-mips/kvm.c
+F: target/mips/kvm.c
PPC
M: Alexander Graf <agraf@suse.de>
S: Maintained
-F: target-ppc/kvm.c
+F: target/ppc/kvm.c
S390
M: Christian Borntraeger <borntraeger@de.ibm.com>
M: Cornelia Huck <cornelia.huck@de.ibm.com>
M: Alexander Graf <agraf@suse.de>
S: Maintained
-F: target-s390x/kvm.c
-F: target-s390x/ioinst.[ch]
-F: target-s390x/machine.c
+F: target/s390x/kvm.c
+F: target/s390x/ioinst.[ch]
+F: target/s390x/machine.c
F: hw/intc/s390_flic.c
F: hw/intc/s390_flic_kvm.c
F: include/hw/s390x/s390_flic.h
@@ -301,7 +301,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
M: Marcelo Tosatti <mtosatti@redhat.com>
L: kvm@vger.kernel.org
S: Supported
-F: target-i386/kvm.c
+F: target/i386/kvm.c
Guest CPU Cores (Xen):
----------------------
diff --git a/Makefile.objs b/Makefile.objs
index 06f74b8b99..e59b97947a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -155,11 +155,11 @@ trace-events-y += hw/alpha/trace-events
trace-events-y += ui/trace-events
trace-events-y += audio/trace-events
trace-events-y += net/trace-events
-trace-events-y += target-arm/trace-events
-trace-events-y += target-i386/trace-events
-trace-events-y += target-sparc/trace-events
-trace-events-y += target-s390x/trace-events
-trace-events-y += target-ppc/trace-events
+trace-events-y += target/arm/trace-events
+trace-events-y += target/i386/trace-events
+trace-events-y += target/sparc/trace-events
+trace-events-y += target/s390x/trace-events
+trace-events-y += target/ppc/trace-events
trace-events-y += qom/trace-events
trace-events-y += linux-user/trace-events
trace-events-y += qapi/trace-events
diff --git a/Makefile.target b/Makefile.target
index 7a5080e94a..6689e31f17 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -11,7 +11,7 @@ $(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
ifdef CONFIG_LINUX
QEMU_CFLAGS += -I../linux-headers
endif
-QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H
+QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H
QEMU_CFLAGS+=-I$(SRC_PATH)/include
@@ -92,7 +92,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += tci.o
obj-y += tcg/tcg-common.o
obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-y += fpu/softfloat.o
-obj-y += target-$(TARGET_BASE_ARCH)/
+obj-y += target/$(TARGET_BASE_ARCH)/
obj-y += disas.o
obj-y += tcg-runtime.o
obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
diff --git a/disas/cris.c b/disas/cris.c
index 7f35bc0c6b..08161d1f21 100644
--- a/disas/cris.c
+++ b/disas/cris.c
@@ -21,9 +21,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
-//#include "sysdep.h"
-#include "target-cris/opcode-cris.h"
-//#include "libiberty.h"
+#include "target/cris/opcode-cris.h"
#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h
index ed911f22a1..b6d8369ed7 100644
--- a/hw/alpha/alpha_sys.h
+++ b/hw/alpha/alpha_sys.h
@@ -3,7 +3,7 @@
#ifndef HW_ALPHA_SYS_H
#define HW_ALPHA_SYS_H
-#include "target-alpha/cpu-qom.h"
+#include "target/alpha/cpu-qom.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/ide.h"
diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index 1470eac4f5..e98840b461 100644
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -2,7 +2,7 @@
#define STRONGARM_H
#include "exec/memory.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index d4160dfa7d..7102686882 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -33,7 +33,7 @@
#include "qemu/bitmap.h"
#include "trace.h"
#include "qom/cpu.h"
-#include "target-arm/cpu.h"
+#include "target/arm/cpu.h"
#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9708cdc463..42ecf619d5 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -29,7 +29,7 @@
#include "hw/pci/pci.h"
#include "qom/cpu.h"
#include "hw/i386/pc.h"
-#include "target-i386/cpu.h"
+#include "target/i386/cpu.h"
#include "hw/timer/hpet.h"
#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h"
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 01cbaa88d2..df5180b1e0 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -15,7 +15,7 @@
#include "hw/i386/apic_internal.h"
#include "hw/pci/msi.h"
#include "sysemu/kvm.h"
-#include "target-i386/kvm_i386.h"
+#include "target/i386/kvm_i386.h"
static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic,
int reg_id, uint32_t val)
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index fd9208fde0..ea7ea0bce8 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -30,7 +30,7 @@
#include "hw/i386/ioapic_internal.h"
#include "include/hw/pci/msi.h"
#include "sysemu/kvm.h"
-#include "target-i386/cpu.h"
+#include "target/i386/cpu.h"
#include "hw/i386/apic-msidef.h"
#include "hw/i386/x86-iommu.h"
diff --git a/hw/misc/hyperv_testdev.c b/hw/misc/hyperv_testdev.c
index 6cae9e9010..dbd7cdda07 100644
--- a/hw/misc/hyperv_testdev.c
+++ b/hw/misc/hyperv_testdev.c
@@ -17,7 +17,7 @@
#include "hw/qdev.h"
#include "hw/isa/isa.h"
#include "sysemu/kvm.h"
-#include "target-i386/hyperv.h"
+#include "target/i386/hyperv.h"
#include "kvm_i386.h"
#define HV_TEST_DEV_MAX_SINT_ROUTES 64
diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c
index e67d60d03c..38a7234b46 100644
--- a/hw/ppc/fdt.c
+++ b/hw/ppc/fdt.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 9df7b25315..83597fe92b 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -22,7 +22,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/numa.h"
#include "hw/hw.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "qemu/log.h"
#include "hw/ppc/fdt.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index 76ce854b0c..d79d530b48 100644
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -20,7 +20,7 @@
#include "sysemu/sysemu.h"
#include "qapi/error.h"
#include "qemu/log.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/pnv.h"
#include "hw/ppc/pnv_core.h"
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index 0e2117f0f5..78db52415b 100644
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "qapi/error.h"
#include "qemu/log.h"
diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index 8da271872f..b82af4f086 100644
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/log.h"
#include "sysemu/kvm.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "hw/sysbus.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index e0c14f6b77..c18632bbff 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -8,14 +8,14 @@
*/
#include "hw/cpu/core.h"
#include "hw/ppc/spapr_cpu_core.h"
-#include "target-ppc/cpu.h"
+#include "target/ppc/cpu.h"
#include "hw/ppc/spapr.h"
#include "hw/boards.h"
#include "qapi/error.h"
#include "sysemu/cpus.h"
-#include "target-ppc/kvm_ppc.h"
+#include "target/ppc/kvm_ppc.h"
#include "hw/ppc/ppc.h"
-#include "target-ppc/mmu-hash64.h"
+#include "target/ppc/mmu-hash64.h"
#include "sysemu/numa.h"
static void spapr_cpu_reset(void *opaque)
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 14d4007c1c..fd00cc5ea2 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -25,7 +25,7 @@
Shix 2.0 board by Alexis Polti, described at
https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20
- More information in target-sh4/README.sh4
+ More information in target/sh4/README.sh4
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index aeeebfed90..c175c0e999 100644
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -12,7 +12,7 @@
#define HW_ARM_H
#include "exec/memory.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
#include "hw/irq.h"
#include "qemu/notify.h"
diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index 29fef8bfa1..76bb6d4203 100644
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "exec/memory.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
#define EXYNOS4210_NCPUS 2
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index f026c8df57..f25870b718 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -20,7 +20,7 @@
#include "exec/memory.h"
# define hw_omap_h "omap.h"
#include "hw/irq.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
# define OMAP_EMIFS_BASE 0x00000000
# define OMAP2_Q0_BASE 0x00000000
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index 191e068184..0df1199caa 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -11,7 +11,7 @@
#define PXA_H
#include "exec/memory.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/include/hw/m68k/mcf.h b/include/hw/m68k/mcf.h
index 0f0d2288e6..fdae229502 100644
--- a/include/hw/m68k/mcf.h
+++ b/include/hw/m68k/mcf.h
@@ -2,7 +2,7 @@
#define HW_MCF_H
/* Motorola ColdFire device prototypes. */
-#include "target-m68k/cpu-qom.h"
+#include "target/m68k/cpu-qom.h"
struct MemoryRegion;
diff --git a/include/hw/mips/cpudevs.h b/include/hw/mips/cpudevs.h
index 8673daa39d..698339b83e 100644
--- a/include/hw/mips/cpudevs.h
+++ b/include/hw/mips/cpudevs.h
@@ -1,7 +1,7 @@
#ifndef HW_MIPS_CPUDEVS_H
#define HW_MIPS_CPUDEVS_H
-#include "target-mips/cpu-qom.h"
+#include "target/mips/cpu-qom.h"
/* Definitions for MIPS CPU internal devices. */
diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h
index 0cabb6af04..bd5b0a8c3d 100644
--- a/include/hw/ppc/fdt.h
+++ b/include/hw/ppc/fdt.h
@@ -11,7 +11,7 @@
#define PPC_FDT_H
#include "qemu/error-report.h"
-#include "target-ppc/cpu-qom.h"
+#include "target/ppc/cpu-qom.h"
#define _FDT(exp) \
do { \
diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index 00c1fb1e72..4e7fe110d6 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -1,7 +1,7 @@
#ifndef HW_PPC_H
#define HW_PPC_H
-#include "target-ppc/cpu-qom.h"
+#include "target/ppc/cpu-qom.h"
void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level);
diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_core.h
index 283969bafb..50292f48b1 100644
--- a/include/hw/ppc/spapr_cpu_core.h
+++ b/include/hw/ppc/spapr_cpu_core.h
@@ -11,7 +11,7 @@
#include "hw/qdev.h"
#include "hw/cpu/core.h"
-#include "target-ppc/cpu-qom.h"
+#include "target/ppc/cpu-qom.h"
#define TYPE_SPAPR_CPU_CORE "spapr-cpu-core"
#define SPAPR_CPU_CORE(obj) \
diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index 070312d921..e59b9e7c45 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -3,7 +3,7 @@
/* Definitions for SH board emulation. */
#include "hw/sh4/sh_intc.h"
-#include "target-sh4/cpu-qom.h"
+#include "target/sh4/cpu-qom.h"
#define A7ADDR(x) ((x) & 0x1fffffff)
#define P4ADDR(x) ((x) | 0xe0000000)
diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
index a8108d9b88..14806e18c6 100644
--- a/scripts/analyze-inclusions
+++ b/scripts/analyze-inclusions
@@ -48,7 +48,7 @@ grep_include() {
echo Found $(find . -name "*.d" | wc -l) object files
echo $(grep_include -F 'include/qemu-common.h') files include qemu-common.h
echo $(grep_include -F 'hw/hw.h') files include hw/hw.h
-echo $(grep_include 'target-[a-z0-9]*/cpu\.h') files include cpu.h
+echo $(grep_include 'target/[a-z0-9]*/cpu\.h') files include cpu.h
echo $(grep_include -F 'qapi-types.h') files include qapi-types.h
echo $(grep_include -F 'trace/generated-tracers.h') files include generated-tracers.h
echo $(grep_include -F 'qapi/error.h') files include qapi/error.h
@@ -95,8 +95,8 @@ analyze -include ../include/qemu/osdep.h ../include/hw/hw.h
echo trace/generated-tracers.h:
analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
-echo target-i386/cpu.h:
-analyze -DNEED_CPU_H -I../target-i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target-i386/cpu.h
+echo target/i386/cpu.h:
+analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h
echo hw/hw.h + NEED_CPU_H:
-analyze -DNEED_CPU_H -I../target-i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h
+analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h
diff --git a/target-alpha/Makefile.objs b/target/alpha/Makefile.objs
index 63664629f6..63664629f6 100644
--- a/target-alpha/Makefile.objs
+++ b/target/alpha/Makefile.objs
diff --git a/target-alpha/STATUS b/target/alpha/STATUS
index 6c9744569e..6c9744569e 100644
--- a/target-alpha/STATUS
+++ b/target/alpha/STATUS
diff --git a/target-alpha/cpu-qom.h b/target/alpha/cpu-qom.h
index bae4945344..bae4945344 100644
--- a/target-alpha/cpu-qom.h
+++ b/target/alpha/cpu-qom.h
diff --git a/target-alpha/cpu.c b/target/alpha/cpu.c
index 30d77ce71c..30d77ce71c 100644
--- a/target-alpha/cpu.c
+++ b/target/alpha/cpu.c
diff --git a/target-alpha/cpu.h b/target/alpha/cpu.h
index b08d1601d1..b08d1601d1 100644
--- a/target-alpha/cpu.h
+++ b/target/alpha/cpu.h
diff --git a/target-alpha/fpu_helper.c b/target/alpha/fpu_helper.c
index 9645978aaa..9645978aaa 100644
--- a/target-alpha/fpu_helper.c
+++ b/target/alpha/fpu_helper.c
diff --git a/target-alpha/gdbstub.c b/target/alpha/gdbstub.c
index d64bcccfa0..d64bcccfa0 100644
--- a/target-alpha/gdbstub.c
+++ b/target/alpha/gdbstub.c
diff --git a/target-alpha/helper.c b/target/alpha/helper.c
index a5c308859b..a5c308859b 100644
--- a/target-alpha/helper.c
+++ b/target/alpha/helper.c
diff --git a/target-alpha/helper.h b/target/alpha/helper.h
index 004221df8c..004221df8c 100644
--- a/target-alpha/helper.h
+++ b/target/alpha/helper.h
diff --git a/target-alpha/int_helper.c b/target/alpha/int_helper.c
index 19bebfe742..19bebfe742 100644
--- a/target-alpha/int_helper.c
+++ b/target/alpha/int_helper.c
diff --git a/target-alpha/machine.c b/target/alpha/machine.c
index b99a123a39..b99a123a39 100644
--- a/target-alpha/machine.c
+++ b/target/alpha/machine.c
diff --git a/target-alpha/mem_helper.c b/target/alpha/mem_helper.c
index 78a7d45590..78a7d45590 100644
--- a/target-alpha/mem_helper.c
+++ b/target/alpha/mem_helper.c
diff --git a/target-alpha/sys_helper.c b/target/alpha/sys_helper.c
index bec1e178be..bec1e178be 100644
--- a/target-alpha/sys_helper.c
+++ b/target/alpha/sys_helper.c
diff --git a/target-alpha/translate.c b/target/alpha/translate.c
index 114927b751..114927b751 100644
--- a/target-alpha/translate.c
+++ b/target/alpha/translate.c
diff --git a/target-alpha/vax_helper.c b/target/alpha/vax_helper.c
index 2b0c178274..2b0c178274 100644
--- a/target-alpha/vax_helper.c
+++ b/target/alpha/vax_helper.c
diff --git a/target-arm/Makefile.objs b/target/arm/Makefile.objs
index 847fb52ee0..847fb52ee0 100644
--- a/target-arm/Makefile.objs
+++ b/target/arm/Makefile.objs
diff --git a/target-arm/arch_dump.c b/target/arm/arch_dump.c
index 1a9861f69b..1a9861f69b 100644
--- a/target-arm/arch_dump.c
+++ b/target/arm/arch_dump.c
diff --git a/target-arm/arm-powerctl.c b/target/arm/arm-powerctl.c
index fbb7a15daa..fbb7a15daa 100644
--- a/target-arm/arm-powerctl.c
+++ b/target/arm/arm-powerctl.c
diff --git a/target-arm/arm-powerctl.h b/target/arm/arm-powerctl.h
index 98ee04989b..98ee04989b 100644
--- a/target-arm/arm-powerctl.h
+++ b/target/arm/arm-powerctl.h
diff --git a/target-arm/arm-semi.c b/target/arm/arm-semi.c
index 7cac8734c7..7cac8734c7 100644
--- a/target-arm/arm-semi.c
+++ b/target/arm/arm-semi.c
diff --git a/target-arm/arm_ldst.h b/target/arm/arm_ldst.h
index a76d89f62c..a76d89f62c 100644
--- a/target-arm/arm_ldst.h
+++ b/target/arm/arm_ldst.h
diff --git a/target-arm/cpu-qom.h b/target/arm/cpu-qom.h
index a42495bac9..a42495bac9 100644
--- a/target-arm/cpu-qom.h
+++ b/target/arm/cpu-qom.h
diff --git a/target-arm/cpu.c b/target/arm/cpu.c
index 99f0dbebb9..99f0dbebb9 100644
--- a/target-arm/cpu.c
+++ b/target/arm/cpu.c
diff --git a/target-arm/cpu.h b/target/arm/cpu.h
index ca5c849ed6..ca5c849ed6 100644
--- a/target-arm/cpu.h
+++ b/target/arm/cpu.h
diff --git a/target-arm/cpu64.c b/target/arm/cpu64.c
index 549cb1ee93..549cb1ee93 100644
--- a/target-arm/cpu64.c
+++ b/target/arm/cpu64.c
diff --git a/target-arm/crypto_helper.c b/target/arm/crypto_helper.c
index 3b6df3f41a..3b6df3f41a 100644
--- a/target-arm/crypto_helper.c
+++ b/target/arm/crypto_helper.c
diff --git a/target-arm/gdbstub.c b/target/arm/gdbstub.c
index 04c1208d03..04c1208d03 100644
--- a/target-arm/gdbstub.c
+++ b/target/arm/gdbstub.c
diff --git a/target-arm/gdbstub64.c b/target/arm/gdbstub64.c
index 49bc3fc521..49bc3fc521 100644
--- a/target-arm/gdbstub64.c
+++ b/target/arm/gdbstub64.c
diff --git a/target-arm/helper-a64.c b/target/arm/helper-a64.c
index 98b97df461..98b97df461 100644
--- a/target-arm/helper-a64.c
+++ b/target/arm/helper-a64.c
diff --git a/target-arm/helper-a64.h b/target/arm/helper-a64.h
index dd32000e63..dd32000e63 100644
--- a/target-arm/helper-a64.h
+++ b/target/arm/helper-a64.h
diff --git a/target-arm/helper.c b/target/arm/helper.c
index b5b65caadf..b5b65caadf 100644
--- a/target-arm/helper.c
+++ b/target/arm/helper.c
diff --git a/target-arm/helper.h b/target/arm/helper.h
index 84aa637629..84aa637629 100644
--- a/target-arm/helper.h
+++ b/target/arm/helper.h
diff --git a/target-arm/internals.h b/target/arm/internals.h
index 3edccd2529..3cae5ff3b5 100644
--- a/target-arm/internals.h
+++ b/target/arm/internals.h
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/gpl-2.0.html>
*
* This header defines functions, types, etc which need to be shared
- * between different source files within target-arm/ but which are
+ * between different source files within target/arm/ but which are
* private to it and not required by the rest of QEMU.
*/
diff --git a/target-arm/iwmmxt_helper.c b/target/arm/iwmmxt_helper.c
index 7d87e1a0a8..7d87e1a0a8 100644
--- a/target-arm/iwmmxt_helper.c
+++ b/target/arm/iwmmxt_helper.c
diff --git a/target-arm/kvm-consts.h b/target/arm/kvm-consts.h
index a2c9518592..a2c9518592 100644
--- a/target-arm/kvm-consts.h
+++ b/target/arm/kvm-consts.h
diff --git a/target-arm/kvm-stub.c b/target/arm/kvm-stub.c
index b2c66df532..b2c66df532 100644
--- a/target-arm/kvm-stub.c
+++ b/target/arm/kvm-stub.c
diff --git a/target-arm/kvm.c b/target/arm/kvm.c
index c00b94e42a..c00b94e42a 100644
--- a/target-arm/kvm.c
+++ b/target/arm/kvm.c
diff --git a/target-arm/kvm32.c b/target/arm/kvm32.c
index 069da0c5fd..069da0c5fd 100644
--- a/target-arm/kvm32.c
+++ b/target/arm/kvm32.c
diff --git a/target-arm/kvm64.c b/target/arm/kvm64.c
index 61111091ad..61111091ad 100644
--- a/target-arm/kvm64.c
+++ b/target/arm/kvm64.c
diff --git a/target-arm/kvm_arm.h b/target/arm/kvm_arm.h
index 633d08828a..633d08828a 100644
--- a/target-arm/kvm_arm.h
+++ b/target/arm/kvm_arm.h
diff --git a/target-arm/machine.c b/target/arm/machine.c
index d90943b6db..d90943b6db 100644
--- a/target-arm/machine.c
+++ b/target/arm/machine.c
diff --git a/target-arm/monitor.c b/target/arm/monitor.c
index 299cb80ae7..299cb80ae7 100644
--- a/target-arm/monitor.c
+++ b/target/arm/monitor.c
diff --git a/target-arm/neon_helper.c b/target/arm/neon_helper.c
index ebdf7c9b10..ebdf7c9b10 100644
--- a/target-arm/neon_helper.c
+++ b/target/arm/neon_helper.c
diff --git a/target-arm/op_addsub.h b/target/arm/op_addsub.h
index ca4a1893c3..ca4a1893c3 100644
--- a/target-arm/op_addsub.h
+++ b/target/arm/op_addsub.h
diff --git a/target-arm/op_helper.c b/target/arm/op_helper.c
index cd94216591..cd94216591 100644
--- a/target-arm/op_helper.c
+++ b/target/arm/op_helper.c
diff --git a/target-arm/psci.c b/target/arm/psci.c
index 14316eb0ae..14316eb0ae 100644
--- a/target-arm/psci.c
+++ b/target/arm/psci.c
diff --git a/target-arm/trace-events b/target/arm/trace-events
index 9f726bdae3..e21c84fc6f 100644
--- a/target-arm/trace-events
+++ b/target/arm/trace-events
@@ -1,6 +1,6 @@
# See docs/tracing.txt for syntax documentation.
-# target-arm/helper.c
+# target/arm/helper.c
arm_gt_recalc(int timer, int irqstate, uint64_t nexttick) "gt recalc: timer %d irqstate %d next tick %" PRIx64
arm_gt_recalc_disabled(int timer) "gt recalc: timer %d irqstate 0 timer disabled"
arm_gt_cval_write(int timer, uint64_t value) "gt_cval_write: timer %d value %" PRIx64
diff --git a/target-arm/translate-a64.c b/target/arm/translate-a64.c
index 6dc27a6115..6dc27a6115 100644
--- a/target-arm/translate-a64.c
+++ b/target/arm/translate-a64.c
diff --git a/target-arm/translate.c b/target/arm/translate.c
index 0ad9070b45..0ad9070b45 100644
--- a/target-arm/translate.c
+++ b/target/arm/translate.c
diff --git a/target-arm/translate.h b/target/arm/translate.h
index 285e96f087..285e96f087 100644
--- a/target-arm/translate.h
+++ b/target/arm/translate.h
diff --git a/target-cris/Makefile.objs b/target/cris/Makefile.objs
index 7779227fc4..7779227fc4 100644
--- a/target-cris/Makefile.objs
+++ b/target/cris/Makefile.objs
diff --git a/target-cris/cpu-qom.h b/target/cris/cpu-qom.h
index 7556e9f97e..7556e9f97e 100644
--- a/target-cris/cpu-qom.h
+++ b/target/cris/cpu-qom.h
diff --git a/target-cris/cpu.c b/target/cris/cpu.c
index 2e9ab9700e..2e9ab9700e 100644
--- a/target-cris/cpu.c
+++ b/target/cris/cpu.c
diff --git a/target-cris/cpu.h b/target/cris/cpu.h
index 43d5f9d1da..43d5f9d1da 100644
--- a/target-cris/cpu.h
+++ b/target/cris/cpu.h
diff --git a/target-cris/crisv10-decode.h b/target/cris/crisv10-decode.h
index bdb4b6d318..bdb4b6d318 100644
--- a/target-cris/crisv10-decode.h
+++ b/target/cris/crisv10-decode.h
diff --git a/target-cris/crisv32-decode.h b/target/cris/crisv32-decode.h
index cdc2f8cbe6..cdc2f8cbe6 100644
--- a/target-cris/crisv32-decode.h
+++ b/target/cris/crisv32-decode.h
diff --git a/target-cris/gdbstub.c b/target/cris/gdbstub.c
index 3a72ee2a98..3a72ee2a98 100644
--- a/target-cris/gdbstub.c
+++ b/target/cris/gdbstub.c
diff --git a/target-cris/helper.c b/target/cris/helper.c
index af78cca8b9..af78cca8b9 100644
--- a/target-cris/helper.c
+++ b/target/cris/helper.c
diff --git a/target-cris/helper.h b/target/cris/helper.h
index ff3595641a..ff3595641a 100644
--- a/target-cris/helper.h
+++ b/target/cris/helper.h
diff --git a/target-cris/machine.c b/target/cris/machine.c
index 6b797e8c1d..6b797e8c1d 100644
--- a/target-cris/machine.c
+++ b/target/cris/machine.c
diff --git a/target-cris/mmu.c b/target/cris/mmu.c
index b8db908823..b8db908823 100644
--- a/target-cris/mmu.c
+++ b/target/cris/mmu.c
diff --git a/target-cris/mmu.h b/target/cris/mmu.h
index 8e249e812b..8e249e812b 100644
--- a/target-cris/mmu.h
+++ b/target/cris/mmu.h
diff --git a/target-cris/op_helper.c b/target/cris/op_helper.c
index 504303913c..504303913c 100644
--- a/target-cris/op_helper.c
+++ b/target/cris/op_helper.c
diff --git a/target-cris/opcode-cris.h b/target/cris/opcode-cris.h
index e7ebb98cd0..e7ebb98cd0 100644
--- a/target-cris/opcode-cris.h
+++ b/target/cris/opcode-cris.h
diff --git a/target-cris/translate.c b/target/cris/translate.c
index b91042743f..b91042743f 100644
--- a/target-cris/translate.c
+++ b/target/cris/translate.c
diff --git a/target-cris/translate_v10.c b/target/cris/translate_v10.c
index 4a0b485d8e..4a0b485d8e 100644
--- a/target-cris/translate_v10.c
+++ b/target/cris/translate_v10.c
diff --git a/target-i386/Makefile.objs b/target/i386/Makefile.objs
index b223d7932b..b223d7932b 100644
--- a/target-i386/Makefile.objs
+++ b/target/i386/Makefile.objs
diff --git a/target-i386/TODO b/target/i386/TODO
index a8d69cf87f..a8d69cf87f 100644
--- a/target-i386/TODO
+++ b/target/i386/TODO
diff --git a/target-i386/arch_dump.c b/target/i386/arch_dump.c
index 5a2e4be5d0..5a2e4be5d0 100644
--- a/target-i386/arch_dump.c
+++ b/target/i386/arch_dump.c
diff --git a/target-i386/arch_memory_mapping.c b/target/i386/arch_memory_mapping.c
index 88f341e1bb..88f341e1bb 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target/i386/arch_memory_mapping.c
diff --git a/target-i386/bpt_helper.c b/target/i386/bpt_helper.c
index 6fd7fe04a0..6fd7fe04a0 100644
--- a/target-i386/bpt_helper.c
+++ b/target/i386/bpt_helper.c
diff --git a/target-i386/cc_helper.c b/target/i386/cc_helper.c
index 83af223c9f..83af223c9f 100644
--- a/target-i386/cc_helper.c
+++ b/target/i386/cc_helper.c
diff --git a/target-i386/cc_helper_template.h b/target/i386/cc_helper_template.h
index 607311f195..607311f195 100644
--- a/target-i386/cc_helper_template.h
+++ b/target/i386/cc_helper_template.h
diff --git a/target-i386/cpu-qom.h b/target/i386/cpu-qom.h
index 7c9a07ae65..7c9a07ae65 100644
--- a/target-i386/cpu-qom.h
+++ b/target/i386/cpu-qom.h
diff --git a/target-i386/cpu.c b/target/i386/cpu.c
index de1f30eeda..de1f30eeda 100644
--- a/target-i386/cpu.c
+++ b/target/i386/cpu.c
diff --git a/target-i386/cpu.h b/target/i386/cpu.h
index c605724022..c605724022 100644
--- a/target-i386/cpu.h
+++ b/target/i386/cpu.h
diff --git a/target-i386/excp_helper.c b/target/i386/excp_helper.c
index f0dc4996c1..f0dc4996c1 100644
--- a/target-i386/excp_helper.c
+++ b/target/i386/excp_helper.c
diff --git a/target-i386/fpu_helper.c b/target/i386/fpu_helper.c
index 2049a8c01d..2049a8c01d 100644
--- a/target-i386/fpu_helper.c
+++ b/target/i386/fpu_helper.c
diff --git a/target-i386/gdbstub.c b/target/i386/gdbstub.c
index c494535df1..c494535df1 100644
--- a/target-i386/gdbstub.c
+++ b/target/i386/gdbstub.c
diff --git a/target-i386/helper.c b/target/i386/helper.c
index 4ecc0912a4..4ecc0912a4 100644
--- a/target-i386/helper.c
+++ b/target/i386/helper.c
diff --git a/target-i386/helper.h b/target/i386/helper.h
index 4e859eba9d..4e859eba9d 100644
--- a/target-i386/helper.h
+++ b/target/i386/helper.h
diff --git a/target-i386/hyperv.c b/target/i386/hyperv.c
index 39a230f119..39a230f119 100644
--- a/target-i386/hyperv.c
+++ b/target/i386/hyperv.c
diff --git a/target-i386/hyperv.h b/target/i386/hyperv.h
index 0c3b562018..0c3b562018 100644
--- a/target-i386/hyperv.h
+++ b/target/i386/hyperv.h
diff --git a/target-i386/int_helper.c b/target/i386/int_helper.c
index 9e873ac150..9e873ac150 100644
--- a/target-i386/int_helper.c
+++ b/target/i386/int_helper.c
diff --git a/target-i386/kvm-stub.c b/target/i386/kvm-stub.c
index bda4dc2f0c..bda4dc2f0c 100644
--- a/target-i386/kvm-stub.c
+++ b/target/i386/kvm-stub.c
diff --git a/target-i386/kvm.c b/target/i386/kvm.c
index f62264a7a8..f62264a7a8 100644
--- a/target-i386/kvm.c
+++ b/target/i386/kvm.c
diff --git a/target-i386/kvm_i386.h b/target/i386/kvm_i386.h
index 76079295b2..76079295b2 100644
--- a/target-i386/kvm_i386.h
+++ b/target/i386/kvm_i386.h
diff --git a/target-i386/machine.c b/target/i386/machine.c
index 760f82b6c7..760f82b6c7 100644
--- a/target-i386/machine.c
+++ b/target/i386/machine.c
diff --git a/target-i386/mem_helper.c b/target/i386/mem_helper.c
index 70f67668ab..70f67668ab 100644
--- a/target-i386/mem_helper.c
+++ b/target/i386/mem_helper.c
diff --git a/target-i386/misc_helper.c b/target/i386/misc_helper.c
index 3f666b4b87..3f666b4b87 100644
--- a/target-i386/misc_helper.c
+++ b/target/i386/misc_helper.c
diff --git a/target-i386/monitor.c b/target/i386/monitor.c
index 9a3b4d746e..9a3b4d746e 100644
--- a/target-i386/monitor.c
+++ b/target/i386/monitor.c
diff --git a/target-i386/mpx_helper.c b/target/i386/mpx_helper.c
index 7e44820659..7e44820659 100644
--- a/target-i386/mpx_helper.c
+++ b/target/i386/mpx_helper.c
diff --git a/target-i386/ops_sse.h b/target/i386/ops_sse.h
index 7a98f53864..7a98f53864 100644
--- a/target-i386/ops_sse.h
+++ b/target/i386/ops_sse.h
diff --git a/target-i386/ops_sse_header.h b/target/i386/ops_sse_header.h
index 64c5857cf4..64c5857cf4 100644
--- a/target-i386/ops_sse_header.h
+++ b/target/i386/ops_sse_header.h
diff --git a/target-i386/seg_helper.c b/target/i386/seg_helper.c
index fb79f3180d..fb79f3180d 100644
--- a/target-i386/seg_helper.c
+++ b/target/i386/seg_helper.c
diff --git a/target-i386/shift_helper_template.h b/target/i386/shift_helper_template.h
index cf91a2d284..cf91a2d284 100644
--- a/target-i386/shift_helper_template.h
+++ b/target/i386/shift_helper_template.h
diff --git a/target-i386/smm_helper.c b/target/i386/smm_helper.c
index 4dd6a2c544..4dd6a2c544 100644
--- a/target-i386/smm_helper.c
+++ b/target/i386/smm_helper.c
diff --git a/target-i386/svm.h b/target/i386/svm.h
index 922c8fd39c..922c8fd39c 100644
--- a/target-i386/svm.h
+++ b/target/i386/svm.h
diff --git a/target-i386/svm_helper.c b/target/i386/svm_helper.c
index 782b3f12f0..782b3f12f0 100644
--- a/target-i386/svm_helper.c
+++ b/target/i386/svm_helper.c
diff --git a/target-i386/trace-events b/target/i386/trace-events
index 05c5453d35..de6a1cf0cb 100644
--- a/target-i386/trace-events
+++ b/target/i386/trace-events
@@ -1,6 +1,6 @@
# See docs/tracing.txt for syntax documentation.
-# target-i386/kvm.c
+# target/i386/kvm.c
kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" PRIu32
kvm_x86_add_msi_route(int virq) "Adding route entry for virq %d"
kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d"
diff --git a/target-i386/translate.c b/target/i386/translate.c
index 324103c885..324103c885 100644
--- a/target-i386/translate.c
+++ b/target/i386/translate.c
diff --git a/target-lm32/Makefile.objs b/target/lm32/Makefile.objs
index c3e1bd6bd6..c3e1bd6bd6 100644
--- a/target-lm32/Makefile.objs
+++ b/target/lm32/Makefile.objs
diff --git a/target-lm32/README b/target/lm32/README
index ba3508a711..ba3508a711 100644
--- a/target-lm32/README
+++ b/target/lm32/README
diff --git a/target-lm32/TODO b/target/lm32/TODO
index e163c42ebe..e163c42ebe 100644
--- a/target-lm32/TODO
+++ b/target/lm32/TODO
diff --git a/target-lm32/cpu-qom.h b/target/lm32/cpu-qom.h
index b423d2564b..b423d2564b 100644
--- a/target-lm32/cpu-qom.h
+++ b/target/lm32/cpu-qom.h
diff --git a/target-lm32/cpu.c b/target/lm32/cpu.c
index 8d939a7779..8d939a7779 100644
--- a/target-lm32/cpu.c
+++ b/target/lm32/cpu.c
diff --git a/target-lm32/cpu.h b/target/lm32/cpu.h
index d8a3515244..d8a3515244 100644
--- a/target-lm32/cpu.h
+++ b/target/lm32/cpu.h
diff --git a/target-lm32/gdbstub.c b/target/lm32/gdbstub.c
index cf929dd392..cf929dd392 100644
--- a/target-lm32/gdbstub.c
+++ b/target/lm32/gdbstub.c
diff --git a/target-lm32/helper.c b/target/lm32/helper.c
index 891da18c30..891da18c30 100644
--- a/target-lm32/helper.c
+++ b/target/lm32/helper.c
diff --git a/target-lm32/helper.h b/target/lm32/helper.h
index 445578c439..445578c439 100644
--- a/target-lm32/helper.h
+++ b/target/lm32/helper.h
diff --git a/target-lm32/lm32-semi.c b/target/lm32/lm32-semi.c
index 20f1a1cd48..6a11a6299a 100644
--- a/target-lm32/lm32-semi.c
+++ b/target/lm32/lm32-semi.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2014 Michael Walle <michael@walle.cc>
*
- * Based on target-m68k/m68k-semi.c, which is
+ * Based on target/m68k/m68k-semi.c, which is
* Copyright (c) 2005-2007 CodeSourcery.
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
diff --git a/target-lm32/machine.c b/target/lm32/machine.c
index 3c258a4bcc..3c258a4bcc 100644
--- a/target-lm32/machine.c
+++ b/target/lm32/machine.c
diff --git a/target-lm32/op_helper.c b/target/lm32/op_helper.c
index 2177c8ad12..2177c8ad12 100644
--- a/target-lm32/op_helper.c
+++ b/target/lm32/op_helper.c
diff --git a/target-lm32/translate.c b/target/lm32/translate.c
index 692882f447..692882f447 100644
--- a/target-lm32/translate.c
+++ b/target/lm32/translate.c
diff --git a/target-m68k/Makefile.objs b/target/m68k/Makefile.objs
index 02cf616a78..02cf616a78 100644
--- a/target-m68k/Makefile.objs
+++ b/target/m68k/Makefile.objs
diff --git a/target-m68k/cpu-qom.h b/target/m68k/cpu-qom.h
index 9885bba317..9885bba317 100644
--- a/target-m68k/cpu-qom.h
+++ b/target/m68k/cpu-qom.h
diff --git a/target-m68k/cpu.c b/target/m68k/cpu.c
index ba17480098..ba17480098 100644
--- a/target-m68k/cpu.c
+++ b/target/m68k/cpu.c
diff --git a/target-m68k/cpu.h b/target/m68k/cpu.h
index 6dfb54eb70..6dfb54eb70 100644
--- a/target-m68k/cpu.h
+++ b/target/m68k/cpu.h
diff --git a/target-m68k/gdbstub.c b/target/m68k/gdbstub.c
index c7f44c9bb3..c7f44c9bb3 100644
--- a/target-m68k/gdbstub.c
+++ b/target/m68k/gdbstub.c
diff --git a/target-m68k/helper.c b/target/m68k/helper.c
index 7aed9ffd2f..7aed9ffd2f 100644
--- a/target-m68k/helper.c
+++ b/target/m68k/helper.c
diff --git a/target-m68k/helper.h b/target/m68k/helper.h
index 2697e32d0b..2697e32d0b 100644
--- a/target-m68k/helper.h
+++ b/target/m68k/helper.h
diff --git a/target-m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 1402145c8f..1402145c8f 100644
--- a/target-m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
diff --git a/target-m68k/op_helper.c b/target/m68k/op_helper.c
index 48e02e4062..48e02e4062 100644
--- a/target-m68k/op_helper.c
+++ b/target/m68k/op_helper.c
diff --git a/target-m68k/qregs.def b/target/m68k/qregs.def
index 156c0f558f..156c0f558f 100644
--- a/target-m68k/qregs.def
+++ b/target/m68k/qregs.def
diff --git a/target-m68k/translate.c b/target/m68k/translate.c
index d6ed883882..d6ed883882 100644
--- a/target-m68k/translate.c
+++ b/target/m68k/translate.c
diff --git a/target-microblaze/Makefile.objs b/target/microblaze/Makefile.objs
index f3d7b44c89..f3d7b44c89 100644
--- a/target-microblaze/Makefile.objs
+++ b/target/microblaze/Makefile.objs
diff --git a/target-microblaze/cpu-qom.h b/target/microblaze/cpu-qom.h
index 1a61db77d0..1a61db77d0 100644
--- a/target-microblaze/cpu-qom.h
+++ b/target/microblaze/cpu-qom.h
diff --git a/target-microblaze/cpu.c b/target/microblaze/cpu.c
index 389c7b691e..389c7b691e 100644
--- a/target-microblaze/cpu.c
+++ b/target/microblaze/cpu.c
diff --git a/target-microblaze/cpu.h b/target/microblaze/cpu.h
index beb75ffd26..beb75ffd26 100644
--- a/target-microblaze/cpu.h
+++ b/target/microblaze/cpu.h
diff --git a/target-microblaze/gdbstub.c b/target/microblaze/gdbstub.c
index 7fb076c2e9..7fb076c2e9 100644
--- a/target-microblaze/gdbstub.c
+++ b/target/microblaze/gdbstub.c
diff --git a/target-microblaze/helper.c b/target/microblaze/helper.c
index da394d1dfc..da394d1dfc 100644
--- a/target-microblaze/helper.c
+++ b/target/microblaze/helper.c
diff --git a/target-microblaze/helper.h b/target/microblaze/helper.h
index bd13826de0..bd13826de0 100644
--- a/target-microblaze/helper.h
+++ b/target/microblaze/helper.h
diff --git a/target-microblaze/microblaze-decode.h b/target/microblaze/microblaze-decode.h
index 401319ed46..401319ed46 100644
--- a/target-microblaze/microblaze-decode.h
+++ b/target/microblaze/microblaze-decode.h
diff --git a/target-microblaze/mmu.c b/target/microblaze/mmu.c
index a22a496ebb..a22a496ebb 100644
--- a/target-microblaze/mmu.c
+++ b/target/microblaze/mmu.c
diff --git a/target-microblaze/mmu.h b/target/microblaze/mmu.h
index 3b7a9983d5..3b7a9983d5 100644
--- a/target-microblaze/mmu.h
+++ b/target/microblaze/mmu.h
diff --git a/target-microblaze/op_helper.c b/target/microblaze/op_helper.c
index 4a856e6204..4a856e6204 100644
--- a/target-microblaze/op_helper.c
+++ b/target/microblaze/op_helper.c
diff --git a/target-microblaze/translate.c b/target/microblaze/translate.c
index de2090ac71..de2090ac71 100644
--- a/target-microblaze/translate.c
+++ b/target/microblaze/translate.c
diff --git a/target-mips/Makefile.objs b/target/mips/Makefile.objs
index bc5ed8511f..bc5ed8511f 100644
--- a/target-mips/Makefile.objs
+++ b/target/mips/Makefile.objs
diff --git a/target-mips/TODO b/target/mips/TODO
index 1d782d8027..1d782d8027 100644
--- a/target-mips/TODO
+++ b/target/mips/TODO
diff --git a/target-mips/cpu-qom.h b/target/mips/cpu-qom.h
index 3f5bf23823..3f5bf23823 100644
--- a/target-mips/cpu-qom.h
+++ b/target/mips/cpu-qom.h
diff --git a/target-mips/cpu.c b/target/mips/cpu.c
index 65ca607f88..65ca607f88 100644
--- a/target-mips/cpu.c
+++ b/target/mips/cpu.c
diff --git a/target-mips/cpu.h b/target/mips/cpu.h
index 5182dc74ff..5182dc74ff 100644
--- a/target-mips/cpu.h
+++ b/target/mips/cpu.h
diff --git a/target-mips/dsp_helper.c b/target/mips/dsp_helper.c
index dc707934ea..dc707934ea 100644
--- a/target-mips/dsp_helper.c
+++ b/target/mips/dsp_helper.c
diff --git a/target-mips/gdbstub.c b/target/mips/gdbstub.c
index 7c682289c2..7c682289c2 100644
--- a/target-mips/gdbstub.c
+++ b/target/mips/gdbstub.c
diff --git a/target-mips/helper.c b/target/mips/helper.c
index c864b15b97..c864b15b97 100644
--- a/target-mips/helper.c
+++ b/target/mips/helper.c
diff --git a/target-mips/helper.h b/target/mips/helper.h
index 666936c81b..666936c81b 100644
--- a/target-mips/helper.h
+++ b/target/mips/helper.h
diff --git a/target-mips/kvm.c b/target/mips/kvm.c
index dcf5fbba0c..dcf5fbba0c 100644
--- a/target-mips/kvm.c
+++ b/target/mips/kvm.c
diff --git a/target-mips/kvm_mips.h b/target/mips/kvm_mips.h
index ae957f37f0..ae957f37f0 100644
--- a/target-mips/kvm_mips.h
+++ b/target/mips/kvm_mips.h
diff --git a/target-mips/lmi_helper.c b/target/mips/lmi_helper.c
index fb1245b39d..fb1245b39d 100644
--- a/target-mips/lmi_helper.c
+++ b/target/mips/lmi_helper.c
diff --git a/target-mips/machine.c b/target/mips/machine.c
index d20d948457..d20d948457 100644
--- a/target-mips/machine.c
+++ b/target/mips/machine.c
diff --git a/target-mips/mips-defs.h b/target/mips/mips-defs.h
index 047554ee45..047554ee45 100644
--- a/target-mips/mips-defs.h
+++ b/target/mips/mips-defs.h
diff --git a/target-mips/mips-semi.c b/target/mips/mips-semi.c
index a7aefbaefc..a7aefbaefc 100644
--- a/target-mips/mips-semi.c
+++ b/target/mips/mips-semi.c
diff --git a/target-mips/msa_helper.c b/target/mips/msa_helper.c
index 1fdb0d9792..1fdb0d9792 100644
--- a/target-mips/msa_helper.c
+++ b/target/mips/msa_helper.c
diff --git a/target-mips/op_helper.c b/target/mips/op_helper.c
index 7af4c2f084..7af4c2f084 100644
--- a/target-mips/op_helper.c
+++ b/target/mips/op_helper.c
diff --git a/target-mips/translate.c b/target/mips/translate.c
index 57b824ff2d..57b824ff2d 100644
--- a/target-mips/translate.c
+++ b/target/mips/translate.c
diff --git a/target-mips/translate_init.c b/target/mips/translate_init.c
index 6ae23e476f..6ae23e476f 100644
--- a/target-mips/translate_init.c
+++ b/target/mips/translate_init.c
diff --git a/target-moxie/Makefile.objs b/target/moxie/Makefile.objs
index 6381d4d636..6381d4d636 100644
--- a/target-moxie/Makefile.objs
+++ b/target/moxie/Makefile.objs
diff --git a/target-moxie/cpu.c b/target/moxie/cpu.c
index b0be4a7551..b0be4a7551 100644
--- a/target-moxie/cpu.c
+++ b/target/moxie/cpu.c
diff --git a/target-moxie/cpu.h b/target/moxie/cpu.h
index 3e880facf4..3e880facf4 100644
--- a/target-moxie/cpu.h
+++ b/target/moxie/cpu.h
diff --git a/target-moxie/helper.c b/target/moxie/helper.c
index 330299f5a7..330299f5a7 100644
--- a/target-moxie/helper.c
+++ b/target/moxie/helper.c
diff --git a/target-moxie/helper.h b/target/moxie/helper.h
index d94ef7a17e..d94ef7a17e 100644
--- a/target-moxie/helper.h
+++ b/target/moxie/helper.h
diff --git a/target-moxie/machine.c b/target/moxie/machine.c
index 282dcd869f..282dcd869f 100644
--- a/target-moxie/machine.c
+++ b/target/moxie/machine.c
diff --git a/target-moxie/machine.h b/target/moxie/machine.h
index a1b72907ae..a1b72907ae 100644
--- a/target-moxie/machine.h
+++ b/target/moxie/machine.h
diff --git a/target-moxie/mmu.c b/target/moxie/mmu.c
index 9203330b3b..9203330b3b 100644
--- a/target-moxie/mmu.c
+++ b/target/moxie/mmu.c
diff --git a/target-moxie/mmu.h b/target/moxie/mmu.h
index 284a44d18e..284a44d18e 100644
--- a/target-moxie/mmu.h
+++ b/target/moxie/mmu.h
diff --git a/target-moxie/translate.c b/target/moxie/translate.c
index 0660b44c08..0660b44c08 100644
--- a/target-moxie/translate.c
+++ b/target/moxie/translate.c
diff --git a/target-openrisc/Makefile.objs b/target/openrisc/Makefile.objs
index 397d01650e..397d01650e 100644
--- a/target-openrisc/Makefile.objs
+++ b/target/openrisc/Makefile.objs
diff --git a/target-openrisc/cpu.c b/target/openrisc/cpu.c
index 698e87bb25..698e87bb25 100644
--- a/target-openrisc/cpu.c
+++ b/target/openrisc/cpu.c
diff --git a/target-openrisc/cpu.h b/target/openrisc/cpu.h
index aaf153579a..aaf153579a 100644
--- a/target-openrisc/cpu.h
+++ b/target/openrisc/cpu.h
diff --git a/target-openrisc/exception.c b/target/openrisc/exception.c
index 49470be051..49470be051 100644
--- a/target-openrisc/exception.c
+++ b/target/openrisc/exception.c
diff --git a/target-openrisc/exception.h b/target/openrisc/exception.h
index 4ec56b4653..4ec56b4653 100644
--- a/target-openrisc/exception.h
+++ b/target/openrisc/exception.h
diff --git a/target-openrisc/exception_helper.c b/target/openrisc/exception_helper.c
index 329a9e400b..329a9e400b 100644
--- a/target-openrisc/exception_helper.c
+++ b/target/openrisc/exception_helper.c
diff --git a/target-openrisc/fpu_helper.c b/target/openrisc/fpu_helper.c
index c54404b80d..c54404b80d 100644
--- a/target-openrisc/fpu_helper.c
+++ b/target/openrisc/fpu_helper.c
diff --git a/target-openrisc/gdbstub.c b/target/openrisc/gdbstub.c
index cb16e76358..cb16e76358 100644
--- a/target-openrisc/gdbstub.c
+++ b/target/openrisc/gdbstub.c
diff --git a/target-openrisc/helper.h b/target/openrisc/helper.h
index f53fa21344..f53fa21344 100644
--- a/target-openrisc/helper.h
+++ b/target/openrisc/helper.h
diff --git a/target-openrisc/int_helper.c b/target/openrisc/int_helper.c
index 4d1f958901..4d1f958901 100644
--- a/target-openrisc/int_helper.c
+++ b/target/openrisc/int_helper.c
diff --git a/target-openrisc/interrupt.c b/target/openrisc/interrupt.c
index 5fe3f11ffc..5fe3f11ffc 100644
--- a/target-openrisc/interrupt.c
+++ b/target/openrisc/interrupt.c
diff --git a/target-openrisc/interrupt_helper.c b/target/openrisc/interrupt_helper.c
index 116f9109a7..116f9109a7 100644
--- a/target-openrisc/interrupt_helper.c
+++ b/target/openrisc/interrupt_helper.c
diff --git a/target-openrisc/machine.c b/target/openrisc/machine.c
index 17b0c77d6c..17b0c77d6c 100644
--- a/target-openrisc/machine.c
+++ b/target/openrisc/machine.c
diff --git a/target-openrisc/mmu.c b/target/openrisc/mmu.c
index 505dcdcdc8..505dcdcdc8 100644
--- a/target-openrisc/mmu.c
+++ b/target/openrisc/mmu.c
diff --git a/target-openrisc/mmu_helper.c b/target/openrisc/mmu_helper.c
index a44d0aa51a..a44d0aa51a 100644
--- a/target-openrisc/mmu_helper.c
+++ b/target/openrisc/mmu_helper.c
diff --git a/target-openrisc/sys_helper.c b/target/openrisc/sys_helper.c
index a719e452be..a719e452be 100644
--- a/target-openrisc/sys_helper.c
+++ b/target/openrisc/sys_helper.c
diff --git a/target-openrisc/translate.c b/target/openrisc/translate.c
index 229361aed1..229361aed1 100644
--- a/target-openrisc/translate.c
+++ b/target/openrisc/translate.c
diff --git a/target-ppc/Makefile.objs b/target/ppc/Makefile.objs
index e667e69701..e667e69701 100644
--- a/target-ppc/Makefile.objs
+++ b/target/ppc/Makefile.objs
diff --git a/target-ppc/STATUS b/target/ppc/STATUS
index a4d48a7ca2..a4d48a7ca2 100644
--- a/target-ppc/STATUS
+++ b/target/ppc/STATUS
diff --git a/target-ppc/arch_dump.c b/target/ppc/arch_dump.c
index 40282a1f50..40282a1f50 100644
--- a/target-ppc/arch_dump.c
+++ b/target/ppc/arch_dump.c
diff --git a/target-ppc/cpu-models.c b/target/ppc/cpu-models.c
index 506dee1ee8..506dee1ee8 100644
--- a/target-ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
diff --git a/target-ppc/cpu-models.h b/target/ppc/cpu-models.h
index aafbbd7d5d..aafbbd7d5d 100644
--- a/target-ppc/cpu-models.h
+++ b/target/ppc/cpu-models.h
diff --git a/target-ppc/cpu-qom.h b/target/ppc/cpu-qom.h
index d46c31a15d..d46c31a15d 100644
--- a/target-ppc/cpu-qom.h
+++ b/target/ppc/cpu-qom.h
diff --git a/target-ppc/cpu.h b/target/ppc/cpu.h
index 2a50c43689..2a50c43689 100644
--- a/target-ppc/cpu.h
+++ b/target/ppc/cpu.h
diff --git a/target-ppc/dfp_helper.c b/target/ppc/dfp_helper.c
index 9164fe701b..9164fe701b 100644
--- a/target-ppc/dfp_helper.c
+++ b/target/ppc/dfp_helper.c
diff --git a/target-ppc/excp_helper.c b/target/ppc/excp_helper.c
index 93369d4fe5..93369d4fe5 100644
--- a/target-ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
diff --git a/target-ppc/fpu_helper.c b/target/ppc/fpu_helper.c
index 8a389e19af..8a389e19af 100644
--- a/target-ppc/fpu_helper.c
+++ b/target/ppc/fpu_helper.c
diff --git a/target-ppc/gdbstub.c b/target/ppc/gdbstub.c
index 7a338136a8..7a338136a8 100644
--- a/target-ppc/gdbstub.c
+++ b/target/ppc/gdbstub.c
diff --git a/target-ppc/helper.h b/target/ppc/helper.h
index da00f0ab49..da00f0ab49 100644
--- a/target-ppc/helper.h
+++ b/target/ppc/helper.h
diff --git a/target-ppc/helper_regs.h b/target/ppc/helper_regs.h
index 62138163a5..62138163a5 100644
--- a/target-ppc/helper_regs.h
+++ b/target/ppc/helper_regs.h
diff --git a/target-ppc/int_helper.c b/target/ppc/int_helper.c
index 2d57c9a1c2..2d57c9a1c2 100644
--- a/target-ppc/int_helper.c
+++ b/target/ppc/int_helper.c
diff --git a/target-ppc/internal.h b/target/ppc/internal.h
index 1ff4896c45..1ff4896c45 100644
--- a/target-ppc/internal.h
+++ b/target/ppc/internal.h
diff --git a/target-ppc/kvm-stub.c b/target/ppc/kvm-stub.c
index efeafca1df..efeafca1df 100644
--- a/target-ppc/kvm-stub.c
+++ b/target/ppc/kvm-stub.c
diff --git a/target-ppc/kvm.c b/target/ppc/kvm.c
index 9c4834c4fc..9c4834c4fc 100644
--- a/target-ppc/kvm.c
+++ b/target/ppc/kvm.c
diff --git a/target-ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index bd1d78bfbe..bd1d78bfbe 100644
--- a/target-ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
diff --git a/target-ppc/machine.c b/target/ppc/machine.c
index 18c16d2512..18c16d2512 100644
--- a/target-ppc/machine.c
+++ b/target/ppc/machine.c
diff --git a/target-ppc/mem_helper.c b/target/ppc/mem_helper.c
index 1ab8a6eab4..1ab8a6eab4 100644
--- a/target-ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
diff --git a/target-ppc/mfrom_table.c b/target/ppc/mfrom_table.c
index 6a1fa375c9..6a1fa375c9 100644
--- a/target-ppc/mfrom_table.c
+++ b/target/ppc/mfrom_table.c
diff --git a/target-ppc/mfrom_table_gen.c b/target/ppc/mfrom_table_gen.c
index 631791808e..631791808e 100644
--- a/target-ppc/mfrom_table_gen.c
+++ b/target/ppc/mfrom_table_gen.c
diff --git a/target-ppc/misc_helper.c b/target/ppc/misc_helper.c
index 1e6e705a4e..1e6e705a4e 100644
--- a/target-ppc/misc_helper.c
+++ b/target/ppc/misc_helper.c
diff --git a/target-ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c
index 29bace622a..29bace622a 100644
--- a/target-ppc/mmu-hash32.c
+++ b/target/ppc/mmu-hash32.c
diff --git a/target-ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h
index 5b9fb08d1a..5b9fb08d1a 100644
--- a/target-ppc/mmu-hash32.h
+++ b/target/ppc/mmu-hash32.h
diff --git a/target-ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index fdb7a787bf..fdb7a787bf 100644
--- a/target-ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
diff --git a/target-ppc/mmu-hash64.h b/target/ppc/mmu-hash64.h
index ab5d347a53..ab5d347a53 100644
--- a/target-ppc/mmu-hash64.h
+++ b/target/ppc/mmu-hash64.h
diff --git a/target-ppc/mmu_helper.c b/target/ppc/mmu_helper.c
index d09fc0a85f..d09fc0a85f 100644
--- a/target-ppc/mmu_helper.c
+++ b/target/ppc/mmu_helper.c
diff --git a/target-ppc/monitor.c b/target/ppc/monitor.c
index c2d0806dd1..c2d0806dd1 100644
--- a/target-ppc/monitor.c
+++ b/target/ppc/monitor.c
diff --git a/target-ppc/timebase_helper.c b/target/ppc/timebase_helper.c
index 73363e08ae..73363e08ae 100644
--- a/target-ppc/timebase_helper.c
+++ b/target/ppc/timebase_helper.c
diff --git a/target-ppc/trace-events b/target/ppc/trace-events
index 8fcc3ce98c..b666156114 100644
--- a/target-ppc/trace-events
+++ b/target/ppc/trace-events
@@ -1,5 +1,5 @@
# See docs/tracing.txt for syntax documentation.
-# target-ppc/kvm.c
+# target/ppc/kvm.c
kvm_failed_spr_set(int str, const char *msg) "Warning: Unable to set SPR %d to KVM: %s"
kvm_failed_spr_get(int str, const char *msg) "Warning: Unable to retrieve SPR %d from KVM: %s"
diff --git a/target-ppc/translate.c b/target/ppc/translate.c
index 59e9552d2b..59e9552d2b 100644
--- a/target-ppc/translate.c
+++ b/target/ppc/translate.c
diff --git a/target-ppc/translate/dfp-impl.inc.c b/target/ppc/translate/dfp-impl.inc.c
index 178d3044a7..178d3044a7 100644
--- a/target-ppc/translate/dfp-impl.inc.c
+++ b/target/ppc/translate/dfp-impl.inc.c
diff --git a/target-ppc/translate/dfp-ops.inc.c b/target/ppc/translate/dfp-ops.inc.c
index 6ef38e5712..6ef38e5712 100644
--- a/target-ppc/translate/dfp-ops.inc.c
+++ b/target/ppc/translate/dfp-ops.inc.c
diff --git a/target-ppc/translate/fp-impl.inc.c b/target/ppc/translate/fp-impl.inc.c
index 872af7b56f..872af7b56f 100644
--- a/target-ppc/translate/fp-impl.inc.c
+++ b/target/ppc/translate/fp-impl.inc.c
diff --git a/target-ppc/translate/fp-ops.inc.c b/target/ppc/translate/fp-ops.inc.c
index d36ab4ecc3..d36ab4ecc3 100644
--- a/target-ppc/translate/fp-ops.inc.c
+++ b/target/ppc/translate/fp-ops.inc.c
diff --git a/target-ppc/translate/spe-impl.inc.c b/target/ppc/translate/spe-impl.inc.c
index 8c1c16c63e..8c1c16c63e 100644
--- a/target-ppc/translate/spe-impl.inc.c
+++ b/target/ppc/translate/spe-impl.inc.c
diff --git a/target-ppc/translate/spe-ops.inc.c b/target/ppc/translate/spe-ops.inc.c
index 7efe8b8746..7efe8b8746 100644
--- a/target-ppc/translate/spe-ops.inc.c
+++ b/target/ppc/translate/spe-ops.inc.c
diff --git a/target-ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.inc.c
index 7143eb3a39..7143eb3a39 100644
--- a/target-ppc/translate/vmx-impl.inc.c
+++ b/target/ppc/translate/vmx-impl.inc.c
diff --git a/target-ppc/translate/vmx-ops.inc.c b/target/ppc/translate/vmx-ops.inc.c
index f02b3bed50..f02b3bed50 100644
--- a/target-ppc/translate/vmx-ops.inc.c
+++ b/target/ppc/translate/vmx-ops.inc.c
diff --git a/target-ppc/translate/vsx-impl.inc.c b/target/ppc/translate/vsx-impl.inc.c
index 5a27be4bd4..5a27be4bd4 100644
--- a/target-ppc/translate/vsx-impl.inc.c
+++ b/target/ppc/translate/vsx-impl.inc.c
diff --git a/target-ppc/translate/vsx-ops.inc.c b/target/ppc/translate/vsx-ops.inc.c
index 3d9104155a..3d9104155a 100644
--- a/target-ppc/translate/vsx-ops.inc.c
+++ b/target/ppc/translate/vsx-ops.inc.c
diff --git a/target-ppc/translate_init.c b/target/ppc/translate_init.c
index 626e03186c..626e03186c 100644
--- a/target-ppc/translate_init.c
+++ b/target/ppc/translate_init.c
diff --git a/target-ppc/user_only_helper.c b/target/ppc/user_only_helper.c
index 6aff34713f..6aff34713f 100644
--- a/target-ppc/user_only_helper.c
+++ b/target/ppc/user_only_helper.c
diff --git a/target-s390x/Makefile.objs b/target/s390x/Makefile.objs
index 6b02b1794c..c573633bd1 100644
--- a/target-s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -5,7 +5,7 @@ obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o
obj-$(CONFIG_KVM) += kvm.o
# build and run feature list generator
-feat-src = $(SRC_PATH)/target-$(TARGET_BASE_ARCH)/
+feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/
feat-dst = $(BUILD_DIR)/$(TARGET_DIR)
ifneq ($(MAKECMDGOALS),clean)
GENERATED_HEADERS += $(feat-dst)gen-features.h
diff --git a/target-s390x/arch_dump.c b/target/s390x/arch_dump.c
index 4731869f6b..4731869f6b 100644
--- a/target-s390x/arch_dump.c
+++ b/target/s390x/arch_dump.c
diff --git a/target-s390x/cc_helper.c b/target/s390x/cc_helper.c
index 1cf855133e..1cf855133e 100644
--- a/target-s390x/cc_helper.c
+++ b/target/s390x/cc_helper.c
diff --git a/target-s390x/cpu-qom.h b/target/s390x/cpu-qom.h
index 4e936e7788..4e936e7788 100644
--- a/target-s390x/cpu-qom.h
+++ b/target/s390x/cpu-qom.h
diff --git a/target-s390x/cpu.c b/target/s390x/cpu.c
index 0a39d31237..0a39d31237 100644
--- a/target-s390x/cpu.c
+++ b/target/s390x/cpu.c
diff --git a/target-s390x/cpu.h b/target/s390x/cpu.h
index fd36a25cf5..fd36a25cf5 100644
--- a/target-s390x/cpu.h
+++ b/target/s390x/cpu.h
diff --git a/target-s390x/cpu_features.c b/target/s390x/cpu_features.c
index 42fd9d792b..42fd9d792b 100644
--- a/target-s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
diff --git a/target-s390x/cpu_features.h b/target/s390x/cpu_features.h
index d669121786..d669121786 100644
--- a/target-s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
diff --git a/target-s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index aa5ab8d371..aa5ab8d371 100644
--- a/target-s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
diff --git a/target-s390x/cpu_models.c b/target/s390x/cpu_models.c
index c1e729df5e..c1e729df5e 100644
--- a/target-s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
diff --git a/target-s390x/cpu_models.h b/target/s390x/cpu_models.h
index 136a602313..136a602313 100644
--- a/target-s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
diff --git a/target-s390x/fpu_helper.c b/target/s390x/fpu_helper.c
index e604e9f7be..e604e9f7be 100644
--- a/target-s390x/fpu_helper.c
+++ b/target/s390x/fpu_helper.c
diff --git a/target-s390x/gdbstub.c b/target/s390x/gdbstub.c
index 3d223dec97..3d223dec97 100644
--- a/target-s390x/gdbstub.c
+++ b/target/s390x/gdbstub.c
diff --git a/target-s390x/gen-features.c b/target/s390x/gen-features.c
index e674738ae3..e674738ae3 100644
--- a/target-s390x/gen-features.c
+++ b/target/s390x/gen-features.c
diff --git a/target-s390x/helper.c b/target/s390x/helper.c
index 68bd2f9784..68bd2f9784 100644
--- a/target-s390x/helper.c
+++ b/target/s390x/helper.c
diff --git a/target-s390x/helper.h b/target/s390x/helper.h
index 207a6e7d1c..207a6e7d1c 100644
--- a/target-s390x/helper.h
+++ b/target/s390x/helper.h
diff --git a/target-s390x/insn-data.def b/target/s390x/insn-data.def
index 075ff597c3..075ff597c3 100644
--- a/target-s390x/insn-data.def
+++ b/target/s390x/insn-data.def
diff --git a/target-s390x/insn-format.def b/target/s390x/insn-format.def
index 0e898b90bd..0e898b90bd 100644
--- a/target-s390x/insn-format.def
+++ b/target/s390x/insn-format.def
diff --git a/target-s390x/int_helper.c b/target/s390x/int_helper.c
index 370c94da55..370c94da55 100644
--- a/target-s390x/int_helper.c
+++ b/target/s390x/int_helper.c
diff --git a/target-s390x/interrupt.c b/target/s390x/interrupt.c
index 9edef96795..9edef96795 100644
--- a/target-s390x/interrupt.c
+++ b/target/s390x/interrupt.c
diff --git a/target-s390x/ioinst.c b/target/s390x/ioinst.c
index 590bfa4f12..590bfa4f12 100644
--- a/target-s390x/ioinst.c
+++ b/target/s390x/ioinst.c
diff --git a/target-s390x/kvm.c b/target/s390x/kvm.c
index 97afe02599..97afe02599 100644
--- a/target-s390x/kvm.c
+++ b/target/s390x/kvm.c
diff --git a/target-s390x/machine.c b/target/s390x/machine.c
index edc3a4717b..edc3a4717b 100644
--- a/target-s390x/machine.c
+++ b/target/s390x/machine.c
diff --git a/target-s390x/mem_helper.c b/target/s390x/mem_helper.c
index 99bc5e2834..99bc5e2834 100644
--- a/target-s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
diff --git a/target-s390x/misc_helper.c b/target/s390x/misc_helper.c
index c9604ea9c7..c9604ea9c7 100644
--- a/target-s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
diff --git a/target-s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index b11a02706c..b11a02706c 100644
--- a/target-s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
diff --git a/target-s390x/trace-events b/target/s390x/trace-events
index df59f5f19f..1574033e31 100644
--- a/target-s390x/trace-events
+++ b/target/s390x/trace-events
@@ -1,22 +1,22 @@
# See docs/tracing.txt for syntax documentation.
-# target-s390x/mmu_helper.c
+# target/s390x/mmu_helper.c
get_skeys_nonzero(int rc) "SKEY: Call to get_skeys unexpectedly returned %d"
set_skeys_nonzero(int rc) "SKEY: Call to set_skeys unexpectedly returned %d"
-# target-s390x/ioinst.c
+# target/s390x/ioinst.c
ioinst(const char *insn) "IOINST: %s"
ioinst_sch_id(const char *insn, int cssid, int ssid, int schid) "IOINST: %s (%x.%x.%04x)"
ioinst_chp_id(const char *insn, int cssid, int chpid) "IOINST: %s (%x.%02x)"
ioinst_chsc_cmd(uint16_t cmd, uint16_t len) "IOINST: chsc command %04x, len %04x"
-# target-s390x/kvm.c
+# target/s390x/kvm.c
kvm_enable_cmma(int rc) "CMMA: enabling with result code %d"
kvm_clear_cmma(int rc) "CMMA: clearing with result code %d"
kvm_failed_cpu_state_set(int cpu_index, uint8_t state, const char *msg) "Warning: Unable to set cpu %d state %" PRIu8 " to KVM: %s"
kvm_sigp_finished(uint8_t order, int cpu_index, int dst_index, int cc) "SIGP: Finished order %u on cpu %d -> cpu %d with cc=%d"
-# target-s390x/cpu.c
+# target/s390x/cpu.c
cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8
cpu_halt(int cpu_index) "halting cpu %d"
cpu_unhalt(int cpu_index) "unhalting cpu %d"
diff --git a/target-s390x/translate.c b/target/s390x/translate.c
index 02bc7058fd..02bc7058fd 100644
--- a/target-s390x/translate.c
+++ b/target/s390x/translate.c
diff --git a/target-sh4/Makefile.objs b/target/sh4/Makefile.objs
index 2c25d96e65..2c25d96e65 100644
--- a/target-sh4/Makefile.objs
+++ b/target/sh4/Makefile.objs
diff --git a/target-sh4/README.sh4 b/target/sh4/README.sh4
index ece046442a..a192ca7540 100644
--- a/target-sh4/README.sh4
+++ b/target/sh4/README.sh4
@@ -8,7 +8,7 @@ file describes the current state of implementation.
Most places requiring attention and/or modification can be detected by
looking for "XXXXX" or "abort()".
-The sh4 core is located in target-sh4/*, while the 7750 peripheral
+The sh4 core is located in target/sh4/*, while the 7750 peripheral
features (IO ports for example) are located in hw/sh7750.[ch]. The
main board description is in hw/shix.c, and the NAND flash in
hw/tc58128.[ch].
diff --git a/target-sh4/cpu-qom.h b/target/sh4/cpu-qom.h
index 01abb206e4..01abb206e4 100644
--- a/target-sh4/cpu-qom.h
+++ b/target/sh4/cpu-qom.h
diff --git a/target-sh4/cpu.c b/target/sh4/cpu.c
index a38f6a6ded..a38f6a6ded 100644
--- a/target-sh4/cpu.c
+++ b/target/sh4/cpu.c
diff --git a/target-sh4/cpu.h b/target/sh4/cpu.h
index 478ab55868..478ab55868 100644
--- a/target-sh4/cpu.h
+++ b/target/sh4/cpu.h
diff --git a/target-sh4/gdbstub.c b/target/sh4/gdbstub.c
index 13bea00d7d..13bea00d7d 100644
--- a/target-sh4/gdbstub.c
+++ b/target/sh4/gdbstub.c
diff --git a/target-sh4/helper.c b/target/sh4/helper.c
index a33ac697c5..a33ac697c5 100644
--- a/target-sh4/helper.c
+++ b/target/sh4/helper.c
diff --git a/target-sh4/helper.h b/target/sh4/helper.h
index dce859caea..dce859caea 100644
--- a/target-sh4/helper.h
+++ b/target/sh4/helper.h
diff --git a/target-sh4/monitor.c b/target/sh4/monitor.c
index 426e5d4914..426e5d4914 100644
--- a/target-sh4/monitor.c
+++ b/target/sh4/monitor.c
diff --git a/target-sh4/op_helper.c b/target/sh4/op_helper.c
index 684d3f3758..684d3f3758 100644
--- a/target-sh4/op_helper.c
+++ b/target/sh4/op_helper.c
diff --git a/target-sh4/translate.c b/target/sh4/translate.c
index c89a14733f..c89a14733f 100644
--- a/target-sh4/translate.c
+++ b/target/sh4/translate.c
diff --git a/target-sparc/Makefile.objs b/target/sparc/Makefile.objs
index ec905698c5..ec905698c5 100644
--- a/target-sparc/Makefile.objs
+++ b/target/sparc/Makefile.objs
diff --git a/target-sparc/TODO b/target/sparc/TODO
index b8c727e858..b8c727e858 100644
--- a/target-sparc/TODO
+++ b/target/sparc/TODO
diff --git a/target-sparc/asi.h b/target/sparc/asi.h
index c9a1849600..c9a1849600 100644
--- a/target-sparc/asi.h
+++ b/target/sparc/asi.h
diff --git a/target-sparc/cc_helper.c b/target/sparc/cc_helper.c
index a410a0b98f..a410a0b98f 100644
--- a/target-sparc/cc_helper.c
+++ b/target/sparc/cc_helper.c
diff --git a/target-sparc/cpu-qom.h b/target/sparc/cpu-qom.h
index f63af728ee..f63af728ee 100644
--- a/target-sparc/cpu-qom.h
+++ b/target/sparc/cpu-qom.h
diff --git a/target-sparc/cpu.c b/target/sparc/cpu.c
index 4e07b92fbd..4e07b92fbd 100644
--- a/target-sparc/cpu.c
+++ b/target/sparc/cpu.c
diff --git a/target-sparc/cpu.h b/target/sparc/cpu.h
index 5fb0ed1aad..5fb0ed1aad 100644
--- a/target-sparc/cpu.h
+++ b/target/sparc/cpu.h
diff --git a/target-sparc/fop_helper.c b/target/sparc/fop_helper.c
index c7fb176e4c..c7fb176e4c 100644
--- a/target-sparc/fop_helper.c
+++ b/target/sparc/fop_helper.c
diff --git a/target-sparc/gdbstub.c b/target/sparc/gdbstub.c
index ffc2baa2e7..ffc2baa2e7 100644
--- a/target-sparc/gdbstub.c
+++ b/target/sparc/gdbstub.c
diff --git a/target-sparc/helper.c b/target/sparc/helper.c
index 359b0b15ed..359b0b15ed 100644
--- a/target-sparc/helper.c
+++ b/target/sparc/helper.c
diff --git a/target-sparc/helper.h b/target/sparc/helper.h
index 0cf1bfb73a..0cf1bfb73a 100644
--- a/target-sparc/helper.h
+++ b/target/sparc/helper.h
diff --git a/target-sparc/int32_helper.c b/target/sparc/int32_helper.c
index 09afe136e5..09afe136e5 100644
--- a/target-sparc/int32_helper.c
+++ b/target/sparc/int32_helper.c
diff --git a/target-sparc/int64_helper.c b/target/sparc/int64_helper.c
index 29360fa5fe..29360fa5fe 100644
--- a/target-sparc/int64_helper.c
+++ b/target/sparc/int64_helper.c
diff --git a/target-sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index de7d53ae20..de7d53ae20 100644
--- a/target-sparc/ldst_helper.c
+++ b/target/sparc/ldst_helper.c
diff --git a/target-sparc/machine.c b/target/sparc/machine.c
index aea6397861..aea6397861 100644
--- a/target-sparc/machine.c
+++ b/target/sparc/machine.c
diff --git a/target-sparc/mmu_helper.c b/target/sparc/mmu_helper.c
index 044e88c4c5..044e88c4c5 100644
--- a/target-sparc/mmu_helper.c
+++ b/target/sparc/mmu_helper.c
diff --git a/target-sparc/monitor.c b/target/sparc/monitor.c
index 7cc1b0f87f..7cc1b0f87f 100644
--- a/target-sparc/monitor.c
+++ b/target/sparc/monitor.c
diff --git a/target-sparc/trace-events b/target/sparc/trace-events
index bf52d9769b..8df178a347 100644
--- a/target-sparc/trace-events
+++ b/target/sparc/trace-events
@@ -1,6 +1,6 @@
# See docs/tracing.txt for syntax documentation.
-# target-sparc/mmu_helper.c
+# target/sparc/mmu_helper.c
mmu_helper_dfault(uint64_t address, uint64_t context, int mmu_idx, uint32_t tl) "DFAULT at %"PRIx64" context %"PRIx64" mmu_idx=%d tl=%d"
mmu_helper_dprot(uint64_t address, uint64_t context, int mmu_idx, uint32_t tl) "DPROT at %"PRIx64" context %"PRIx64" mmu_idx=%d tl=%d"
mmu_helper_dmiss(uint64_t address, uint64_t context) "DMISS at %"PRIx64" context %"PRIx64
@@ -10,16 +10,16 @@ mmu_helper_get_phys_addr_code(uint32_t tl, int mmu_idx, uint64_t prim_context, u
mmu_helper_get_phys_addr_data(uint32_t tl, int mmu_idx, uint64_t prim_context, uint64_t sec_context, uint64_t address) "tl=%d mmu_idx=%d primary context=%"PRIx64" secondary context=%"PRIx64" address=%"PRIx64
mmu_helper_mmu_fault(uint64_t address, uint64_t paddr, int mmu_idx, uint32_t tl, uint64_t prim_context, uint64_t sec_context) "Translate at %"PRIx64" -> %"PRIx64", mmu_idx=%d tl=%d primary context=%"PRIx64" secondary context=%"PRIx64
-# target-sparc/int64_helper.c
+# target/sparc/int64_helper.c
int_helper_set_softint(uint32_t softint) "new %08x"
int_helper_clear_softint(uint32_t softint) "new %08x"
int_helper_write_softint(uint32_t softint) "new %08x"
-# target-sparc/int32_helper.c
+# target/sparc/int32_helper.c
int_helper_icache_freeze(void) "Instruction cache: freeze"
int_helper_dcache_freeze(void) "Data cache: freeze"
-# target-sparc/win_helper.c
+# target/sparc/win_helper.c
win_helper_gregset_error(uint32_t pstate) "ERROR in get_gregset: active pstate bits=%x"
win_helper_switch_pstate(uint32_t pstate_regs, uint32_t new_pstate_regs) "change_pstate: switching regs old=%x new=%x"
win_helper_no_switch_pstate(uint32_t new_pstate_regs) "change_pstate: regs new=%x (unchanged)"
diff --git a/target-sparc/translate.c b/target/sparc/translate.c
index 2205f89837..2205f89837 100644
--- a/target-sparc/translate.c
+++ b/target/sparc/translate.c
diff --git a/target-sparc/vis_helper.c b/target/sparc/vis_helper.c
index 8a9b763d0b..8a9b763d0b 100644
--- a/target-sparc/vis_helper.c
+++ b/target/sparc/vis_helper.c
diff --git a/target-sparc/win_helper.c b/target/sparc/win_helper.c
index 2d5b5469a9..2d5b5469a9 100644
--- a/target-sparc/win_helper.c
+++ b/target/sparc/win_helper.c
diff --git a/target-tilegx/Makefile.objs b/target/tilegx/Makefile.objs
index 0db778f407..0db778f407 100644
--- a/target-tilegx/Makefile.objs
+++ b/target/tilegx/Makefile.objs
diff --git a/target-tilegx/cpu.c b/target/tilegx/cpu.c
index 454793f94a..454793f94a 100644
--- a/target-tilegx/cpu.c
+++ b/target/tilegx/cpu.c
diff --git a/target-tilegx/cpu.h b/target/tilegx/cpu.h
index 1735427233..1735427233 100644
--- a/target-tilegx/cpu.h
+++ b/target/tilegx/cpu.h
diff --git a/target-tilegx/helper.c b/target/tilegx/helper.c
index b4fba9cc21..b4fba9cc21 100644
--- a/target-tilegx/helper.c
+++ b/target/tilegx/helper.c
diff --git a/target-tilegx/helper.h b/target/tilegx/helper.h
index 9281d0f428..9281d0f428 100644
--- a/target-tilegx/helper.h
+++ b/target/tilegx/helper.h
diff --git a/target-tilegx/opcode_tilegx.h b/target/tilegx/opcode_tilegx.h
index 55376be4cf..55376be4cf 100644
--- a/target-tilegx/opcode_tilegx.h
+++ b/target/tilegx/opcode_tilegx.h
diff --git a/target-tilegx/simd_helper.c b/target/tilegx/simd_helper.c
index 2d40ddb63e..2d40ddb63e 100644
--- a/target-tilegx/simd_helper.c
+++ b/target/tilegx/simd_helper.c
diff --git a/target-tilegx/spr_def_64.h b/target/tilegx/spr_def_64.h
index 67a6c1751e..67a6c1751e 100644
--- a/target-tilegx/spr_def_64.h
+++ b/target/tilegx/spr_def_64.h
diff --git a/target-tilegx/translate.c b/target/tilegx/translate.c
index 9c734eeba3..9c734eeba3 100644
--- a/target-tilegx/translate.c
+++ b/target/tilegx/translate.c
diff --git a/target-tricore/Makefile.objs b/target/tricore/Makefile.objs
index 7a05670718..7a05670718 100644
--- a/target-tricore/Makefile.objs
+++ b/target/tricore/Makefile.objs
diff --git a/target-tricore/cpu-qom.h b/target/tricore/cpu-qom.h
index 6a69756126..6a69756126 100644
--- a/target-tricore/cpu-qom.h
+++ b/target/tricore/cpu-qom.h
diff --git a/target-tricore/cpu.c b/target/tricore/cpu.c
index 785b76bd3a..785b76bd3a 100644
--- a/target-tricore/cpu.c
+++ b/target/tricore/cpu.c
diff --git a/target-tricore/cpu.h b/target/tricore/cpu.h
index a3493a123c..a3493a123c 100644
--- a/target-tricore/cpu.h
+++ b/target/tricore/cpu.h
diff --git a/target-tricore/csfr.def b/target/tricore/csfr.def
index 05c45dd628..05c45dd628 100644
--- a/target-tricore/csfr.def
+++ b/target/tricore/csfr.def
diff --git a/target-tricore/fpu_helper.c b/target/tricore/fpu_helper.c
index 98fe9472b1..98fe9472b1 100644
--- a/target-tricore/fpu_helper.c
+++ b/target/tricore/fpu_helper.c
diff --git a/target-tricore/helper.c b/target/tricore/helper.c
index 3118905eca..3118905eca 100644
--- a/target-tricore/helper.c
+++ b/target/tricore/helper.c
diff --git a/target-tricore/helper.h b/target/tricore/helper.h
index 9333e161ab..9333e161ab 100644
--- a/target-tricore/helper.h
+++ b/target/tricore/helper.h
diff --git a/target-tricore/op_helper.c b/target/tricore/op_helper.c
index ac02e0a36b..ac02e0a36b 100644
--- a/target-tricore/op_helper.c
+++ b/target/tricore/op_helper.c
diff --git a/target-tricore/translate.c b/target/tricore/translate.c
index 36f734a662..36f734a662 100644
--- a/target-tricore/translate.c
+++ b/target/tricore/translate.c
diff --git a/target-tricore/tricore-defs.h b/target/tricore/tricore-defs.h
index 40abfaac14..40abfaac14 100644
--- a/target-tricore/tricore-defs.h
+++ b/target/tricore/tricore-defs.h
diff --git a/target-tricore/tricore-opcodes.h b/target/tricore/tricore-opcodes.h
index df666b081f..df666b081f 100644
--- a/target-tricore/tricore-opcodes.h
+++ b/target/tricore/tricore-opcodes.h
diff --git a/target-unicore32/Makefile.objs b/target/unicore32/Makefile.objs
index 6b41b1e9ef..6b41b1e9ef 100644
--- a/target-unicore32/Makefile.objs
+++ b/target/unicore32/Makefile.objs
diff --git a/target-unicore32/cpu-qom.h b/target/unicore32/cpu-qom.h
index bc68e78045..bc68e78045 100644
--- a/target-unicore32/cpu-qom.h
+++ b/target/unicore32/cpu-qom.h
diff --git a/target-unicore32/cpu.c b/target/unicore32/cpu.c
index c169972b59..c169972b59 100644
--- a/target-unicore32/cpu.c
+++ b/target/unicore32/cpu.c
diff --git a/target-unicore32/cpu.h b/target/unicore32/cpu.h
index 7b5b405e79..7b5b405e79 100644
--- a/target-unicore32/cpu.h
+++ b/target/unicore32/cpu.h
diff --git a/target-unicore32/helper.c b/target/unicore32/helper.c
index d603bde237..d603bde237 100644
--- a/target-unicore32/helper.c
+++ b/target/unicore32/helper.c
diff --git a/target-unicore32/helper.h b/target/unicore32/helper.h
index 941813749d..941813749d 100644
--- a/target-unicore32/helper.h
+++ b/target/unicore32/helper.h
diff --git a/target-unicore32/op_helper.c b/target/unicore32/op_helper.c
index 0872c29faa..0872c29faa 100644
--- a/target-unicore32/op_helper.c
+++ b/target/unicore32/op_helper.c
diff --git a/target-unicore32/softmmu.c b/target/unicore32/softmmu.c
index e7152e72e0..e7152e72e0 100644
--- a/target-unicore32/softmmu.c
+++ b/target/unicore32/softmmu.c
diff --git a/target-unicore32/translate.c b/target/unicore32/translate.c
index 514d460408..514d460408 100644
--- a/target-unicore32/translate.c
+++ b/target/unicore32/translate.c
diff --git a/target-unicore32/ucf64_helper.c b/target/unicore32/ucf64_helper.c
index 6c919010c3..6c919010c3 100644
--- a/target-unicore32/ucf64_helper.c
+++ b/target/unicore32/ucf64_helper.c
diff --git a/target-xtensa/Makefile.objs b/target/xtensa/Makefile.objs
index 481de91973..481de91973 100644
--- a/target-xtensa/Makefile.objs
+++ b/target/xtensa/Makefile.objs
diff --git a/target-xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index bb8ed4197f..bb8ed4197f 100644
--- a/target-xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
diff --git a/target-xtensa/core-dc232b/core-isa.h b/target/xtensa/core-dc232b/core-isa.h
index a9935b87af..a9935b87af 100644
--- a/target-xtensa/core-dc232b/core-isa.h
+++ b/target/xtensa/core-dc232b/core-isa.h
diff --git a/target-xtensa/core-dc232b/gdb-config.c b/target/xtensa/core-dc232b/gdb-config.c
index 13aba5edec..13aba5edec 100644
--- a/target-xtensa/core-dc232b/gdb-config.c
+++ b/target/xtensa/core-dc232b/gdb-config.c
diff --git a/target-xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c
index 40475e5205..40475e5205 100644
--- a/target-xtensa/core-dc233c.c
+++ b/target/xtensa/core-dc233c.c
diff --git a/target-xtensa/core-dc233c/core-isa.h b/target/xtensa/core-dc233c/core-isa.h
index ff92b7f3ed..ff92b7f3ed 100644
--- a/target-xtensa/core-dc233c/core-isa.h
+++ b/target/xtensa/core-dc233c/core-isa.h
diff --git a/target-xtensa/core-dc233c/gdb-config.c b/target/xtensa/core-dc233c/gdb-config.c
index b632341b28..b632341b28 100644
--- a/target-xtensa/core-dc233c/gdb-config.c
+++ b/target/xtensa/core-dc233c/gdb-config.c
diff --git a/target-xtensa/core-fsf.c b/target/xtensa/core-fsf.c
index 15ef470e8b..15ef470e8b 100644
--- a/target-xtensa/core-fsf.c
+++ b/target/xtensa/core-fsf.c
diff --git a/target-xtensa/core-fsf/core-isa.h b/target/xtensa/core-fsf/core-isa.h
index fb2bb8f2cb..fb2bb8f2cb 100644
--- a/target-xtensa/core-fsf/core-isa.h
+++ b/target/xtensa/core-fsf/core-isa.h
diff --git a/target-xtensa/cpu-qom.h b/target/xtensa/cpu-qom.h
index 403bd95721..403bd95721 100644
--- a/target-xtensa/cpu-qom.h
+++ b/target/xtensa/cpu-qom.h
diff --git a/target-xtensa/cpu.c b/target/xtensa/cpu.c
index e8e9f9175b..e8e9f9175b 100644
--- a/target-xtensa/cpu.c
+++ b/target/xtensa/cpu.c
diff --git a/target-xtensa/cpu.h b/target/xtensa/cpu.h
index 7fe82a37af..7fe82a37af 100644
--- a/target-xtensa/cpu.h
+++ b/target/xtensa/cpu.h
diff --git a/target-xtensa/gdbstub.c b/target/xtensa/gdbstub.c
index fa5469a4ef..fa5469a4ef 100644
--- a/target-xtensa/gdbstub.c
+++ b/target/xtensa/gdbstub.c
diff --git a/target-xtensa/helper.c b/target/xtensa/helper.c
index 768b32c417..768b32c417 100644
--- a/target-xtensa/helper.c
+++ b/target/xtensa/helper.c
diff --git a/target-xtensa/helper.h b/target/xtensa/helper.h
index 5ea9c5beec..5ea9c5beec 100644
--- a/target-xtensa/helper.h
+++ b/target/xtensa/helper.h
diff --git a/target-xtensa/import_core.sh b/target/xtensa/import_core.sh
index 351bee41c2..351bee41c2 100755
--- a/target-xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
diff --git a/target-xtensa/monitor.c b/target/xtensa/monitor.c
index f3fa4cd278..f3fa4cd278 100644
--- a/target-xtensa/monitor.c
+++ b/target/xtensa/monitor.c
diff --git a/target-xtensa/op_helper.c b/target/xtensa/op_helper.c
index 0a4b2147bc..0a4b2147bc 100644
--- a/target-xtensa/op_helper.c
+++ b/target/xtensa/op_helper.c
diff --git a/target-xtensa/overlay_tool.h b/target/xtensa/overlay_tool.h
index e8a7fda3d8..e8a7fda3d8 100644
--- a/target-xtensa/overlay_tool.h
+++ b/target/xtensa/overlay_tool.h
diff --git a/target-xtensa/translate.c b/target/xtensa/translate.c
index 0858c296ea..0858c296ea 100644
--- a/target-xtensa/translate.c
+++ b/target/xtensa/translate.c
diff --git a/target-xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c
index 370e365c65..370e365c65 100644
--- a/target-xtensa/xtensa-semi.c
+++ b/target/xtensa/xtensa-semi.c
diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile
index 522a63e36b..7f9f2d96c3 100644
--- a/tests/tcg/xtensa/Makefile
+++ b/tests/tcg/xtensa/Makefile
@@ -19,7 +19,7 @@ AS = $(CROSS)gcc -x assembler-with-cpp
LD = $(CROSS)ld
XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa
-INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target-xtensa/core-$(CORE)
+INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE)
XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))
LDFLAGS = -Tlinker.ld