From: Claudio Fontana <cfontana@suse.de>
To: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Roman Bolshakov <r.bolshakov@yadro.com>,
Claudio Fontana <cfontana@suse.de>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-devel@nongnu.org
Subject: [RFC v8 28/44] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/
Date: Tue, 16 Mar 2021 19:36:46 +0100 [thread overview]
Message-ID: <20210316183702.10216-29-cfontana@suse.de> (raw)
In-Reply-To: <20210316183702.10216-1-cfontana@suse.de>
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%)
diff --git a/meson.build b/meson.build
index cf6b2a49f1..af4ddad035 100644
--- a/meson.build
+++ b/meson.build
@@ -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',
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 3911b49399..0554533d13 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -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"
diff --git a/target/arm/kvm-consts.h b/target/arm/kvm/kvm-consts.h
similarity index 100%
rename from target/arm/kvm-consts.h
rename to target/arm/kvm/kvm-consts.h
diff --git a/target/arm/kvm_arm.h b/target/arm/kvm/kvm_arm.h
similarity index 100%
rename from target/arm/kvm_arm.h
rename to target/arm/kvm/kvm_arm.h
diff --git a/target/arm/kvm/trace.h b/target/arm/kvm/trace.h
new file mode 100644
index 0000000000..c688745b90
--- /dev/null
+++ b/target/arm/kvm/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-target_arm_kvm.h"
diff --git a/target/arm/trace.h b/target/arm/trace.h
deleted file mode 100644
index 60372d8e26..0000000000
--- a/target/arm/trace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "trace/trace-target_arm.h"
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 88dfb2284c..fa0356cf20 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -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"
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index f9c9df916c..76b4e17243 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index aa2bbd14e0..3aa71dd591 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -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"
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 79609692e4..49873584a1 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -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"
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 7f01284a5c..90c3254bdd 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -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
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 774ca9987a..670d07a98c 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -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)
{
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 9494185cf4..c10e96496a 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -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"
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index b554d2ede0..5322e1bcaf 100644
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -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"
diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 6e7e894f50..fead001beb 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -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"
diff --git a/target/arm/cpu-sysemu.c b/target/arm/cpu-sysemu.c
index 05d6e79ad9..cb4ae2263c 100644
--- a/target/arm/cpu-sysemu.c
+++ b/target/arm/cpu-sysemu.c
@@ -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
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 1043551b9c..97cb6ec8a8 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -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"
diff --git a/target/arm/cpu32.c b/target/arm/cpu32.c
index 17db6b334b..655f0a4263 100644
--- a/target/arm/cpu32.c
+++ b/target/arm/cpu32.c
@@ -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"
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index 0a14cca194..d7e9a812cd 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -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"
diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c
deleted file mode 100644
index 56a7099e6b..0000000000
--- a/target/arm/kvm-stub.c
+++ /dev/null
@@ -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();
-}
diff --git a/target/arm/kvm.c b/target/arm/kvm/kvm.c
similarity index 100%
rename from target/arm/kvm.c
rename to target/arm/kvm/kvm.c
diff --git a/target/arm/kvm64.c b/target/arm/kvm/kvm64.c
similarity index 100%
rename from target/arm/kvm64.c
rename to target/arm/kvm/kvm64.c
diff --git a/target/arm/machine.c b/target/arm/machine.c
index 2982e8d7f4..595ab94237 100644
--- a/target/arm/machine.c
+++ b/target/arm/machine.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"
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 80c64fa355..0c72bf7c31 100644
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -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"
diff --git a/target/arm/tcg/sysemu/tcg-cpu.c b/target/arm/tcg/sysemu/tcg-cpu.c
index 2c395f47e7..6ab49ba614 100644
--- a/target/arm/tcg/sysemu/tcg-cpu.c
+++ b/target/arm/tcg/sysemu/tcg-cpu.c
@@ -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"
diff --git a/MAINTAINERS b/MAINTAINERS
index c9094e4409..80feee2d1b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/target/arm/kvm/meson.build b/target/arm/kvm/meson.build
index 1015fc0afb..ba02e96e76 100644
--- a/target/arm/kvm/meson.build
+++ b/target/arm/kvm/meson.build
@@ -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
diff --git a/target/arm/trace-events b/target/arm/kvm/trace-events
similarity index 100%
rename from target/arm/trace-events
rename to target/arm/kvm/trace-events
diff --git a/target/arm/meson.build b/target/arm/meson.build
index 3166e88c0d..6bc95197fd 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -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',
--
2.26.2
next prev parent reply other threads:[~2021-03-16 19:43 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 18:36 [RFC v8 00/44] arm cleanup experiment for kvm-only build Claudio Fontana
2021-03-16 18:36 ` [RFC v8 01/44] target/arm: move translate modules to tcg/ Claudio Fontana
2021-03-16 18:36 ` [RFC v8 02/44] target/arm: move helpers " Claudio Fontana
2021-03-16 18:36 ` [RFC v8 03/44] arm: tcg: only build under CONFIG_TCG Claudio Fontana
2021-03-16 18:36 ` [RFC v8 04/44] target/arm: tcg: add sysemu and user subsirs Claudio Fontana
2021-03-16 18:36 ` [RFC v8 05/44] target/arm: only build psci for TCG Claudio Fontana
2021-03-16 18:36 ` [RFC v8 06/44] target/arm: split off cpu-sysemu.c Claudio Fontana
2021-03-16 18:36 ` [RFC v8 07/44] target/arm: move physical address translation to cpu-mmu Claudio Fontana
2021-03-16 18:36 ` [RFC v8 08/44] target/arm: cpu-mmu: fix comment style Claudio Fontana
2021-03-16 18:36 ` [RFC v8 09/44] target/arm: split cpregs from tcg/helper.c Claudio Fontana
2021-03-16 18:36 ` [RFC v8 10/44] target/arm: cpregs: fix style (mostly just comments) Claudio Fontana
2021-03-16 18:36 ` [RFC v8 11/44] target/arm: move cpu definitions to common cpu module Claudio Fontana
2021-03-16 18:36 ` [RFC v8 12/44] target/arm: only perform TCG cpu and machine inits if TCG enabled Claudio Fontana
2021-03-16 18:36 ` [RFC v8 13/44] target/arm: kvm: add stubs for some helpers Claudio Fontana
2021-03-16 18:36 ` [RFC v8 14/44] target/arm: move cpsr_read, cpsr_write to cpu_common Claudio Fontana
2021-03-16 18:36 ` [RFC v8 15/44] target/arm: add temporary stub for arm_rebuild_hflags Claudio Fontana
2021-03-16 18:36 ` [RFC v8 16/44] target/arm: split vfp state setting from tcg helpers Claudio Fontana
2021-03-16 18:36 ` [RFC v8 17/44] target/arm: move arm_mmu_idx* to cpu-mmu Claudio Fontana
2021-03-16 18:36 ` [RFC v8 18/44] target/arm: move sve_zcr_len_for_el to common_cpu Claudio Fontana
2021-03-16 18:36 ` [RFC v8 19/44] target/arm: move arm_sctlr away from tcg helpers Claudio Fontana
2021-03-16 18:36 ` [RFC v8 20/44] target/arm: move arm_cpu_list to common_cpu Claudio Fontana
2021-03-16 18:36 ` [RFC v8 21/44] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code Claudio Fontana
2021-03-16 18:36 ` [RFC v8 22/44] target/arm: split a15 cpu model and 32bit class functions to cpu32.c Claudio Fontana
2021-03-16 18:36 ` [RFC v8 23/44] target/arm: move sve_exception_el out of TCG helpers Claudio Fontana
2021-03-16 18:36 ` [RFC v8 24/44] target/arm: refactor exception and cpu code Claudio Fontana
2021-03-16 18:36 ` [RFC v8 25/44] target/arm: cpu: fix style Claudio Fontana
2021-03-16 18:36 ` [RFC v8 26/44] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled() Claudio Fontana
2021-03-16 18:36 ` [RFC v8 27/44] target/arm: remove kvm include file for PSCI and arm-powerctl Claudio Fontana
2021-03-16 18:36 ` Claudio Fontana [this message]
2021-03-16 18:36 ` [RFC v8 29/44] target/arm: cleanup cpu includes Claudio Fontana
2021-03-16 18:36 ` [RFC v8 30/44] target/arm: remove broad "else" statements when checking accels Claudio Fontana
2021-03-16 18:36 ` [RFC v8 31/44] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM Claudio Fontana
2021-03-16 18:36 ` [RFC v8 32/44] tests: restrict TCG-only arm-cpu-features tests to TCG builds Claudio Fontana
2021-03-16 18:36 ` [RFC v8 33/44] tests: do not run test-hmp on all machines for ARM KVM-only Claudio Fontana
2021-03-16 18:36 ` [RFC v8 34/44] tests: device-introspect-test: cope with ARM TCG-only devices Claudio Fontana
2021-03-16 18:36 ` [RFC v8 35/44] tests: do not run qom-test on all machines for ARM KVM-only Claudio Fontana
2021-03-16 18:36 ` [RFC v8 36/44] Revert "target/arm: Restrict v8M IDAU to TCG" Claudio Fontana
2021-03-16 18:36 ` [RFC v8 37/44] target/arm: create kvm cpu accel class Claudio Fontana
2021-03-16 18:36 ` [RFC v8 38/44] target/arm: move kvm cpu properties setting to kvm-cpu Claudio Fontana
2021-03-16 18:36 ` [RFC v8 39/44] accel: move call to accel_init_interfaces Claudio Fontana
2021-03-16 18:36 ` [RFC v8 40/44] accel: add double dispatch mechanism for class initialization Claudio Fontana
2021-03-16 18:36 ` [RFC v8 41/44] target/arm: add tcg cpu accel class Claudio Fontana
2021-03-16 18:37 ` [RFC v8 42/44] target/arm: move TCG gt timer creation code in tcg/ Claudio Fontana
2021-03-16 18:37 ` [RFC v8 43/44] target/arm: cpu-sve: new module Claudio Fontana
2021-03-16 18:37 ` [RFC v8 44/44] target/arm: cpu-sve: split TCG and KVM functionality Claudio Fontana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316183702.10216-29-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).