| Message ID | 20210326193701.5981-42-cfontana@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | arm cleanup experiment for kvm-only build | expand |
On 3/26/21 1:36 PM, Claudio Fontana wrote: > sve_tests_sve_max_vq_8, > sve_tests_sve_off, > test_query_cpu_model_expansion The final two confused me before I realized there are separate tests for kvm. I think we should rename them to *_tcg, so that it's clearer next to the kvm brothers. > +#ifndef CONFIG_TCG Also, tcg_enabled() again. r~
On 3/28/21 7:23 PM, Richard Henderson wrote: > On 3/26/21 1:36 PM, Claudio Fontana wrote: >> sve_tests_sve_max_vq_8, >> sve_tests_sve_off, >> test_query_cpu_model_expansion > > The final two confused me before I realized there are separate tests for kvm. > I think we should rename them to *_tcg, so that it's clearer next to the kvm > brothers. > >> +#ifndef CONFIG_TCG > > Also, tcg_enabled() again. > > > r~ > I don't think we have access to that from here, right? If we use tcg_enabled(), this would be replaced with tcg_allowed, that is not set for qtest, and we end up skipping all the time? I think even the presence of CONFIG_TCG is a necessary workaround that Paolo has set in place, but had to be explicitly coded in. Or did I remember wrong? Thanks, Claudio
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 8252b85bb8..e793bffcaa 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -352,6 +352,11 @@ static void sve_tests_sve_max_vq_8(const void *data) { QTestState *qts; +#ifndef CONFIG_TCG + g_test_skip("TCG disabled, skipping tcg_only sve_tests_sve_max_vq_8"); + return; +#endif /* CONFIG_TCG */ + qts = qtest_init(MACHINE "-cpu max,sve-max-vq=8"); assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); @@ -387,6 +392,11 @@ static void sve_tests_sve_off(const void *data) { QTestState *qts; +#ifndef CONFIG_TCG + g_test_skip("TCG disabled, skipping tcg_only sve_tests_sve_off"); + return; +#endif /* CONFIG_TCG */ + qts = qtest_init(MACHINE "-cpu max,sve=off"); /* SVE is off, so the map should be empty. */ @@ -443,6 +453,11 @@ static void test_query_cpu_model_expansion(const void *data) { QTestState *qts; +#ifndef CONFIG_TCG + g_test_skip("TCG disabled, skipping tcg_only test_query_cpu_model_expansion"); + return; +#endif /* CONFIG_TCG */ + qts = qtest_init(MACHINE "-cpu max"); /* Test common query-cpu-model-expansion input validation */
sve_tests_sve_max_vq_8, sve_tests_sve_off, test_query_cpu_model_expansion all require TCG to run. Skip them for KVM-only builds. Signed-off-by: Claudio Fontana <cfontana@suse.de> --- tests/qtest/arm-cpu-features.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)