[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v5 4/9] tests/qtest: arm-cpu-features: Match tests to require
From: |
Fabiano Rosas |
Subject: |
[RFC PATCH v5 4/9] tests/qtest: arm-cpu-features: Match tests to required accelerators |
Date: |
Fri, 20 Jan 2023 15:48:20 -0300 |
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/arm-cpu-features.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
index 4ff2014bea..1555b0bab8 100644
--- a/tests/qtest/arm-cpu-features.c
+++ b/tests/qtest/arm-cpu-features.c
@@ -21,7 +21,7 @@
#define SVE_MAX_VQ 16
#define MACHINE "-machine virt,gic-version=max -accel tcg "
-#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg "
+#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm "
#define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \
" 'arguments': { 'type': 'full', "
#define QUERY_TAIL "}}"
@@ -613,31 +613,39 @@ int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
- qtest_add_data_func("/arm/query-cpu-model-expansion",
- NULL, test_query_cpu_model_expansion);
+ if (qtest_has_accel("tcg")) {
+ qtest_add_data_func("/arm/query-cpu-model-expansion",
+ NULL, test_query_cpu_model_expansion);
+ }
+
+ if (!g_str_equal(qtest_get_arch(), "aarch64")) {
+ goto out;
+ }
/*
* For now we only run KVM specific tests with AArch64 QEMU in
* order avoid attempting to run an AArch32 QEMU with KVM on
* AArch64 hosts. That won't work and isn't easy to detect.
*/
- if (g_str_equal(qtest_get_arch(), "aarch64") && qtest_has_accel("kvm")) {
+ if (qtest_has_accel("kvm")) {
/*
* This tests target the 'host' CPU type, so register it only if
* KVM is available.
*/
qtest_add_data_func("/arm/kvm/query-cpu-model-expansion",
NULL, test_query_cpu_model_expansion_kvm);
+
+ qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off",
+ NULL, sve_tests_sve_off_kvm);
}
- if (g_str_equal(qtest_get_arch(), "aarch64")) {
+ if (qtest_has_accel("tcg")) {
qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-max-vq-8",
NULL, sve_tests_sve_max_vq_8);
qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off",
NULL, sve_tests_sve_off);
- qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off",
- NULL, sve_tests_sve_off_kvm);
}
+out:
return g_test_run();
}
--
2.35.3
- [RFC PATCH v5 0/9] target/arm: Allow CONFIG_TCG=n builds, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 2/9] target/arm: move cpu_tcg to tcg/cpu32.c, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 1/9] target/arm: Move 64-bit TCG CPUs into tcg/, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 6/9] tests/tcg: Do not build/run TCG tests if TCG is disabled, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 3/9] target/arm: Use "max" as default cpu for the virt machine with KVM, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 4/9] tests/qtest: arm-cpu-features: Match tests to required accelerators,
Fabiano Rosas <=
- [RFC PATCH v5 5/9] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG, Fabiano Rosas, 2023/01/20
- [RFC PATCH v5 7/9] target/avocado: Pass parameters to migration test on aarch64, Fabiano Rosas, 2023/01/20
[RFC PATCH v5 8/9] arm/Kconfig: Always select SEMIHOSTING when TCG is present, Fabiano Rosas, 2023/01/20
[RFC PATCH v5 9/9] arm/Kconfig: Do not build TCG-only boards on a KVM-only build, Fabiano Rosas, 2023/01/20