From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Eric Farman" <farman@linux.ibm.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Matthew Rosato" <mjrosato@linux.ibm.com>,
"Daniel Henrique Barboza" <daniel.barboza@oss.qualcomm.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
kvm@vger.kernel.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Huacai Chen" <chenhuacai@kernel.org>,
qemu-riscv@nongnu.org, "Alexander Graf" <agraf@csgraf.de>,
"Pedro Barbuda" <pbarbuda@microsoft.com>,
"Anton Johansson" <anjo@rev.ng>, "Song Gao" <gaosong@loongson.cn>,
"Weiwei Li" <liwei1518@gmail.com>,
"Aleksandar Rikalo" <arikalo@gmail.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Cornelia Huck" <cohuck@redhat.com>,
qemu-s390x@nongnu.org, "Chao Liu" <chao.liu.zevorn@gmail.com>,
"Bibo Mao" <maobibo@loongson.cn>,
qemu-arm@nongnu.org, "Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Mohamed Mediouni" <mohamed@unpredictable.fr>,
"Zhao Liu" <zhao1.liu@intel.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH-for-11.1 8/8] target/arm: Compile KVM as common object
Date: Wed, 1 Apr 2026 22:17:52 +0200 [thread overview]
Message-ID: <20260401201753.92290-9-philmd@linaro.org> (raw)
In-Reply-To: <20260401201753.92290-1-philmd@linaro.org>
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
prev parent reply other threads:[~2026-04-01 20:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 20:17 [PATCH-for-11.1 0/8] target/arm: Compile accelerator-related objects as common code Philippe Mathieu-Daudé
2026-04-01 20:17 ` [PATCH-for-11.1 1/8] accel/kvm: Include missing 'exec/vaddr.h' header Philippe Mathieu-Daudé
2026-04-02 0:45 ` Alistair Francis
2026-04-01 20:17 ` [PATCH-for-11.1 2/8] accel/kvm: Remove TARGET_KVM_HAVE_GUEST_DEBUG Philippe Mathieu-Daudé
2026-04-02 0:45 ` Alistair Francis
2026-04-01 20:17 ` [PATCH-for-11.1 3/8] accel/kvm: Expose all non-target specific declarations Philippe Mathieu-Daudé
2026-04-01 21:02 ` Philippe Mathieu-Daudé
2026-04-01 20:17 ` [PATCH-for-11.1 4/8] target/arm: Compile WHPX as common object Philippe Mathieu-Daudé
2026-04-01 20:17 ` [PATCH-for-11.1 5/8] target/arm: Remove target_ulong use in hvf_handle_psci_call() Philippe Mathieu-Daudé
2026-04-01 20:17 ` [PATCH-for-11.1 6/8] target/arm: Compile HVF as common object Philippe Mathieu-Daudé
2026-04-01 20:17 ` [PATCH-for-11.1 7/8] target/arm: Remove target_ulong cast in kvm_arm_handle_dabt_nisv() Philippe Mathieu-Daudé
2026-04-01 20:17 ` Philippe Mathieu-Daudé [this message]
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=20260401201753.92290-9-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=agraf@csgraf.de \
--cc=alistair.francis@wdc.com \
--cc=anjo@rev.ng \
--cc=arikalo@gmail.com \
--cc=chao.liu.zevorn@gmail.com \
--cc=chenhuacai@kernel.org \
--cc=cohuck@redhat.com \
--cc=daniel.barboza@oss.qualcomm.com \
--cc=farman@linux.ibm.com \
--cc=gaosong@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=liwei1518@gmail.com \
--cc=maobibo@loongson.cn \
--cc=mjrosato@linux.ibm.com \
--cc=mohamed@unpredictable.fr \
--cc=palmer@dabbelt.com \
--cc=pbarbuda@microsoft.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=zhao1.liu@intel.com \
--cc=zhiwei_liu@linux.alibaba.com \
/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