diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-04-13 10:31:44 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-05-02 16:49:35 +0200 |
| commit | 85d8da3fea0c4ff38bbe759febfc2d2299b33ccd (patch) | |
| tree | 2213b38bf446082bf2f5c23d9303bd2c01b748f8 | |
| parent | 44e3b05005c6696cd526a4575293513db453f4b5 (diff) | |
target/mips: Move sysemu specific files under sysemu/ subfolder
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>
Message-Id: <20210428170410.479308-17-f4bug@amsat.org>
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | target/mips/meson.build | 12 | ||||
| -rw-r--r-- | target/mips/sysemu/addr.c (renamed from target/mips/addr.c) | 0 | ||||
| -rw-r--r-- | target/mips/sysemu/cp0_timer.c (renamed from target/mips/cp0_timer.c) | 0 | ||||
| -rw-r--r-- | target/mips/sysemu/machine.c (renamed from target/mips/machine.c) | 0 | ||||
| -rw-r--r-- | target/mips/sysemu/meson.build | 5 |
6 files changed, 13 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4c05ff8bba..8e4e329810 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 ca3cc62cf7..9a507937ec 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -7,6 +7,7 @@ gen = [ ] 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 @@ mips_ss.add(files( '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 @@ endif 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/addr.c b/target/mips/sysemu/addr.c index 86f1c129c9..86f1c129c9 100644 --- a/target/mips/addr.c +++ b/target/mips/sysemu/addr.c diff --git a/target/mips/cp0_timer.c b/target/mips/sysemu/cp0_timer.c index 70de95d338..70de95d338 100644 --- a/target/mips/cp0_timer.c +++ b/target/mips/sysemu/cp0_timer.c diff --git a/target/mips/machine.c b/target/mips/sysemu/machine.c index 80d37f9c2f..80d37f9c2f 100644 --- a/target/mips/machine.c +++ b/target/mips/sysemu/machine.c diff --git a/target/mips/sysemu/meson.build b/target/mips/sysemu/meson.build new file mode 100644 index 0000000000..f2a1ff4608 --- /dev/null +++ b/target/mips/sysemu/meson.build @@ -0,0 +1,5 @@ +mips_softmmu_ss.add(files( + 'addr.c', + 'cp0_timer.c', + 'machine.c', +)) |