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@centriq4.arch.suse.de>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-devel@nongnu.org
Subject: [RFC v6 29/38] target/arm: cleanup cpu includes
Date: Thu, 11 Mar 2021 14:30:17 +0100 [thread overview]
Message-ID: <20210311133026.14052-30-cfontana@suse.de> (raw)
In-Reply-To: <20210311133026.14052-1-cfontana@suse.de>
From: Claudio Fontana <cfontana@centriq4.arch.suse.de>
cpu.c,
cpu32.c,
cpu64.c,
tcg/sysemu/tcg-cpu.c,
all need a good cleanup when it comes to included header files.
Signed-off-by: Claudio Fontana <cfontana@centriq4.arch.suse.de>
---
target/arm/cpu.c | 8 ++------
target/arm/cpu32.c | 14 --------------
target/arm/cpu64.c | 6 ------
target/arm/tcg/sysemu/tcg-cpu.c | 22 +---------------------
4 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 97cb6ec8a8..3491e615c3 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -19,28 +19,24 @@
*/
#include "qemu/osdep.h"
-#include "qemu/qemu-print.h"
#include "qemu-common.h"
#include "target/arm/idau.h"
-#include "qemu/module.h"
#include "qapi/error.h"
-#include "qapi/visitor.h"
#include "cpu.h"
#include "cpregs.h"
+
#ifdef CONFIG_TCG
#include "tcg/tcg-cpu.h"
#endif /* CONFIG_TCG */
#include "cpu32.h"
-#include "internals.h"
#include "exec/exec-all.h"
#include "hw/qdev-properties.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
#include "hw/boards.h"
#endif
-#include "sysemu/sysemu.h"
+
#include "sysemu/tcg.h"
-#include "sysemu/hw_accel.h"
#include "kvm/kvm_arm.h"
#include "disas/capstone.h"
#include "fpu/softfloat.h"
diff --git a/target/arm/cpu32.c b/target/arm/cpu32.c
index 655f0a4263..52b5411af6 100644
--- a/target/arm/cpu32.c
+++ b/target/arm/cpu32.c
@@ -20,26 +20,12 @@
#include "qemu/osdep.h"
#include "qemu/qemu-print.h"
-#include "qemu-common.h"
-#include "target/arm/idau.h"
#include "qemu/module.h"
-#include "qapi/error.h"
-#include "qapi/visitor.h"
#include "cpu.h"
#include "cpregs.h"
-#include "internals.h"
-#include "exec/exec-all.h"
-#include "hw/qdev-properties.h"
#if !defined(CONFIG_USER_ONLY)
-#include "hw/loader.h"
#include "hw/boards.h"
#endif
-#include "sysemu/sysemu.h"
-#include "sysemu/tcg.h"
-#include "sysemu/hw_accel.h"
-#include "kvm/kvm_arm.h"
-#include "disas/capstone.h"
-#include "fpu/softfloat.h"
#include "cpu-mmu.h"
#include "cpu32.h"
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index d7e9a812cd..b3475a93cc 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -22,13 +22,7 @@
#include "qapi/error.h"
#include "qemu/qemu-print.h"
#include "cpu.h"
-#ifdef CONFIG_TCG
-#include "hw/core/tcg-cpu-ops.h"
-#endif /* CONFIG_TCG */
#include "qemu/module.h"
-#if !defined(CONFIG_USER_ONLY)
-#include "hw/loader.h"
-#endif
#include "sysemu/kvm.h"
#include "kvm/kvm_arm.h"
#include "qapi/visitor.h"
diff --git a/target/arm/tcg/sysemu/tcg-cpu.c b/target/arm/tcg/sysemu/tcg-cpu.c
index ed030678f3..664a7ee206 100644
--- a/target/arm/tcg/sysemu/tcg-cpu.c
+++ b/target/arm/tcg/sysemu/tcg-cpu.c
@@ -19,29 +19,9 @@
*/
#include "qemu/osdep.h"
-#include "qemu/qemu-print.h"
-#include "qemu-common.h"
-#include "target/arm/idau.h"
-#include "qemu/module.h"
-#include "qapi/error.h"
-#include "qapi/visitor.h"
#include "cpu.h"
-#include "hw/core/tcg-cpu-ops.h"
#include "hw/semihosting/common-semi.h"
-#include "cpregs.h"
-#include "internals.h"
-#include "exec/exec-all.h"
-#include "hw/qdev-properties.h"
-#if !defined(CONFIG_USER_ONLY)
-#include "hw/loader.h"
-#include "hw/boards.h"
-#endif
-#include "sysemu/sysemu.h"
-#include "sysemu/tcg.h"
-#include "sysemu/hw_accel.h"
-#include "disas/capstone.h"
-#include "fpu/softfloat.h"
-#include "cpu-mmu.h"
+#include "qemu/log.h"
#include "tcg/tcg-cpu.h"
/*
--
2.26.2
next prev parent reply other threads:[~2021-03-11 14:08 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 13:29 [RFC v6 00/38] arm cleanup experiment for kvm-only build Claudio Fontana
2021-03-11 13:29 ` [RFC v6 01/38] target/arm: move translate modules to tcg/ Claudio Fontana
2021-03-11 13:29 ` [RFC v6 02/38] target/arm: move helpers " Claudio Fontana
2021-03-11 13:29 ` [RFC v6 03/38] arm: tcg: only build under CONFIG_TCG Claudio Fontana
2021-03-11 13:29 ` [RFC v6 04/38] target/arm: tcg: add sysemu and user subsirs Claudio Fontana
2021-03-11 13:29 ` [RFC v6 05/38] target/arm: only build psci for TCG Claudio Fontana
2021-03-11 13:29 ` [RFC v6 06/38] target/arm: split off cpu-sysemu.c Claudio Fontana
2021-03-11 13:29 ` [RFC v6 07/38] target/arm: move physical address translation to cpu-mmu Claudio Fontana
2021-03-11 13:29 ` [RFC v6 08/38] target/arm: cpu-mmu: fix comment style Claudio Fontana
2021-03-11 13:29 ` [RFC v6 09/38] target/arm: split cpregs from tcg/helper.c Claudio Fontana
2021-03-11 13:29 ` [RFC v6 10/38] target/arm: cpregs: fix style (mostly just comments) Claudio Fontana
2021-03-11 13:29 ` [RFC v6 11/38] target/arm: move cpu definitions to common cpu module Claudio Fontana
2021-03-11 13:30 ` [RFC v6 12/38] target/arm: only perform TCG cpu and machine inits if TCG enabled Claudio Fontana
2021-03-11 13:30 ` [RFC v6 13/38] target/arm: kvm: add stubs for some helpers Claudio Fontana
2021-03-11 13:30 ` [RFC v6 14/38] target/arm: move cpsr_read, cpsr_write to cpu_common Claudio Fontana
2021-03-11 13:30 ` [RFC v6 15/38] target/arm: add temporary stub for arm_rebuild_hflags Claudio Fontana
2021-03-11 13:30 ` [RFC v6 16/38] target/arm: split vfp state setting from tcg helpers Claudio Fontana
2021-03-11 13:30 ` [RFC v6 17/38] target/arm: move arm_mmu_idx* to cpu-mmu Claudio Fontana
2021-03-11 13:30 ` [RFC v6 18/38] target/arm: move sve_zcr_len_for_el to common_cpu Claudio Fontana
2021-03-11 13:30 ` [RFC v6 19/38] target/arm: move arm_sctlr away from tcg helpers Claudio Fontana
2021-03-11 13:30 ` [RFC v6 20/38] target/arm: move arm_cpu_list to common_cpu Claudio Fontana
2021-03-11 13:30 ` [RFC v6 21/38] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code Claudio Fontana
2021-03-11 13:30 ` [RFC v6 22/38] target/arm: split a15 cpu model and 32bit class functions to cpu32.c Claudio Fontana
2021-03-11 13:30 ` [RFC v6 23/38] target/arm: move sve_exception_el out of TCG helpers Claudio Fontana
2021-03-11 13:30 ` [RFC v6 24/38] target/arm: refactor exception and cpu code Claudio Fontana
2021-03-11 13:30 ` [RFC v6 25/38] target/arm: cpu: fix style Claudio Fontana
2021-03-11 18:30 ` Philippe Mathieu-Daudé
2021-03-11 13:30 ` [RFC v6 26/38] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled() Claudio Fontana
2021-03-11 13:30 ` [RFC v6 27/38] target/arm: remove kvm include file for PSCI and arm-powerctl Claudio Fontana
2021-03-11 13:30 ` [RFC v6 28/38] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/ Claudio Fontana
2021-03-11 13:30 ` Claudio Fontana [this message]
2021-03-11 13:30 ` [RFC v6 30/38] target/arm: remove broad "else" statements when checking accels Claudio Fontana
2021-03-11 13:30 ` [RFC v6 31/38] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM Claudio Fontana
2021-03-11 13:30 ` [RFC v6 32/38] tests: restrict TCG-only arm-cpu-features tests to TCG builds Claudio Fontana
2021-03-11 13:30 ` [RFC v6 33/38] tests: do not run test-hmp on all machines for ARM KVM-only Claudio Fontana
2021-03-11 13:30 ` [RFC v6 34/38] tests: device-introspect-test: cope with ARM TCG-only devices Claudio Fontana
2021-03-11 13:30 ` [RFC v6 35/38] tests: do not run qom-test on all machines for ARM KVM-only Claudio Fontana
2021-03-11 13:30 ` [RFC v6 36/38] Revert "target/arm: Restrict v8M IDAU to TCG" Claudio Fontana
2021-03-11 13:30 ` [RFC v6 37/38] kvm: create kvm cpu accel class Claudio Fontana
2021-03-11 13:30 ` [RFC v6 38/38] target/arm: move kvm cpu properties setting to kvm-cpu 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=20210311133026.14052-30-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=cfontana@centriq4.arch.suse.de \
--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).