From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Andrew Jones" <drjones@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
qemu-arm@nongnu.org, "Claudio Fontana" <cfontana@suse.de>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: [PATCH v4 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG
Date: Thu, 15 Apr 2021 18:32:59 +0200 [thread overview]
Message-ID: <20210415163304.4120052-8-philmd@redhat.com> (raw)
In-Reply-To: <20210415163304.4120052-1-philmd@redhat.com>
Now than we can probe if the TCG accelerator is available
at runtime with a QMP command, only run these tests if TCG
is built into the QEMU binary.
Suggested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/qtest/arm-cpu-features.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
index b1d406542f7..0d9145dd168 100644
--- a/tests/qtest/arm-cpu-features.c
+++ b/tests/qtest/arm-cpu-features.c
@@ -20,7 +20,7 @@
*/
#define SVE_MAX_VQ 16
-#define MACHINE "-machine virt,gic-version=max -accel tcg "
+#define MACHINE_TCG "-machine virt,gic-version=max -accel tcg "
#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm "
#define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \
" 'arguments': { 'type': 'full', "
@@ -337,7 +337,7 @@ static void sve_tests_sve_max_vq_8(const void *data)
{
QTestState *qts;
- qts = qtest_init(MACHINE "-cpu max,sve-max-vq=8");
+ qts = qtest_init(MACHINE_TCG "-cpu max,sve-max-vq=8");
assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL);
@@ -372,7 +372,7 @@ static void sve_tests_sve_off(const void *data)
{
QTestState *qts;
- qts = qtest_init(MACHINE "-cpu max,sve=off");
+ qts = qtest_init(MACHINE_TCG "-cpu max,sve=off");
/* SVE is off, so the map should be empty. */
assert_sve_vls(qts, "max", 0, NULL);
@@ -428,7 +428,7 @@ static void test_query_cpu_model_expansion(const void *data)
{
QTestState *qts;
- qts = qtest_init(MACHINE "-cpu max");
+ qts = qtest_init(MACHINE_TCG "-cpu max");
/* Test common query-cpu-model-expansion input validation */
assert_type_full(qts);
@@ -593,8 +593,10 @@ 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);
+ }
/*
* For now we only run KVM specific tests with AArch64 QEMU in
@@ -608,7 +610,7 @@ int main(int argc, char **argv)
NULL, sve_tests_sve_off_kvm);
}
- if (g_str_equal(qtest_get_arch(), "aarch64")) {
+ if (g_str_equal(qtest_get_arch(), "aarch64") && 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",
--
2.26.3
next prev parent reply other threads:[~2021-04-15 16:49 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 16:32 [PATCH v4 00/12] qtests: Check accelerator available at runtime via QMP 'query-accels' Philippe Mathieu-Daudé
2021-04-15 16:32 ` [PATCH v4 01/12] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section Philippe Mathieu-Daudé
2021-04-16 18:06 ` Thomas Huth
2021-04-16 18:21 ` Philippe Mathieu-Daudé
2021-04-29 10:30 ` Alex Bennée
2021-04-15 16:32 ` [PATCH v4 02/12] accel: Introduce 'query-accels' QMP command Philippe Mathieu-Daudé
2021-04-29 14:50 ` Alex Bennée
2021-04-30 19:03 ` Eric Blake
2021-05-01 22:24 ` Philippe Mathieu-Daudé
2021-04-15 16:32 ` [PATCH v4 03/12] tests/qtest: Add qtest_has_accel() method Philippe Mathieu-Daudé
2021-04-29 14:52 ` Alex Bennée
2021-04-15 16:32 ` [PATCH v4 04/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM Philippe Mathieu-Daudé
2021-04-15 16:43 ` Andrew Jones
2021-04-29 14:59 ` Alex Bennée
2021-04-15 16:32 ` [PATCH v4 05/12] qtest/arm-cpu-features: Restrict sve_tests_sve_off_kvm test to KVM Philippe Mathieu-Daudé
2021-04-15 16:44 ` Andrew Jones
2021-04-30 9:51 ` Alex Bennée
2021-04-15 16:32 ` [PATCH v4 06/12] qtest/arm-cpu-features: Remove TCG fallback to KVM specific tests Philippe Mathieu-Daudé
2021-04-15 16:44 ` Andrew Jones
2021-04-30 10:19 ` Alex Bennée
2021-04-15 16:32 ` Philippe Mathieu-Daudé [this message]
2021-04-15 16:45 ` [PATCH v4 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG Andrew Jones
2021-04-30 10:20 ` Alex Bennée
2021-04-15 16:33 ` [PATCH v4 08/12] qtest/bios-tables-test: Make test build-independent from accelerator Philippe Mathieu-Daudé
2021-04-30 15:35 ` Alex Bennée
2021-04-15 16:33 ` [PATCH v4 09/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Philippe Mathieu-Daudé
2021-04-16 4:33 ` David Gibson
2021-04-16 10:55 ` Greg Kurz
2021-04-16 11:58 ` Cornelia Huck
2021-04-30 15:37 ` Alex Bennée
2021-04-15 16:33 ` [PATCH v4 10/12] qtest/qmp-cmd-test: Make test build-independent from accelerator Philippe Mathieu-Daudé
2021-04-28 16:39 ` Philippe Mathieu-Daudé
2021-04-29 5:43 ` Markus Armbruster
2021-04-29 8:41 ` Philippe Mathieu-Daudé
2021-04-29 13:22 ` Markus Armbruster
2021-04-29 15:10 ` Philippe Mathieu-Daudé
2021-04-30 6:13 ` Markus Armbruster
2021-04-30 15:48 ` Philippe Mathieu-Daudé
2021-05-01 6:49 ` Markus Armbruster
2021-04-15 16:33 ` [PATCH v4 11/12] tests/qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Philippe Mathieu-Daudé
2021-04-30 17:21 ` Alex Bennée
2021-04-15 16:33 ` [PATCH v4 12/12] tests/meson: Only build softfloat objects if TCG is selected Philippe Mathieu-Daudé
2021-04-28 16:38 ` Philippe Mathieu-Daudé
2021-04-28 17:06 ` Alex Bennée
2021-04-28 17:32 ` Philippe Mathieu-Daudé
2021-04-28 19:04 ` Alex Bennée
2021-04-28 19:12 ` Philippe Mathieu-Daudé
2021-04-29 12:57 ` Philippe Mathieu-Daudé
2021-04-30 16:37 ` Alex Bennée
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=20210415163304.4120052-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cfontana@suse.de \
--cc=dgilbert@redhat.com \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.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;
as well as URLs for NNTP newsgroup(s).