| Message ID | 20230119135424.5417-5-farosas@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/arm: Allow CONFIG_TCG=n builds | expand |
On 1/19/23 03:54, Fabiano Rosas wrote: > Signed-off-by: Fabiano Rosas<farosas@suse.de> > --- > tests/qtest/arm-cpu-features.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 19/01/2023 14.54, Fabiano Rosas wrote: > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > 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(); > } Acked-by: Thomas Huth <thuth@redhat.com>
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(); }
Signed-off-by: Fabiano Rosas <farosas@suse.de> --- tests/qtest/arm-cpu-features.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)