| Message ID | 20210418163134.1133100-13-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/mips: Re-org to allow KVM-only builds | expand |
On 4/18/21 9:31 AM, Philippe Mathieu-Daudé wrote: > Move sysemu-specific files under the new sysemu/ subfolder > and adapt the Meson machinery. > > 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 > target/mips/meson.build | 12 ++++++------ > target/mips/sysemu/meson.build | 5 +++++ > 5 files changed, 11 insertions(+), 6 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 Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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/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', +))
Move sysemu-specific files under the new sysemu/ subfolder and adapt the Meson machinery. 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 target/mips/meson.build | 12 ++++++------ target/mips/sysemu/meson.build | 5 +++++ 5 files changed, 11 insertions(+), 6 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