From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Andrew Jones" <drjones@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-arm@nongnu.org, "Claudio Fontana" <cfontana@suse.de>,
"Igor Mammedov" <imammedo@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 2/4] tests/qtest: Add qtest_has_accel() method
Date: Tue, 16 Mar 2021 18:24:47 +0100 [thread overview]
Message-ID: <20210316172449.3148634-3-philmd@redhat.com> (raw)
In-Reply-To: <20210316172449.3148634-1-philmd@redhat.com>
Introduce the qtest_has_accel() method which allows
to query at runtime if a QEMU instance has an accelerator
built-in.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Since v1:
- rename qtest_probe_accel() -> qtest_has_accel()
- run with -machine none before creating QTestState
---
tests/qtest/libqos/libqtest.h | 8 ++++++++
tests/qtest/libqtest.c | 29 +++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h
index a68dcd79d44..d80c618c18d 100644
--- a/tests/qtest/libqos/libqtest.h
+++ b/tests/qtest/libqos/libqtest.h
@@ -763,6 +763,14 @@ void qmp_expect_error_and_unref(QDict *rsp, const char *class);
*/
bool qtest_probe_child(QTestState *s);
+/**
+ * qtest_has_accel:
+ * @accel_name: Accelerator name to check for.
+ *
+ * Returns: true if the accelerator is built in.
+ */
+bool qtest_has_accel(const char *accel_name);
+
/**
* qtest_set_expected_status:
* @s: QTestState instance to operate on.
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 71e359efcd3..2156b7e3972 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -393,6 +393,35 @@ QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd)
return qts;
}
+bool qtest_has_accel(const char *accel_name)
+{
+ bool has_accel = false;
+ QDict *response;
+ QList *accels;
+ QListEntry *accel;
+ QTestState *qts;
+
+ qts = qtest_initf("-accel qtest -machine none");
+ response = qtest_qmp(qts, "{'execute': 'query-accels'}");
+ accels = qdict_get_qlist(response, "return");
+
+ QLIST_FOREACH_ENTRY(accels, accel) {
+ QDict *accel_dict = qobject_to(QDict, qlist_entry_obj(accel));
+ const char *name = qdict_get_str(accel_dict, "name");
+
+ if (g_str_equal(name, accel_name)) {
+ has_accel = true;
+ break;
+ }
+ }
+ qobject_unref(response);
+
+ qtest_quit(qts);
+
+ return has_accel;
+}
+
+
void qtest_quit(QTestState *s)
{
qtest_remove_abrt_handler(s);
--
2.26.2
next prev parent reply other threads:[~2021-03-16 17:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 17:24 [PATCH v2 0/4] qtests: Check accelerator available at runtime via QMP 'query-accels' Philippe Mathieu-Daudé
2021-03-16 17:24 ` [PATCH v2 1/4] accel: Introduce 'query-accels' QMP command Philippe Mathieu-Daudé
2021-03-16 17:29 ` Eric Blake
2021-03-16 18:00 ` Philippe Mathieu-Daudé
2021-03-16 17:24 ` Philippe Mathieu-Daudé [this message]
2021-03-16 17:31 ` [PATCH v2 2/4] tests/qtest: Add qtest_has_accel() method Eric Blake
2021-03-16 17:24 ` [PATCH v2 3/4] qtest/bios-tables-test: Make test build-independent from accelerator Philippe Mathieu-Daudé
2021-03-16 17:32 ` Eric Blake
2021-03-16 17:24 ` [PATCH v2 4/4] tests/qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Philippe Mathieu-Daudé
2021-03-16 17:33 ` Eric Blake
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=20210316172449.3148634-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cfontana@suse.de \
--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=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--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).