[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 16/30] target/mips: Move sysemu specific files under sysemu/ s
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 16/30] target/mips: Move sysemu specific files under sysemu/ subfolder |
Date: |
Wed, 28 Apr 2021 19:03:56 +0200 |
Move sysemu-specific files under the new sysemu/ subfolder
and adapt the Meson machinery.
Update the KVM MIPS entry in MAINTAINERS.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/{ => sysemu}/addr.c | 0
target/mips/{ => sysemu}/cp0_timer.c | 0
target/mips/{ => sysemu}/machine.c | 0
MAINTAINERS | 3 ++-
target/mips/meson.build | 12 ++++++------
target/mips/sysemu/meson.build | 5 +++++
6 files changed, 13 insertions(+), 7 deletions(-)
rename target/mips/{ => sysemu}/addr.c (100%)
rename target/mips/{ => sysemu}/cp0_timer.c (100%)
rename target/mips/{ => sysemu}/machine.c (100%)
create mode 100644 target/mips/sysemu/meson.build
diff --git a/target/mips/addr.c b/target/mips/sysemu/addr.c
similarity index 100%
rename from target/mips/addr.c
rename to target/mips/sysemu/addr.c
diff --git a/target/mips/cp0_timer.c b/target/mips/sysemu/cp0_timer.c
similarity index 100%
rename from target/mips/cp0_timer.c
rename to target/mips/sysemu/cp0_timer.c
diff --git a/target/mips/machine.c b/target/mips/sysemu/machine.c
similarity index 100%
rename from target/mips/machine.c
rename to target/mips/sysemu/machine.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 36055f14c59..0620326544e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -404,7 +404,8 @@ F: target/arm/kvm.c
MIPS KVM CPUs
M: Huacai Chen <chenhuacai@kernel.org>
S: Odd Fixes
-F: target/mips/kvm.c
+F: target/mips/kvm*
+F: target/mips/sysemu/
PPC KVM CPUs
M: David Gibson <david@gibson.dropbear.id.au>
diff --git a/target/mips/meson.build b/target/mips/meson.build
index ca3cc62cf7a..9a507937ece 100644
--- a/target/mips/meson.build
+++ b/target/mips/meson.build
@@ -7,6 +7,7 @@
]
mips_user_ss = ss.source_set()
+mips_softmmu_ss = ss.source_set()
mips_ss = ss.source_set()
mips_ss.add(files(
'cpu.c',
@@ -14,6 +15,11 @@
'gdbstub.c',
'msa.c',
))
+
+if have_system
+ subdir('sysemu')
+endif
+
mips_tcg_ss = ss.source_set()
mips_tcg_ss.add(gen)
mips_tcg_ss.add(files(
@@ -41,12 +47,6 @@
mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
-mips_softmmu_ss = ss.source_set()
-mips_softmmu_ss.add(files(
- 'addr.c',
- 'cp0_timer.c',
- 'machine.c',
-))
mips_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
'cp0_helper.c',
'mips-semi.c',
diff --git a/target/mips/sysemu/meson.build b/target/mips/sysemu/meson.build
new file mode 100644
index 00000000000..f2a1ff46081
--- /dev/null
+++ b/target/mips/sysemu/meson.build
@@ -0,0 +1,5 @@
+mips_softmmu_ss.add(files(
+ 'addr.c',
+ 'cp0_timer.c',
+ 'machine.c',
+))
--
2.26.3
- [PATCH v4 06/30] target/mips: Restrict mips_cpu_dump_state() to cpu.c, (continued)
- [PATCH v4 06/30] target/mips: Restrict mips_cpu_dump_state() to cpu.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 07/30] target/mips: Turn printfpr() macro into a proper function, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 08/30] target/mips: Declare mips_env_set_pc() inlined in "internal.h", Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 09/30] target/mips: Merge do_translate_address into cpu_mips_translate_address, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 10/30] target/mips: Extract load/store helpers to ldst_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 11/30] meson: Introduce meson_user_arch source set for arch-specific user-mode, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 12/30] target/mips: Introduce tcg-internal.h for TCG specific declarations, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 13/30] target/mips: Add simple user-mode mips_cpu_do_interrupt(), Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 14/30] target/mips: Add simple user-mode mips_cpu_tlb_fill(), Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 15/30] target/mips: Move cpu_signal_handler definition around, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 16/30] target/mips: Move sysemu specific files under sysemu/ subfolder,
Philippe Mathieu-Daudé <=
- [PATCH v4 17/30] target/mips: Move physical addressing code to sysemu/physaddr.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 18/30] target/mips: Restrict cpu_mips_get_random() / update_pagemask() to TCG, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 19/30] target/mips: Move sysemu TCG-specific code to tcg/sysemu/ subfolder, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 20/30] target/mips: Restrict mmu_init() to TCG, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 21/30] target/mips: Move tlb_helper.c to tcg/sysemu/, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 22/30] target/mips: Restrict CPUMIPSTLBContext::map_address() handlers scope, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 23/30] target/mips: Move Special opcodes to tcg/sysemu/special_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 24/30] target/mips: Move helper_cache() to tcg/sysemu/special_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 25/30] target/mips: Move TLB management helpers to tcg/sysemu/tlb_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 26/30] target/mips: Move exception management code to exception.c, Philippe Mathieu-Daudé, 2021/04/28