qemu: capabilities: Probe QEMU_CAPS_SMP_DIES from the QMP schema

The configurability of the number of dies in a CPU can be inferred from
the presence of the 'die-id' field in 'query-hotpluggable-cpus'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-07-26 14:03:07 +02:00
parent 067f44fd0b
commit fb5a246424

View File

@ -1581,6 +1581,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL }, { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL },
{ "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLESS }, { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLESS },
{ "query-iothreads/ret-type/poll-max-ns", QEMU_CAPS_IOTHREAD_POLLING }, { "query-iothreads/ret-type/poll-max-ns", QEMU_CAPS_IOTHREAD_POLLING },
{ "query-hotpluggable-cpus/ret-type/props/die-id", QEMU_CAPS_SMP_DIES },
{ "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT }, { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT },
{ "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE },
{ "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
@ -3253,7 +3254,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
{ "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX }, { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX },
{ "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST }, { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST },
{ "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
{ "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE },
{ "spice", "gl", QEMU_CAPS_SPICE_GL }, { "spice", "gl", QEMU_CAPS_SPICE_GL },
{ "spice", "unix", QEMU_CAPS_SPICE_UNIX }, { "spice", "unix", QEMU_CAPS_SPICE_UNIX },