| Message ID | 20210604155312.15902-3-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm tcg/kvm refactor and split with kvm only support | expand |
On 04/06/2021 17.51, Alex Bennée wrote: > From: Philippe Mathieu-Daudé <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> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Tested-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20210505125806.1263441-3-philmd@redhat.com> > --- [...] > +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 Nit: Use alphabetical order here, too, just like you did in the enum? Apart from that: Reviewed-by: Thomas Huth <thuth@redhat.com>
On 6/7/21 3:07 PM, Thomas Huth wrote: > On 04/06/2021 17.51, Alex Bennée wrote: >> From: Philippe Mathieu-Daudé <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> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> Tested-by: Alex Bennée <alex.bennee@linaro.org> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Message-Id: <20210505125806.1263441-3-philmd@redhat.com> >> --- > [...] >> +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 > > Nit: Use alphabetical order here, too, just like you did in the enum? This has been drastically simplified by Markus using target-specific machine code in v8.
Alex Bennée <alex.bennee@linaro.org> writes: > From: Philippe Mathieu-Daudé <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> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Tested-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20210505125806.1263441-3-philmd@redhat.com> I assume this one's superseded by Phil's "[PATCH v8 02/12] accel: Introduce 'query-accels' QMP command", i.e. I should review that one, not this one.
On Tue, Jun 8, 2021 at 5:42 PM Markus Armbruster <armbru@redhat.com> wrote: > Alex Bennée <alex.bennee@linaro.org> writes: > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > > Tested-by: Alex Bennée <alex.bennee@linaro.org> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > Message-Id: <20210505125806.1263441-3-philmd@redhat.com> > > I assume this one's superseded by Phil's "[PATCH v8 02/12] accel: > Introduce 'query-accels' QMP command", i.e. I should review that one, > not this one. Correct.
diff --git a/qapi/machine.json b/qapi/machine.json index 58a9c86b36..79a0891793 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': [ 'hax', 'hvf', 'kvm', 'qtest', 'tcg', '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 0000000000..426737b3f9 --- /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 b44ba30c86..7a48f6d568 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'))