From fcf5ef2ab52c621a4617ebbef36bf43b4003f4c0 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 11 Oct 2016 08:56:52 +0200 Subject: 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 [m68k part] Acked-by: Bastian Koppelmann [tricore part] Acked-by: Michael Walle [lm32 part] Acked-by: Cornelia Huck [s390x part] Reviewed-by: Christian Borntraeger [s390x part] Acked-by: Eduardo Habkost [i386 part] Acked-by: Artyom Tarasenko [sparc part] Acked-by: Richard Henderson [alpha part] Acked-by: Max Filippov [xtensa part] Reviewed-by: David Gibson [ppc part] Acked-by: Edgar E. Iglesias [crisµblaze part] Acked-by: Guan Xuetao [unicore32 part] Signed-off-by: Thomas Huth --- hw/alpha/alpha_sys.h | 2 +- hw/arm/strongarm.h | 2 +- hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 2 +- hw/i386/kvm/apic.c | 2 +- hw/intc/ioapic.c | 2 +- hw/misc/hyperv_testdev.c | 2 +- hw/ppc/fdt.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_xscom.c | 2 +- hw/ppc/spapr_cpu_core.c | 6 +++--- hw/sh4/shix.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'hw') diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index ed911f2..b6d8369 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 1470eac..e98840b 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 d4160df..7102686 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 9708cdc..42ecf61 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 01cbaa8..df5180b 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 fd9208f..ea7ea0b 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 6cae9e9..dbd7cdd 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 e67d60d..38a7234 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 9df7b25..83597fe 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 76ce854..d79d530 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 0e2117f..78db524 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 8da2718..b82af4f 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 e0c14f6..c18632b 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 14d4007..fd00cc5 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" -- cgit v1.1