From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Claudio Fontana <cfontana@suse.de>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"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>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: [PATCH 1/6] accel: Introduce 'query-accels' QMP command
Date: Fri, 12 Mar 2021 00:11:57 +0100 [thread overview]
Message-ID: <20210311231202.1536040-2-philmd@redhat.com> (raw)
In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com>
Introduce the 'query-accels' QMP command which returns a list
of built-in accelerators names.
- Accelerator is an 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": [
{
"type": "qtest"
},
{
"type": "kvm"
}
]
}
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/machine.json | 55 +++++++++++++++++++++++++++++++++++++++++++++++
accel/accel-qmp.c | 47 ++++++++++++++++++++++++++++++++++++++++
accel/meson.build | 2 +-
3 files changed, 103 insertions(+), 1 deletion(-)
create mode 100644 accel/accel-qmp.c
diff --git a/qapi/machine.json b/qapi/machine.json
index 330189efe3d..ffbf28e5d50 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1471,3 +1471,58 @@
##
{ 'event': 'MEM_UNPLUG_ERROR',
'data': { 'device': 'str', 'msg': 'str' } }
+
+##
+# @Accelerator:
+#
+# An enumeration of accelerator names.
+#
+# Since: 6.0
+##
+{ 'enum': 'Accelerator',
+ 'data': [ { 'name': 'qtest' },
+ { 'name': 'tcg' },
+ { 'name': 'kvm' },
+ { 'name': 'hax' },
+ { 'name': 'hvf' },
+ { 'name': 'whpx' },
+ { 'name': 'xen' } ] }
+
+##
+# @AcceleratorInfo:
+#
+# Accelerator information.
+#
+# @name: The accelerator name.
+#
+# Since: 6.0
+##
+{ 'union': 'AcceleratorInfo',
+ 'base': {'name': 'Accelerator'},
+ 'discriminator': 'name',
+ 'data': { } }
+
+##
+# @query-accels:
+#
+# Get a list of AcceleratorInfo for all built-in accelerators.
+#
+# Returns: a list of @AcceleratorInfo describing each accelerator.
+#
+# Since: 6.0
+#
+# Example:
+#
+# -> { "execute": "query-accels" }
+# <- { "return": [
+# {
+# "type": "qtest"
+# },
+# {
+# "type": "kvm"
+# }
+# ] }
+#
+##
+{ 'command': 'query-accels',
+ 'returns': ['AcceleratorInfo'] }
diff --git a/accel/accel-qmp.c b/accel/accel-qmp.c
new file mode 100644
index 00000000000..f16e49b8956
--- /dev/null
+++ b/accel/accel-qmp.c
@@ -0,0 +1,47 @@
+/*
+ * 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 Accelerator accel_list[] = {
+ ACCELERATOR_QTEST,
+#ifdef CONFIG_TCG
+ ACCELERATOR_TCG,
+#endif
+#ifdef CONFIG_KVM
+ ACCELERATOR_KVM,
+#endif
+#ifdef CONFIG_HAX
+ ACCELERATOR_HAX,
+#endif
+#ifdef CONFIG_HVF
+ ACCELERATOR_HVF,
+#endif
+#ifdef CONFIG_WHPX
+ ACCELERATOR_WHPX,
+#endif
+#ifdef CONFIG_XEN_BACKEND
+ ACCELERATOR_XEN,
+#endif
+};
+
+AcceleratorInfoList *qmp_query_accels(Error **errp)
+{
+ AcceleratorInfoList *list = NULL, **tail = &list;
+
+ for (unsigned i = 0; i < ARRAY_SIZE(accel_list); i++) {
+ AcceleratorInfo *info = g_new0(AcceleratorInfo, 1);
+
+ info->name = accel_list[i];
+
+ 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.2
next prev parent reply other threads:[~2021-03-11 23:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 23:11 [PATCH 0/6] qtests: Check accelerator available at runtime via QMP 'query-accels' Philippe Mathieu-Daudé
2021-03-11 23:11 ` Philippe Mathieu-Daudé [this message]
2021-03-12 7:42 ` [PATCH 1/6] accel: Introduce 'query-accels' QMP command Marc-André Lureau
2021-03-12 8:11 ` Thomas Huth
2021-03-12 8:48 ` Andrew Jones
2021-03-12 8:52 ` Claudio Fontana
2021-03-12 9:09 ` Andrew Jones
2021-03-12 9:01 ` Paolo Bonzini
2021-03-12 9:17 ` Andrew Jones
2021-03-12 9:28 ` Paolo Bonzini
2021-03-12 8:46 ` Claudio Fontana
2021-03-12 9:04 ` Paolo Bonzini
2021-03-15 17:53 ` Eric Blake
2021-03-16 6:51 ` Markus Armbruster
2021-03-16 8:21 ` Paolo Bonzini
2021-03-16 9:02 ` Philippe Mathieu-Daudé
2021-03-16 10:26 ` Philippe Mathieu-Daudé
2021-03-16 10:39 ` Markus Armbruster
2021-03-16 10:55 ` Philippe Mathieu-Daudé
2021-03-16 12:41 ` Markus Armbruster
2021-03-16 12:48 ` Thomas Huth
2021-03-16 15:20 ` Philippe Mathieu-Daudé
2021-03-11 23:11 ` [PATCH 2/6] tests/qtest: Add qtest_probe_accel() method Philippe Mathieu-Daudé
2021-03-12 8:16 ` Thomas Huth
2021-03-12 8:58 ` Andrew Jones
2021-03-11 23:11 ` [PATCH 3/6] qtest/bios-tables-test: Make test build-independent from accelerator Philippe Mathieu-Daudé
2021-03-11 23:12 ` [PATCH 4/6] qtest/arm-cpu-features: Check KVM availability at runtime Philippe Mathieu-Daudé
2021-03-12 9:05 ` Paolo Bonzini
2021-03-12 9:32 ` Philippe Mathieu-Daudé
2021-03-12 9:50 ` Paolo Bonzini
2021-03-11 23:12 ` [PATCH 5/6] qtest/arm-cpu-features: Check TCG " Philippe Mathieu-Daudé
2021-03-12 9:05 ` Paolo Bonzini
2021-03-11 23:12 ` [PATCH 6/6] tests/qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Philippe Mathieu-Daudé
2021-03-12 9:06 ` Paolo Bonzini
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=20210311231202.1536040-2-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).