@@ -1844,8 +1844,8 @@ if have_system or have_user
trace_events_subdirs += [
'accel/tcg',
'hw/core',
- 'target/arm',
'target/arm/tcg',
+ 'target/arm/kvm',
'target/hppa',
'target/i386',
'target/i386/kvm',
@@ -20,7 +20,7 @@
#ifndef ARM_CPU_H
#define ARM_CPU_H
-#include "kvm-consts.h"
+#include "kvm/kvm-consts.h"
#include "hw/registerfields.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
similarity index 100%
rename from target/arm/kvm-consts.h
rename to target/arm/kvm/kvm-consts.h
similarity index 100%
rename from target/arm/kvm_arm.h
rename to target/arm/kvm/kvm_arm.h
new file mode 100644
@@ -0,0 +1 @@
+#include "trace/trace-target_arm_kvm.h"
deleted file mode 100644
@@ -1 +0,0 @@
-#include "trace/trace-target_arm.h"
@@ -29,7 +29,7 @@
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
#include "exec/hwaddr.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
#include "hw/boards.h"
@@ -51,7 +51,7 @@
#include "sysemu/numa.h"
#include "sysemu/reset.h"
#include "sysemu/tpm.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "migration/vmstate.h"
#include "hw/acpi/ghes.h"
@@ -65,7 +65,7 @@
#include "hw/intc/arm_gic.h"
#include "hw/intc/arm_gicv3_common.h"
#include "hw/irq.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "hw/firmware/smbios.h"
#include "qapi/visitor.h"
#include "qapi/qapi-visit-common.h"
@@ -19,7 +19,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "hw/arm/boot.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "hw/misc/unimp.h"
#include "hw/arm/xlnx-versal.h"
@@ -25,7 +25,7 @@
#include "exec/address-spaces.h"
#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#define GIC_NUM_SPI_INTR 160
@@ -25,7 +25,7 @@
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "sysemu/kvm.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
static void a15mp_priv_set_irq(void *opaque, int irq, int level)
{
@@ -26,7 +26,7 @@
#include "hw/sysbus.h"
#include "migration/blocker.h"
#include "sysemu/kvm.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "gic_internal.h"
#include "vgic_common.h"
#include "qom/object.h"
@@ -25,7 +25,7 @@
#include "hw/qdev-properties.h"
#include "sysemu/runstate.h"
#include "sysemu/kvm.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "migration/blocker.h"
#include "qom/object.h"
@@ -27,7 +27,7 @@
#include "qemu/module.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "gicv3_internal.h"
#include "vgic_common.h"
#include "migration/blocker.h"
@@ -24,7 +24,7 @@
#include "cpu.h"
#include "internals.h"
#include "sysemu/hw_accel.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "sysemu/tcg.h"
#ifdef CONFIG_TCG
@@ -41,7 +41,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
#include "sysemu/hw_accel.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "disas/capstone.h"
#include "fpu/softfloat.h"
#include "cpu-mmu.h"
@@ -37,7 +37,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
#include "sysemu/hw_accel.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "disas/capstone.h"
#include "fpu/softfloat.h"
#include "cpu-mmu.h"
@@ -30,7 +30,7 @@
#include "hw/loader.h"
#endif
#include "sysemu/kvm.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "qapi/visitor.h"
#include "hw/qdev-properties.h"
#include "cpregs.h"
deleted file mode 100644
@@ -1,24 +0,0 @@
-/*
- * QEMU KVM ARM specific function stubs
- *
- * Copyright Linaro Limited 2013
- *
- * Author: Peter Maydell <peter.maydell@linaro.org>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-#include "qemu/osdep.h"
-#include "cpu.h"
-#include "kvm_arm.h"
-
-bool write_kvmstate_to_list(ARMCPU *cpu)
-{
- abort();
-}
-
-bool write_list_to_kvmstate(ARMCPU *cpu, int level)
-{
- abort();
-}
similarity index 100%
rename from target/arm/kvm.c
rename to target/arm/kvm/kvm.c
similarity index 100%
rename from target/arm/kvm64.c
rename to target/arm/kvm/kvm64.c
@@ -3,7 +3,7 @@
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
#include "sysemu/tcg.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "internals.h"
#include "migration/cpu.h"
#include "cpregs.h"
@@ -22,7 +22,7 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
-#include "kvm_arm.h"
+#include "kvm/kvm_arm.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "qapi/qobject-input-visitor.h"
@@ -39,7 +39,6 @@
#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
#include "sysemu/hw_accel.h"
-#include "kvm_arm.h"
#include "disas/capstone.h"
#include "fpu/softfloat.h"
#include "cpu-mmu.h"
@@ -398,7 +398,7 @@ ARM KVM CPUs
M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Maintained
-F: target/arm/kvm.c
+F: target/arm/kvm/kvm.c
MIPS KVM CPUs
M: Huacai Chen <chenhuacai@kernel.org>
@@ -1,3 +1,8 @@
arm_ss.add(when: 'CONFIG_TCG', if_false: files(
'helper-stubs.c',
))
+
+arm_ss.add(when: 'CONFIG_KVM', if_true: files(
+ 'kvm.c',
+ 'kvm64.c',
+))
\ No newline at end of file
similarity index 100%
rename from target/arm/trace-events
rename to target/arm/kvm/trace-events
@@ -11,8 +11,6 @@ arm_ss.add(files(
))
arm_ss.add(zlib)
-arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
-
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
'cpu64.c',
'gdbstub64.c',
and adapt the code including the header references, and trace-events / trace.h Signed-off-by: Claudio Fontana <cfontana@suse.de> --- meson.build | 2 +- target/arm/cpu.h | 2 +- target/arm/{ => kvm}/kvm-consts.h | 0 target/arm/{ => kvm}/kvm_arm.h | 0 target/arm/kvm/trace.h | 1 + target/arm/trace.h | 1 - hw/arm/sbsa-ref.c | 2 +- hw/arm/virt-acpi-build.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/arm/xlnx-zynqmp.c | 2 +- hw/cpu/a15mpcore.c | 2 +- hw/intc/arm_gic_kvm.c | 2 +- hw/intc/arm_gicv3_its_kvm.c | 2 +- hw/intc/arm_gicv3_kvm.c | 2 +- target/arm/cpu-sysemu.c | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu32.c | 2 +- target/arm/cpu64.c | 2 +- target/arm/kvm-stub.c | 24 ------------------------ target/arm/{ => kvm}/kvm.c | 0 target/arm/{ => kvm}/kvm64.c | 0 target/arm/machine.c | 2 +- target/arm/monitor.c | 2 +- target/arm/tcg/sysemu/tcg-cpu.c | 1 - MAINTAINERS | 2 +- target/arm/kvm/meson.build | 5 +++++ target/arm/{ => kvm}/trace-events | 0 target/arm/meson.build | 2 -- 29 files changed, 24 insertions(+), 46 deletions(-) rename target/arm/{ => kvm}/kvm-consts.h (100%) rename target/arm/{ => kvm}/kvm_arm.h (100%) create mode 100644 target/arm/kvm/trace.h delete mode 100644 target/arm/trace.h delete mode 100644 target/arm/kvm-stub.c rename target/arm/{ => kvm}/kvm.c (100%) rename target/arm/{ => kvm}/kvm64.c (100%) rename target/arm/{ => kvm}/trace-events (100%)