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 02/12] accel: Introduce 'query-accels' QMP command
Date: Thu, 15 Apr 2021 18:32:54 +0200 [thread overview]
Message-ID: <20210415163304.4120052-3-philmd@redhat.com> (raw)
In-Reply-To: <20210415163304.4120052-1-philmd@redhat.com>
Introduce the 'query-accels' QMP command which returns a list
of built-in accelerator names.
- Accelerator is a QAPI enum of all existing accelerators,
- AcceleratorInfo is a QAPI structure providing accelerator
specific information. Currently the common structure base
provides the name of the accelerator, while the specific
part is empty, but each accelerator can expand it.
- 'query-accels' QMP command returns a list of @AcceleratorInfo
For example on a KVM-only build we get:
{ "execute": "query-accels" }
{
"return": [
{
"name": "qtest"
},
{
"name": "kvm"
}
]
}
Note that we can't make the enum values or union branches conditional
because of target-specific poisoning of accelerator definitions.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Since v3: Simplify over-engineered AcceleratorInfo (Markus, kept Eric R-b)
Since v2: @since 6.0 -> 6.1, added note (Eric)
Since v1: 'type' -> 'name' in comments
---
qapi/machine.json | 47 +++++++++++++++++++++++++++++++++++++++++++++
accel/accel-qmp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++
accel/meson.build | 2 +-
3 files changed, 97 insertions(+), 1 deletion(-)
create mode 100644 accel/accel-qmp.c
diff --git a/qapi/machine.json b/qapi/machine.json
index 6e90d463fc9..1ef729f6f84 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1274,3 +1274,50 @@
##
{ 'event': 'MEM_UNPLUG_ERROR',
'data': { 'device': 'str', 'msg': 'str' } }
+
+##
+# @Accelerator:
+#
+# An enumeration of accelerator names.
+#
+# Since: 6.1
+##
+{ 'enum': 'Accelerator',
+ 'data': [ 'qtest', 'tcg', 'kvm', 'hax', 'hvf', 'whpx', 'xen' ] }
+
+##
+# @AcceleratorInfo:
+#
+# Accelerator information.
+#
+# @name: The accelerator name.
+#
+# Since: 6.1
+##
+{ 'struct': 'AcceleratorInfo',
+ 'data': { 'name': 'Accelerator' } }
+
+##
+# @query-accels:
+#
+# Get a list of AcceleratorInfo for all built-in accelerators.
+#
+# Returns: a list of @AcceleratorInfo describing each accelerator.
+#
+# Since: 6.1
+#
+# Example:
+#
+# -> { "execute": "query-accels" }
+# <- { "return": [
+# {
+# "name": "qtest"
+# },
+# {
+# "name": "kvm"
+# }
+# ] }
+#
+##
+{ 'command': 'query-accels',
+ 'returns': ['AcceleratorInfo'] }
diff --git a/accel/accel-qmp.c b/accel/accel-qmp.c
new file mode 100644
index 00000000000..426737b3f9a
--- /dev/null
+++ b/accel/accel-qmp.c
@@ -0,0 +1,49 @@
+/*
+ * QEMU accelerators, QMP commands
+ *
+ * Copyright (c) 2021 Red Hat Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/qapi-commands-machine.h"
+
+static const bool accel_builtin_list[ACCELERATOR__MAX] = {
+ [ACCELERATOR_QTEST] = true,
+#ifdef CONFIG_TCG
+ [ACCELERATOR_TCG] = true,
+#endif
+#ifdef CONFIG_KVM
+ [ACCELERATOR_KVM] = true,
+#endif
+#ifdef CONFIG_HAX
+ [ACCELERATOR_HAX] = true,
+#endif
+#ifdef CONFIG_HVF
+ [ACCELERATOR_HVF] = true,
+#endif
+#ifdef CONFIG_WHPX
+ [ACCELERATOR_WHPX] = true,
+#endif
+#ifdef CONFIG_XEN_BACKEND
+ [ACCELERATOR_XEN] = true,
+#endif
+};
+
+AcceleratorInfoList *qmp_query_accels(Error **errp)
+{
+ AcceleratorInfoList *list = NULL, **tail = &list;
+
+ for (Accelerator accel = 0; accel < ACCELERATOR__MAX; accel++) {
+ if (accel_builtin_list[accel]) {
+ AcceleratorInfo *info = g_new0(AcceleratorInfo, 1);
+
+ info->name = accel;
+
+ QAPI_LIST_APPEND(tail, info);
+ }
+ }
+
+ return list;
+}
diff --git a/accel/meson.build b/accel/meson.build
index b44ba30c864..7a48f6d568d 100644
--- a/accel/meson.build
+++ b/accel/meson.build
@@ -1,4 +1,4 @@
-specific_ss.add(files('accel-common.c'))
+specific_ss.add(files('accel-common.c', 'accel-qmp.c'))
softmmu_ss.add(files('accel-softmmu.c'))
user_ss.add(files('accel-user.c'))
--
2.26.3
next prev parent reply other threads:[~2021-04-15 16:47 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 ` Philippe Mathieu-Daudé [this message]
2021-04-29 14:50 ` [PATCH v4 02/12] accel: Introduce 'query-accels' QMP command 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 ` [PATCH v4 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG Philippe Mathieu-Daudé
2021-04-15 16:45 ` 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-3-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).