[v1] target/arm: Compile accelerator-related objects as common code

[PATCH-for-11.1 8/8] target/arm: Compile KVM as common object

Philippe Mathieu-Daudé posted 8 patches 1 week, 2 days ago

Diff against v2
Download mbox

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>, Song Gao <gaosong@loongson.cn>, Bibo Mao <maobibo@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Chao Liu <chao.liu.zevorn@gmail.com>, Cornelia Huck <cohuck@redhat.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Alexander Graf <agraf@csgraf.de>, Peter Maydell <peter.maydell@linaro.org>, Pedro Barbuda <pbarbuda@microsoft.com>, Mohamed Mediouni <mohamed@unpredictable.fr>, Huacai Chen <chenhuacai@kernel.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Aleksandar Rikalo <arikalo@gmail.com>

There is a newer version of this series

Expand all Fold all

[PATCH-for-11.1 8/8] target/arm: Compile KVM as common object

Posted by Philippe Mathieu-Daudé 1 week, 2 days ago

Neither of kvm.c nor hyp_gdbstub.c use target-specific code.
Move them from arm_system_ss[] to arm_common_system_ss[] to
compile them once. The arm_system_ss[] source set ends up
unused, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/arm/meson.build | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/target/arm/meson.build b/target/arm/meson.build
index f14debc6a2f..1b5d346d474 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -1,7 +1,6 @@
 arm_ss = ss.source_set()
 arm_common_ss = ss.source_set()
 arm_common_system_ss = ss.source_set()
-arm_system_ss = ss.source_set()
 arm_user_ss = ss.source_set()
 
 arm_common_system_ss.add(files('gdbstub.c'))
@@ -19,7 +18,6 @@ arm_common_ss.add(files(
 arm_common_system_ss.add(files(
   'arm-qmp-cmds.c',
 ))
-arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'))
 
 arm_user_ss.add(files('cpu.c'))
 arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files(
@@ -39,7 +37,12 @@ arm_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
 arm_common_system_ss.add(files('cpu.c'))
 arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files(
   'cpu32-stubs.c'))
-arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
+arm_common_system_ss.add(when: 'CONFIG_KVM', if_true: files(
+  'kvm.c',
+  'hyp_gdbstub.c',
+), if_false: files(
+  'kvm-stub.c',
+))
 arm_common_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
 arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
 		                 if_true: files('common-semi-target.c'))
@@ -67,7 +70,6 @@ else
 endif
 
 target_arch += {'arm': arm_ss}
-target_system_arch += {'arm': arm_system_ss}
 target_user_arch += {'arm': arm_user_ss}
 target_common_arch += {'arm': arm_common_ss}
 target_common_system_arch += {'arm': arm_common_system_ss}
-- 
2.53.0

Re: [PATCH-for-11.1 8/8] target/arm: Compile KVM as common object

Posted by Richard Henderson 1 week ago

On 4/2/26 06:17, Philippe Mathieu-Daudé wrote:
> Neither of kvm.c nor hyp_gdbstub.c use target-specific code.
> Move them from arm_system_ss[] to arm_common_system_ss[] to
> compile them once. The arm_system_ss[] source set ends up
> unused, remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/arm/meson.build | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

> 
> diff --git a/target/arm/meson.build b/target/arm/meson.build
> index f14debc6a2f..1b5d346d474 100644
> --- a/target/arm/meson.build
> +++ b/target/arm/meson.build
> @@ -1,7 +1,6 @@
>   arm_ss = ss.source_set()
>   arm_common_ss = ss.source_set()
>   arm_common_system_ss = ss.source_set()
> -arm_system_ss = ss.source_set()
>   arm_user_ss = ss.source_set()
>   
>   arm_common_system_ss.add(files('gdbstub.c'))
> @@ -19,7 +18,6 @@ arm_common_ss.add(files(
>   arm_common_system_ss.add(files(
>     'arm-qmp-cmds.c',
>   ))
> -arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'))
>   
>   arm_user_ss.add(files('cpu.c'))
>   arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files(
> @@ -39,7 +37,12 @@ arm_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
>   arm_common_system_ss.add(files('cpu.c'))
>   arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files(
>     'cpu32-stubs.c'))
> -arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
> +arm_common_system_ss.add(when: 'CONFIG_KVM', if_true: files(
> +  'kvm.c',
> +  'hyp_gdbstub.c',
> +), if_false: files(
> +  'kvm-stub.c',
> +))
>   arm_common_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
>   arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING',
>   		                 if_true: files('common-semi-target.c'))
> @@ -67,7 +70,6 @@ else
>   endif
>   
>   target_arch += {'arm': arm_ss}
> -target_system_arch += {'arm': arm_system_ss}
>   target_user_arch += {'arm': arm_user_ss}
>   target_common_arch += {'arm': arm_common_ss}
>   target_common_system_arch += {'arm': arm_common_system_ss}