From c574ff9245c7e9d10433efd60df2319ff4d69084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Date: Wed, 25 Feb 2026 06:29:21 +0100
Subject: [PATCH] accel/qtest: Build once as common object
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No code within qtest.c uses target-specific knowledge:
build it once as target-agnostic common unit.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20260225053408.18426-1-philmd@linaro.org>
---
 accel/qtest/meson.build | 5 ++++-
 meson.build             | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/accel/qtest/meson.build b/accel/qtest/meson.build
index 2018de8a05..e1b089e02c 100644
--- a/accel/qtest/meson.build
+++ b/accel/qtest/meson.build
@@ -1 +1,4 @@
-qtest_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files('qtest.c'))
+qtest_module_ss = ss.source_set()
+qtest_module_ss.add(files('qtest.c'))
+
+modules += {'accel': {'qtest': qtest_module_ss}}
diff --git a/meson.build b/meson.build
index f45885f05a..1867560da6 100644
--- a/meson.build
+++ b/meson.build
@@ -3897,9 +3897,6 @@ subdir('linux-user')
 subdir('tests/qtest/libqos')
 subdir('tests/qtest/fuzz')
 
-# accel modules
-target_modules += { 'accel' : { 'qtest': qtest_module_ss }}
-
 ##############################################
 # Internal static_libraries and dependencies #
 ##############################################