* [PATCH 0/2] monitor: generalized query for accelerator availability
@ 2025-10-13 11:26 Paolo Bonzini
2025-10-13 11:26 ` [PATCH 1/2] monitor: clarify "info accel" help message Paolo Bonzini
2025-10-13 11:26 ` [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Paolo Bonzini
0 siblings, 2 replies; 6+ messages in thread
From: Paolo Bonzini @ 2025-10-13 11:26 UTC (permalink / raw)
To: qemu-devel
Cc: Praveen K Paladugu, Magnus Kulke, Markus Armbruster,
Daniel P . Berrangé
The recently-introduced query-mshv command is a duplicate of query-kvm,
and neither provides a full view of which accelerators are supported
by a particular binary of QEMU and which is in use.
KVM was the first accelerator added to QEMU, predating QOM and TYPE_ACCEL,
so it got a pass. But now, instead of adding a badly designed copy, solve
the problem completely for all accelerators with a command that provides
the whole picture:
>> {"execute": "query-accelerators"}
<< {"return": {"enabled": "tcg", "present": ["kvm", "mshv", "qtest", "tcg", "xen"]}}
Since query-mshv was not in any released version, drop it. Because the
code looks similar, I am not splitting this into removal of query-mshv
and addition of the new command.
Paolo
Paolo Bonzini (2):
monitor: clarify "info accel" help message
monitor: generalize query-mshv/"info mshv" to query-accelerators/"info
accelerators"
qapi/accelerator.json | 47 +++++++++++++++++++++++++++++---------
include/monitor/hmp.h | 2 +-
hw/core/machine-hmp-cmds.c | 21 +++++++++--------
hw/core/machine-qmp-cmds.c | 20 ++++++++++++----
hmp-commands-info.hx | 19 +++++++++------
5 files changed, 76 insertions(+), 33 deletions(-)
--
2.51.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] monitor: clarify "info accel" help message 2025-10-13 11:26 [PATCH 0/2] monitor: generalized query for accelerator availability Paolo Bonzini @ 2025-10-13 11:26 ` Paolo Bonzini 2025-10-14 8:50 ` Daniel P. Berrangé 2025-10-13 11:26 ` [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Paolo Bonzini 1 sibling, 1 reply; 6+ messages in thread From: Paolo Bonzini @ 2025-10-13 11:26 UTC (permalink / raw) To: qemu-devel Cc: Praveen K Paladugu, Magnus Kulke, Markus Armbruster, Daniel P . Berrangé In preparation for adding "info accelerators", explain that this command is about runtime statistics. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hmp-commands-info.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index eaaa880c1b3..c2aa40056bb 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -271,12 +271,12 @@ ERST .name = "accel", .args_type = "", .params = "", - .help = "show accelerator info", + .help = "show accelerator statistics", }, SRST ``info accel`` - Show accelerator info. + Show accelerator statistics. ERST SRST -- 2.51.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] monitor: clarify "info accel" help message 2025-10-13 11:26 ` [PATCH 1/2] monitor: clarify "info accel" help message Paolo Bonzini @ 2025-10-14 8:50 ` Daniel P. Berrangé 0 siblings, 0 replies; 6+ messages in thread From: Daniel P. Berrangé @ 2025-10-14 8:50 UTC (permalink / raw) To: Paolo Bonzini Cc: qemu-devel, Praveen K Paladugu, Magnus Kulke, Markus Armbruster On Mon, Oct 13, 2025 at 01:26:49PM +0200, Paolo Bonzini wrote: > In preparation for adding "info accelerators", explain that this command > is about runtime statistics. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hmp-commands-info.hx | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" 2025-10-13 11:26 [PATCH 0/2] monitor: generalized query for accelerator availability Paolo Bonzini 2025-10-13 11:26 ` [PATCH 1/2] monitor: clarify "info accel" help message Paolo Bonzini @ 2025-10-13 11:26 ` Paolo Bonzini 2025-10-14 8:54 ` Daniel P. Berrangé 2025-10-15 19:14 ` Eric Blake 1 sibling, 2 replies; 6+ messages in thread From: Paolo Bonzini @ 2025-10-13 11:26 UTC (permalink / raw) To: qemu-devel Cc: Praveen K Paladugu, Magnus Kulke, Markus Armbruster, Daniel P . Berrangé The recently-introduced query-mshv command is a duplicate of query-kvm, and neither provides a full view of which accelerators are supported by a particular binary of QEMU and which is in use. KVM was the first accelerator added to QEMU, predating QOM and TYPE_ACCEL, so it got a pass. But now, instead of adding a badly designed copy, solve the problem completely for all accelerators with a command that provides the whole picture: >> {"execute": "query-accelerators"} << {"return": {"enabled": "tcg", "present": ["kvm", "mshv", "qtest", "tcg", "xen"]}} Cc: Praveen K Paladugu <prapal@microsoft.com> Cc: Magnus Kulke <magnuskulke@linux.microsoft.com> Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> fixup a0df118f73f # fff --- qapi/accelerator.json | 47 +++++++++++++++++++++++++++++--------- include/monitor/hmp.h | 2 +- hw/core/machine-hmp-cmds.c | 21 +++++++++-------- hw/core/machine-qmp-cmds.c | 20 ++++++++++++---- hmp-commands-info.hx | 15 ++++++++---- 5 files changed, 74 insertions(+), 31 deletions(-) diff --git a/qapi/accelerator.json b/qapi/accelerator.json index 664e0272465..2b920608847 100644 --- a/qapi/accelerator.json +++ b/qapi/accelerator.json @@ -56,30 +56,55 @@ 'features': [ 'unstable' ] } ## -# @MshvInfo: +# @Accelerator: # # Information about support for MSHV acceleration # -# @enabled: true if MSHV acceleration is active +# @hvf: Apple Hypervisor.framework # -# @present: true if MSHV acceleration is built into this executable +# @kvm: KVM +# +# @mshv: Hyper-V +# +# @nvmm: NetBSD NVMM +# +# @qtest: QTest (dummy accelerator) +# +# @tcg: TCG (dynamic translation) +# +# @whpx: Windows Hypervisor Platform +# +# @xen: Xen # # Since: 10.2.0 ## -{ 'struct': 'MshvInfo', 'data': {'enabled': 'bool', 'present': 'bool'} } +{ 'enum': 'Accelerator', 'data': ['hvf', 'kvm', 'mshv', 'nvmm', 'qtest', 'tcg', 'whpx', 'xen'] } ## -# @query-mshv: +# @AcceleratorInfo: # -# Return information about MSHV acceleration +# Information about support for various accelerators # -# Returns: @MshvInfo +# @enabled: the accelerator that is in use # -# Since: 10.0.92 +# @present: the list of accelerators that are built into this executable +# +# Since: 10.2.0 +## +{ 'struct': 'AcceleratorInfo', 'data': {'enabled': 'Accelerator', 'present': ['Accelerator']} } + +## +# @query-accelerators: +# +# Return information about accelerators +# +# Returns: @AcceleratorInfo +# +# Since: 10.2.0 # # .. qmp-example:: # -# -> { "execute": "query-mshv" } -# <- { "return": { "enabled": true, "present": true } } +# -> { "execute": "query-accelerators" } +# <- { "return": { "enabled": "mshv", "present": ["kvm", "mshv", "qtest", "tcg"] } } ## -{ 'command': 'query-mshv', 'returns': 'MshvInfo' } +{ 'command': 'query-accelerators', 'returns': 'AcceleratorInfo' } diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 31bd812e5f4..897dfaa2b6d 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,7 +24,7 @@ strList *hmp_split_at_comma(const char *str); void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); void hmp_info_kvm(Monitor *mon, const QDict *qdict); -void hmp_info_mshv(Monitor *mon, const QDict *qdict); +void hmp_info_accelerators(Monitor *mon, const QDict *qdict); void hmp_info_status(Monitor *mon, const QDict *qdict); void hmp_info_uuid(Monitor *mon, const QDict *qdict); void hmp_info_chardev(Monitor *mon, const QDict *qdict); diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index 682ed9f49b8..74a56600be8 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -163,19 +163,22 @@ void hmp_info_kvm(Monitor *mon, const QDict *qdict) qapi_free_KvmInfo(info); } -void hmp_info_mshv(Monitor *mon, const QDict *qdict) +void hmp_info_accelerators(Monitor *mon, const QDict *qdict) { - MshvInfo *info; + AcceleratorInfo *info; + AcceleratorList *accel; - info = qmp_query_mshv(NULL); - monitor_printf(mon, "mshv support: "); - if (info->present) { - monitor_printf(mon, "%s\n", info->enabled ? "enabled" : "disabled"); - } else { - monitor_printf(mon, "not compiled\n"); + info = qmp_query_accelerators(NULL); + for (accel = info->present; accel; accel = accel->next) { + char trail = accel->next ? ' ' : '\n'; + if (info->enabled == accel->value) { + monitor_printf(mon, "[%s]%c", Accelerator_str(accel->value), trail); + } else { + monitor_printf(mon, "%s%c", Accelerator_str(accel->value), trail); + } } - qapi_free_MshvInfo(info); + qapi_free_AcceleratorInfo(info); } void hmp_info_uuid(Monitor *mon, const QDict *qdict) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index e24bf0d97bf..51d5c230f7e 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -31,15 +31,25 @@ #include <sys/stat.h> /* - * QMP query for MSHV + * QMP query for enabled and present accelerators */ -MshvInfo *qmp_query_mshv(Error **errp) +AcceleratorInfo *qmp_query_accelerators(Error **errp) { - MshvInfo *info = g_malloc0(sizeof(*info)); + AcceleratorInfo *info = g_malloc0(sizeof(*info)); + AccelClass *current_class = ACCEL_GET_CLASS(current_accel()); + int i; - info->enabled = mshv_enabled(); - info->present = accel_find("mshv"); + for (i = ACCELERATOR__MAX; i-- > 0; ) { + const char *s = Accelerator_str(i); + AccelClass *this_class = accel_find(s); + if (this_class) { + QAPI_LIST_PREPEND(info->present, i); + if (this_class == current_class) { + info->enabled = i; + } + } + } return info; } diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index c2aa40056bb..25b4aed51f5 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -308,16 +308,21 @@ SRST ERST { - .name = "mshv", + .name = "accelerators", .args_type = "", .params = "", - .help = "show MSHV information", - .cmd = hmp_info_mshv, + .help = "show present and enabled information", + .cmd = hmp_info_accelerators, }, SRST - ``info mshv`` - Show MSHV information. + ``info accelerators`` + Show which accelerators are compiled into a QEMU binary, and what accelerator + is in use. For example:: + + kvm qtest [tcg] + + indicates that TCG in use, and that KVM and qtest are also available. ERST { -- 2.51.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" 2025-10-13 11:26 ` [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Paolo Bonzini @ 2025-10-14 8:54 ` Daniel P. Berrangé 2025-10-15 19:14 ` Eric Blake 1 sibling, 0 replies; 6+ messages in thread From: Daniel P. Berrangé @ 2025-10-14 8:54 UTC (permalink / raw) To: Paolo Bonzini Cc: qemu-devel, Praveen K Paladugu, Magnus Kulke, Markus Armbruster On Mon, Oct 13, 2025 at 01:26:50PM +0200, Paolo Bonzini wrote: > The recently-introduced query-mshv command is a duplicate of query-kvm, > and neither provides a full view of which accelerators are supported > by a particular binary of QEMU and which is in use. > > KVM was the first accelerator added to QEMU, predating QOM and TYPE_ACCEL, > so it got a pass. But now, instead of adding a badly designed copy, solve > the problem completely for all accelerators with a command that provides > the whole picture: > > >> {"execute": "query-accelerators"} > << {"return": {"enabled": "tcg", "present": ["kvm", "mshv", "qtest", "tcg", "xen"]}} > > Cc: Praveen K Paladugu <prapal@microsoft.com> > Cc: Magnus Kulke <magnuskulke@linux.microsoft.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > fixup a0df118f73f # fff > --- > qapi/accelerator.json | 47 +++++++++++++++++++++++++++++--------- > include/monitor/hmp.h | 2 +- > hw/core/machine-hmp-cmds.c | 21 +++++++++-------- > hw/core/machine-qmp-cmds.c | 20 ++++++++++++---- > hmp-commands-info.hx | 15 ++++++++---- > 5 files changed, 74 insertions(+), 31 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" 2025-10-13 11:26 ` [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Paolo Bonzini 2025-10-14 8:54 ` Daniel P. Berrangé @ 2025-10-15 19:14 ` Eric Blake 1 sibling, 0 replies; 6+ messages in thread From: Eric Blake @ 2025-10-15 19:14 UTC (permalink / raw) To: Paolo Bonzini Cc: qemu-devel, Praveen K Paladugu, Magnus Kulke, Markus Armbruster, Daniel P . Berrangé On Mon, Oct 13, 2025 at 01:26:50PM +0200, Paolo Bonzini wrote: > The recently-introduced query-mshv command is a duplicate of query-kvm, > and neither provides a full view of which accelerators are supported > by a particular binary of QEMU and which is in use. > > KVM was the first accelerator added to QEMU, predating QOM and TYPE_ACCEL, > so it got a pass. But now, instead of adding a badly designed copy, solve > the problem completely for all accelerators with a command that provides > the whole picture: > > >> {"execute": "query-accelerators"} > << {"return": {"enabled": "tcg", "present": ["kvm", "mshv", "qtest", "tcg", "xen"]}} > > Cc: Praveen K Paladugu <prapal@microsoft.com> > Cc: Magnus Kulke <magnuskulke@linux.microsoft.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > fixup a0df118f73f # fff Is this note stale? > --- > qapi/accelerator.json | 47 +++++++++++++++++++++++++++++--------- > include/monitor/hmp.h | 2 +- > hw/core/machine-hmp-cmds.c | 21 +++++++++-------- > hw/core/machine-qmp-cmds.c | 20 ++++++++++++---- > hmp-commands-info.hx | 15 ++++++++---- > 5 files changed, 74 insertions(+), 31 deletions(-) > Otherwise, Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-10-15 19:16 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-10-13 11:26 [PATCH 0/2] monitor: generalized query for accelerator availability Paolo Bonzini 2025-10-13 11:26 ` [PATCH 1/2] monitor: clarify "info accel" help message Paolo Bonzini 2025-10-14 8:50 ` Daniel P. Berrangé 2025-10-13 11:26 ` [PATCH 2/2] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Paolo Bonzini 2025-10-14 8:54 ` Daniel P. Berrangé 2025-10-15 19:14 ` Eric Blake
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.