July 2023 - Devel - libvirt List Archives

Plans for the next release
by Jiri Denemark 21 Jul '23

21 Jul '23

We are getting close to the next release of libvirt. To aim for the release on Aug 01 I suggest entering the freeze on Wednesday Jul 26 and tagging RC2 on Friday Jul 28. I hope this works for everyone. Jirka

1 0

[PATCH RFC 0/4] rely on QEMU provided macros for some QEMU feature selection
by Daniel P. Berrangé 20 Jul '23

20 Jul '23

We currently have various features in the RPMs selected based on what the QEMU RPM has built. If the QEMU RPM changes, then libvirt needs to change to match which is an undesirable situation. Forthcoming upstream QEMU changes will involve corresponding Fedora downstream changes. eg removal of i386 host support for system emulators. I would like to make it so that we don't change libvirt RPM spec when these changes happen, merely rebuild libvirt and it "does the right thing". To that end I've proposed some QEMU macros for Fedora: https://src.fedoraproject.org/rpms/qemu/pull-request/43 with intention they would also go into future RHEL-10. This series illustrates what libvirt RPM spec changes would be to adapt to this. I'm not proposing to merge this libvirt series. Rather looking for whether I've missed anything in the design from te QEMU side that could be done better for libvirt. Daniel P. Berrangé (4): rpm: boilerplate to pull in qemu-srpm-macros rpm: use %{qemu_sysemu_host_arches} rpm: use %{qemu_sysemu_kvm_arches} rpm: use %{qemu_sysemu_tcg_non_native} libvirt.spec.in | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) -- 2.41.0

1 4

[PATCH] storage: zfs: Use 'zfs list' to check pool status
by Matt Low 20 Jul '23

20 Jul '23

The current virtStorageBackendZFSCheckPool checks for the existence of a path under /dev/zvol/ to determine if the pool is active. ZFS does not create a path under /dev/zvol/ if no ZFS volumes have been created under a particular dataset, thus, empty ZFS storage pools are deactivated whenever checkPool is called on them (as noted in referenced issue). This commit changes virStorageBackendZFSCheckPool so that the 'zfs list' command is used to explicitly check for the existence a dataset specified by the pool's def->source.name. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/221 Signed-off-by: Matt Low <matt(a)mlow.ca> --- src/storage/storage_backend_zfs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 2a5d74357d..4e243a738a 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -85,10 +85,24 @@ virStorageBackendZFSCheckPool(virStoragePoolObj *pool G_GNUC_UNUSED, bool *isActive) { virStoragePoolDef *def = virStoragePoolObjGetDef(pool); - g_autofree char *devpath = NULL; + g_autoptr(virCommand) cmd = NULL; + int exit_code = -1; + + /* Check for an existing dataset of type 'filesystem' by the name of our + * pool->source.name. */ + cmd = virCommandNewArgList(ZFS, + "list", "-H", + "-t", "filesystem", + "-o", "name", + def->source.name, + NULL); + + + if (virCommandRun(cmd, &exit_code) < 0) + return -1; - devpath = g_strdup_printf("/dev/zvol/%s", def->source.name); - *isActive = virFileIsDir(devpath); + /* zfs list exits with 0 if the dataset exists, 1 if it doesn't */ + *isActive = exit_code == 0; return 0; } -- 2.39.2

3 2

[PATCH Libvirt v2 0/3] support discard and write-zeroes options for virtio-blk device
by ~hyman 20 Jul '23

20 Jul '23

v2: This version made some modifications. (include suggestion of Jonathon) - rebase on master - assume QEMU support discard and write-zeroes and drop the capability introduction and probe - add validation for options, only allowing attributes be configured for VIRTIO bus - enrich the test case - update NEWS Thanks Jonathon for pointing out the redundant commit in time. Please review! Yong DISCARD and WRITE_ZEROES commands has been implemented in virtio-blk protocol since qemu >= 4.2.0, may be it's time to introduce discard and write-zeroes options for virtio-blk device in libvirt so that the upper layer can enable this feature at disk granularity. To distinguish the discard option in block drive layer, use the 'virtio' prefix to indicate that these attributes are specific for virtio-blk disk. To try this out, three things has done in this patchset: 1. introduce capabilities of discard and write-zeroes for virtio-blk 2. add virtio_discard and virtio_write_zeroes attributes of driver in disk xml element 3. generate cmd line when launching vm Hyman Huang(黄勇) (3): conf: Add 'virtio_discard' and 'virtio_write_zeroes' attributes qemu_command: Generate cmd line for discard and write-zeroes properties NEWS: Mention support for discard and write_zeroes of virtio-blk device NEWS.rst | 8 +++ docs/formatdomain.rst | 8 +++ src/conf/domain_conf.c | 16 +++++ src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 10 ++++ src/conf/storage_source_conf.c | 2 + src/conf/storage_source_conf.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_validate.c | 9 +++ src/vz/vz_utils.c | 12 ++++ .../disk-virtio-discard.x86_64-latest.args | 45 ++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 45 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-virtio-discard.x86_64-latest.xml | 58 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-discard.x86_64-latest.xml -- 2.38.5

3 7

[libvirt PATCH 0/4] Introduce new Metadata fields for Network object with corresponding APIs
by K Shiva Kiran 20 Jul '23

20 Jul '23

This commit introduces <title> and <description> fields to the XML schema of the Network object. It also adds public Get/Set APIs for modifying all metadata fields of the same, along with a test program. K Shiva Kiran (4): Add <title> and <description> for Network Objects Adding Public Get and Set APIs for Network Metadata Add virNetworkObj Get and Set Methods for Metadata Add Test driver and testcase for Network Metadata change APIs docs/formatnetwork.rst | 11 + include/libvirt/libvirt-network.h | 29 +++ include/libvirt/virterror.h | 1 + src/conf/network_conf.c | 21 ++ src/conf/network_conf.h | 2 + src/conf/schemas/basictypes.rng | 15 ++ src/conf/schemas/domaincommon.rng | 15 -- src/conf/schemas/network.rng | 10 + src/conf/virnetworkobj.c | 325 ++++++++++++++++++++++++++++++ src/conf/virnetworkobj.h | 17 ++ src/driver-network.h | 16 ++ src/libvirt-network.c | 167 +++++++++++++++ src/libvirt_public.syms | 6 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 36 +++- src/remote_protocol-structs | 19 ++ src/test/test_driver.c | 67 ++++++ src/util/virerror.c | 3 + tests/meson.build | 1 + tests/networkmetadatatest.c | 297 +++++++++++++++++++++++++++ 20 files changed, 1044 insertions(+), 16 deletions(-) create mode 100644 tests/networkmetadatatest.c -- 2.41.0

2 11

[libvirt PATCH v2 3/4] Add virNetworkObj Get and Set Methods for Metadata
by K Shiva Kiran 20 Jul '23

20 Jul '23

- Introduces virNetworkObjGetMetadata() and virNetworkObjSetMetadata(). - These functions implement common behaviour that can be reused by network drivers that use the virNetworkObj struct. - Introduces virNetworkObjUpdateModificationImpact() among other helper functions that resolve the live/persistent state of the network before setting metadata. - Replace redundant flag resolving code with the forementioned function in bridge_driver.c and test_driver.c - Eliminates redundant call of virNetworkObjSetDefTransient() in virNetworkConfigChangeSetup(). Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- src/conf/virnetworkobj.c | 329 ++++++++++++++++++++++++++++++++++-- src/conf/virnetworkobj.h | 21 +++ src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 14 +- src/test/test_driver.c | 16 +- 5 files changed, 345 insertions(+), 36 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index b8b86da06f..20ee8eb58a 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -725,7 +725,6 @@ virNetworkObjReplacePersistentDef(virNetworkObj *obj, */ static int virNetworkObjConfigChangeSetup(virNetworkObj *obj, - virNetworkXMLOption *xmlopt, unsigned int flags) { bool isActive; @@ -738,17 +737,10 @@ virNetworkObjConfigChangeSetup(virNetworkObj *obj, return -1; } - if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { - if (!obj->persistent) { + if ((flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) && + !obj->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient network")); - return -1; - } - /* this should already have been done by the driver, but do it - * anyway just in case. - */ - if (isActive && (virNetworkObjSetDefTransient(obj, false, xmlopt) < 0)) + _("cannot change persistent config of a transient network")); return -1; } @@ -1187,7 +1179,7 @@ virNetworkObjUpdate(virNetworkObj *obj, g_autoptr(virNetworkDef) configdef = NULL; /* normalize config data, and check for common invalid requests. */ - if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0) + if (virNetworkObjConfigChangeSetup(obj, flags) < 0) return -1; if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { @@ -1822,3 +1814,316 @@ virNetworkObjLoadAllPorts(virNetworkObj *net, return 0; } + + +/** + * virNetworkObjUpdateModificationImpact: + * + * @obj: network object + * @flags: flags to update the modification impact on + * + * Resolves virNetworkUpdateFlags in @flags so that they correctly + * apply to the actual state of @obj. @flags may be modified after call to this + * function. + * + * Returns 0 on success if @flags point to a valid combination for @obj or -1 on + * error. + */ +int +virNetworkObjUpdateModificationImpact(virNetworkObj *obj, + unsigned int *flags) +{ + bool isActive = virNetworkObjIsActive(obj); + + if ((*flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == + VIR_NETWORK_UPDATE_AFFECT_CURRENT) { + if (isActive) + *flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; + else + *flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + } + + if (virNetworkObjConfigChangeSetup(obj, *flags) < 0) + return -1; + + return 0; +} + + +/** + * virNetworkObjGetDefs: + * + * @net: network object + * @flags: for virNetworkUpdateFlags + * @liveDef: Set the pointer to the live definition of @net. + * @persDef: Set the pointer to the config definition of @net. + * + * Helper function to resolve @flags and retrieve correct network pointer + * objects. This function should be used only when the network driver + * creates net->newDef once the network has started. + * + * If @liveDef or @persDef are set it implies that @flags request modification + * thereof. + * + * Returns 0 on success and sets @liveDef and @persDef; -1 if @flags are + * inappropriate. + */ +static int +virNetworkObjGetDefs(virNetworkObj *net, + unsigned int flags, + virNetworkDef **liveDef, + virNetworkDef **persDef) +{ + if (liveDef) + *liveDef = NULL; + + if (persDef) + *persDef = NULL; + + if (virNetworkObjUpdateModificationImpact(net, &flags) < 0) + return -1; + + if (virNetworkObjIsActive(net)) { + if (liveDef && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) + *liveDef = net->def; + + if (persDef && (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG)) + *persDef = net->newDef; + } else { + if (persDef) + *persDef = net->def; + } + + return 0; +} + + +/** + * virNetworkObjGetOneDefState: + * + * @net: Network object + * @flags: for virNetworkUpdateFlags + * @live: set to true if live config was returned (may be omitted) + * + * Helper function to resolve @flags and return the correct network pointer + * object. This function returns one of @net->def or @net->persistentDef + * according to @flags. @live is set to true if the live net config will be + * returned. This helper should be used only in APIs that guarantee + * that @flags contains exactly one of VIR_NETWORK_UPDATE_AFFECT_LIVE or + * VIR_NETWORK_UPDATE_AFFECT_CONFIG and not both. + * + * Returns the correct definition pointer or NULL on error. + */ +static virNetworkDef * +virNetworkObjGetOneDefState(virNetworkObj *net, + unsigned int flags, + bool *live) +{ + if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE && + flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { + virReportInvalidArg(flags, "%s", + _("Flags 'VIR_NETWORK_UPDATE_AFFECT_LIVE' and 'VIR_NETWORK_UPDATE_AFFECT_CONFIG' are mutually exclusive")); + return NULL; + } + + if (virNetworkObjUpdateModificationImpact(net, &flags) < 0) + return NULL; + + if (live) + *live = flags & VIR_NETWORK_UPDATE_AFFECT_LIVE; + + if (virNetworkObjIsActive(net) && flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) + return net->newDef; + + return net->def; +} + + +/** + * virNetworkObjGetOneDef: + * + * @net: Network object + * @flags: for virNetworkUpdateFlags + * + * Helper function to resolve @flags and return the correct network pointer + * object. This function returns one of @net->def or @net->persistentDef + * according to @flags. This helper should be used only in APIs that guarantee + * that @flags contains exactly one of VIR_NETWORK_UPDATE_AFFECT_LIVE or + * VIR_NETWORK_UPDATE_AFFECT_CONFIG and not both. + * + * Returns the correct definition pointer or NULL on error. + */ +static virNetworkDef * +virNetworkObjGetOneDef(virNetworkObj *net, + unsigned int flags) +{ + return virNetworkObjGetOneDefState(net, flags, NULL); +} + + +char * +virNetworkObjGetMetadata(virNetworkObj *net, + int type, + const char *uri, + unsigned int flags) +{ + virNetworkDef *def; + char *ret = NULL; + + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | + VIR_NETWORK_UPDATE_AFFECT_CONFIG, NULL); + + if (type >= VIR_NETWORK_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%1$d'"), type); + return NULL; + } + + if (!(def = virNetworkObjGetOneDef(net, flags))) + return NULL; + + switch ((virNetworkMetadataType) type) { + case VIR_NETWORK_METADATA_DESCRIPTION: + ret = g_strdup(def->description); + break; + + case VIR_NETWORK_METADATA_TITLE: + ret = g_strdup(def->title); + break; + + case VIR_NETWORK_METADATA_ELEMENT: + if (!def->metadata) + break; + + if (virXMLExtractNamespaceXML(def->metadata, uri, &ret) < 0) + return NULL; + break; + + case VIR_NETWORK_METADATA_LAST: + break; + } + + if (!ret) + virReportError(VIR_ERR_NO_NETWORK_METADATA, "%s", + _("Requested metadata element is not present")); + + return ret; +} + + +static int +virNetworkDefSetMetadata(virNetworkDef *def, + int type, + const char *metadata, + const char *key, + const char *uri) +{ + g_autoptr(xmlDoc) doc = NULL; + xmlNodePtr old; + g_autoptr(xmlNode) new = NULL; + + if (type >= VIR_NETWORK_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%1$d'"), type); + return -1; + } + + switch ((virNetworkMetadataType) type) { + case VIR_NETWORK_METADATA_DESCRIPTION: + g_clear_pointer(&def->description, g_free); + + if (STRNEQ_NULLABLE(metadata, "")) + def->description = g_strdup(metadata); + break; + + case VIR_NETWORK_METADATA_TITLE: + g_clear_pointer(&def->title, g_free); + + if (STRNEQ_NULLABLE(metadata, "")) + def->title = g_strdup(metadata); + break; + + case VIR_NETWORK_METADATA_ELEMENT: + if (metadata) { + + /* parse and modify the xml from the user */ + if (!(doc = virXMLParseStringCtxt(metadata, _("(metadata_xml)"), NULL))) + return -1; + + if (virXMLInjectNamespace(doc->children, uri, key) < 0) + return -1; + + /* create the root node if needed */ + if (!def->metadata) + def->metadata = virXMLNewNode(NULL, "metadata"); + + if (!(new = xmlCopyNode(doc->children, 1))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to copy XML node")); + return -1; + } + } + + /* remove possible other nodes sharing the namespace */ + while ((old = virXMLFindChildNodeByNs(def->metadata, uri))) { + xmlUnlinkNode(old); + xmlFreeNode(old); + } + + if (new) { + if (!(xmlAddChild(def->metadata, new))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add metadata to XML document")); + return -1; + } + new = NULL; + } + break; + + case VIR_NETWORK_METADATA_LAST: + break; + } + + return 0; +} + + +int +virNetworkObjSetMetadata(virNetworkObj *net, + int type, + const char *metadata, + const char *key, + const char *uri, + virNetworkXMLOption *xmlopt, + const char *stateDir, + const char *configDir, + unsigned int flags) +{ + virNetworkDef *def; + virNetworkDef *persistentDef; + + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | + VIR_NETWORK_UPDATE_AFFECT_CONFIG, -1); + + if (virNetworkObjGetDefs(net, flags, &def, &persistentDef) < 0) + return -1; + + if (def) { + if (virNetworkDefSetMetadata(def, type, metadata, key, uri) < 0) + return -1; + + if (virNetworkObjSaveStatus(stateDir, net, xmlopt) < 0) + return -1; + } + + if (persistentDef) { + if (virNetworkDefSetMetadata(persistentDef, type, metadata, key, + uri) < 0) + return -1; + + if (virNetworkSaveConfig(configDir, persistentDef, xmlopt) < 0) + return -1; + } + + return 0; +} diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 7d34fa3204..d3847d3422 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -258,3 +258,24 @@ virNetworkObjListNumOfNetworks(virNetworkObjList *nets, void virNetworkObjListPrune(virNetworkObjList *nets, unsigned int flags); + +int +virNetworkObjUpdateModificationImpact(virNetworkObj *obj, + unsigned int *flags); + +char * +virNetworkObjGetMetadata(virNetworkObj *network, + int type, + const char *uri, + unsigned int flags); + +int +virNetworkObjSetMetadata(virNetworkObj *network, + int type, + const char *metadata, + const char *key, + const char *uri, + virNetworkXMLOption *xmlopt, + const char *stateDir, + const char *configDir, + unsigned int flags); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb7ad9c855..c392bfd65a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1326,6 +1326,7 @@ virNetworkObjUnrefMacMap; virNetworkObjUnsetDefTransient; virNetworkObjUpdate; virNetworkObjUpdateAssignDef; +virNetworkObjUpdateModificationImpact; # conf/virnetworkportdef.h diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9eb543a0a3..e776d86c73 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3210,18 +3210,10 @@ networkUpdate(virNetworkPtr net, } } - /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network - * is active, else change CONFIG - */ + if (virNetworkObjUpdateModificationImpact(obj, &flags) < 0) + goto cleanup; + isActive = virNetworkObjIsActive(obj); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | - VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == - VIR_NETWORK_UPDATE_AFFECT_CURRENT) { - if (isActive) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - else - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - } if (isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { /* Take care of anything that must be done before updating the diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e7fce053b4..4c1df77f8b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5658,7 +5658,7 @@ testNetworkUpdate(virNetworkPtr net, { testDriver *privconn = net->conn->privateData; virNetworkObj *obj = NULL; - int isActive, ret = -1; + int ret = -1; virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG, @@ -5667,18 +5667,8 @@ testNetworkUpdate(virNetworkPtr net, if (!(obj = testNetworkObjFindByUUID(privconn, net->uuid))) goto cleanup; - /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network - * is active, else change CONFIG - */ - isActive = virNetworkObjIsActive(obj); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE - | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == - VIR_NETWORK_UPDATE_AFFECT_CURRENT) { - if (isActive) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - else - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - } + if (virNetworkObjUpdateModificationImpact(obj, &flags) < 0) + goto cleanup; /* update the network config in memory/on disk */ if (virNetworkObjUpdate(obj, command, section, -- 2.41.0

1 1

[PATCH] node_device: Don't leak error message buffer from virMdevctlListDefined|Active
by Peter Krempa 20 Jul '23

20 Jul '23

nodeDeviceUpdateMediatedDevices invokes virMdevctlListDefined and virMdevctlListActive both of which were passed the same 'errmsg' buffer. Since virCommandSetErrorBuffer() always allocates the error buffer one of them was leaked. Fix it by populating the 'errmsg' buffer only on failure of virMdevctlListActive|Defined which invoke the command. Add a comment to nodeDeviceGetMdevctlListCommand reminding how virCommandSetErrorBuffer() works. Fixes: 44a0f2f0c8f Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/node_device/node_device_driver.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a2d0600560..f8fae71194 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1044,6 +1044,15 @@ virMdevctlSetAutostart(virNodeDeviceDef *def, bool autostart, char **errmsg) } +/** + * nodeDeviceGetMdevctlListCommand: + * @defined: list mdevctl entries with persistent config + * @output: filled with the output of mdevctl once invoked + * @errmsg: always allocated, optionally filled with error from 'mdevctl' + * + * Prepares a virCommand structure to invoke 'mdevctl' caller is responsible to + * free the buffers which are filled by the virCommand infrastructure. + */ virCommand* nodeDeviceGetMdevctlListCommand(bool defined, char **output, @@ -1623,9 +1632,11 @@ virMdevctlListDefined(virNodeDeviceDef ***devs, char **errmsg) { int status; g_autofree char *output = NULL; - g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, errmsg); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, &errbuf); if (virCommandRun(cmd, &status) < 0 || status != 0) { + *errmsg = g_steal_pointer(&errbuf); return -1; } @@ -1641,9 +1652,11 @@ virMdevctlListActive(virNodeDeviceDef ***devs, char **errmsg) { int status; g_autofree char *output = NULL; - g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, errmsg); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, &errbuf); if (virCommandRun(cmd, &status) < 0 || status != 0) { + *errmsg = g_steal_pointer(&errbuf); return -1; } -- 2.41.0

2 1

[PATCH] qemu: Adapt to new way of specifying PC speaker
by Michal Privoznik 19 Jul '23

19 Jul '23

Historically, the way to set PC speaker for a guest was to pass: -soundhw pcspk but as of QEMU commit v5.1.0-rc0~28^2~3 this is deprecated and we should use: -machine pcspk-audiodev=$id instead. The old way was then removed in commit v7.1.0-rc0~99^2~3. Now, ideally we would have a capability selecting whether we talk to a QEMU that understands the new way or not. But it's not that simple - the machine attribute is just an alias to the .audiodev= attribute of 'isa-pcspk' object and both are created in pc_machine_initfn() function, i.e. not then the PC_MACHINE() class is initialized, but when it's instantiated. IOW, it's not possible for us to query whether we're dealing with older or newer QEMU. But given that the newer version is supported since v5.1.0 and the minimal version we require is v4.2.0 (i.e. there are two releases which don't understand the newer cmd line) and how frequently this feature is (un-)used (the issue was reported after ~1 year since it stopped working), I believe we can live without any capability and just use the newer cmd line unconditionally. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/490 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 57 ++++++++++++------- .../sound-device.x86_64-4.2.0.args | 3 +- .../sound-device.x86_64-latest.args | 3 +- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a19902988c..3b0b162b8b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4477,31 +4477,30 @@ qemuBuildSoundCommandLine(virCommand *cmd, for (i = 0; i < def->nsounds; i++) { virDomainSoundDef *sound = def->sounds[i]; - /* Sadly pcspk device doesn't use -device syntax. Fortunately - * we don't need to set any PCI address on it, so we don't - * mind too much */ - if (sound->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) { - virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); - } else { - if (qemuCommandAddExtDevice(cmd, &sound->info, def, qemuCaps) < 0) - return -1; + /* Sadly pcspk device doesn't use -device syntax. And it + * was handled already in qemuBuildMachineCommandLine(). + */ + if (sound->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) + continue; - if (qemuBuildSoundDevCmd(cmd, def, sound, qemuCaps) < 0) - return -1; + if (qemuCommandAddExtDevice(cmd, &sound->info, def, qemuCaps) < 0) + return -1; - if (virDomainSoundModelSupportsCodecs(sound)) { - for (j = 0; j < sound->ncodecs; j++) { - if (qemuBuildSoundCodecCmd(cmd, def, sound, sound->codecs[j], - qemuCaps) < 0) - return -1; - } + if (qemuBuildSoundDevCmd(cmd, def, sound, qemuCaps) < 0) + return -1; - if (j == 0) { - virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 }; + if (virDomainSoundModelSupportsCodecs(sound)) { + for (j = 0; j < sound->ncodecs; j++) { + if (qemuBuildSoundCodecCmd(cmd, def, sound, sound->codecs[j], + qemuCaps) < 0) + return -1; + } - if (qemuBuildSoundCodecCmd(cmd, def, sound, &codec, qemuCaps) < 0) - return -1; - } + if (j == 0) { + virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 }; + + if (qemuBuildSoundCodecCmd(cmd, def, sound, &codec, qemuCaps) < 0) + return -1; } } } @@ -7029,6 +7028,22 @@ qemuBuildMachineCommandLine(virCommand *cmd, } } + /* PC speaker is a bit different than the rest of sound cards + * which is handled in qemuBuildSoundCommandLine(). */ + for (i = 0; i < def->nsounds; i++) { + const virDomainSoundDef *sound = def->sounds[i]; + g_autofree char *audioid = NULL; + + if (sound->model != VIR_DOMAIN_SOUND_MODEL_PCSPK) + continue; + + if (!(audioid = qemuGetAudioIDString(def, sound->audioId))) + return -1; + + virBufferAsprintf(&buf, ",pcspk-audiodev=%s", audioid); + break; + } + qemuBuildMachineACPI(&buf, def, qemuCaps); virCommandAddArgBuffer(cmd, &buf); diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args index b2a5afd8c8..1e3cc9eaa2 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,pcspk-audiodev=audio1 \ -accel tcg \ -cpu qemu64 \ -m 214 \ @@ -28,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --soundhw pcspk \ -device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \ -device sb16,id=sound2,audiodev=audio1 \ -device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args index e0a2f21b31..7c90c1271c 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pcspk-audiodev=audio1,acpi=off \ -accel tcg \ -cpu qemu64 \ -m 214 \ @@ -28,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --soundhw pcspk \ -device '{"driver":"ES1370","id":"sound1","audiodev":"audio1","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"sb16","id":"sound2","audiodev":"audio1"}' \ -device '{"driver":"AC97","id":"sound3","audiodev":"audio1","bus":"pci.0","addr":"0x3"}' \ -- 2.39.3

3 2

[PATCH 0/2] Improve running test suite under valgrind
by Michal Privoznik 19 Jul '23

19 Jul '23

*** BLURB HERE *** Michal Prívozník (2): meson: Annotate each test() with 'suite' tests: Refresh valgrind suppressions docs/advanced-tests.rst | 2 +- docs/html/meson.build | 1 + docs/meson.build | 1 + src/access/meson.build | 1 + src/meson.build | 10 +++ tests/.valgrind.supp | 188 +++++++++------------------------------- tests/meson.build | 11 ++- 7 files changed, 64 insertions(+), 150 deletions(-) -- 2.41.0

3 6

[PATCH] qemu: Retire QEMU_CAPS_USB_STORAGE_REMOVABLE
by Michal Privoznik 19 Jul '23

19 Jul '23

Introduced in QEMU commit of v0.14.0-rc0~83^2~1 and not being able to compile the .removable attribute of the "usb-storage" object out, renders our corresponding capability QEMU_CAPS_USB_STORAGE_REMOVABLE useless. Retire it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 9 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_validate.c | 8 - .../caps_4.2.0_aarch64.replies | 195 ++++---------- .../caps_4.2.0_aarch64.xml | 1 - .../caps_4.2.0_ppc64.replies | 179 +++--------- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - .../caps_4.2.0_x86_64.replies | 211 +++++---------- .../caps_4.2.0_x86_64.xml | 1 - .../caps_5.0.0_aarch64.replies | 211 ++++----------- .../caps_5.0.0_aarch64.xml | 1 - .../caps_5.0.0_ppc64.replies | 203 ++++---------- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - .../caps_5.0.0_riscv64.replies | 191 +++---------- .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.0.0_x86_64.replies | 227 +++++----------- .../caps_5.0.0_x86_64.xml | 1 - .../caps_5.1.0_x86_64.replies | 231 +++++----------- .../caps_5.1.0_x86_64.xml | 1 - .../caps_5.2.0_aarch64.replies | 219 ++++----------- .../caps_5.2.0_aarch64.xml | 1 - .../caps_5.2.0_ppc64.replies | 207 ++++---------- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - .../caps_5.2.0_riscv64.replies | 195 +++----------- .../caps_5.2.0_riscv64.xml | 1 - .../caps_5.2.0_x86_64.replies | 235 +++++----------- .../caps_5.2.0_x86_64.xml | 1 - .../caps_6.0.0_aarch64.replies | 217 ++++----------- .../caps_6.0.0_aarch64.xml | 1 - .../caps_6.0.0_x86_64.replies | 233 +++++----------- .../caps_6.0.0_x86_64.xml | 1 - .../caps_6.1.0_x86_64.replies | 239 +++++----------- .../caps_6.1.0_x86_64.xml | 1 - .../caps_6.2.0_aarch64.replies | 223 ++++----------- .../caps_6.2.0_aarch64.xml | 1 - .../caps_6.2.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - .../caps_6.2.0_x86_64.replies | 243 +++++------------ .../caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.replies | 227 ++++------------ .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.replies | 227 ++++------------ .../caps_7.0.0_aarch64.xml | 1 - .../caps_7.0.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - .../caps_7.0.0_x86_64.replies | 243 +++++------------ .../caps_7.0.0_x86_64.xml | 1 - .../caps_7.1.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - .../caps_7.1.0_x86_64.replies | 243 +++++------------ .../caps_7.1.0_x86_64.xml | 1 - .../caps_7.2.0_ppc.replies | 211 +++------------ tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - .../caps_7.2.0_x86_64+hvf.replies | 255 +++++------------- .../caps_7.2.0_x86_64+hvf.xml | 1 - .../caps_7.2.0_x86_64.replies | 255 +++++------------- .../caps_7.2.0_x86_64.xml | 1 - .../caps_8.0.0_riscv64.replies | 207 +++----------- .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.replies | 255 +++++------------- .../caps_8.0.0_x86_64.xml | 1 - .../caps_8.1.0_x86_64.replies | 255 +++++------------- .../caps_8.1.0_x86_64.xml | 1 - 64 files changed, 1704 insertions(+), 5025 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7dad7231ee..26adb38844 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -280,7 +280,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */ "q35-pci-hole64-size", /* X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE */ "usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */ - "usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */ + "usb-storage.removable", /* X_QEMU_CAPS_USB_STORAGE_REMOVABLE */ /* 155 */ "virtio-mmio", /* QEMU_CAPS_DEVICE_VIRTIO_MMIO */ @@ -1467,10 +1467,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { { "filter", QEMU_CAPS_USB_REDIR_FILTER, NULL }, }; -static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = { - { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, -}; - static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = { { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY, NULL }, }; @@ -1618,9 +1614,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "usb-redir", virQEMUCapsDevicePropsUSBRedir, G_N_ELEMENTS(virQEMUCapsDevicePropsUSBRedir), QEMU_CAPS_USB_REDIR }, - { "usb-storage", virQEMUCapsDevicePropsUSBStorage, - G_N_ELEMENTS(virQEMUCapsDevicePropsUSBStorage), - QEMU_CAPS_DEVICE_USB_STORAGE }, { "kvm-pit", virQEMUCapsDevicePropsKVMPit, G_N_ELEMENTS(virQEMUCapsDevicePropsKVMPit), -1 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ce545cb2cc..a90988405b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -258,7 +258,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ + X_QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ /* 155 */ QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cde6ab4dde..550cb0aebf 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1840,12 +1840,10 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_USB: driver = "usb-storage"; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) - removable = VIR_TRISTATE_SWITCH_OFF; - else - removable = disk->removable; - } + if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) + removable = VIR_TRISTATE_SWITCH_OFF; + else + removable = disk->removable; break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a53729d349..e1939322ea 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2997,14 +2997,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, return -1; } - if (disk->removable != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support setting the " - "removable flag of USB storage devices")); - return -1; - } - break; case VIR_DOMAIN_DISK_BUS_XEN: diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies index f8619d8843..896ff981d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies @@ -17727,107 +17727,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "serial", - "type": "str" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17839,7 +17748,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17925,7 +17834,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17933,7 +17842,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17984,7 +17893,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17992,7 +17901,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18166,7 +18075,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18174,7 +18083,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18235,7 +18144,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18243,11 +18152,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18259,7 +18168,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18433,7 +18342,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18441,11 +18350,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18457,7 +18366,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18523,7 +18432,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18531,7 +18440,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18633,7 +18542,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18641,7 +18550,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18730,7 +18639,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18738,7 +18647,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18809,7 +18718,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18817,7 +18726,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18882,7 +18791,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18890,7 +18799,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18954,7 +18863,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18962,7 +18871,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19149,12 +19058,12 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19712,7 +19621,7 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19720,7 +19629,7 @@ "arguments": { "typename": "virt-4.2-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19873,7 +19782,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19881,7 +19790,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19986,12 +19895,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20182,34 +20091,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21377,12 +21286,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21460,12 +21369,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21481,7 +21390,7 @@ "kernel": false } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21492,7 +21401,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21522,7 +21431,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21537,7 +21446,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -21567,7 +21476,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml index 6a7f33e3c6..0c5e917658 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies index e31c49f24d..cbaa9a02a1 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies @@ -17156,107 +17156,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "serial", - "type": "str" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17268,7 +17177,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17350,7 +17259,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17358,7 +17267,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17405,7 +17314,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17413,7 +17322,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17578,7 +17487,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17586,7 +17495,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17642,7 +17551,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17650,11 +17559,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17666,7 +17575,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17831,7 +17740,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17839,11 +17748,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17855,7 +17764,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17916,7 +17825,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17924,7 +17833,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17990,7 +17899,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17998,7 +17907,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18100,7 +18009,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18108,7 +18017,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18197,7 +18106,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18205,7 +18114,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18270,7 +18179,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18278,7 +18187,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18342,12 +18251,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18609,7 +18518,7 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18617,7 +18526,7 @@ "arguments": { "typename": "pseries-4.2-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18816,7 +18725,7 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18824,7 +18733,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18929,12 +18838,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21130,34 +21039,34 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22296,12 +22205,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22379,7 +22288,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml index 2064f07c9c..c7b35dd1d6 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -38,7 +38,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies index a45fd2f669..cf33d049af 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies @@ -17071,103 +17071,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17181,7 +17090,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17189,7 +17098,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17275,7 +17184,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17283,7 +17192,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17334,7 +17243,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17342,7 +17251,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17445,7 +17354,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17453,7 +17362,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17637,7 +17546,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17645,7 +17554,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17716,7 +17625,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17724,7 +17633,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17824,7 +17733,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17832,7 +17741,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18006,7 +17915,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18014,11 +17923,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18030,7 +17939,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18096,7 +18005,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18104,7 +18013,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18152,7 +18061,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18160,7 +18069,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18207,7 +18116,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18215,7 +18124,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18249,7 +18158,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18257,7 +18166,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18359,7 +18268,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18367,7 +18276,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18456,7 +18365,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18464,7 +18373,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18535,7 +18444,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18543,7 +18452,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18608,7 +18517,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18616,7 +18525,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18680,7 +18589,7 @@ "type": "int" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18688,7 +18597,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20242,12 +20151,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20639,7 +20548,7 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20647,7 +20556,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20752,12 +20661,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22140,12 +22049,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22153,12 +22062,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22166,12 +22075,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -23457,12 +23366,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -23540,16 +23449,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -23564,7 +23473,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -23866,7 +23775,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -23880,7 +23789,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -24182,7 +24091,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -24197,7 +24106,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -24499,7 +24408,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index b45d4a6293..c2f9dd8add 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies index e63c9d5f0a..b5a087f449 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies @@ -18881,119 +18881,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19005,7 +18902,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19100,7 +18997,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19108,7 +19005,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19161,7 +19058,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19169,7 +19066,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19375,7 +19272,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19383,7 +19280,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19461,7 +19358,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19469,11 +19366,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19485,7 +19382,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19688,7 +19585,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19696,11 +19593,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19712,7 +19609,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19793,7 +19690,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19801,7 +19698,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19922,7 +19819,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19930,7 +19827,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20024,7 +19921,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20032,7 +19929,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20108,7 +20005,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20116,7 +20013,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20127,7 +20024,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20135,7 +20032,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20205,7 +20102,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20213,7 +20110,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20282,7 +20179,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20290,7 +20187,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20494,12 +20391,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21087,7 +20984,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21095,7 +20992,7 @@ "arguments": { "typename": "virt-5.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21243,7 +21140,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21251,7 +21148,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21341,12 +21238,12 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21542,24 +21439,24 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21567,12 +21464,12 @@ "passthrough", "emulator" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22730,12 +22627,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22813,12 +22710,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22834,7 +22731,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22845,7 +22742,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22876,7 +22773,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22891,7 +22788,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -22922,7 +22819,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml index a2b7214b8a..8e26b07d23 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies index aaf69cab46..f449a21b0b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies @@ -18680,119 +18680,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18804,7 +18701,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18899,7 +18796,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18907,7 +18804,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18960,7 +18857,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18968,7 +18865,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19174,7 +19071,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19182,7 +19079,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19260,7 +19157,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19268,11 +19165,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19284,7 +19181,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19487,7 +19384,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19495,11 +19392,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19511,7 +19408,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19592,7 +19489,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19600,7 +19497,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19681,7 +19578,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19689,7 +19586,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19731,7 +19628,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19739,7 +19636,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19860,7 +19757,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19868,7 +19765,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19962,7 +19859,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19970,7 +19867,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20046,7 +19943,7 @@ "type": "uint16" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20054,7 +19951,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20065,7 +19962,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20073,7 +19970,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20143,7 +20040,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20151,7 +20048,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20220,12 +20117,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20495,7 +20392,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20503,7 +20400,7 @@ "arguments": { "typename": "pseries-5.0-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20712,7 +20609,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20720,7 +20617,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20810,12 +20707,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23021,24 +22918,24 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23046,12 +22943,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24188,12 +24085,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24271,7 +24168,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml index 16333ba499..03a47bf713 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies index 929b2179ae..10e075c9a6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies @@ -16992,119 +16992,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17116,7 +17013,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17211,7 +17108,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17219,7 +17116,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17272,7 +17169,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17280,7 +17177,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17498,7 +17395,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17506,7 +17403,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17596,7 +17493,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17604,11 +17501,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17620,7 +17517,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17823,7 +17720,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17831,11 +17728,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17847,7 +17744,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17928,7 +17825,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17936,7 +17833,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18057,7 +17954,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18065,7 +17962,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18159,7 +18056,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18167,7 +18064,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18243,7 +18140,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18251,7 +18148,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18262,7 +18159,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18270,7 +18167,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18340,7 +18237,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18348,7 +18245,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18417,12 +18314,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18480,7 +18377,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18488,7 +18385,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18578,7 +18475,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18586,7 +18483,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18676,34 +18573,34 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19969,12 +19866,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20052,5 +19949,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml index 09a71875ef..a9f81c0180 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -41,7 +41,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies index 13b9b02e4c..6b026771dc 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies @@ -18169,115 +18169,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18293,7 +18190,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18301,7 +18198,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18396,7 +18293,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18404,7 +18301,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18457,7 +18354,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18465,7 +18362,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18583,7 +18480,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18591,7 +18488,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18809,7 +18706,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18817,7 +18714,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18907,7 +18804,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18915,7 +18812,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19017,7 +18914,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19025,7 +18922,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19228,7 +19125,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19236,11 +19133,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19252,7 +19149,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19333,7 +19230,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19341,7 +19238,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19399,7 +19296,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19407,7 +19304,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19460,7 +19357,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19468,7 +19365,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19510,7 +19407,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19518,7 +19415,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19639,7 +19536,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19647,7 +19544,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19741,7 +19638,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19749,7 +19646,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19825,7 +19722,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19833,7 +19730,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19844,7 +19741,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19852,7 +19749,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19922,7 +19819,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19930,7 +19827,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19999,7 +19896,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20007,7 +19904,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21573,12 +21470,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21954,7 +21851,7 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21962,7 +21859,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22052,12 +21949,12 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -23602,12 +23499,12 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -23615,12 +23512,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -23628,12 +23525,12 @@ "passthrough", "emulator" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24909,12 +24806,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24992,16 +24889,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { - "id": "libvirt-46", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -25016,7 +24913,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25319,7 +25216,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25333,7 +25230,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -25636,7 +25533,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -25651,7 +25548,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -25954,7 +25851,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index 5331cf0113..c84821dd4b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies index d66583fa92..2c815c713f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies @@ -18678,115 +18678,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18802,7 +18699,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18810,7 +18707,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18905,7 +18802,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18913,7 +18810,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18966,7 +18863,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18974,7 +18871,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19092,7 +18989,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19100,7 +18997,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19318,7 +19215,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19326,7 +19223,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19416,7 +19313,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19424,7 +19321,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19526,7 +19423,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19534,7 +19431,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19749,7 +19646,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19757,11 +19654,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19773,7 +19670,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19866,7 +19763,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19874,7 +19771,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19932,7 +19829,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19940,7 +19837,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19993,7 +19890,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20001,7 +19898,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20043,7 +19940,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20051,7 +19948,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20172,7 +20069,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20180,7 +20077,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20278,7 +20175,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20286,7 +20183,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20362,7 +20259,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20370,7 +20267,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20565,7 +20462,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20573,7 +20470,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20584,7 +20481,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20592,7 +20489,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20662,7 +20559,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20670,7 +20567,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20739,7 +20636,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20747,7 +20644,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22333,12 +22230,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22730,7 +22627,7 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22738,7 +22635,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22828,12 +22725,12 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24535,12 +24432,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24548,12 +24445,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24561,12 +24458,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -25861,12 +25758,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -25944,16 +25841,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -25968,7 +25865,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -26276,7 +26173,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -26290,7 +26187,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26598,7 +26495,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26613,7 +26510,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -26921,7 +26818,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index 1c3d3ea2a9..c8ee593131 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies index 8c78533719..60e0887a9e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies @@ -20044,123 +20044,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -20172,7 +20065,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20267,7 +20160,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20275,7 +20168,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20328,7 +20221,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20336,7 +20229,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20547,7 +20440,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20555,7 +20448,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20638,7 +20531,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20646,11 +20539,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20662,7 +20555,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20882,7 +20775,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20890,11 +20783,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20906,7 +20799,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21004,7 +20897,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21012,7 +20905,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21054,7 +20947,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21062,7 +20955,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21183,7 +21076,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21191,7 +21084,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21289,7 +21182,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21297,7 +21190,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21373,7 +21266,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21381,7 +21274,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21392,7 +21285,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21400,7 +21293,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21470,7 +21363,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21478,7 +21371,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21547,7 +21440,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21555,7 +21448,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21764,12 +21657,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22506,7 +22399,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22514,7 +22407,7 @@ "arguments": { "typename": "virt-5.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22677,7 +22570,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22685,7 +22578,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22770,12 +22663,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23009,24 +22902,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23034,12 +22927,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24216,12 +24109,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24299,12 +24192,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24320,7 +24213,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24331,7 +24224,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24363,7 +24256,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24378,7 +24271,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24410,7 +24303,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml index b1c5c21abb..131f31b597 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies index 9a0e5622d9..f012a8c93a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies @@ -19691,123 +19691,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19819,7 +19712,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19914,7 +19807,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19922,7 +19815,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19975,7 +19868,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19983,7 +19876,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20194,7 +20087,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20202,7 +20095,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20285,7 +20178,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20293,11 +20186,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20309,7 +20202,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20529,7 +20422,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20537,11 +20430,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20553,7 +20446,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20651,7 +20544,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20659,7 +20552,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20750,7 +20643,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20758,7 +20651,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20800,7 +20693,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20808,7 +20701,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20929,7 +20822,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20937,7 +20830,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21035,7 +20928,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21043,7 +20936,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21119,7 +21012,7 @@ "type": "uint16" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21127,7 +21020,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21138,7 +21031,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21146,7 +21039,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21216,7 +21109,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21224,7 +21117,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21293,12 +21186,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21618,7 +21511,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21626,7 +21519,7 @@ "arguments": { "typename": "pseries-5.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21830,7 +21723,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21838,7 +21731,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21923,12 +21816,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -24574,24 +24467,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -24599,12 +24492,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25760,12 +25653,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25843,7 +25736,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml index 9db85dafef..c719334258 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies index 19fa83490c..afc22224c0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies @@ -17988,123 +17988,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18116,7 +18009,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18211,7 +18104,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18219,7 +18112,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18272,7 +18165,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18280,7 +18173,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18503,7 +18396,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18511,7 +18404,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18606,7 +18499,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18614,11 +18507,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18630,7 +18523,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18850,7 +18743,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18858,11 +18751,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18874,7 +18767,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18972,7 +18865,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18980,7 +18873,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19101,7 +18994,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19109,7 +19002,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19207,7 +19100,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19215,7 +19108,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19291,7 +19184,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19299,7 +19192,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19310,7 +19203,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19318,7 +19211,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19388,7 +19281,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19396,7 +19289,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19465,12 +19358,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19524,7 +19417,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19532,7 +19425,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19622,7 +19515,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19630,7 +19523,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19715,34 +19608,34 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21027,12 +20920,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21110,5 +21003,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml index 4d03004fa1..fecbf3ef69 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -41,7 +41,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies index f224bd2fee..68e59b073e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies @@ -19225,119 +19225,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19353,7 +19246,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19361,7 +19254,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19456,7 +19349,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19464,7 +19357,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19517,7 +19410,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19525,7 +19418,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19643,7 +19536,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19651,7 +19544,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19874,7 +19767,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19882,7 +19775,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19977,7 +19870,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19985,7 +19878,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20103,7 +19996,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20111,7 +20004,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20331,7 +20224,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20339,11 +20232,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20355,7 +20248,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20453,7 +20346,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20461,7 +20354,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20519,7 +20412,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20527,7 +20420,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20580,7 +20473,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20588,7 +20481,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20630,7 +20523,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20638,7 +20531,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20759,7 +20652,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20767,7 +20660,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20865,7 +20758,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20873,7 +20766,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20949,7 +20842,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20957,7 +20850,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21157,7 +21050,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21165,7 +21058,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21176,7 +21069,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21184,7 +21077,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21254,7 +21147,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21262,7 +21155,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21331,7 +21224,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21339,7 +21232,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22937,12 +22830,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23400,7 +23293,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23408,7 +23301,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -23493,12 +23386,12 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25323,12 +25216,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -25336,12 +25229,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -25349,12 +25242,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -26649,12 +26542,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -26732,16 +26625,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -26756,7 +26649,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -27065,7 +26958,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -27079,7 +26972,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27388,7 +27281,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27403,7 +27296,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -27712,7 +27605,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 654fec58fe..86123439c4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies index ed04553f29..b7ed0ce448 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies @@ -21824,121 +21824,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -21950,7 +21845,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -22055,7 +21950,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -22063,7 +21958,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22126,7 +22021,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22134,7 +22029,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22367,7 +22262,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22375,7 +22270,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -22458,7 +22353,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -22466,11 +22361,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -22482,7 +22377,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -22719,7 +22614,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -22727,11 +22622,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22743,7 +22638,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22841,7 +22736,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22849,7 +22744,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -22891,7 +22786,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -22899,7 +22794,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23030,7 +22925,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23038,7 +22933,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23134,7 +23029,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23142,7 +23037,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23222,7 +23117,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23230,7 +23125,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -23241,7 +23136,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -23249,7 +23144,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -23319,7 +23214,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -23327,7 +23222,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -23396,7 +23291,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -23404,7 +23299,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -23613,12 +23508,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24397,7 +24292,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24405,7 +24300,7 @@ "arguments": { "typename": "virt-6.0-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -24591,7 +24486,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -24599,7 +24494,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -24697,12 +24592,12 @@ "type": "child<container>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -24942,24 +24837,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -24967,12 +24862,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -26169,12 +26064,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -26256,12 +26151,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -26277,7 +26172,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -26288,7 +26183,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -26320,7 +26215,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -26335,7 +26230,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -26367,7 +26262,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml index 6faf407a97..ca69f1b45e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -38,7 +38,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies index d815a91f4c..aac31cca53 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies @@ -20873,117 +20873,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20999,7 +20894,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21007,7 +20902,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21112,7 +21007,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21120,7 +21015,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21183,7 +21078,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21191,7 +21086,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21319,7 +21214,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21327,7 +21222,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21572,7 +21467,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21580,7 +21475,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21675,7 +21570,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21683,7 +21578,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21816,7 +21711,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21824,7 +21719,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22061,7 +21956,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22069,11 +21964,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22085,7 +21980,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22183,7 +22078,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22191,7 +22086,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22249,7 +22144,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22257,7 +22152,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22320,7 +22215,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22328,7 +22223,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22370,7 +22265,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22378,7 +22273,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22509,7 +22404,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22517,7 +22412,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22613,7 +22508,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22621,7 +22516,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22701,7 +22596,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22709,7 +22604,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22931,7 +22826,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22939,7 +22834,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22950,7 +22845,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22958,7 +22853,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23032,7 +22927,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23040,7 +22935,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23109,7 +23004,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23117,7 +23012,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -24763,12 +24658,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25215,7 +25110,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25223,7 +25118,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25321,12 +25216,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27194,12 +27089,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27207,12 +27102,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27220,12 +27115,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -28544,12 +28439,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -28631,12 +28526,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28646,7 +28541,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28657,7 +28552,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -28978,7 +28873,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -28992,7 +28887,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29313,7 +29208,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29328,7 +29223,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -29649,7 +29544,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index b1bf3caecf..53876effa8 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies index e55adfbe66..dd8042dafb 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies @@ -21097,123 +21097,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21229,7 +21118,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21237,7 +21126,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21347,7 +21236,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21355,7 +21244,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21418,7 +21307,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21426,7 +21315,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21554,7 +21443,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21562,7 +21451,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21801,7 +21690,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21809,7 +21698,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21898,7 +21787,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21906,7 +21795,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -22043,7 +21932,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -22051,7 +21940,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22288,7 +22177,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22296,11 +22185,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22312,7 +22201,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22410,7 +22299,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22418,7 +22307,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22476,7 +22365,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22484,7 +22373,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22547,7 +22436,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22555,7 +22444,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22597,7 +22486,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22605,7 +22494,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22741,7 +22630,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22749,7 +22638,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22845,7 +22734,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22853,7 +22742,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22933,7 +22822,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22941,7 +22830,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -23163,7 +23052,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -23171,7 +23060,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -23182,7 +23071,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -23190,7 +23079,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23269,7 +23158,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23277,7 +23166,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23351,7 +23240,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23359,7 +23248,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -25017,12 +24906,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25487,7 +25376,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25495,7 +25384,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25598,12 +25487,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27660,12 +27549,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27673,12 +27562,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27686,12 +27575,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -29023,12 +28912,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -29110,16 +28999,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Failed to open /dev/sev: No such file or directory" @@ -29134,7 +29023,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -29457,7 +29346,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -29471,7 +29360,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29794,7 +29683,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29809,7 +29698,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -30132,7 +30021,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index 13d909e382..667e60b087 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies index 20d176e4b7..0baab2ad15 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies @@ -22637,127 +22637,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -22769,7 +22658,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22879,7 +22768,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22887,7 +22776,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22950,7 +22839,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22958,7 +22847,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -23197,7 +23086,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -23205,7 +23094,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -23294,7 +23183,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -23302,11 +23191,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -23318,7 +23207,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -23555,7 +23444,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -23563,11 +23452,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -23579,7 +23468,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -23677,7 +23566,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -23685,7 +23574,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23727,7 +23616,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23735,7 +23624,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23871,7 +23760,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23879,7 +23768,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23975,7 +23864,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23983,7 +23872,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -24063,7 +23952,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -24071,7 +23960,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -24082,7 +23971,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -24090,7 +23979,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -24165,7 +24054,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -24173,7 +24062,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -24247,7 +24136,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -24255,7 +24144,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24464,12 +24353,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -25313,7 +25202,7 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -25321,7 +25210,7 @@ "arguments": { "typename": "virt-6.2-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -25517,7 +25406,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -25525,7 +25414,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -25628,12 +25517,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -25879,24 +25768,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25904,12 +25793,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27257,12 +27146,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27344,12 +27233,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27365,7 +27254,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27376,7 +27265,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27408,7 +27297,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27423,7 +27312,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -27455,7 +27344,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml index e312801b89..16d8a21081 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies index 0ac9b2cfe2..e58fab36f6 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies @@ -24557,127 +24557,16 @@ "id": "libvirt-16" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -24689,7 +24578,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24799,7 +24688,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24807,7 +24696,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24870,7 +24759,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24878,7 +24767,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25117,7 +25006,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25125,7 +25014,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25214,7 +25103,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25222,11 +25111,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25238,7 +25127,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25475,7 +25364,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25483,11 +25372,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25499,7 +25388,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25597,7 +25486,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25605,7 +25494,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -25701,7 +25590,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -25709,7 +25598,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25751,7 +25640,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25759,7 +25648,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25895,7 +25784,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25903,11 +25792,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -25919,7 +25808,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25999,7 +25888,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26007,7 +25896,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26018,7 +25907,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26026,7 +25915,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26101,7 +25990,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26109,7 +25998,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26183,12 +26072,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26551,7 +26440,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26559,7 +26448,7 @@ "arguments": { "typename": "pseries-6.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26791,7 +26680,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26799,7 +26688,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26902,12 +26791,12 @@ "type": "child<container>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29559,24 +29448,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29584,12 +29473,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30723,12 +30612,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -30810,7 +30699,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index e6b0bc03f4..f25eacd8fb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies index d7da5068b0..d725cba4ed 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies @@ -24274,123 +24274,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24406,7 +24295,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24414,7 +24303,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24524,7 +24413,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24532,7 +24421,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24595,7 +24484,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24603,7 +24492,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -24731,7 +24620,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -24739,7 +24628,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -24978,7 +24867,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -24986,7 +24875,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25075,7 +24964,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25083,7 +24972,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25224,7 +25113,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25232,7 +25121,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25469,7 +25358,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25477,11 +25366,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25493,7 +25382,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25591,7 +25480,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25599,7 +25488,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25657,7 +25546,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25665,7 +25554,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -25728,7 +25617,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -25736,7 +25625,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25778,7 +25667,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25786,7 +25675,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -25922,7 +25811,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -25930,7 +25819,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26026,7 +25915,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26034,7 +25923,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26114,7 +26003,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26122,7 +26011,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26344,7 +26233,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26352,7 +26241,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26363,7 +26252,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26371,7 +26260,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26450,7 +26339,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26458,7 +26347,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -26532,7 +26421,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -26540,7 +26429,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -28280,12 +28169,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -28768,7 +28657,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -28776,7 +28665,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -28879,12 +28768,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -30953,12 +30842,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -30966,12 +30855,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -30979,12 +30868,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -32316,12 +32205,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -32403,16 +32292,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -32421,11 +32310,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -32440,7 +32329,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32773,7 +32662,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32787,7 +32676,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33120,7 +33009,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33135,7 +33024,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33468,7 +33357,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index e1758396b0..8a3c0192b5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies index f2854f9fa6..465bdb890b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies @@ -25915,127 +25915,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26047,7 +25936,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26157,7 +26046,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26165,7 +26054,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26228,7 +26117,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26236,7 +26125,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26475,7 +26364,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26483,7 +26372,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26572,7 +26461,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26580,11 +26469,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26596,7 +26485,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26833,7 +26722,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26841,11 +26730,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26857,7 +26746,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26955,7 +26844,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26963,7 +26852,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27005,7 +26894,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27013,7 +26902,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27149,7 +27038,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27157,7 +27046,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27253,7 +27142,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27261,7 +27150,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27341,7 +27230,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27349,7 +27238,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27576,7 +27465,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27584,7 +27473,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27799,7 +27688,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27807,7 +27696,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27882,7 +27771,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27890,7 +27779,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27964,7 +27853,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27972,7 +27861,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28181,12 +28070,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29056,7 +28945,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29064,7 +28953,7 @@ "arguments": { "typename": "virt-7.0-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29265,7 +29154,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29273,7 +29162,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29376,12 +29265,12 @@ "type": "child<container>" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29627,24 +29516,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -29652,12 +29541,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31009,12 +30898,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31096,12 +30985,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31117,7 +31006,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31128,7 +31017,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31161,7 +31050,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31176,7 +31065,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -31209,7 +31098,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 3517e81d15..13259cce79 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -42,7 +42,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies index b330e842c2..8ff01e05a4 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies @@ -25915,127 +25915,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26047,7 +25936,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26157,7 +26046,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26165,7 +26054,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26228,7 +26117,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26236,7 +26125,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26475,7 +26364,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26483,7 +26372,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26572,7 +26461,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26580,11 +26469,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26596,7 +26485,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26833,7 +26722,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26841,11 +26730,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26857,7 +26746,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26955,7 +26844,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26963,7 +26852,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27005,7 +26894,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27013,7 +26902,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27149,7 +27038,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27157,7 +27046,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27253,7 +27142,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27261,7 +27150,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27341,7 +27230,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27349,7 +27238,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27576,7 +27465,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27584,7 +27473,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27799,7 +27688,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27807,7 +27696,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27882,7 +27771,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27890,7 +27779,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27964,7 +27853,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27972,7 +27861,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28181,12 +28070,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29056,7 +28945,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29064,7 +28953,7 @@ "arguments": { "typename": "virt-7.0-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29265,7 +29154,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29273,7 +29162,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29376,12 +29265,12 @@ "type": "child<container>" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29627,24 +29516,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -29652,12 +29541,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31009,12 +30898,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31096,12 +30985,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31117,7 +31006,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31128,7 +31017,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31161,7 +31050,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31176,7 +31065,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -31209,7 +31098,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml index 58db75d1d7..1f08d3d696 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies index 84d993a581..d2e23d84f8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies @@ -24970,127 +24970,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25102,7 +24991,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25212,7 +25101,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25220,7 +25109,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25283,7 +25172,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25291,7 +25180,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25530,7 +25419,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25538,7 +25427,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25627,7 +25516,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25635,11 +25524,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25651,7 +25540,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25888,7 +25777,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25896,11 +25785,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25912,7 +25801,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26010,7 +25899,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26018,7 +25907,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26114,7 +26003,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26122,7 +26011,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26164,7 +26053,7 @@ "type": "uint64" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26172,7 +26061,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26308,7 +26197,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26316,7 +26205,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26412,7 +26301,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26420,7 +26309,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26500,7 +26389,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26508,7 +26397,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26723,7 +26612,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26731,7 +26620,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26810,7 +26699,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26818,7 +26707,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26892,12 +26781,12 @@ "type": "int" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27269,7 +27158,7 @@ "default-ram-id": "ppc_spapr.ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27277,7 +27166,7 @@ "arguments": { "typename": "pseries-7.0-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27509,7 +27398,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27517,7 +27406,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27620,12 +27509,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30151,24 +30040,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-spapr" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30176,12 +30065,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -31379,12 +31268,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31466,7 +31355,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 40130f180f..49efb98040 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -45,7 +45,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies index a4b1a8490f..58b589dcfa 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies @@ -24590,123 +24590,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24722,7 +24611,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24730,7 +24619,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24840,7 +24729,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24848,7 +24737,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24911,7 +24800,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24919,7 +24808,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25047,7 +24936,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25055,7 +24944,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25294,7 +25183,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25302,7 +25191,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25391,7 +25280,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25399,7 +25288,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25540,7 +25429,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25548,7 +25437,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25785,7 +25674,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25793,11 +25682,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25809,7 +25698,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25907,7 +25796,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25915,7 +25804,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25978,7 +25867,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25986,7 +25875,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26049,7 +25938,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26057,7 +25946,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26099,7 +25988,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26107,7 +25996,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26243,7 +26132,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26251,7 +26140,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26347,7 +26236,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26355,7 +26244,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26435,7 +26324,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26443,7 +26332,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26676,7 +26565,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26684,7 +26573,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26899,7 +26788,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26907,7 +26796,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26986,7 +26875,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26994,7 +26883,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27068,7 +26957,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27076,7 +26965,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -28832,12 +28721,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29338,7 +29227,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29346,7 +29235,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -29449,12 +29338,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -31559,12 +31448,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31572,12 +31461,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31585,12 +31474,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -32926,12 +32815,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -33013,16 +32902,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33031,7 +32920,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -33052,7 +32941,7 @@ } ] }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -33063,7 +32952,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -33400,7 +33289,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -33414,7 +33303,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33751,7 +33640,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33766,7 +33655,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34103,7 +33992,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index b7446435a6..00bf47f46a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies index cf23680766..12ace92630 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies @@ -25678,127 +25678,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25810,7 +25699,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25920,7 +25809,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25928,7 +25817,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25991,7 +25880,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25999,7 +25888,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26238,7 +26127,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26246,7 +26135,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26335,7 +26224,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26343,11 +26232,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26359,7 +26248,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26596,7 +26485,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26604,11 +26493,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26620,7 +26509,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26718,7 +26607,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26726,7 +26615,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26822,7 +26711,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26830,7 +26719,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26872,7 +26761,7 @@ "type": "uint64" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26880,7 +26769,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27016,7 +26905,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27024,7 +26913,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27120,7 +27009,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27128,7 +27017,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27208,7 +27097,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27216,7 +27105,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27431,7 +27320,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27439,7 +27328,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27518,7 +27407,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27526,7 +27415,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27600,12 +27489,12 @@ "type": "int" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27986,7 +27875,7 @@ "default-ram-id": "ppc_spapr.ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27994,7 +27883,7 @@ "arguments": { "typename": "pseries-7.1-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28236,7 +28125,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28244,7 +28133,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28357,12 +28246,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30876,24 +30765,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-spapr" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30901,12 +30790,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -32104,12 +31993,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -32199,7 +32088,7 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 6bc39b85f7..2306703402 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -44,7 +44,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies index 1726cbc5f3..2248247849 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies @@ -25326,123 +25326,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25458,7 +25347,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25466,7 +25355,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25576,7 +25465,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25584,7 +25473,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25647,7 +25536,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25655,7 +25544,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25783,7 +25672,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25791,7 +25680,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26030,7 +25919,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26038,7 +25927,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -26127,7 +26016,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -26135,7 +26024,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26276,7 +26165,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26284,7 +26173,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26521,7 +26410,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26529,11 +26418,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26545,7 +26434,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26643,7 +26532,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26651,7 +26540,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26719,7 +26608,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26727,7 +26616,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26790,7 +26679,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26798,7 +26687,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26840,7 +26729,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26848,7 +26737,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26984,7 +26873,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26992,7 +26881,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27088,7 +26977,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27096,7 +26985,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27176,7 +27065,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27184,7 +27073,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27417,7 +27306,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27425,7 +27314,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27640,7 +27529,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27648,7 +27537,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27727,7 +27616,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27735,7 +27624,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27809,7 +27698,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27817,7 +27706,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29610,12 +29499,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -30134,7 +30023,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -30142,7 +30031,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30255,12 +30144,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -32244,12 +32133,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -32257,12 +32146,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -32270,12 +32159,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -33611,12 +33500,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -33706,16 +33595,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33724,11 +33613,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -33743,7 +33632,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -34081,7 +33970,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -34095,7 +33984,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34433,7 +34322,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34448,7 +34337,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34786,7 +34675,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 6492695705..9edf6a9733 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies index 2df79da5a5..079c9f3d49 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies @@ -26411,139 +26411,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26555,7 +26432,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26665,7 +26542,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26673,7 +26550,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26736,7 +26613,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26744,7 +26621,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26989,7 +26866,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26997,7 +26874,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -27092,7 +26969,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -27100,11 +26977,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -27116,7 +26993,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27359,7 +27236,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27367,11 +27244,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27383,7 +27260,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -27487,7 +27364,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -27495,7 +27372,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27631,7 +27508,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27639,7 +27516,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27735,7 +27612,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27743,7 +27620,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27829,7 +27706,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27837,7 +27714,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -28058,7 +27935,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -28066,7 +27943,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -28150,7 +28027,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -28158,7 +28035,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28237,12 +28114,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28345,7 +28222,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28353,7 +28230,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28466,12 +28343,12 @@ "type": "child<container>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30781,34 +30658,34 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32134,12 +32011,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32229,5 +32106,5 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index f190be552a..e80fd7cc25 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies index 1883926667..d4200b280f 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies @@ -26254,135 +26254,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26398,7 +26275,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26406,7 +26283,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26516,7 +26393,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26524,7 +26401,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26587,7 +26464,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26595,7 +26472,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26723,7 +26600,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26731,7 +26608,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26976,7 +26853,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26984,7 +26861,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27079,7 +26956,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27087,7 +26964,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27228,7 +27105,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27236,7 +27113,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27479,7 +27356,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27487,11 +27364,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27503,7 +27380,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27607,7 +27484,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27615,7 +27492,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27688,7 +27565,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27696,7 +27573,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27759,7 +27636,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27767,7 +27644,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27809,7 +27686,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27817,7 +27694,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27953,7 +27830,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27961,7 +27838,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28057,7 +27934,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28065,7 +27942,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28151,7 +28028,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28159,7 +28036,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28398,7 +28275,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28406,7 +28283,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28627,7 +28504,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28635,7 +28512,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28719,7 +28596,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28727,7 +28604,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28806,7 +28683,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28814,7 +28691,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30607,12 +30484,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31149,7 +31026,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31157,7 +31034,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -31270,12 +31147,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33259,12 +33136,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -33272,12 +33149,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -33285,12 +33162,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -34626,12 +34503,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -34721,16 +34598,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34739,11 +34616,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34758,7 +34635,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35096,7 +34973,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35110,7 +34987,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35448,7 +35325,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35463,7 +35340,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -35801,7 +35678,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index c08a99e734..06ba71e1dd 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -45,7 +45,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies index 6a465f6856..875ecd2c2c 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies @@ -26254,135 +26254,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26398,7 +26275,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26406,7 +26283,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26516,7 +26393,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26524,7 +26401,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26587,7 +26464,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26595,7 +26472,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26723,7 +26600,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26731,7 +26608,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26976,7 +26853,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26984,7 +26861,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27079,7 +26956,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27087,7 +26964,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27228,7 +27105,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27236,7 +27113,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27479,7 +27356,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27487,11 +27364,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27503,7 +27380,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27607,7 +27484,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27615,7 +27492,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27688,7 +27565,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27696,7 +27573,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27759,7 +27636,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27767,7 +27644,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27809,7 +27686,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27817,7 +27694,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27953,7 +27830,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27961,7 +27838,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28057,7 +27934,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28065,7 +27942,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28151,7 +28028,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28159,7 +28036,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28398,7 +28275,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28406,7 +28283,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28627,7 +28504,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28635,7 +28512,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28719,7 +28596,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28727,7 +28604,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28806,7 +28683,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28814,7 +28691,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30607,12 +30484,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31149,7 +31026,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31157,7 +31034,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -31270,12 +31147,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33259,12 +33136,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -33272,12 +33149,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -33285,12 +33162,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -34626,12 +34503,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -34721,16 +34598,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34739,11 +34616,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34758,7 +34635,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35096,7 +34973,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35110,7 +34987,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35448,7 +35325,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35463,7 +35340,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -35801,7 +35678,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 37933c0848..e726c5ca97 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies index f6bebee386..7dbbd90427 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies @@ -25045,139 +25045,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25189,7 +25066,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25299,7 +25176,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25307,7 +25184,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25552,7 +25429,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25560,7 +25437,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25655,7 +25532,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25663,11 +25540,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25679,7 +25556,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25922,7 +25799,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25930,11 +25807,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25946,7 +25823,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26050,7 +25927,7 @@ "type": "guest statistics" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26058,7 +25935,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26194,7 +26071,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26202,11 +26079,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -26218,7 +26095,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26304,7 +26181,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26312,7 +26189,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26533,7 +26410,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26541,7 +26418,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26625,7 +26502,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26633,7 +26510,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26712,12 +26589,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26792,7 +26669,7 @@ "default-ram-id": "riscv_virt_board.ram" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26800,7 +26677,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26933,7 +26810,7 @@ "type": "child<container>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26941,7 +26818,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27054,24 +26931,24 @@ "type": "child<container>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ "tpm-tis" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27079,12 +26956,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28455,12 +28332,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28550,5 +28427,5 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-38" + "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml index 4c5e72ba56..8286806239 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -36,7 +36,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies index 94a36dbbc2..c94a80b7b5 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies @@ -27636,135 +27636,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -27780,7 +27657,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -27788,7 +27665,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -27898,7 +27775,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -27906,7 +27783,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -27969,7 +27846,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -27977,7 +27854,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28105,7 +27982,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28113,7 +27990,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28358,7 +28235,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28366,7 +28243,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28461,7 +28338,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28469,7 +28346,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28615,7 +28492,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28623,7 +28500,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -28866,7 +28743,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -28874,11 +28751,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -28890,7 +28767,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -28994,7 +28871,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29002,7 +28879,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29075,7 +28952,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29083,7 +28960,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29146,7 +29023,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29154,7 +29031,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29196,7 +29073,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29204,7 +29081,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29340,7 +29217,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29348,7 +29225,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29444,7 +29321,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29452,7 +29329,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29538,7 +29415,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29546,7 +29423,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -29790,7 +29667,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -29798,7 +29675,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30019,7 +29896,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30027,7 +29904,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30111,7 +29988,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30119,7 +29996,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30198,7 +30075,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30206,7 +30083,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32023,12 +31900,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32644,7 +32521,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32652,7 +32529,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -32765,12 +32642,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -34861,12 +34738,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -34874,12 +34751,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -34887,12 +34764,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -36345,12 +36222,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -36440,16 +36317,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -36458,11 +36335,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -36477,7 +36354,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -36820,7 +36697,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -36834,7 +36711,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37177,7 +37054,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37192,7 +37069,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -37641,7 +37518,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index cd5341f4fa..e6174532aa 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index 21ce2566d3..a8afa88c45 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -27930,135 +27930,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -28074,7 +27951,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -28082,7 +27959,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -28198,7 +28075,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -28206,7 +28083,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -28275,7 +28152,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -28283,7 +28160,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28417,7 +28294,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28425,7 +28302,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28676,7 +28553,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28684,7 +28561,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28779,7 +28656,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28787,7 +28664,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28943,7 +28820,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28951,7 +28828,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -29200,7 +29077,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -29208,11 +29085,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -29224,7 +29101,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29328,7 +29205,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29336,7 +29213,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29409,7 +29286,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29417,7 +29294,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29486,7 +29363,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29494,7 +29371,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29536,7 +29413,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29544,7 +29421,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29686,7 +29563,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29694,7 +29571,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29790,7 +29667,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29798,7 +29675,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29884,7 +29761,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29892,7 +29769,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -30142,7 +30019,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -30150,7 +30027,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30377,7 +30254,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30385,7 +30262,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30474,7 +30351,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30482,7 +30359,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30561,7 +30438,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30569,7 +30446,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32446,12 +32323,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -33087,7 +32964,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -33095,7 +32972,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -33208,12 +33085,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -35456,12 +35333,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35469,12 +35346,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -35482,12 +35359,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -36953,12 +36830,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -37048,16 +36925,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37066,11 +36943,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37085,7 +36962,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -37443,7 +37320,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -37457,7 +37334,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37815,7 +37692,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37830,7 +37707,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38294,7 +38171,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index f717c83fec..98a5b2590b 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> -- 2.39.3

4 4

[PATCH 0/5] Random fixes
by Michal Privoznik 19 Jul '23

19 Jul '23

The first two patches stem from me playing with split daemons. The rest fixes code in/around virRandomGenerateWWN() since that's where the second patch led me to. Michal Prívozník (5): virsh: Make cmdVersion() work with split daemon virrandom: Accept "nodedev" driver in virRandomGenerateWWN() virrandom: Fix printf format string in virRandomGenerateWWN() test_driver: Pass virt_type to virNodeDeviceDefParse() in testNodeDeviceCreateXML() virrandommock: Drop virRandomGenerateWWN src/test/test_driver.c | 7 +++++-- src/util/virrandom.c | 14 +++++++++++--- tests/virrandommock.c | 8 -------- tools/virsh-host.c | 26 ++++++++++++-------------- 4 files changed, 28 insertions(+), 27 deletions(-) -- 2.41.0

3 11

Re: [PATCH] Added support for vendor and product for qemu ide-hd
by Benedek Major 19 Jul '23

19 Jul '23

Hello, thanks for your fast responses. I've also recognized flaws in my implementation, after your comments, so I'll try to find a solution, that is acceptable, and create a better patch. But first, I'll need to know if this approach is correct: > my interpretation is that the SCSI "product" field data is identical > to the ATAPI "model" field data. > AFAICT, ATAPI doesn't provide a way to expose a vendor in string > format. So I would say we accept 'product' for IDE, but reject > 'vendor' I would also say so. Therefore I would need to expand the vendor field to 40 Chars, if a SATA/IDE bus is selected. (current is 8 for SCSI). about this: > an IDENTIFY DEVICE / IDENTIFY PACKET DEVICE command on some *real* > hardware With hdparm -I /dev/sdX I got: Model Number: TOSHIBA DT01ACA050 Model Number: Samsung SSD 850 EVO 250GB I think hdparam just dumps the raw responses, but correct me if I'm wrong. >> Therefore I would say, that vendor and product pretty much correlate to the model field in QEMU, >>This feels very subjective. Could you please add a better justification? >>E.g. show how qemu formats the default vendor and product name? QEMU formats the defaults as "QEMU HARDDISK" and "QEMU CD-ROM" This was just an assumption, for which I didn't find any spec yet. Since every disk I know is in the form of: MANUFACTURER SOME OTHER MODEL NAME Maybe it is just a convention, but I have no experience in that field. In the Windows VM in device manager under the SATA device for "QEMU HARDDISK" it shows as Device instance path SCSI\DISK&VEN_QEMU&PROD_HARDDISK\, which also made me think that it is the norm. About the coding style, I'll fix those problems. And thanks for reminding me of the memory leaks in C, im so accustomed to writing in code that does not have them, that I almost forgot how aware you must be of declaring pointers. Sincerely, Benedek

3 5

[libvirt PATCH] nodedev: report mdev persistence properly
by Jonathon Jongsma 19 Jul '23

19 Jul '23

Since commit 44a0f2f0, we now query mdevctl for transient (active) mdevs in order to gather attributes for the mdev. Unfortunately, this commit introduced a regression because nodeDeviceUpdateMediatedDevice() assumed that all mdevs returned from mdevctl were actually persistent mdevs but we were using it to update transient mdevs. Refactor the function so that we can use it to update both persistent and transient mdevs. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/node_device/node_device_driver.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a2d0600560..5dc45ddbb4 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1339,11 +1339,12 @@ nodeDeviceDestroy(virNodeDevicePtr device) /* takes ownership of @def and potentially frees it. @def should not be used * after returning from this function */ static int -nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) +nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def, + bool defined) { virNodeDeviceObj *obj; virObjectEvent *event; - bool defined = false; + bool was_defined = false; g_autoptr(virNodeDeviceDef) owned = def; g_autofree char *name = g_strdup(owned->name); @@ -1359,13 +1360,13 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) bool changed; virNodeDeviceDef *olddef = virNodeDeviceObjGetDef(obj); - defined = virNodeDeviceObjIsPersistent(obj); + was_defined = virNodeDeviceObjIsPersistent(obj); /* Active devices contain some additional information (e.g. sysfs * path) that is not provided by mdevctl, so re-use the existing * definition and copy over new mdev data */ changed = nodeDeviceDefCopyFromMdevctl(olddef, owned); - if (defined && !changed) { + if (was_defined && !changed) { /* if this device was already defined and the definition * hasn't changed, there's nothing to do for this device */ virNodeDeviceObjEndAPI(&obj); @@ -1373,11 +1374,11 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) } } - /* all devices returned by virMdevctlListDefined() are persistent */ - virNodeDeviceObjSetPersistent(obj, true); + if (defined) + virNodeDeviceObjSetPersistent(obj, true); virNodeDeviceObjSetAutostart(obj, def->caps->data.mdev.autostart); - if (!defined) + if (!was_defined && defined) event = virNodeDeviceEventLifecycleNew(name, VIR_NODE_DEVICE_EVENT_DEFINED, 0); @@ -1447,7 +1448,7 @@ nodeDeviceDefineXML(virConnect *conn, * have already received the uuid from virMdevctlDefine(), we can simply * add the provisional device to the list and return it immediately and * avoid this long delay. */ - if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def)) < 0) + if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def), true) < 0) return NULL; return virGetNodeDevice(conn, name); @@ -1742,7 +1743,7 @@ nodeDeviceUpdateMediatedDevices(void) removeMissingPersistentMdev, &data); for (i = 0; i < data.ndefs; i++) - if (nodeDeviceUpdateMediatedDevice(defs[i]) < 0) + if (nodeDeviceUpdateMediatedDevice(defs[i], true) < 0) return -1; /* Update active/transient mdev devices */ @@ -1753,7 +1754,7 @@ nodeDeviceUpdateMediatedDevices(void) } for (i = 0; i < act_ndefs; i++) - if (nodeDeviceUpdateMediatedDevice(act_defs[i]) < 0) + if (nodeDeviceUpdateMediatedDevice(act_defs[i], false) < 0) return -1; return 0; -- 2.41.0

3 2

[PATCH 0/2] NEWS update for 9.4 and 9.6
by Han Han 19 Jul '23

19 Jul '23

Han Han (2): NEWS: qemu: Support removable attribute for scsi disk NEWS: cpu_map: Add SapphireRapids cpu model NEWS.rst | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.41.0

2 4

[libvirt PATCH] qemu: require memfd memory for virtio 'blob' support
by Jonathon Jongsma 19 Jul '23

19 Jul '23

The virtio-gpu 'blob' support was insufficiently validated. Qemu requires a memfd memory backing in order to use udmabuf and enable blob support. Example error: $ virsh start rhel9 error: Failed to start domain 'rhel9' error: internal error: qemu unexpectedly closed the monitor: 2023-07-18T02:33:57.083178Z qemu-kvm: -device {"driver":"virtio-vga","id":"video0","max_outputs":1,"blob":true,"bus":"pcie.0","addr":"0x1"}: cannot enable blob resources without udmabuf Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_validate.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..139e6f3d62 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2598,6 +2598,7 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev, static int qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, + const virDomainDef *def, virQEMUCaps *qemuCaps) { virDomainCapsDeviceVideo videoCaps = { 0 }; @@ -2714,11 +2715,18 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, } if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - if (video->blob != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_BLOB)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this QEMU does not support 'blob' for virtio-gpu devices")); - return -1; + if (video->blob != VIR_TRISTATE_SWITCH_ABSENT) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_BLOB)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU does not support 'blob' for virtio-gpu devices")); + return -1; + } + if (video->blob == VIR_TRISTATE_SWITCH_ON + && def->mem.source != VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'blob' support for virtio-gpu devices requires a memfd memory backend")); + return -1; + } } } @@ -5217,7 +5225,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev, qemuCaps); case VIR_DOMAIN_DEVICE_VIDEO: - return qemuValidateDomainDeviceDefVideo(dev->data.video, qemuCaps); + return qemuValidateDomainDeviceDefVideo(dev->data.video, def, qemuCaps); case VIR_DOMAIN_DEVICE_DISK: return qemuValidateDomainDeviceDefDisk(dev->data.disk, def, qemuCaps); -- 2.41.0

2 1

[PATCH Libvirt 0/3] support discard and write-zeroes options for virtio-blk device
by ~hyman 19 Jul '23

19 Jul '23

DISCARD and WRITE_ZEROES commands has been implemented in virtio-blk protocol since qemu >= 4.2.0, may be it's time to introduce discard and write-zeroes options for virtio-blk device in libvirt so that the upper layer can enable this feature at disk granularity. To distinguish the discard option in block drive layer, use the 'virtio' prefix to indicate that these attributes are specific for virtio-blk disk. To try this out, three things has done in this patchset: 1. introduce capabilities of discard and write-zeroes for virtio-blk 2. add virtio_discard and virtio_write_zeroes attributes of driver in disk xml element 3. generate cmd line when launching vm Please review, any comments and suggestions are very appreciated, thanks! Yong Hyman Huang(黄勇) (3): qemu_capabilities: Introduce virtio-blk DISCARD and WRITE_ZEROES capabilities conf: Add 'virtio_discard' and 'virtio_write_zeroes' attributes qemu_command: Generate cmd line for discard and write-zeroes properties docs/formatdomain.rst | 8 +++ src/conf/domain_conf.c | 16 ++++++ src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 10 ++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_validate.c | 14 +++++ .../caps_4.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 2 + .../caps_4.2.0_x86_64.xml | 2 + .../caps_5.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 + .../caps_5.0.0_riscv64.xml | 2 + .../caps_5.0.0_x86_64.xml | 2 + .../caps_5.1.0_x86_64.xml | 2 + .../caps_5.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 + .../caps_5.2.0_riscv64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 2 + .../caps_5.2.0_x86_64.xml | 2 + .../caps_6.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 2 + .../caps_6.0.0_x86_64.xml | 2 + .../caps_6.1.0_x86_64.xml | 2 + .../caps_6.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 + .../caps_6.2.0_x86_64.xml | 2 + .../caps_7.0.0_aarch64+hvf.xml | 2 + .../caps_7.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 + .../caps_7.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 + .../caps_7.1.0_x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 + .../caps_7.2.0_x86_64+hvf.xml | 2 + .../caps_7.2.0_x86_64.xml | 2 + .../caps_8.0.0_riscv64.xml | 2 + .../caps_8.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 2 + .../caps_8.1.0_x86_64.xml | 2 + .../disk-virtio-discard.x86_64-latest.args | 44 +++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 56 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 45 files changed, 227 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml -- 2.38.5

3 5

[PATCH] qemu: S390 does not provide physical address size
by Boris Fiuczynski 19 Jul '23

19 Jul '23

Commit be1b7d5b18 introduced parsing /proc/cpuinfo for "address size" which is not including on S390 and therefore reports an internal error. Lets remove the parsing on S390. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> Reviewed-by: Collin Walling <walling(a)linux.ibm.com> --- src/cpu/cpu_x86.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/util/virhostcpu.c | 11 +++++++++-- src/util/virhostcpu.h | 3 ++- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 - tests/domaincapsdata/qemu_8.1.0.s390x.xml | 1 - tests/domaincapsmock.c | 7 +++++-- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d371d5501..3c0163c4d1 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2795,7 +2795,7 @@ virCPUx86GetHost(virCPUDef *cpu, VIR_DEBUG("Host CPU does not support invariant TSC"); } - if (virHostCPUGetPhysAddrSize(&addrsz) == 0) { + if (virHostCPUGetPhysAddrSize(cpuData->arch, &addrsz) == 0) { virCPUMaxPhysAddrDef *addr = g_new0(virCPUMaxPhysAddrDef, 1); addr->bits = addrsz; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9f4b17208..d82fe88057 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3911,7 +3911,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps, } if (virQEMUCapsTypeIsAccelerated(type)) - virHostCPUGetPhysAddrSize(&physAddrSize); + virHostCPUGetPhysAddrSize(hostArch, &physAddrSize); virQEMUCapsSetHostModel(qemuCaps, type, physAddrSize, cpu, migCPU, fullCPU); diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 19195a1470..41be4bffe0 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1646,10 +1646,16 @@ virHostCPUGetSignature(char **signature) } int -virHostCPUGetPhysAddrSize(unsigned int *size) +virHostCPUGetPhysAddrSize(const virArch hostArch, unsigned int *size) { g_autoptr(FILE) cpuinfo = NULL; + if (ARCH_IS_S390(hostArch)) { + /* Ensure size is set to 0 as physical address size is unknown */ + *size = 0; + return 0; + } + if (!(cpuinfo = fopen(CPUINFO_PATH, "r"))) { virReportSystemError(errno, _("Failed to open cpuinfo file '%1$s'"), CPUINFO_PATH); @@ -1669,7 +1675,8 @@ virHostCPUGetSignature(char **signature) } int -virHostCPUGetPhysAddrSize(unsigned int *size G_GNUC_UNUSED) +virHostCPUGetPhysAddrSize(const virArch hostArch G_GNUC_UNUSED, + unsigned int *size G_GNUC_UNUSED) { errno = ENOSYS; return -1; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 5232fee36d..5f0d43e069 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -87,7 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void); int virHostCPUGetSignature(char **signature); -int virHostCPUGetPhysAddrSize(unsigned int *size); +int virHostCPUGetPhysAddrSize(const virArch hostArch, + unsigned int *size); int virHostCPUGetHaltPollTime(pid_t pid, unsigned long long *haltPollSuccess, diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c35bed1326..81395f43bf 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 9dbf118713..1e615dab7c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index f0a8b196f5..f3287347aa 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 6b78a718b0..7380edd0c4 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen16a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='nnpa'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index cecb333602..6a23f2cb11 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -37,9 +37,12 @@ virHostCPUGetMicrocodeVersion(virArch hostArch G_GNUC_UNUSED) } int -virHostCPUGetPhysAddrSize(unsigned int *size) +virHostCPUGetPhysAddrSize(const virArch hostArch, unsigned int *size) { - *size = 64; + if (ARCH_IS_S390(hostArch)) + *size = 0; + else + *size = 64; return 0; } -- 2.41.0

2 1

[PATCH 0/3] qemu: capabilities: Retire QEMU_CAPS_SCSI_DISK_WWN and QEMU_CAPS_IDE_DRIVE_WWN
by Peter Krempa 18 Jul '23

18 Jul '23

Peter Krempa (3): qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN src/qemu/qemu_capabilities.c | 6 ++--- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_validate.c | 26 ------------------- .../caps_4.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 2 -- .../caps_5.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 -- .../caps_5.0.0_riscv64.xml | 2 -- .../caps_5.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../caps_5.1.0_x86_64.xml | 2 -- .../caps_5.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 -- .../caps_5.2.0_riscv64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 2 -- .../caps_6.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 2 -- .../caps_6.1.0_x86_64.xml | 2 -- .../caps_6.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- .../caps_6.2.0_x86_64.xml | 2 -- .../caps_7.0.0_aarch64+hvf.xml | 2 -- .../caps_7.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- .../caps_7.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- .../caps_7.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- .../caps_7.2.0_x86_64+hvf.xml | 2 -- .../caps_7.2.0_x86_64.xml | 2 -- .../caps_8.0.0_riscv64.xml | 2 -- .../caps_8.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 2 -- tests/qemuxml2xmltest.c | 2 +- 39 files changed, 5 insertions(+), 98 deletions(-) -- 2.41.0

2 4

[PATCH] qemu: capabilities: Update capabilities test data for qemu-8.1 dev cycle
by Peter Krempa 18 Jul '23

18 Jul '23

Update the test data on x86_64 to v8.0.0-2835-g361d539735 Notable changes: - added new commands: - cxl-inject-dram-event - cxl-inject-general-media-event - cxl-inject-memory-module-event - cxl-inject-poison - switchover-ack - q35-8.1 machine type now supports 1024 cpus - new cpu models: - 'SapphireRapids-v2' - 'GraniteRapids-v1' - removed commands: - x-query-profile - cpu features which can be emulated now: - rdseed, rdpid, 3dnowprefetch, xsaveerptr, wbnoinvd - applicable CPU bug mitigation flags are now exposed to TCG guests to allow using more named models Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 2 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 +- .../caps_8.1.0_x86_64.replies | 3856 +++++++++-------- .../caps_8.1.0_x86_64.xml | 580 +-- 4 files changed, 2453 insertions(+), 1990 deletions(-) diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index f8165fe212..0c6ed0f858 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -3,7 +3,7 @@ <domain>kvm</domain> <machine>pc-q35-8.1</machine> <arch>x86_64</arch> - <vcpu max='288'/> + <vcpu max='1024'/> <iothreads supported='yes'/> <os supported='yes'> <enum name='firmware'> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index ea9e085af5..0089331fcf 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -50,6 +50,7 @@ <feature policy='require' name='pku'/> <feature policy='require' name='vaes'/> <feature policy='require' name='la57'/> + <feature policy='require' name='rdpid'/> <feature policy='require' name='pks'/> <feature policy='require' name='fsrm'/> <feature policy='require' name='fzrm'/> @@ -57,16 +58,16 @@ <feature policy='require' name='fsrc'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='xsaveerptr'/> + <feature policy='require' name='wbnoinvd'/> <feature policy='require' name='npt'/> <feature policy='require' name='vgif'/> <feature policy='require' name='svme-addr-chk'/> <feature policy='disable' name='vme'/> - <feature policy='disable' name='rdseed'/> <feature policy='disable' name='sha-ni'/> <feature policy='disable' name='xsavec'/> <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> <feature policy='disable' name='osvw'/> <feature policy='disable' name='topoext'/> <feature policy='disable' name='nrip-save'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index 21ce2566d3..3d603c04b0 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -21,7 +21,7 @@ "minor": 0, "major": 8 }, - "package": "v8.0.0-1739-g5f9dd6a8ce" + "package": "v8.0.0-2835-g361d539735" }, "id": "libvirt-2" } @@ -1379,15 +1379,6 @@ "unstable" ] }, - { - "name": "x-query-profile", - "ret-type": "210", - "meta-type": "command", - "arg-type": "0", - "features": [ - "unstable" - ] - }, { "name": "x-query-ramblock", "ret-type": "210", @@ -1721,17 +1712,41 @@ "arg-type": "0" }, { - "name": "cxl-inject-uncorrectable-errors", + "name": "cxl-inject-general-media-event", "ret-type": "0", "meta-type": "command", "arg-type": "268" }, { - "name": "cxl-inject-correctable-error", + "name": "cxl-inject-dram-event", "ret-type": "0", "meta-type": "command", "arg-type": "269" }, + { + "name": "cxl-inject-memory-module-event", + "ret-type": "0", + "meta-type": "command", + "arg-type": "270" + }, + { + "name": "cxl-inject-poison", + "ret-type": "0", + "meta-type": "command", + "arg-type": "271" + }, + { + "name": "cxl-inject-uncorrectable-errors", + "ret-type": "0", + "meta-type": "command", + "arg-type": "272" + }, + { + "name": "cxl-inject-correctable-error", + "ret-type": "0", + "meta-type": "command", + "arg-type": "273" + }, { "name": "0", "members": [ @@ -1754,7 +1769,7 @@ }, { "name": "status", - "type": "270" + "type": "274" } ], "meta-type": "object" @@ -1768,7 +1783,7 @@ }, { "name": "reason", - "type": "271" + "type": "275" } ], "meta-type": "object" @@ -1782,7 +1797,7 @@ }, { "name": "reason", - "type": "271" + "type": "275" } ], "meta-type": "object" @@ -1792,7 +1807,7 @@ "members": [ { "name": "action", - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1802,7 +1817,7 @@ "members": [ { "name": "action", - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1813,22 +1828,22 @@ { "name": "reboot", "default": null, - "type": "273" + "type": "277" }, { "name": "shutdown", "default": null, - "type": "274" + "type": "278" }, { "name": "panic", "default": null, - "type": "275" + "type": "279" }, { "name": "watchdog", "default": null, - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1838,12 +1853,12 @@ "members": [ { "name": "action", - "type": "276" + "type": "280" }, { "name": "info", "default": null, - "type": "277" + "type": "281" } ], "meta-type": "object" @@ -1853,12 +1868,12 @@ "members": [ { "name": "action", - "type": "276" + "type": "280" }, { "name": "info", "default": null, - "type": "277" + "type": "281" } ], "meta-type": "object" @@ -1868,15 +1883,15 @@ "members": [ { "name": "recipient", - "type": "278" + "type": "282" }, { "name": "action", - "type": "279" + "type": "283" }, { "name": "flags", - "type": "280" + "type": "284" } ], "meta-type": "object" @@ -1890,7 +1905,7 @@ }, { "name": "status", - "type": "281" + "type": "285" } ], "meta-type": "object" @@ -1969,11 +1984,11 @@ }, { "name": "type", - "type": "282" + "type": "286" }, { "name": "status", - "type": "281" + "type": "285" }, { "name": "current-progress", @@ -2134,7 +2149,7 @@ { "name": "read-only-mode", "default": null, - "type": "283" + "type": "287" } ], "meta-type": "object" @@ -2361,7 +2376,7 @@ { "name": "io-status", "default": null, - "type": "284" + "type": "288" } ], "meta-type": "object" @@ -2402,12 +2417,12 @@ }, { "name": "stats", - "type": "285" + "type": "289" }, { "name": "driver-specific", "default": null, - "type": "286" + "type": "290" }, { "name": "parent", @@ -2460,7 +2475,7 @@ }, { "name": "io-status", - "type": "284" + "type": "288" }, { "name": "ready", @@ -2468,7 +2483,7 @@ }, { "name": "status", - "type": "281" + "type": "285" }, { "name": "auto-finalize", @@ -2536,7 +2551,7 @@ { "name": "mode", "default": null, - "type": "287" + "type": "291" } ], "meta-type": "object" @@ -2624,7 +2639,7 @@ { "name": "on-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -2658,7 +2673,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -2673,7 +2688,7 @@ { "name": "bitmap-mode", "default": null, - "type": "290" + "type": "294" }, { "name": "compress", @@ -2683,12 +2698,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "auto-finalize", @@ -2708,7 +2723,7 @@ { "name": "x-perf", "default": null, - "type": "291", + "type": "295", "features": [ "unstable" ] @@ -2725,7 +2740,7 @@ { "name": "mode", "default": null, - "type": "287" + "type": "291" } ], "meta-type": "object" @@ -2744,7 +2759,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -2759,7 +2774,7 @@ { "name": "bitmap-mode", "default": null, - "type": "290" + "type": "294" }, { "name": "compress", @@ -2769,12 +2784,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "auto-finalize", @@ -2794,7 +2809,7 @@ { "name": "x-perf", "default": null, - "type": "291", + "type": "295", "features": [ "unstable" ] @@ -2857,7 +2872,7 @@ }, { "name": "detect_zeroes", - "type": "292" + "type": "296" }, { "name": "bps", @@ -2885,7 +2900,7 @@ }, { "name": "image", - "type": "293" + "type": "297" }, { "name": "bps_max", @@ -2959,7 +2974,7 @@ }, { "name": "cache", - "type": "294" + "type": "298" }, { "name": "write_threshold", @@ -2968,7 +2983,7 @@ { "name": "dirty-bitmaps", "default": null, - "type": "[295]" + "type": "[299]" } ], "meta-type": "object" @@ -2978,11 +2993,11 @@ "members": [ { "name": "nodes", - "type": "[296]" + "type": "[300]" }, { "name": "edges", - "type": "[297]" + "type": "[301]" } ], "meta-type": "object" @@ -3020,12 +3035,12 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "mode", "default": null, - "type": "287" + "type": "291" }, { "name": "speed", @@ -3045,12 +3060,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "unmap", @@ -3060,7 +3075,7 @@ { "name": "copy-mode", "default": null, - "type": "298" + "type": "302" }, { "name": "auto-finalize", @@ -3131,7 +3146,7 @@ }, { "name": "bitmaps", - "type": "[299]" + "type": "[303]" } ], "meta-type": "object" @@ -3169,7 +3184,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -3189,12 +3204,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -3204,7 +3219,7 @@ { "name": "copy-mode", "default": null, - "type": "298" + "type": "302" }, { "name": "auto-finalize", @@ -3259,7 +3274,7 @@ { "name": "on-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -3364,197 +3379,197 @@ "variants": [ { "case": "blkdebug", - "type": "303" + "type": "307" }, { "case": "blklogwrites", - "type": "304" + "type": "308" }, { "case": "blkverify", - "type": "305" + "type": "309" }, { "case": "blkreplay", - "type": "306" + "type": "310" }, { "case": "bochs", - "type": "307" + "type": "311" }, { "case": "cloop", - "type": "307" + "type": "311" }, { "case": "compress", - "type": "307" + "type": "311" }, { "case": "copy-before-write", - "type": "308" + "type": "312" }, { "case": "copy-on-read", - "type": "309" + "type": "313" }, { "case": "dmg", - "type": "307" + "type": "311" }, { "case": "file", - "type": "310" + "type": "314" }, { "case": "ftp", - "type": "311" + "type": "315" }, { "case": "ftps", - "type": "312" + "type": "316" }, { "case": "gluster", - "type": "313" + "type": "317" }, { "case": "host_cdrom", - "type": "310" + "type": "314" }, { "case": "host_device", - "type": "310" + "type": "314" }, { "case": "http", - "type": "314" + "type": "318" }, { "case": "https", - "type": "315" + "type": "319" }, { "case": "io_uring", - "type": "316" + "type": "320" }, { "case": "iscsi", - "type": "317" + "type": "321" }, { "case": "luks", - "type": "318" + "type": "322" }, { "case": "nbd", - "type": "319" + "type": "323" }, { "case": "nfs", - "type": "320" + "type": "324" }, { "case": "null-aio", - "type": "321" + "type": "325" }, { "case": "null-co", - "type": "321" + "type": "325" }, { "case": "nvme", - "type": "322" + "type": "326" }, { "case": "nvme-io_uring", - "type": "323" + "type": "327" }, { "case": "parallels", - "type": "307" + "type": "311" }, { "case": "preallocate", - "type": "324" + "type": "328" }, { "case": "qcow2", - "type": "325" + "type": "329" }, { "case": "qcow", - "type": "326" + "type": "330" }, { "case": "qed", - "type": "327" + "type": "331" }, { "case": "quorum", - "type": "328" + "type": "332" }, { "case": "raw", - "type": "329" + "type": "333" }, { "case": "rbd", - "type": "330" + "type": "334" }, { "case": "replication", - "type": "331" + "type": "335" }, { "case": "snapshot-access", - "type": "307" + "type": "311" }, { "case": "ssh", - "type": "332" + "type": "336" }, { "case": "throttle", - "type": "333" + "type": "337" }, { "case": "vdi", - "type": "307" + "type": "311" }, { "case": "vhdx", - "type": "307" + "type": "311" }, { "case": "virtio-blk-vfio-pci", - "type": "334" + "type": "338" }, { "case": "virtio-blk-vhost-user", - "type": "335" + "type": "339" }, { "case": "virtio-blk-vhost-vdpa", - "type": "336" + "type": "340" }, { "case": "vmdk", - "type": "327" + "type": "331" }, { "case": "vpc", - "type": "307" + "type": "311" }, { "case": "vvfat", - "type": "337" + "type": "341" } ], "members": [ { "name": "driver", - "type": "300" + "type": "304" }, { "name": "node-name", @@ -3564,12 +3579,12 @@ { "name": "discard", "default": null, - "type": "301" + "type": "305" }, { "name": "cache", "default": null, - "type": "302" + "type": "306" }, { "name": "read-only", @@ -3589,7 +3604,7 @@ { "name": "detect-zeroes", "default": null, - "type": "292" + "type": "296" } ], "meta-type": "object" @@ -3623,7 +3638,7 @@ }, { "name": "options", - "type": "338" + "type": "342" } ], "meta-type": "object" @@ -3641,7 +3656,7 @@ }, { "name": "options", - "type": "339" + "type": "343" }, { "name": "force", @@ -3698,11 +3713,11 @@ }, { "name": "operation", - "type": "340" + "type": "344" }, { "name": "action", - "type": "341" + "type": "345" }, { "name": "nospace", @@ -3721,7 +3736,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3752,7 +3767,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3782,11 +3797,11 @@ }, { "name": "operation", - "type": "340" + "type": "344" }, { "name": "action", - "type": "341" + "type": "345" } ], "meta-type": "object" @@ -3796,7 +3811,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3822,7 +3837,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "id", @@ -3892,7 +3907,7 @@ }, { "name": "iothread", - "type": "342" + "type": "346" }, { "name": "force", @@ -3925,7 +3940,7 @@ "members": [ { "name": "type", - "type": "343" + "type": "347" }, { "name": "error", @@ -4025,7 +4040,7 @@ "members": [ { "name": "addr", - "type": "344" + "type": "348" }, { "name": "tls-creds", @@ -4085,7 +4100,7 @@ { "name": "mode", "default": null, - "type": "345" + "type": "349" } ], "meta-type": "object" @@ -4096,25 +4111,25 @@ "variants": [ { "case": "nbd", - "type": "347" + "type": "351" }, { "case": "vhost-user-blk", - "type": "348" + "type": "352" }, { "case": "fuse", - "type": "349" + "type": "353" }, { "case": "vduse-blk", - "type": "350" + "type": "354" } ], "members": [ { "name": "type", - "type": "346" + "type": "350" }, { "name": "id", @@ -4157,7 +4172,7 @@ { "name": "mode", "default": null, - "type": "345" + "type": "349" } ], "meta-type": "object" @@ -4186,7 +4201,7 @@ }, { "name": "type", - "type": "346" + "type": "350" }, { "name": "node-name", @@ -4251,7 +4266,7 @@ { "name": "format", "default": null, - "type": "351" + "type": "355" } ], "meta-type": "object" @@ -4270,7 +4285,7 @@ { "name": "format", "default": null, - "type": "351" + "type": "355" } ], "meta-type": "object" @@ -4289,7 +4304,7 @@ }, { "name": "backend", - "type": "352" + "type": "356" } ], "meta-type": "object" @@ -4314,7 +4329,7 @@ }, { "name": "backend", - "type": "352" + "type": "356" } ], "meta-type": "object" @@ -4382,7 +4397,7 @@ { "name": "format", "default": null, - "type": "353" + "type": "357" } ], "meta-type": "object" @@ -4392,7 +4407,7 @@ "members": [ { "name": "status", - "type": "354" + "type": "358" }, { "name": "completed", @@ -4425,7 +4440,7 @@ "members": [ { "name": "formats", - "type": "[353]" + "type": "[357]" } ], "meta-type": "object" @@ -4450,55 +4465,55 @@ "variants": [ { "case": "nic", - "type": "356" + "type": "360" }, { "case": "user", - "type": "357" + "type": "361" }, { "case": "tap", - "type": "358" + "type": "362" }, { "case": "l2tpv3", - "type": "359" + "type": "363" }, { "case": "socket", - "type": "360" + "type": "364" }, { "case": "stream", - "type": "361" + "type": "365" }, { "case": "dgram", - "type": "362" + "type": "366" }, { "case": "vde", - "type": "363" + "type": "367" }, { "case": "bridge", - "type": "364" + "type": "368" }, { "case": "hubport", - "type": "365" + "type": "369" }, { "case": "netmap", - "type": "366" + "type": "370" }, { "case": "vhost-user", - "type": "367" + "type": "371" }, { "case": "vhost-vdpa", - "type": "368" + "type": "372" }, { "case": "none", @@ -4512,7 +4527,7 @@ }, { "name": "type", - "type": "355" + "type": "359" } ], "meta-type": "object" @@ -4556,15 +4571,15 @@ }, { "name": "multicast", - "type": "372" + "type": "376" }, { "name": "unicast", - "type": "372" + "type": "376" }, { "name": "vlan", - "type": "372" + "type": "376" }, { "name": "broadcast-allowed", @@ -4663,7 +4678,7 @@ }, { "name": "addr", - "type": "373" + "type": "377" } ], "meta-type": "object" @@ -4764,11 +4779,11 @@ }, { "name": "duplex", - "type": "374" + "type": "378" }, { "name": "autoneg", - "type": "375" + "type": "379" } ], "meta-type": "object" @@ -4806,15 +4821,15 @@ }, { "name": "key", - "type": "376" + "type": "380" }, { "name": "mask", - "type": "377" + "type": "381" }, { "name": "action", - "type": "378" + "type": "382" } ], "meta-type": "object" @@ -4972,7 +4987,7 @@ }, { "name": "options", - "type": "379" + "type": "383" } ], "meta-type": "object" @@ -4983,7 +4998,7 @@ "variants": [ { "case": "vnc", - "type": "382" + "type": "386" }, { "case": "spice", @@ -4993,7 +5008,7 @@ "members": [ { "name": "protocol", - "type": "380" + "type": "384" }, { "name": "password", @@ -5002,7 +5017,7 @@ { "name": "connected", "default": null, - "type": "381" + "type": "385" } ], "meta-type": "object" @@ -5013,7 +5028,7 @@ "variants": [ { "case": "vnc", - "type": "383" + "type": "387" }, { "case": "spice", @@ -5023,7 +5038,7 @@ "members": [ { "name": "protocol", - "type": "380" + "type": "384" }, { "name": "time", @@ -5052,7 +5067,7 @@ { "name": "format", "default": null, - "type": "384" + "type": "388" } ], "meta-type": "object" @@ -5095,12 +5110,12 @@ }, { "name": "mouse-mode", - "type": "385" + "type": "389" }, { "name": "channels", "default": null, - "type": "[386]" + "type": "[390]" } ], "meta-type": "object" @@ -5110,11 +5125,11 @@ "members": [ { "name": "server", - "type": "387" + "type": "391" }, { "name": "client", - "type": "387" + "type": "391" } ], "meta-type": "object" @@ -5124,11 +5139,11 @@ "members": [ { "name": "server", - "type": "388" + "type": "392" }, { "name": "client", - "type": "386" + "type": "390" } ], "meta-type": "object" @@ -5138,11 +5153,11 @@ "members": [ { "name": "server", - "type": "387" + "type": "391" }, { "name": "client", - "type": "387" + "type": "391" } ], "meta-type": "object" @@ -5162,7 +5177,7 @@ { "name": "family", "default": null, - "type": "389" + "type": "393" }, { "name": "service", @@ -5177,7 +5192,7 @@ { "name": "clients", "default": null, - "type": "[390]" + "type": "[394]" } ], "meta-type": "object" @@ -5196,20 +5211,20 @@ }, { "name": "server", - "type": "[391]" + "type": "[395]" }, { "name": "clients", - "type": "[390]" + "type": "[394]" }, { "name": "auth", - "type": "392" + "type": "396" }, { "name": "vencrypt", "default": null, - "type": "393" + "type": "397" }, { "name": "display", @@ -5234,11 +5249,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "395" + "type": "399" } ], "meta-type": "object" @@ -5248,11 +5263,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "390" + "type": "394" } ], "meta-type": "object" @@ -5262,11 +5277,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "390" + "type": "394" } ], "meta-type": "object" @@ -5303,7 +5318,7 @@ "members": [ { "name": "keys", - "type": "[396]" + "type": "[400]" }, { "name": "hold-time", @@ -5328,7 +5343,7 @@ }, { "name": "events", - "type": "[397]" + "type": "[401]" } ], "meta-type": "object" @@ -5339,19 +5354,19 @@ "variants": [ { "case": "curses", - "type": "402" + "type": "406" }, { "case": "egl-headless", - "type": "403" + "type": "407" }, { "case": "dbus", - "type": "404" + "type": "408" }, { "case": "sdl", - "type": "405" + "type": "409" }, { "case": "default", @@ -5369,7 +5384,7 @@ "members": [ { "name": "type", - "type": "398" + "type": "402" }, { "name": "full-screen", @@ -5389,7 +5404,7 @@ { "name": "gl", "default": null, - "type": "399" + "type": "403" } ], "meta-type": "object" @@ -5400,13 +5415,13 @@ "variants": [ { "case": "vnc", - "type": "407" + "type": "411" } ], "members": [ { "name": "type", - "type": "406" + "type": "410" } ], "meta-type": "object" @@ -5417,13 +5432,13 @@ "variants": [ { "case": "vnc", - "type": "409" + "type": "413" } ], "members": [ { "name": "type", - "type": "408" + "type": "412" } ], "meta-type": "object" @@ -5463,27 +5478,27 @@ { "name": "status", "default": null, - "type": "410" + "type": "414" }, { "name": "ram", "default": null, - "type": "411" + "type": "415" }, { "name": "disk", "default": null, - "type": "411" + "type": "415" }, { "name": "vfio", "default": null, - "type": "412" + "type": "416" }, { "name": "xbzrle-cache", "default": null, - "type": "413" + "type": "417" }, { "name": "total-time", @@ -5533,12 +5548,12 @@ { "name": "compression", "default": null, - "type": "414" + "type": "418" }, { "name": "socket-address", "default": null, - "type": "[373]" + "type": "[377]" } ], "meta-type": "object" @@ -5563,7 +5578,7 @@ "members": [ { "name": "capability", - "type": "415" + "type": "419" }, { "name": "state", @@ -5638,17 +5653,17 @@ { "name": "tls-creds", "default": null, - "type": "342" + "type": "346" }, { "name": "tls-hostname", "default": null, - "type": "342" + "type": "346" }, { "name": "tls-authz", "default": null, - "type": "342" + "type": "346" }, { "name": "max-bandwidth", @@ -5696,7 +5711,7 @@ { "name": "multifd-compression", "default": null, - "type": "416" + "type": "420" }, { "name": "multifd-zlib-level", @@ -5711,7 +5726,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[417]" + "type": "[421]" } ], "meta-type": "object" @@ -5840,7 +5855,7 @@ { "name": "multifd-compression", "default": null, - "type": "416" + "type": "420" }, { "name": "multifd-zlib-level", @@ -5855,7 +5870,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[417]" + "type": "[421]" } ], "meta-type": "object" @@ -5865,7 +5880,7 @@ "members": [ { "name": "status", - "type": "410" + "type": "414" } ], "meta-type": "object" @@ -5885,11 +5900,11 @@ "members": [ { "name": "mode", - "type": "418" + "type": "422" }, { "name": "reason", - "type": "419" + "type": "423" } ], "meta-type": "object" @@ -5899,7 +5914,7 @@ "members": [ { "name": "state", - "type": "410" + "type": "414" } ], "meta-type": "object" @@ -6018,15 +6033,15 @@ "members": [ { "name": "mode", - "type": "418" + "type": "422" }, { "name": "last-mode", - "type": "418" + "type": "422" }, { "name": "reason", - "type": "419" + "type": "423" } ], "meta-type": "object" @@ -6066,7 +6081,7 @@ { "name": "mode", "default": null, - "type": "420" + "type": "424" } ], "meta-type": "object" @@ -6081,7 +6096,7 @@ }, { "name": "status", - "type": "421" + "type": "425" }, { "name": "start-time", @@ -6097,12 +6112,12 @@ }, { "name": "mode", - "type": "420" + "type": "424" }, { "name": "vcpu-dirty-rate", "default": null, - "type": "[422]" + "type": "[426]" } ], "meta-type": "object" @@ -6242,12 +6257,12 @@ "members": [ { "name": "actions", - "type": "[423]" + "type": "[427]" }, { "name": "properties", "default": null, - "type": "424" + "type": "428" } ], "meta-type": "object" @@ -6284,7 +6299,7 @@ }, { "name": "state", - "type": "425" + "type": "429" }, { "name": "vcpu", @@ -6329,7 +6344,7 @@ { "name": "enable", "default": null, - "type": "[426]" + "type": "[430]" } ], "meta-type": "object" @@ -6339,7 +6354,7 @@ "members": [ { "name": "qemu", - "type": "427" + "type": "431" }, { "name": "package", @@ -6374,31 +6389,31 @@ "variants": [ { "case": "builtin", - "type": "429" + "type": "433" }, { "case": "enum", - "type": "430" + "type": "434" }, { "case": "array", - "type": "431" + "type": "435" }, { "case": "object", - "type": "432" + "type": "436" }, { "case": "alternate", - "type": "433" + "type": "437" }, { "case": "command", - "type": "434" + "type": "438" }, { "case": "event", - "type": "435" + "type": "439" } ], "members": [ @@ -6408,7 +6423,7 @@ }, { "name": "meta-type", - "type": "428" + "type": "432" }, { "name": "features", @@ -6551,167 +6566,167 @@ "variants": [ { "case": "authz-list", - "type": "437" + "type": "441" }, { "case": "authz-listfile", - "type": "438" + "type": "442" }, { "case": "authz-pam", - "type": "439" + "type": "443" }, { "case": "authz-simple", - "type": "440" + "type": "444" }, { "case": "can-host-socketcan", - "type": "441" + "type": "445" }, { "case": "colo-compare", - "type": "442" + "type": "446" }, { "case": "cryptodev-backend", - "type": "443" + "type": "447" }, { "case": "cryptodev-backend-builtin", - "type": "443" + "type": "447" }, { "case": "cryptodev-backend-lkcf", - "type": "443" + "type": "447" }, { "case": "cryptodev-vhost-user", - "type": "444" + "type": "448" }, { "case": "dbus-vmstate", - "type": "445" + "type": "449" }, { "case": "filter-buffer", - "type": "446" + "type": "450" }, { "case": "filter-dump", - "type": "447" + "type": "451" }, { "case": "filter-mirror", - "type": "448" + "type": "452" }, { "case": "filter-redirector", - "type": "449" + "type": "453" }, { "case": "filter-replay", - "type": "450" + "type": "454" }, { "case": "filter-rewriter", - "type": "451" + "type": "455" }, { "case": "input-barrier", - "type": "452" + "type": "456" }, { "case": "input-linux", - "type": "453" + "type": "457" }, { "case": "iothread", - "type": "454" + "type": "458" }, { "case": "main-loop", - "type": "455" + "type": "459" }, { "case": "memory-backend-epc", - "type": "456" + "type": "460" }, { "case": "memory-backend-file", - "type": "457" + "type": "461" }, { "case": "memory-backend-memfd", - "type": "458" + "type": "462" }, { "case": "memory-backend-ram", - "type": "459" + "type": "463" }, { "case": "pr-manager-helper", - "type": "460" + "type": "464" }, { "case": "qtest", - "type": "461" + "type": "465" }, { "case": "rng-builtin", - "type": "462" + "type": "466" }, { "case": "rng-egd", - "type": "463" + "type": "467" }, { "case": "rng-random", - "type": "464" + "type": "468" }, { "case": "secret", - "type": "465" + "type": "469" }, { "case": "secret_keyring", - "type": "466" + "type": "470" }, { "case": "sev-guest", - "type": "467" + "type": "471" }, { "case": "thread-context", - "type": "468" + "type": "472" }, { "case": "throttle-group", - "type": "469" + "type": "473" }, { "case": "tls-creds-anon", - "type": "470" + "type": "474" }, { "case": "tls-creds-psk", - "type": "471" + "type": "475" }, { "case": "tls-creds-x509", - "type": "472" + "type": "476" }, { "case": "tls-cipher-suites", - "type": "473" + "type": "477" }, { "case": "x-remote-object", - "type": "474" + "type": "478" }, { "case": "x-vfio-user-server", - "type": "475" + "type": "479" }, { "case": "can-bus", @@ -6729,7 +6744,7 @@ "members": [ { "name": "qom-type", - "type": "436" + "type": "440" }, { "name": "id", @@ -6829,7 +6844,7 @@ "variants": [ { "case": "s390x", - "type": "478" + "type": "482" }, { "case": "aarch64", @@ -6968,11 +6983,11 @@ { "name": "props", "default": null, - "type": "476" + "type": "480" }, { "name": "target", - "type": "477" + "type": "481" } ], "meta-type": "object" @@ -7047,7 +7062,7 @@ "members": [ { "name": "arch", - "type": "477" + "type": "481" } ], "meta-type": "object" @@ -7171,7 +7186,7 @@ }, { "name": "policy", - "type": "479" + "type": "483" } ], "meta-type": "object" @@ -7194,7 +7209,7 @@ }, { "name": "props", - "type": "476" + "type": "480" }, { "name": "qom-path", @@ -7210,29 +7225,29 @@ "variants": [ { "case": "node", - "type": "481" + "type": "485" }, { "case": "dist", - "type": "482" + "type": "486" }, { "case": "cpu", - "type": "483" + "type": "487" }, { "case": "hmat-lb", - "type": "484" + "type": "488" }, { "case": "hmat-cache", - "type": "485" + "type": "489" } ], "members": [ { "name": "type", - "type": "480" + "type": "484" } ], "meta-type": "object" @@ -7293,29 +7308,29 @@ "variants": [ { "case": "dimm", - "type": "487" + "type": "491" }, { "case": "nvdimm", - "type": "487" + "type": "491" }, { "case": "virtio-pmem", - "type": "488" + "type": "492" }, { "case": "virtio-mem", - "type": "489" + "type": "493" }, { "case": "sgx-epc", - "type": "490" + "type": "494" } ], "members": [ { "name": "type", - "type": "486" + "type": "490" } ], "meta-type": "object" @@ -7378,11 +7393,11 @@ "members": [ { "name": "type", - "type": "493" + "type": "497" }, { "name": "model", - "type": "491" + "type": "495" } ], "meta-type": "object" @@ -7392,7 +7407,7 @@ "members": [ { "name": "model", - "type": "491" + "type": "495" } ], "meta-type": "object" @@ -7444,7 +7459,7 @@ "members": [ { "name": "mode", - "type": "494" + "type": "498" }, { "name": "filename", @@ -7499,11 +7514,11 @@ "variants": [ { "case": "block-node", - "type": "496" + "type": "500" }, { "case": "chardev", - "type": "497" + "type": "501" }, { "case": "migration", @@ -7513,7 +7528,7 @@ "members": [ { "name": "type", - "type": "495" + "type": "499" } ], "meta-type": "object" @@ -7682,7 +7697,7 @@ }, { "name": "fds", - "type": "[498]" + "type": "[502]" } ], "meta-type": "object" @@ -7712,7 +7727,7 @@ }, { "name": "parameters", - "type": "[499]" + "type": "[503]" } ], "meta-type": "object" @@ -7778,7 +7793,7 @@ }, { "name": "state", - "type": "500" + "type": "504" }, { "name": "handle", @@ -7883,7 +7898,7 @@ }, { "name": "sections", - "type": "[501]" + "type": "[505]" } ], "meta-type": "object" @@ -7906,7 +7921,7 @@ }, { "name": "type", - "type": "502" + "type": "506" }, { "name": "remote-domain", @@ -7948,35 +7963,35 @@ "variants": [ { "case": "none", - "type": "504" + "type": "508" }, { "case": "alsa", - "type": "505" + "type": "509" }, { "case": "dbus", - "type": "504" + "type": "508" }, { "case": "oss", - "type": "509" + "type": "513" }, { "case": "pa", - "type": "510" + "type": "514" }, { "case": "sdl", - "type": "512" + "type": "516" }, { "case": "spice", - "type": "504" + "type": "508" }, { "case": "wav", - "type": "514" + "type": "518" } ], "members": [ @@ -7986,7 +8001,7 @@ }, { "name": "driver", - "type": "503" + "type": "507" }, { "name": "timer-period", @@ -8015,7 +8030,7 @@ }, { "name": "slot-type", - "type": "515" + "type": "519" }, { "name": "source", @@ -8052,7 +8067,7 @@ }, { "name": "devices", - "type": "[516]" + "type": "[520]" } ], "meta-type": "object" @@ -8063,7 +8078,7 @@ "variants": [ { "case": "vcpu", - "type": "519" + "type": "523" }, { "case": "vm", @@ -8077,12 +8092,12 @@ "members": [ { "name": "target", - "type": "517" + "type": "521" }, { "name": "providers", "default": null, - "type": "[518]" + "type": "[522]" } ], "meta-type": "object" @@ -8097,7 +8112,7 @@ "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "qom-path", @@ -8106,7 +8121,7 @@ }, { "name": "stats", - "type": "[521]" + "type": "[525]" } ], "meta-type": "object" @@ -8117,7 +8132,7 @@ { "name": "provider", "default": null, - "type": "520" + "type": "524" } ], "meta-type": "object" @@ -8132,15 +8147,15 @@ "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "target", - "type": "517" + "type": "521" }, { "name": "stats", - "type": "[522]" + "type": "[526]" } ], "meta-type": "object" @@ -8195,15 +8210,15 @@ }, { "name": "guest-features", - "type": "523" + "type": "527" }, { "name": "host-features", - "type": "523" + "type": "527" }, { "name": "backend-features", - "type": "523" + "type": "527" }, { "name": "num-vqs", @@ -8211,7 +8226,7 @@ }, { "name": "status", - "type": "524" + "type": "528" }, { "name": "isr", @@ -8260,7 +8275,7 @@ { "name": "vhost-dev", "default": null, - "type": "525" + "type": "529" } ], "meta-type": "object" @@ -8447,15 +8462,15 @@ }, { "name": "descs", - "type": "[526]" + "type": "[530]" }, { "name": "avail", - "type": "527" + "type": "531" }, { "name": "used", - "type": "528" + "type": "532" } ], "meta-type": "object" @@ -8474,11 +8489,11 @@ }, { "name": "service", - "type": "[529]" + "type": "[533]" }, { "name": "client", - "type": "[530]" + "type": "[534]" } ], "meta-type": "object" @@ -8491,8 +8506,48 @@ "type": "str" }, { - "name": "errors", - "type": "[531]" + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "dpa", + "type": "int" + }, + { + "name": "descriptor", + "type": "int" + }, + { + "name": "type", + "type": "int" + }, + { + "name": "transaction-type", + "type": "int" + }, + { + "name": "channel", + "default": null, + "type": "int" + }, + { + "name": "rank", + "default": null, + "type": "int" + }, + { + "name": "device", + "default": null, + "type": "int" + }, + { + "name": "component-id", + "default": null, + "type": "str" } ], "meta-type": "object" @@ -8504,9 +8559,169 @@ "name": "path", "type": "str" }, + { + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "dpa", + "type": "int" + }, + { + "name": "descriptor", + "type": "int" + }, { "name": "type", - "type": "532" + "type": "int" + }, + { + "name": "transaction-type", + "type": "int" + }, + { + "name": "channel", + "default": null, + "type": "int" + }, + { + "name": "rank", + "default": null, + "type": "int" + }, + { + "name": "nibble-mask", + "default": null, + "type": "int" + }, + { + "name": "bank-group", + "default": null, + "type": "int" + }, + { + "name": "bank", + "default": null, + "type": "int" + }, + { + "name": "row", + "default": null, + "type": "int" + }, + { + "name": "column", + "default": null, + "type": "int" + }, + { + "name": "correction-mask", + "default": null, + "type": "[int]" + } + ], + "meta-type": "object" + }, + { + "name": "270", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "type", + "type": "int" + }, + { + "name": "health-status", + "type": "int" + }, + { + "name": "media-status", + "type": "int" + }, + { + "name": "additional-status", + "type": "int" + }, + { + "name": "life-used", + "type": "int" + }, + { + "name": "temperature", + "type": "int" + }, + { + "name": "dirty-shutdown-count", + "type": "int" + }, + { + "name": "corrected-volatile-error-count", + "type": "int" + }, + { + "name": "corrected-persistent-error-count", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "271", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "start", + "type": "int" + }, + { + "name": "length", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "272", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "errors", + "type": "[536]" + } + ], + "meta-type": "object" + }, + { + "name": "273", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "type", + "type": "537" } ], "meta-type": "object" @@ -8517,7 +8732,7 @@ "meta-type": "builtin" }, { - "name": "270", + "name": "274", "members": [ { "name": "debug" @@ -8589,7 +8804,7 @@ ] }, { - "name": "271", + "name": "275", "members": [ { "name": "none" @@ -8641,7 +8856,7 @@ ] }, { - "name": "272", + "name": "276", "members": [ { "name": "reset" @@ -8677,7 +8892,7 @@ ] }, { - "name": "273", + "name": "277", "members": [ { "name": "reset" @@ -8693,7 +8908,7 @@ ] }, { - "name": "274", + "name": "278", "members": [ { "name": "poweroff" @@ -8709,7 +8924,7 @@ ] }, { - "name": "275", + "name": "279", "members": [ { "name": "pause" @@ -8733,7 +8948,7 @@ ] }, { - "name": "276", + "name": "280", "members": [ { "name": "pause" @@ -8753,28 +8968,28 @@ ] }, { - "name": "277", + "name": "281", "tag": "type", "variants": [ { "case": "hyper-v", - "type": "534" + "type": "539" }, { "case": "s390", - "type": "535" + "type": "540" } ], "members": [ { "name": "type", - "type": "533" + "type": "538" } ], "meta-type": "object" }, { - "name": "278", + "name": "282", "members": [ { "name": "hypervisor" @@ -8790,7 +9005,7 @@ ] }, { - "name": "279", + "name": "283", "members": [ { "name": "ignore" @@ -8814,7 +9029,7 @@ ] }, { - "name": "280", + "name": "284", "members": [ { "name": "action-required", @@ -8828,7 +9043,7 @@ "meta-type": "object" }, { - "name": "281", + "name": "285", "members": [ { "name": "undefined" @@ -8880,7 +9095,7 @@ ] }, { - "name": "282", + "name": "286", "members": [ { "name": "commit" @@ -8929,7 +9144,7 @@ "meta-type": "builtin" }, { - "name": "283", + "name": "287", "members": [ { "name": "retain" @@ -8954,7 +9169,7 @@ "meta-type": "array" }, { - "name": "284", + "name": "288", "members": [ { "name": "ok" @@ -8974,7 +9189,7 @@ ] }, { - "name": "285", + "name": "289", "members": [ { "name": "rd_bytes", @@ -9107,46 +9322,46 @@ }, { "name": "timed_stats", - "type": "[536]" + "type": "[541]" }, { "name": "rd_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "wr_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "zone_append_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "flush_latency_histogram", "default": null, - "type": "537" + "type": "542" } ], "meta-type": "object" }, { - "name": "286", + "name": "290", "tag": "driver", "variants": [ { "case": "file", - "type": "538" + "type": "543" }, { "case": "host_device", - "type": "538" + "type": "543" }, { "case": "nvme", - "type": "539" + "type": "544" }, { "case": "blkdebug", @@ -9328,13 +9543,13 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "287", + "name": "291", "members": [ { "name": "existing" @@ -9350,7 +9565,7 @@ ] }, { - "name": "288", + "name": "292", "members": [ { "name": "report" @@ -9378,7 +9593,7 @@ ] }, { - "name": "289", + "name": "293", "members": [ { "name": "top" @@ -9406,7 +9621,7 @@ ] }, { - "name": "290", + "name": "294", "members": [ { "name": "on-success" @@ -9426,7 +9641,7 @@ ] }, { - "name": "291", + "name": "295", "members": [ { "name": "use-copy-range", @@ -9447,7 +9662,7 @@ "meta-type": "object" }, { - "name": "292", + "name": "296", "members": [ { "name": "off" @@ -9467,7 +9682,7 @@ ] }, { - "name": "293", + "name": "297", "members": [ { "name": "filename", @@ -9529,18 +9744,18 @@ { "name": "format-specific", "default": null, - "type": "540" + "type": "545" }, { "name": "backing-image", "default": null, - "type": "293" + "type": "297" } ], "meta-type": "object" }, { - "name": "294", + "name": "298", "members": [ { "name": "writeback", @@ -9558,12 +9773,12 @@ "meta-type": "object" }, { - "name": "[295]", - "element-type": "295", + "name": "[299]", + "element-type": "299", "meta-type": "array" }, { - "name": "295", + "name": "299", "members": [ { "name": "name", @@ -9599,12 +9814,12 @@ "meta-type": "object" }, { - "name": "[296]", - "element-type": "296", + "name": "[300]", + "element-type": "300", "meta-type": "array" }, { - "name": "296", + "name": "300", "members": [ { "name": "id", @@ -9612,7 +9827,7 @@ }, { "name": "type", - "type": "541" + "type": "546" }, { "name": "name", @@ -9622,12 +9837,12 @@ "meta-type": "object" }, { - "name": "[297]", - "element-type": "297", + "name": "[301]", + "element-type": "301", "meta-type": "array" }, { - "name": "297", + "name": "301", "members": [ { "name": "parent", @@ -9643,17 +9858,17 @@ }, { "name": "perm", - "type": "[542]" + "type": "[547]" }, { "name": "shared-perm", - "type": "[542]" + "type": "[547]" } ], "meta-type": "object" }, { - "name": "298", + "name": "302", "members": [ { "name": "background" @@ -9669,12 +9884,12 @@ ] }, { - "name": "[299]", - "element-type": "299", + "name": "[303]", + "element-type": "303", "meta-type": "array" }, { - "name": "299", + "name": "303", "members": [ { "type": "str" @@ -9686,7 +9901,7 @@ "meta-type": "alternate" }, { - "name": "300", + "name": "304", "members": [ { "name": "blkdebug" @@ -9882,7 +10097,7 @@ ] }, { - "name": "301", + "name": "305", "members": [ { "name": "ignore" @@ -9898,7 +10113,7 @@ ] }, { - "name": "302", + "name": "306", "members": [ { "name": "direct", @@ -9914,11 +10129,11 @@ "meta-type": "object" }, { - "name": "303", + "name": "307", "members": [ { "name": "image", - "type": "543" + "type": "548" }, { "name": "config", @@ -9958,36 +10173,36 @@ { "name": "inject-error", "default": null, - "type": "[544]" + "type": "[549]" }, { "name": "set-state", "default": null, - "type": "[545]" + "type": "[550]" }, { "name": "take-child-perms", "default": null, - "type": "[542]" + "type": "[547]" }, { "name": "unshare-child-perms", "default": null, - "type": "[542]" + "type": "[547]" } ], "meta-type": "object" }, { - "name": "304", + "name": "308", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "log", - "type": "543" + "type": "548" }, { "name": "log-sector-size", @@ -10008,49 +10223,49 @@ "meta-type": "object" }, { - "name": "305", + "name": "309", "members": [ { "name": "test", - "type": "543" + "type": "548" }, { "name": "raw", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "306", + "name": "310", "members": [ { "name": "image", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "307", + "name": "311", "members": [ { "name": "file", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "308", + "name": "312", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "target", - "type": "543" + "type": "548" }, { "name": "bitmap", @@ -10060,7 +10275,7 @@ { "name": "on-cbw-error", "default": null, - "type": "546" + "type": "551" }, { "name": "cbw-timeout", @@ -10071,11 +10286,11 @@ "meta-type": "object" }, { - "name": "309", + "name": "313", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "bottom", @@ -10086,7 +10301,7 @@ "meta-type": "object" }, { - "name": "310", + "name": "314", "members": [ { "name": "filename", @@ -10100,12 +10315,12 @@ { "name": "locking", "default": null, - "type": "547" + "type": "552" }, { "name": "aio", "default": null, - "type": "548" + "type": "553" }, { "name": "aio-max-batch", @@ -10132,7 +10347,7 @@ ] }, { - "name": "311", + "name": "315", "members": [ { "name": "url", @@ -10172,7 +10387,7 @@ "meta-type": "object" }, { - "name": "312", + "name": "316", "members": [ { "name": "url", @@ -10217,7 +10432,7 @@ "meta-type": "object" }, { - "name": "313", + "name": "317", "members": [ { "name": "volume", @@ -10229,7 +10444,7 @@ }, { "name": "server", - "type": "[373]" + "type": "[377]" }, { "name": "debug", @@ -10245,7 +10460,7 @@ "meta-type": "object" }, { - "name": "314", + "name": "318", "members": [ { "name": "url", @@ -10295,7 +10510,7 @@ "meta-type": "object" }, { - "name": "315", + "name": "319", "members": [ { "name": "url", @@ -10350,7 +10565,7 @@ "meta-type": "object" }, { - "name": "316", + "name": "320", "members": [ { "name": "filename", @@ -10360,11 +10575,11 @@ "meta-type": "object" }, { - "name": "317", + "name": "321", "members": [ { "name": "transport", - "type": "549" + "type": "554" }, { "name": "portal", @@ -10397,7 +10612,7 @@ { "name": "header-digest", "default": null, - "type": "550" + "type": "555" }, { "name": "timeout", @@ -10408,11 +10623,11 @@ "meta-type": "object" }, { - "name": "318", + "name": "322", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "key-secret", @@ -10423,11 +10638,11 @@ "meta-type": "object" }, { - "name": "319", + "name": "323", "members": [ { "name": "server", - "type": "373" + "type": "377" }, { "name": "export", @@ -10466,11 +10681,11 @@ "meta-type": "object" }, { - "name": "320", + "name": "324", "members": [ { "name": "server", - "type": "551" + "type": "556" }, { "name": "path", @@ -10510,7 +10725,7 @@ "meta-type": "object" }, { - "name": "321", + "name": "325", "members": [ { "name": "size", @@ -10531,7 +10746,7 @@ "meta-type": "object" }, { - "name": "322", + "name": "326", "members": [ { "name": "device", @@ -10545,7 +10760,7 @@ "meta-type": "object" }, { - "name": "323", + "name": "327", "members": [ { "name": "path", @@ -10555,11 +10770,11 @@ "meta-type": "object" }, { - "name": "324", + "name": "328", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "prealloc-align", @@ -10575,16 +10790,16 @@ "meta-type": "object" }, { - "name": "325", + "name": "329", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" }, { "name": "lazy-refcounts", @@ -10614,7 +10829,7 @@ { "name": "overlap-check", "default": null, - "type": "553" + "type": "558" }, { "name": "cache-size", @@ -10644,53 +10859,53 @@ { "name": "encrypt", "default": null, - "type": "554" + "type": "559" }, { "name": "data-file", "default": null, - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "326", + "name": "330", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" }, { "name": "encrypt", "default": null, - "type": "555" + "type": "560" } ], "meta-type": "object" }, { - "name": "327", + "name": "331", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" } ], "meta-type": "object" }, { - "name": "328", + "name": "332", "members": [ { "name": "blkverify", @@ -10699,7 +10914,7 @@ }, { "name": "children", - "type": "[543]" + "type": "[548]" }, { "name": "vote-threshold", @@ -10713,17 +10928,17 @@ { "name": "read-pattern", "default": null, - "type": "556" + "type": "561" } ], "meta-type": "object" }, { - "name": "329", + "name": "333", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "offset", @@ -10739,7 +10954,7 @@ "meta-type": "object" }, { - "name": "330", + "name": "334", "members": [ { "name": "pool", @@ -10767,7 +10982,7 @@ { "name": "encrypt", "default": null, - "type": "557" + "type": "562" }, { "name": "user", @@ -10777,7 +10992,7 @@ { "name": "auth-client-required", "default": null, - "type": "[558]" + "type": "[563]" }, { "name": "key-secret", @@ -10787,21 +11002,21 @@ { "name": "server", "default": null, - "type": "[559]" + "type": "[564]" } ], "meta-type": "object" }, { - "name": "331", + "name": "335", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "mode", - "type": "560" + "type": "565" }, { "name": "top-id", @@ -10812,11 +11027,11 @@ "meta-type": "object" }, { - "name": "332", + "name": "336", "members": [ { "name": "server", - "type": "561" + "type": "566" }, { "name": "path", @@ -10830,13 +11045,13 @@ { "name": "host-key-check", "default": null, - "type": "562" + "type": "567" } ], "meta-type": "object" }, { - "name": "333", + "name": "337", "members": [ { "name": "throttle-group", @@ -10844,13 +11059,13 @@ }, { "name": "file", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "334", + "name": "338", "members": [ { "name": "path", @@ -10860,7 +11075,7 @@ "meta-type": "object" }, { - "name": "335", + "name": "339", "members": [ { "name": "path", @@ -10870,7 +11085,7 @@ "meta-type": "object" }, { - "name": "336", + "name": "340", "members": [ { "name": "path", @@ -10883,7 +11098,7 @@ ] }, { - "name": "337", + "name": "341", "members": [ { "name": "dir", @@ -10918,64 +11133,64 @@ "meta-type": "array" }, { - "name": "338", + "name": "342", "tag": "driver", "variants": [ { "case": "file", - "type": "563" + "type": "568" }, { "case": "gluster", - "type": "564" + "type": "569" }, { "case": "luks", - "type": "565" + "type": "570" }, { "case": "nfs", - "type": "566" + "type": "571" }, { "case": "parallels", - "type": "567" + "type": "572" }, { "case": "qcow", - "type": "568" + "type": "573" }, { "case": "qcow2", - "type": "569" + "type": "574" }, { "case": "qed", - "type": "570" + "type": "575" }, { "case": "rbd", - "type": "571" + "type": "576" }, { "case": "ssh", - "type": "572" + "type": "577" }, { "case": "vdi", - "type": "573" + "type": "578" }, { "case": "vhdx", - "type": "574" + "type": "579" }, { "case": "vmdk", - "type": "575" + "type": "580" }, { "case": "vpc", - "type": "576" + "type": "581" }, { "case": "blkdebug", @@ -11113,22 +11328,22 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "339", + "name": "343", "tag": "driver", "variants": [ { "case": "luks", - "type": "577" + "type": "582" }, { "case": "qcow2", - "type": "578" + "type": "583" }, { "case": "blkdebug", @@ -11314,13 +11529,13 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "340", + "name": "344", "members": [ { "name": "read" @@ -11336,7 +11551,7 @@ ] }, { - "name": "341", + "name": "345", "members": [ { "name": "ignore" @@ -11356,7 +11571,7 @@ ] }, { - "name": "342", + "name": "346", "members": [ { "type": "str" @@ -11368,7 +11583,7 @@ "meta-type": "alternate" }, { - "name": "343", + "name": "347", "members": [ { "name": "read" @@ -11388,36 +11603,36 @@ ] }, { - "name": "344", + "name": "348", "tag": "type", "variants": [ { "case": "inet", - "type": "580" + "type": "585" }, { "case": "unix", - "type": "581" + "type": "586" }, { "case": "vsock", - "type": "582" + "type": "587" }, { "case": "fd", - "type": "583" + "type": "588" } ], "members": [ { "name": "type", - "type": "579" + "type": "584" } ], "meta-type": "object" }, { - "name": "345", + "name": "349", "members": [ { "name": "safe" @@ -11433,7 +11648,7 @@ ] }, { - "name": "346", + "name": "350", "members": [ { "name": "nbd" @@ -11457,7 +11672,7 @@ ] }, { - "name": "347", + "name": "351", "members": [ { "name": "name", @@ -11472,7 +11687,7 @@ { "name": "bitmaps", "default": null, - "type": "[299]" + "type": "[303]" }, { "name": "allocation-depth", @@ -11483,11 +11698,11 @@ "meta-type": "object" }, { - "name": "348", + "name": "352", "members": [ { "name": "addr", - "type": "373" + "type": "377" }, { "name": "logical-block-size", @@ -11503,7 +11718,7 @@ "meta-type": "object" }, { - "name": "349", + "name": "353", "members": [ { "name": "mountpoint", @@ -11517,13 +11732,13 @@ { "name": "allow-other", "default": null, - "type": "584" + "type": "589" } ], "meta-type": "object" }, { - "name": "350", + "name": "354", "members": [ { "name": "name", @@ -11553,7 +11768,7 @@ "meta-type": "object" }, { - "name": "351", + "name": "355", "members": [ { "name": "utf8" @@ -11569,108 +11784,108 @@ ] }, { - "name": "352", + "name": "356", "tag": "type", "variants": [ { "case": "file", - "type": "586" + "type": "591" }, { "case": "serial", - "type": "587" + "type": "592" }, { "case": "parallel", - "type": "587" + "type": "592" }, { "case": "pipe", - "type": "587" + "type": "592" }, { "case": "socket", - "type": "588" + "type": "593" }, { "case": "udp", - "type": "589" + "type": "594" }, { "case": "pty", - "type": "590" + "type": "595" }, { "case": "null", - "type": "590" + "type": "595" }, { "case": "mux", - "type": "591" + "type": "596" }, { "case": "msmouse", - "type": "590" + "type": "595" }, { "case": "wctablet", - "type": "590" + "type": "595" }, { "case": "braille", - "type": "590" + "type": "595" }, { "case": "testdev", - "type": "590" + "type": "595" }, { "case": "stdio", - "type": "592" + "type": "597" }, { "case": "console", - "type": "590" + "type": "595" }, { "case": "spicevmc", - "type": "593" + "type": "598" }, { "case": "spiceport", - "type": "594" + "type": "599" }, { "case": "qemu-vdagent", - "type": "595" + "type": "600" }, { "case": "dbus", - "type": "596" + "type": "601" }, { "case": "vc", - "type": "597" + "type": "602" }, { "case": "ringbuf", - "type": "598" + "type": "603" }, { "case": "memory", - "type": "598" + "type": "603" } ], "members": [ { "name": "type", - "type": "585" + "type": "590" } ], "meta-type": "object" }, { - "name": "353", + "name": "357", "members": [ { "name": "elf" @@ -11698,7 +11913,7 @@ ] }, { - "name": "354", + "name": "358", "members": [ { "name": "none" @@ -11722,12 +11937,12 @@ ] }, { - "name": "[353]", - "element-type": "353", + "name": "[357]", + "element-type": "357", "meta-type": "array" }, { - "name": "355", + "name": "359", "members": [ { "name": "none" @@ -11791,7 +12006,7 @@ ] }, { - "name": "356", + "name": "360", "members": [ { "name": "netdev", @@ -11822,7 +12037,7 @@ "meta-type": "object" }, { - "name": "357", + "name": "361", "members": [ { "name": "hostname", @@ -11882,7 +12097,7 @@ { "name": "dnssearch", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "domainname", @@ -11922,12 +12137,12 @@ { "name": "hostfwd", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "guestfwd", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "tftp-server-name", @@ -11938,7 +12153,7 @@ "meta-type": "object" }, { - "name": "358", + "name": "362", "members": [ { "name": "ifname", @@ -12019,7 +12234,7 @@ "meta-type": "object" }, { - "name": "359", + "name": "363", "members": [ { "name": "src", @@ -12092,7 +12307,7 @@ "meta-type": "object" }, { - "name": "360", + "name": "364", "members": [ { "name": "fd", @@ -12128,11 +12343,11 @@ "meta-type": "object" }, { - "name": "361", + "name": "365", "members": [ { "name": "addr", - "type": "373" + "type": "377" }, { "name": "server", @@ -12148,23 +12363,23 @@ "meta-type": "object" }, { - "name": "362", + "name": "366", "members": [ { "name": "local", "default": null, - "type": "373" + "type": "377" }, { "name": "remote", "default": null, - "type": "373" + "type": "377" } ], "meta-type": "object" }, { - "name": "363", + "name": "367", "members": [ { "name": "sock", @@ -12190,7 +12405,7 @@ "meta-type": "object" }, { - "name": "364", + "name": "368", "members": [ { "name": "br", @@ -12206,7 +12421,7 @@ "meta-type": "object" }, { - "name": "365", + "name": "369", "members": [ { "name": "hubid", @@ -12221,7 +12436,7 @@ "meta-type": "object" }, { - "name": "366", + "name": "370", "members": [ { "name": "ifname", @@ -12236,7 +12451,7 @@ "meta-type": "object" }, { - "name": "367", + "name": "371", "members": [ { "name": "chardev", @@ -12256,7 +12471,7 @@ "meta-type": "object" }, { - "name": "368", + "name": "372", "members": [ { "name": "vhostdev", @@ -12285,7 +12500,7 @@ "meta-type": "object" }, { - "name": "372", + "name": "376", "members": [ { "name": "normal" @@ -12310,36 +12525,36 @@ "meta-type": "array" }, { - "name": "373", + "name": "377", "tag": "type", "variants": [ { "case": "inet", - "type": "561" + "type": "566" }, { "case": "unix", - "type": "600" + "type": "605" }, { "case": "vsock", - "type": "601" + "type": "606" }, { "case": "fd", - "type": "599" + "type": "604" } ], "members": [ { "name": "type", - "type": "579" + "type": "584" } ], "meta-type": "object" }, { - "name": "374", + "name": "378", "members": [ { "name": "half" @@ -12355,7 +12570,7 @@ ] }, { - "name": "375", + "name": "379", "members": [ { "name": "off" @@ -12371,7 +12586,7 @@ ] }, { - "name": "376", + "name": "380", "members": [ { "name": "priority", @@ -12430,7 +12645,7 @@ "meta-type": "object" }, { - "name": "377", + "name": "381", "members": [ { "name": "in-pport", @@ -12471,7 +12686,7 @@ "meta-type": "object" }, { - "name": "378", + "name": "382", "members": [ { "name": "goto-tbl", @@ -12507,16 +12722,16 @@ "meta-type": "object" }, { - "name": "379", + "name": "383", "tag": "type", "variants": [ { "case": "passthrough", - "type": "602" + "type": "607" }, { "case": "emulator", - "type": "603" + "type": "608" } ], "members": [ @@ -12528,7 +12743,7 @@ "meta-type": "object" }, { - "name": "380", + "name": "384", "members": [ { "name": "vnc" @@ -12544,7 +12759,7 @@ ] }, { - "name": "381", + "name": "385", "members": [ { "name": "keep" @@ -12564,7 +12779,7 @@ ] }, { - "name": "382", + "name": "386", "members": [ { "name": "display", @@ -12575,7 +12790,7 @@ "meta-type": "object" }, { - "name": "383", + "name": "387", "members": [ { "name": "display", @@ -12586,7 +12801,7 @@ "meta-type": "object" }, { - "name": "384", + "name": "388", "members": [ { "name": "ppm" @@ -12602,7 +12817,7 @@ ] }, { - "name": "385", + "name": "389", "members": [ { "name": "client" @@ -12622,12 +12837,12 @@ ] }, { - "name": "[386]", - "element-type": "386", + "name": "[390]", + "element-type": "390", "meta-type": "array" }, { - "name": "386", + "name": "390", "members": [ { "name": "host", @@ -12639,7 +12854,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "connection-id", @@ -12661,7 +12876,7 @@ "meta-type": "object" }, { - "name": "387", + "name": "391", "members": [ { "name": "host", @@ -12673,13 +12888,13 @@ }, { "name": "family", - "type": "389" + "type": "393" } ], "meta-type": "object" }, { - "name": "388", + "name": "392", "members": [ { "name": "host", @@ -12691,7 +12906,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "auth", @@ -12702,7 +12917,7 @@ "meta-type": "object" }, { - "name": "389", + "name": "393", "members": [ { "name": "ipv4" @@ -12730,12 +12945,12 @@ ] }, { - "name": "[390]", - "element-type": "390", + "name": "[394]", + "element-type": "394", "meta-type": "array" }, { - "name": "390", + "name": "394", "members": [ { "name": "host", @@ -12747,7 +12962,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12767,12 +12982,12 @@ "meta-type": "object" }, { - "name": "[391]", - "element-type": "391", + "name": "[395]", + "element-type": "395", "meta-type": "array" }, { - "name": "391", + "name": "395", "members": [ { "name": "host", @@ -12784,7 +12999,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12792,18 +13007,18 @@ }, { "name": "auth", - "type": "392" + "type": "396" }, { "name": "vencrypt", "default": null, - "type": "393" + "type": "397" } ], "meta-type": "object" }, { - "name": "392", + "name": "396", "members": [ { "name": "none" @@ -12847,7 +13062,7 @@ ] }, { - "name": "393", + "name": "397", "members": [ { "name": "plain" @@ -12891,7 +13106,7 @@ ] }, { - "name": "394", + "name": "398", "members": [ { "name": "host", @@ -12903,7 +13118,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12918,7 +13133,7 @@ "meta-type": "object" }, { - "name": "395", + "name": "399", "members": [ { "name": "host", @@ -12930,7 +13145,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12940,71 +13155,71 @@ "meta-type": "object" }, { - "name": "[396]", - "element-type": "396", + "name": "[400]", + "element-type": "400", "meta-type": "array" }, { - "name": "396", + "name": "400", "tag": "type", "variants": [ { "case": "number", - "type": "605" + "type": "610" }, { "case": "qcode", - "type": "606" + "type": "611" } ], "members": [ { "name": "type", - "type": "604" + "type": "609" } ], "meta-type": "object" }, { - "name": "[397]", - "element-type": "397", + "name": "[401]", + "element-type": "401", "meta-type": "array" }, { - "name": "397", + "name": "401", "tag": "type", "variants": [ { "case": "key", - "type": "608" + "type": "613" }, { "case": "btn", - "type": "609" + "type": "614" }, { "case": "rel", - "type": "610" + "type": "615" }, { "case": "abs", - "type": "610" + "type": "615" }, { "case": "mtt", - "type": "611" + "type": "616" } ], "members": [ { "name": "type", - "type": "607" + "type": "612" } ], "meta-type": "object" }, { - "name": "398", + "name": "402", "members": [ { "name": "default" @@ -13040,7 +13255,7 @@ ] }, { - "name": "399", + "name": "403", "members": [ { "name": "off" @@ -13064,7 +13279,7 @@ ] }, { - "name": "400", + "name": "404", "members": [ { "name": "grab-on-hover", @@ -13090,7 +13305,7 @@ "meta-type": "object" }, { - "name": "401", + "name": "405", "members": [ { "name": "left-command-key", @@ -13111,7 +13326,7 @@ "meta-type": "object" }, { - "name": "402", + "name": "406", "members": [ { "name": "charset", @@ -13122,7 +13337,7 @@ "meta-type": "object" }, { - "name": "403", + "name": "407", "members": [ { "name": "rendernode", @@ -13133,7 +13348,7 @@ "meta-type": "object" }, { - "name": "404", + "name": "408", "members": [ { "name": "rendernode", @@ -13159,18 +13374,18 @@ "meta-type": "object" }, { - "name": "405", + "name": "409", "members": [ { "name": "grab-mod", "default": null, - "type": "612" + "type": "617" } ], "meta-type": "object" }, { - "name": "406", + "name": "410", "members": [ { "name": "vnc" @@ -13182,7 +13397,7 @@ ] }, { - "name": "407", + "name": "411", "members": [ { "name": "tls-certs", @@ -13193,7 +13408,7 @@ "meta-type": "object" }, { - "name": "408", + "name": "412", "members": [ { "name": "vnc" @@ -13205,18 +13420,18 @@ ] }, { - "name": "409", + "name": "413", "members": [ { "name": "addresses", "default": null, - "type": "[373]" + "type": "[377]" } ], "meta-type": "object" }, { - "name": "410", + "name": "414", "members": [ { "name": "none" @@ -13280,7 +13495,7 @@ ] }, { - "name": "411", + "name": "415", "members": [ { "name": "transferred", @@ -13358,7 +13573,7 @@ "meta-type": "object" }, { - "name": "412", + "name": "416", "members": [ { "name": "transferred", @@ -13368,7 +13583,7 @@ "meta-type": "object" }, { - "name": "413", + "name": "417", "members": [ { "name": "cache-size", @@ -13402,7 +13617,7 @@ "meta-type": "object" }, { - "name": "414", + "name": "418", "members": [ { "name": "pages", @@ -13428,12 +13643,12 @@ "meta-type": "object" }, { - "name": "[373]", - "element-type": "373", + "name": "[377]", + "element-type": "377", "meta-type": "array" }, { - "name": "415", + "name": "419", "members": [ { "name": "xbzrle" @@ -13503,6 +13718,9 @@ }, { "name": "postcopy-preempt" + }, + { + "name": "switchover-ack" } ], "meta-type": "enum", @@ -13527,11 +13745,12 @@ "validate-uuid", "background-snapshot", "zero-copy-send", - "postcopy-preempt" + "postcopy-preempt", + "switchover-ack" ] }, { - "name": "416", + "name": "420", "members": [ { "name": "none" @@ -13551,12 +13770,12 @@ ] }, { - "name": "[417]", - "element-type": "417", + "name": "[421]", + "element-type": "421", "meta-type": "array" }, { - "name": "417", + "name": "421", "members": [ { "name": "node-name", @@ -13568,13 +13787,13 @@ }, { "name": "bitmaps", - "type": "[613]" + "type": "[618]" } ], "meta-type": "object" }, { - "name": "418", + "name": "422", "members": [ { "name": "none" @@ -13594,7 +13813,7 @@ ] }, { - "name": "419", + "name": "423", "members": [ { "name": "none" @@ -13618,7 +13837,7 @@ ] }, { - "name": "420", + "name": "424", "members": [ { "name": "page-sampling" @@ -13638,7 +13857,7 @@ ] }, { - "name": "421", + "name": "425", "members": [ { "name": "unstarted" @@ -13658,12 +13877,12 @@ ] }, { - "name": "[422]", - "element-type": "422", + "name": "[426]", + "element-type": "426", "meta-type": "array" }, { - "name": "422", + "name": "426", "members": [ { "name": "id", @@ -13677,84 +13896,84 @@ "meta-type": "object" }, { - "name": "[423]", - "element-type": "423", + "name": "[427]", + "element-type": "427", "meta-type": "array" }, { - "name": "423", + "name": "427", "tag": "type", "variants": [ { "case": "abort", - "type": "615" + "type": "620" }, { "case": "block-dirty-bitmap-add", - "type": "616" + "type": "621" }, { "case": "block-dirty-bitmap-remove", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-clear", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-enable", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-disable", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-merge", - "type": "618" + "type": "623" }, { "case": "blockdev-backup", - "type": "619" + "type": "624" }, { "case": "blockdev-snapshot", - "type": "620" + "type": "625" }, { "case": "blockdev-snapshot-internal-sync", - "type": "621" + "type": "626" }, { "case": "blockdev-snapshot-sync", - "type": "622" + "type": "627" }, { "case": "drive-backup", - "type": "623" + "type": "628" } ], "members": [ { "name": "type", - "type": "614" + "type": "619" } ], "meta-type": "object" }, { - "name": "424", + "name": "428", "members": [ { "name": "completion-mode", "default": null, - "type": "624" + "type": "629" } ], "meta-type": "object" }, { - "name": "425", + "name": "429", "members": [ { "name": "unavailable" @@ -13774,12 +13993,12 @@ ] }, { - "name": "[426]", - "element-type": "426", + "name": "[430]", + "element-type": "430", "meta-type": "array" }, { - "name": "426", + "name": "430", "members": [ { "name": "oob" @@ -13791,7 +14010,7 @@ ] }, { - "name": "427", + "name": "431", "members": [ { "name": "major", @@ -13809,7 +14028,7 @@ "meta-type": "object" }, { - "name": "428", + "name": "432", "members": [ { "name": "builtin" @@ -13845,21 +14064,21 @@ ] }, { - "name": "429", + "name": "433", "members": [ { "name": "json-type", - "type": "625" + "type": "630" } ], "meta-type": "object" }, { - "name": "430", + "name": "434", "members": [ { "name": "members", - "type": "[626]" + "type": "[631]" }, { "name": "values", @@ -13872,7 +14091,7 @@ "meta-type": "object" }, { - "name": "431", + "name": "435", "members": [ { "name": "element-type", @@ -13882,11 +14101,11 @@ "meta-type": "object" }, { - "name": "432", + "name": "436", "members": [ { "name": "members", - "type": "[627]" + "type": "[632]" }, { "name": "tag", @@ -13896,23 +14115,23 @@ { "name": "variants", "default": null, - "type": "[628]" + "type": "[633]" } ], "meta-type": "object" }, { - "name": "433", + "name": "437", "members": [ { "name": "members", - "type": "[629]" + "type": "[634]" } ], "meta-type": "object" }, { - "name": "434", + "name": "438", "members": [ { "name": "arg-type", @@ -13931,7 +14150,7 @@ "meta-type": "object" }, { - "name": "435", + "name": "439", "members": [ { "name": "arg-type", @@ -13941,7 +14160,7 @@ "meta-type": "object" }, { - "name": "436", + "name": "440", "members": [ { "name": "authz-list" @@ -14131,23 +14350,23 @@ ] }, { - "name": "437", + "name": "441", "members": [ { "name": "policy", "default": null, - "type": "630" + "type": "635" }, { "name": "rules", "default": null, - "type": "[631]" + "type": "[636]" } ], "meta-type": "object" }, { - "name": "438", + "name": "442", "members": [ { "name": "filename", @@ -14162,7 +14381,7 @@ "meta-type": "object" }, { - "name": "439", + "name": "443", "members": [ { "name": "service", @@ -14172,7 +14391,7 @@ "meta-type": "object" }, { - "name": "440", + "name": "444", "members": [ { "name": "identity", @@ -14182,7 +14401,7 @@ "meta-type": "object" }, { - "name": "441", + "name": "445", "members": [ { "name": "if", @@ -14196,7 +14415,7 @@ "meta-type": "object" }, { - "name": "442", + "name": "446", "members": [ { "name": "primary_in", @@ -14243,7 +14462,7 @@ "meta-type": "object" }, { - "name": "443", + "name": "447", "members": [ { "name": "queues", @@ -14264,7 +14483,7 @@ "meta-type": "object" }, { - "name": "444", + "name": "448", "members": [ { "name": "queues", @@ -14289,7 +14508,7 @@ "meta-type": "object" }, { - "name": "445", + "name": "449", "members": [ { "name": "addr", @@ -14304,7 +14523,7 @@ "meta-type": "object" }, { - "name": "446", + "name": "450", "members": [ { "name": "netdev", @@ -14313,7 +14532,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14328,7 +14547,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "interval", @@ -14338,7 +14557,7 @@ "meta-type": "object" }, { - "name": "447", + "name": "451", "members": [ { "name": "netdev", @@ -14347,7 +14566,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14362,7 +14581,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "file", @@ -14377,7 +14596,7 @@ "meta-type": "object" }, { - "name": "448", + "name": "452", "members": [ { "name": "netdev", @@ -14386,7 +14605,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14401,7 +14620,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "outdev", @@ -14416,7 +14635,7 @@ "meta-type": "object" }, { - "name": "449", + "name": "453", "members": [ { "name": "netdev", @@ -14425,7 +14644,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14440,7 +14659,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "indev", @@ -14461,7 +14680,7 @@ "meta-type": "object" }, { - "name": "450", + "name": "454", "members": [ { "name": "netdev", @@ -14470,7 +14689,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14485,13 +14704,13 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" } ], "meta-type": "object" }, { - "name": "451", + "name": "455", "members": [ { "name": "netdev", @@ -14500,7 +14719,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14515,7 +14734,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "vnet_hdr_support", @@ -14526,7 +14745,7 @@ "meta-type": "object" }, { - "name": "452", + "name": "456", "members": [ { "name": "name", @@ -14566,7 +14785,7 @@ "meta-type": "object" }, { - "name": "453", + "name": "457", "members": [ { "name": "evdev", @@ -14585,13 +14804,13 @@ { "name": "grab-toggle", "default": null, - "type": "634" + "type": "639" } ], "meta-type": "object" }, { - "name": "454", + "name": "458", "members": [ { "name": "aio-max-batch", @@ -14627,7 +14846,7 @@ "meta-type": "object" }, { - "name": "455", + "name": "459", "members": [ { "name": "aio-max-batch", @@ -14648,7 +14867,7 @@ "meta-type": "object" }, { - "name": "456", + "name": "460", "members": [ { "name": "dump", @@ -14668,7 +14887,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14708,7 +14927,7 @@ "meta-type": "object" }, { - "name": "457", + "name": "461", "members": [ { "name": "dump", @@ -14728,7 +14947,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14797,7 +15016,7 @@ "meta-type": "object" }, { - "name": "458", + "name": "462", "members": [ { "name": "dump", @@ -14817,7 +15036,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14872,7 +15091,7 @@ "meta-type": "object" }, { - "name": "459", + "name": "463", "members": [ { "name": "dump", @@ -14892,7 +15111,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14932,7 +15151,7 @@ "meta-type": "object" }, { - "name": "460", + "name": "464", "members": [ { "name": "path", @@ -14942,7 +15161,7 @@ "meta-type": "object" }, { - "name": "461", + "name": "465", "members": [ { "name": "chardev", @@ -14957,7 +15176,7 @@ "meta-type": "object" }, { - "name": "462", + "name": "466", "members": [ { "name": "opened", @@ -14971,7 +15190,7 @@ "meta-type": "object" }, { - "name": "463", + "name": "467", "members": [ { "name": "opened", @@ -14989,7 +15208,7 @@ "meta-type": "object" }, { - "name": "464", + "name": "468", "members": [ { "name": "opened", @@ -15008,7 +15227,7 @@ "meta-type": "object" }, { - "name": "465", + "name": "469", "members": [ { "name": "loaded", @@ -15021,7 +15240,7 @@ { "name": "format", "default": null, - "type": "635" + "type": "640" }, { "name": "keyid", @@ -15047,7 +15266,7 @@ "meta-type": "object" }, { - "name": "466", + "name": "470", "members": [ { "name": "loaded", @@ -15060,7 +15279,7 @@ { "name": "format", "default": null, - "type": "635" + "type": "640" }, { "name": "keyid", @@ -15080,7 +15299,7 @@ "meta-type": "object" }, { - "name": "467", + "name": "471", "members": [ { "name": "sev-device", @@ -15125,7 +15344,7 @@ "meta-type": "object" }, { - "name": "468", + "name": "472", "members": [ { "name": "cpu-affinity", @@ -15141,12 +15360,12 @@ "meta-type": "object" }, { - "name": "469", + "name": "473", "members": [ { "name": "limits", "default": null, - "type": "636" + "type": "641" }, { "name": "x-iops-total", @@ -15304,7 +15523,7 @@ "meta-type": "object" }, { - "name": "470", + "name": "474", "members": [ { "name": "verify-peer", @@ -15319,7 +15538,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15338,7 +15557,7 @@ "meta-type": "object" }, { - "name": "471", + "name": "475", "members": [ { "name": "verify-peer", @@ -15353,7 +15572,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15377,7 +15596,7 @@ "meta-type": "object" }, { - "name": "472", + "name": "476", "members": [ { "name": "verify-peer", @@ -15392,7 +15611,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15421,7 +15640,7 @@ "meta-type": "object" }, { - "name": "473", + "name": "477", "members": [ { "name": "verify-peer", @@ -15436,7 +15655,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15447,7 +15666,7 @@ "meta-type": "object" }, { - "name": "474", + "name": "478", "members": [ { "name": "fd", @@ -15461,11 +15680,11 @@ "meta-type": "object" }, { - "name": "475", + "name": "479", "members": [ { "name": "socket", - "type": "373" + "type": "377" }, { "name": "device", @@ -15475,7 +15694,7 @@ "meta-type": "object" }, { - "name": "476", + "name": "480", "members": [ { "name": "node-id", @@ -15511,7 +15730,7 @@ "meta-type": "object" }, { - "name": "477", + "name": "481", "members": [ { "name": "aarch64" @@ -15643,17 +15862,17 @@ ] }, { - "name": "478", + "name": "482", "members": [ { "name": "cpu-state", - "type": "638" + "type": "643" } ], "meta-type": "object" }, { - "name": "479", + "name": "483", "members": [ { "name": "default" @@ -15677,7 +15896,7 @@ ] }, { - "name": "480", + "name": "484", "members": [ { "name": "node" @@ -15705,7 +15924,7 @@ ] }, { - "name": "481", + "name": "485", "members": [ { "name": "nodeid", @@ -15736,7 +15955,7 @@ "meta-type": "object" }, { - "name": "482", + "name": "486", "members": [ { "name": "src", @@ -15754,7 +15973,7 @@ "meta-type": "object" }, { - "name": "483", + "name": "487", "members": [ { "name": "node-id", @@ -15790,7 +16009,7 @@ "meta-type": "object" }, { - "name": "484", + "name": "488", "members": [ { "name": "initiator", @@ -15802,11 +16021,11 @@ }, { "name": "hierarchy", - "type": "639" + "type": "644" }, { "name": "data-type", - "type": "640" + "type": "645" }, { "name": "latency", @@ -15822,7 +16041,7 @@ "meta-type": "object" }, { - "name": "485", + "name": "489", "members": [ { "name": "node-id", @@ -15838,11 +16057,11 @@ }, { "name": "associativity", - "type": "641" + "type": "646" }, { "name": "policy", - "type": "642" + "type": "647" }, { "name": "line", @@ -15852,7 +16071,7 @@ "meta-type": "object" }, { - "name": "486", + "name": "490", "members": [ { "name": "dimm" @@ -15880,47 +16099,47 @@ ] }, { - "name": "487", + "name": "491", "members": [ { "name": "data", - "type": "643" + "type": "648" } ], "meta-type": "object" }, { - "name": "488", + "name": "492", "members": [ { "name": "data", - "type": "644" + "type": "649" } ], "meta-type": "object" }, { - "name": "489", + "name": "493", "members": [ { "name": "data", - "type": "645" + "type": "650" } ], "meta-type": "object" }, { - "name": "490", + "name": "494", "members": [ { "name": "data", - "type": "646" + "type": "651" } ], "meta-type": "object" }, { - "name": "491", + "name": "495", "members": [ { "name": "name", @@ -15935,7 +16154,7 @@ "meta-type": "object" }, { - "name": "492", + "name": "496", "members": [ { "name": "incompatible" @@ -15959,7 +16178,7 @@ ] }, { - "name": "493", + "name": "497", "members": [ { "name": "static" @@ -15975,7 +16194,7 @@ ] }, { - "name": "494", + "name": "498", "members": [ { "name": "none" @@ -15995,7 +16214,7 @@ ] }, { - "name": "495", + "name": "499", "members": [ { "name": "block-node" @@ -16015,7 +16234,7 @@ ] }, { - "name": "496", + "name": "500", "members": [ { "name": "node-name", @@ -16025,7 +16244,7 @@ "meta-type": "object" }, { - "name": "497", + "name": "501", "members": [ { "name": "id", @@ -16035,12 +16254,12 @@ "meta-type": "object" }, { - "name": "[498]", - "element-type": "498", + "name": "[502]", + "element-type": "502", "meta-type": "array" }, { - "name": "498", + "name": "502", "members": [ { "name": "fd", @@ -16055,12 +16274,12 @@ "meta-type": "object" }, { - "name": "[499]", - "element-type": "499", + "name": "[503]", + "element-type": "503", "meta-type": "array" }, { - "name": "499", + "name": "503", "members": [ { "name": "name", @@ -16068,7 +16287,7 @@ }, { "name": "type", - "type": "647" + "type": "652" }, { "name": "help", @@ -16084,7 +16303,7 @@ "meta-type": "object" }, { - "name": "500", + "name": "504", "members": [ { "name": "uninit" @@ -16116,12 +16335,12 @@ ] }, { - "name": "[501]", - "element-type": "501", + "name": "[505]", + "element-type": "505", "meta-type": "array" }, { - "name": "501", + "name": "505", "members": [ { "name": "node", @@ -16135,7 +16354,7 @@ "meta-type": "object" }, { - "name": "502", + "name": "506", "members": [ { "name": "closed" @@ -16167,7 +16386,7 @@ ] }, { - "name": "503", + "name": "507", "members": [ { "name": "none" @@ -16207,33 +16426,33 @@ ] }, { - "name": "504", + "name": "508", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" } ], "meta-type": "object" }, { - "name": "505", + "name": "509", "members": [ { "name": "in", "default": null, - "type": "649" + "type": "654" }, { "name": "out", "default": null, - "type": "649" + "type": "654" }, { "name": "threshold", @@ -16244,33 +16463,33 @@ "meta-type": "object" }, { - "name": "506", + "name": "510", "members": [ { "name": "in", "default": null, - "type": "650" + "type": "655" }, { "name": "out", "default": null, - "type": "650" + "type": "655" } ], "meta-type": "object" }, { - "name": "507", + "name": "511", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "latency", @@ -16281,33 +16500,33 @@ "meta-type": "object" }, { - "name": "508", + "name": "512", "members": [ { "name": "in", "default": null, - "type": "651" + "type": "656" }, { "name": "out", "default": null, - "type": "651" + "type": "656" } ], "meta-type": "object" }, { - "name": "509", + "name": "513", "members": [ { "name": "in", "default": null, - "type": "652" + "type": "657" }, { "name": "out", "default": null, - "type": "652" + "type": "657" }, { "name": "try-mmap", @@ -16328,17 +16547,17 @@ "meta-type": "object" }, { - "name": "510", + "name": "514", "members": [ { "name": "in", "default": null, - "type": "653" + "type": "658" }, { "name": "out", "default": null, - "type": "653" + "type": "658" }, { "name": "server", @@ -16349,49 +16568,49 @@ "meta-type": "object" }, { - "name": "511", + "name": "515", "members": [ { "name": "in", "default": null, - "type": "654" + "type": "659" }, { "name": "out", "default": null, - "type": "654" + "type": "659" } ], "meta-type": "object" }, { - "name": "512", + "name": "516", "members": [ { "name": "in", "default": null, - "type": "655" + "type": "660" }, { "name": "out", "default": null, - "type": "655" + "type": "660" } ], "meta-type": "object" }, { - "name": "513", + "name": "517", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "dev", @@ -16407,17 +16626,17 @@ "meta-type": "object" }, { - "name": "514", + "name": "518", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "path", @@ -16428,7 +16647,7 @@ "meta-type": "object" }, { - "name": "515", + "name": "519", "members": [ { "name": "DIMM" @@ -16444,12 +16663,12 @@ ] }, { - "name": "[516]", - "element-type": "516", + "name": "[520]", + "element-type": "520", "meta-type": "array" }, { - "name": "516", + "name": "520", "members": [ { "name": "bus", @@ -16465,11 +16684,11 @@ }, { "name": "class_info", - "type": "656" + "type": "661" }, { "name": "id", - "type": "657" + "type": "662" }, { "name": "irq", @@ -16487,17 +16706,17 @@ { "name": "pci_bridge", "default": null, - "type": "658" + "type": "663" }, { "name": "regions", - "type": "[659]" + "type": "[664]" } ], "meta-type": "object" }, { - "name": "517", + "name": "521", "members": [ { "name": "vm" @@ -16517,16 +16736,16 @@ ] }, { - "name": "[518]", - "element-type": "518", + "name": "[522]", + "element-type": "522", "meta-type": "array" }, { - "name": "518", + "name": "522", "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "names", @@ -16537,7 +16756,7 @@ "meta-type": "object" }, { - "name": "519", + "name": "523", "members": [ { "name": "vcpus", @@ -16548,7 +16767,7 @@ "meta-type": "object" }, { - "name": "520", + "name": "524", "members": [ { "name": "kvm" @@ -16564,12 +16783,12 @@ ] }, { - "name": "[521]", - "element-type": "521", + "name": "[525]", + "element-type": "525", "meta-type": "array" }, { - "name": "521", + "name": "525", "members": [ { "name": "name", @@ -16577,18 +16796,18 @@ }, { "name": "value", - "type": "660" + "type": "665" } ], "meta-type": "object" }, { - "name": "[522]", - "element-type": "522", + "name": "[526]", + "element-type": "526", "meta-type": "array" }, { - "name": "522", + "name": "526", "members": [ { "name": "name", @@ -16596,12 +16815,12 @@ }, { "name": "type", - "type": "661" + "type": "666" }, { "name": "unit", "default": null, - "type": "662" + "type": "667" }, { "name": "base", @@ -16621,7 +16840,7 @@ "meta-type": "object" }, { - "name": "523", + "name": "527", "members": [ { "name": "transports", @@ -16641,7 +16860,7 @@ "meta-type": "object" }, { - "name": "524", + "name": "528", "members": [ { "name": "statuses", @@ -16656,7 +16875,7 @@ "meta-type": "object" }, { - "name": "525", + "name": "529", "members": [ { "name": "n-mem-sections", @@ -16676,19 +16895,19 @@ }, { "name": "features", - "type": "523" + "type": "527" }, { "name": "acked-features", - "type": "523" + "type": "527" }, { "name": "backend-features", - "type": "523" + "type": "527" }, { "name": "protocol-features", - "type": "663" + "type": "668" }, { "name": "max-queues", @@ -16710,12 +16929,12 @@ "meta-type": "object" }, { - "name": "[526]", - "element-type": "526", + "name": "[530]", + "element-type": "530", "meta-type": "array" }, { - "name": "526", + "name": "530", "members": [ { "name": "addr", @@ -16733,7 +16952,7 @@ "meta-type": "object" }, { - "name": "527", + "name": "531", "members": [ { "name": "flags", @@ -16751,7 +16970,7 @@ "meta-type": "object" }, { - "name": "528", + "name": "532", "members": [ { "name": "flags", @@ -16765,12 +16984,12 @@ "meta-type": "object" }, { - "name": "[529]", - "element-type": "529", + "name": "[533]", + "element-type": "533", "meta-type": "array" }, { - "name": "529", + "name": "533", "members": [ { "name": "cipher" @@ -16798,12 +17017,12 @@ ] }, { - "name": "[530]", - "element-type": "530", + "name": "[534]", + "element-type": "534", "meta-type": "array" }, { - "name": "530", + "name": "534", "members": [ { "name": "queue", @@ -16811,22 +17030,46 @@ }, { "name": "type", - "type": "664" + "type": "669" } ], "meta-type": "object" }, { - "name": "[531]", - "element-type": "531", + "name": "535", + "members": [ + { + "name": "informational" + }, + { + "name": "warning" + }, + { + "name": "failure" + }, + { + "name": "fatal" + } + ], + "meta-type": "enum", + "values": [ + "informational", + "warning", + "failure", + "fatal" + ] + }, + { + "name": "[536]", + "element-type": "536", "meta-type": "array" }, { - "name": "531", + "name": "536", "members": [ { "name": "type", - "type": "665" + "type": "670" }, { "name": "header", @@ -16836,7 +17079,7 @@ "meta-type": "object" }, { - "name": "532", + "name": "537", "members": [ { "name": "cache-data-ecc" @@ -16872,7 +17115,7 @@ ] }, { - "name": "533", + "name": "538", "members": [ { "name": "hyper-v" @@ -16888,7 +17131,7 @@ ] }, { - "name": "534", + "name": "539", "members": [ { "name": "arg1", @@ -16914,7 +17157,7 @@ "meta-type": "object" }, { - "name": "535", + "name": "540", "members": [ { "name": "core", @@ -16930,18 +17173,18 @@ }, { "name": "reason", - "type": "666" + "type": "671" } ], "meta-type": "object" }, { - "name": "[536]", - "element-type": "536", + "name": "[541]", + "element-type": "541", "meta-type": "array" }, { - "name": "536", + "name": "541", "members": [ { "name": "interval_length", @@ -17011,7 +17254,7 @@ "meta-type": "object" }, { - "name": "537", + "name": "542", "members": [ { "name": "boundaries", @@ -17025,7 +17268,7 @@ "meta-type": "object" }, { - "name": "538", + "name": "543", "members": [ { "name": "discard-nb-ok", @@ -17043,7 +17286,7 @@ "meta-type": "object" }, { - "name": "539", + "name": "544", "members": [ { "name": "completion-errors", @@ -17066,40 +17309,40 @@ "meta-type": "array" }, { - "name": "540", + "name": "545", "tag": "type", "variants": [ { "case": "qcow2", - "type": "668" + "type": "673" }, { "case": "vmdk", - "type": "669" + "type": "674" }, { "case": "luks", - "type": "670" + "type": "675" }, { "case": "rbd", - "type": "671" + "type": "676" }, { "case": "file", - "type": "672" + "type": "677" } ], "members": [ { "name": "type", - "type": "667" + "type": "672" } ], "meta-type": "object" }, { - "name": "541", + "name": "546", "members": [ { "name": "block-backend" @@ -17119,12 +17362,12 @@ ] }, { - "name": "[542]", - "element-type": "542", + "name": "[547]", + "element-type": "547", "meta-type": "array" }, { - "name": "542", + "name": "547", "members": [ { "name": "consistent-read" @@ -17148,7 +17391,7 @@ ] }, { - "name": "543", + "name": "548", "members": [ { "type": "57" @@ -17160,16 +17403,16 @@ "meta-type": "alternate" }, { - "name": "[544]", - "element-type": "544", + "name": "[549]", + "element-type": "549", "meta-type": "array" }, { - "name": "544", + "name": "549", "members": [ { "name": "event", - "type": "673" + "type": "678" }, { "name": "state", @@ -17179,7 +17422,7 @@ { "name": "iotype", "default": null, - "type": "674" + "type": "679" }, { "name": "errno", @@ -17205,16 +17448,16 @@ "meta-type": "object" }, { - "name": "[545]", - "element-type": "545", + "name": "[550]", + "element-type": "550", "meta-type": "array" }, { - "name": "545", + "name": "550", "members": [ { "name": "event", - "type": "673" + "type": "678" }, { "name": "state", @@ -17229,7 +17472,7 @@ "meta-type": "object" }, { - "name": "546", + "name": "551", "members": [ { "name": "break-guest-write" @@ -17245,7 +17488,7 @@ ] }, { - "name": "547", + "name": "552", "members": [ { "name": "auto" @@ -17265,7 +17508,7 @@ ] }, { - "name": "548", + "name": "553", "members": [ { "name": "threads" @@ -17285,7 +17528,7 @@ ] }, { - "name": "549", + "name": "554", "members": [ { "name": "tcp" @@ -17301,7 +17544,7 @@ ] }, { - "name": "550", + "name": "555", "members": [ { "name": "crc32c" @@ -17325,11 +17568,11 @@ ] }, { - "name": "551", + "name": "556", "members": [ { "name": "type", - "type": "675" + "type": "680" }, { "name": "host", @@ -17339,7 +17582,7 @@ "meta-type": "object" }, { - "name": "552", + "name": "557", "members": [ { "type": "57" @@ -17354,62 +17597,62 @@ "meta-type": "alternate" }, { - "name": "553", + "name": "558", "members": [ { - "type": "676" + "type": "681" }, { - "type": "677" + "type": "682" } ], "meta-type": "alternate" }, { - "name": "554", + "name": "559", "tag": "format", "variants": [ { "case": "aes", - "type": "679" + "type": "684" }, { "case": "luks", - "type": "680" + "type": "685" } ], "members": [ { "name": "format", - "type": "678" + "type": "683" } ], "meta-type": "object" }, { - "name": "555", + "name": "560", "tag": "format", "variants": [ { "case": "aes", - "type": "679" + "type": "684" } ], "members": [ { "name": "format", - "type": "681" + "type": "686" } ], "meta-type": "object" }, { - "name": "[543]", - "element-type": "543", + "name": "[548]", + "element-type": "548", "meta-type": "array" }, { - "name": "556", + "name": "561", "members": [ { "name": "quorum" @@ -17425,42 +17668,42 @@ ] }, { - "name": "557", + "name": "562", "tag": "format", "variants": [ { "case": "luks", - "type": "683" + "type": "688" }, { "case": "luks2", - "type": "684" + "type": "689" }, { "case": "luks-any", - "type": "685" + "type": "690" } ], "members": [ { "name": "format", - "type": "682" + "type": "687" }, { "name": "parent", "default": null, - "type": "557" + "type": "562" } ], "meta-type": "object" }, { - "name": "[558]", - "element-type": "558", + "name": "[563]", + "element-type": "563", "meta-type": "array" }, { - "name": "558", + "name": "563", "members": [ { "name": "cephx" @@ -17476,12 +17719,12 @@ ] }, { - "name": "[559]", - "element-type": "559", + "name": "[564]", + "element-type": "564", "meta-type": "array" }, { - "name": "559", + "name": "564", "members": [ { "name": "host", @@ -17495,7 +17738,7 @@ "meta-type": "object" }, { - "name": "560", + "name": "565", "members": [ { "name": "primary" @@ -17511,7 +17754,7 @@ ] }, { - "name": "561", + "name": "566", "members": [ { "name": "host", @@ -17555,12 +17798,12 @@ "meta-type": "object" }, { - "name": "562", + "name": "567", "tag": "mode", "variants": [ { "case": "hash", - "type": "687" + "type": "692" }, { "case": "none", @@ -17574,13 +17817,13 @@ "members": [ { "name": "mode", - "type": "686" + "type": "691" } ], "meta-type": "object" }, { - "name": "563", + "name": "568", "members": [ { "name": "filename", @@ -17593,7 +17836,7 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" }, { "name": "nocow", @@ -17609,11 +17852,11 @@ "meta-type": "object" }, { - "name": "564", + "name": "569", "members": [ { "name": "location", - "type": "313" + "type": "317" }, { "name": "size", @@ -17622,13 +17865,13 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "565", + "name": "570", "members": [ { "name": "key-secret", @@ -17638,27 +17881,27 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" }, { "name": "cipher-mode", "default": null, - "type": "690" + "type": "695" }, { "name": "ivgen-alg", "default": null, - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "iter-time", @@ -17667,7 +17910,7 @@ }, { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17676,17 +17919,17 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "566", + "name": "571", "members": [ { "name": "location", - "type": "320" + "type": "324" }, { "name": "size", @@ -17696,11 +17939,11 @@ "meta-type": "object" }, { - "name": "567", + "name": "572", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17715,11 +17958,11 @@ "meta-type": "object" }, { - "name": "568", + "name": "573", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17733,22 +17976,22 @@ { "name": "encrypt", "default": null, - "type": "693" + "type": "698" } ], "meta-type": "object" }, { - "name": "569", + "name": "574", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "data-file", "default": null, - "type": "543" + "type": "548" }, { "name": "data-file-raw", @@ -17767,7 +18010,7 @@ { "name": "version", "default": null, - "type": "694" + "type": "699" }, { "name": "backing-file", @@ -17777,12 +18020,12 @@ { "name": "backing-fmt", "default": null, - "type": "300" + "type": "304" }, { "name": "encrypt", "default": null, - "type": "693" + "type": "698" }, { "name": "cluster-size", @@ -17792,7 +18035,7 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" }, { "name": "lazy-refcounts", @@ -17807,17 +18050,17 @@ { "name": "compression-type", "default": null, - "type": "695" + "type": "700" } ], "meta-type": "object" }, { - "name": "570", + "name": "575", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17831,7 +18074,7 @@ { "name": "backing-fmt", "default": null, - "type": "300" + "type": "304" }, { "name": "cluster-size", @@ -17847,11 +18090,11 @@ "meta-type": "object" }, { - "name": "571", + "name": "576", "members": [ { "name": "location", - "type": "330" + "type": "334" }, { "name": "size", @@ -17865,17 +18108,17 @@ { "name": "encrypt", "default": null, - "type": "696" + "type": "701" } ], "meta-type": "object" }, { - "name": "572", + "name": "577", "members": [ { "name": "location", - "type": "332" + "type": "336" }, { "name": "size", @@ -17885,11 +18128,11 @@ "meta-type": "object" }, { - "name": "573", + "name": "578", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17898,17 +18141,17 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "574", + "name": "579", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17927,7 +18170,7 @@ { "name": "subformat", "default": null, - "type": "697" + "type": "702" }, { "name": "block-state-zero", @@ -17938,11 +18181,11 @@ "meta-type": "object" }, { - "name": "575", + "name": "580", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17951,12 +18194,12 @@ { "name": "extents", "default": null, - "type": "[543]" + "type": "[548]" }, { "name": "subformat", "default": null, - "type": "698" + "type": "703" }, { "name": "backing-file", @@ -17966,7 +18209,7 @@ { "name": "adapter-type", "default": null, - "type": "699" + "type": "704" }, { "name": "hwversion", @@ -17987,11 +18230,11 @@ "meta-type": "object" }, { - "name": "576", + "name": "581", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -18000,7 +18243,7 @@ { "name": "subformat", "default": null, - "type": "700" + "type": "705" }, { "name": "force-size", @@ -18011,11 +18254,11 @@ "meta-type": "object" }, { - "name": "577", + "name": "582", "members": [ { "name": "state", - "type": "701" + "type": "706" }, { "name": "new-secret", @@ -18046,12 +18289,12 @@ "meta-type": "object" }, { - "name": "578", + "name": "583", "members": [ { "name": "encrypt", "default": null, - "type": "702" + "type": "707" } ], "meta-type": "object" @@ -18062,7 +18305,7 @@ "meta-type": "builtin" }, { - "name": "579", + "name": "584", "members": [ { "name": "inet" @@ -18086,47 +18329,47 @@ ] }, { - "name": "580", + "name": "585", "members": [ { "name": "data", - "type": "561" + "type": "566" } ], "meta-type": "object" }, { - "name": "581", + "name": "586", "members": [ { "name": "data", - "type": "600" + "type": "605" } ], "meta-type": "object" }, { - "name": "582", + "name": "587", "members": [ { "name": "data", - "type": "601" + "type": "606" } ], "meta-type": "object" }, { - "name": "583", + "name": "588", "members": [ { "name": "data", - "type": "599" + "type": "604" } ], "meta-type": "object" }, { - "name": "584", + "name": "589", "members": [ { "name": "off" @@ -18146,7 +18389,7 @@ ] }, { - "name": "585", + "name": "590", "members": [ { "name": "file" @@ -18242,142 +18485,142 @@ ] }, { - "name": "586", + "name": "591", "members": [ { "name": "data", - "type": "703" + "type": "708" } ], "meta-type": "object" }, { - "name": "587", + "name": "592", "members": [ { "name": "data", - "type": "704" + "type": "709" } ], "meta-type": "object" }, { - "name": "588", + "name": "593", "members": [ { "name": "data", - "type": "705" + "type": "710" } ], "meta-type": "object" }, { - "name": "589", + "name": "594", "members": [ { "name": "data", - "type": "706" + "type": "711" } ], "meta-type": "object" }, { - "name": "590", + "name": "595", "members": [ { "name": "data", - "type": "707" + "type": "712" } ], "meta-type": "object" }, { - "name": "591", + "name": "596", "members": [ { "name": "data", - "type": "708" + "type": "713" } ], "meta-type": "object" }, { - "name": "592", + "name": "597", "members": [ { "name": "data", - "type": "709" + "type": "714" } ], "meta-type": "object" }, { - "name": "593", + "name": "598", "members": [ { "name": "data", - "type": "710" + "type": "715" } ], "meta-type": "object" }, { - "name": "594", + "name": "599", "members": [ { "name": "data", - "type": "711" + "type": "716" } ], "meta-type": "object" }, { - "name": "595", + "name": "600", "members": [ { "name": "data", - "type": "712" + "type": "717" } ], "meta-type": "object" }, { - "name": "596", + "name": "601", "members": [ { "name": "data", - "type": "713" + "type": "718" } ], "meta-type": "object" }, { - "name": "597", + "name": "602", "members": [ { "name": "data", - "type": "714" + "type": "719" } ], "meta-type": "object" }, { - "name": "598", + "name": "603", "members": [ { "name": "data", - "type": "715" + "type": "720" } ], "meta-type": "object" }, { - "name": "[599]", - "element-type": "599", + "name": "[604]", + "element-type": "604", "meta-type": "array" }, { - "name": "599", + "name": "604", "members": [ { "name": "str", @@ -18387,7 +18630,7 @@ "meta-type": "object" }, { - "name": "600", + "name": "605", "members": [ { "name": "path", @@ -18407,7 +18650,7 @@ "meta-type": "object" }, { - "name": "601", + "name": "606", "members": [ { "name": "cid", @@ -18421,27 +18664,27 @@ "meta-type": "object" }, { - "name": "602", + "name": "607", "members": [ { "name": "data", - "type": "716" + "type": "721" } ], "meta-type": "object" }, { - "name": "603", + "name": "608", "members": [ { "name": "data", - "type": "717" + "type": "722" } ], "meta-type": "object" }, { - "name": "604", + "name": "609", "members": [ { "name": "number" @@ -18457,7 +18700,7 @@ ] }, { - "name": "605", + "name": "610", "members": [ { "name": "data", @@ -18467,17 +18710,17 @@ "meta-type": "object" }, { - "name": "606", + "name": "611", "members": [ { "name": "data", - "type": "718" + "type": "723" } ], "meta-type": "object" }, { - "name": "607", + "name": "612", "members": [ { "name": "key" @@ -18505,47 +18748,47 @@ ] }, { - "name": "608", + "name": "613", "members": [ { "name": "data", - "type": "719" + "type": "724" } ], "meta-type": "object" }, { - "name": "609", + "name": "614", "members": [ { "name": "data", - "type": "720" + "type": "725" } ], "meta-type": "object" }, { - "name": "610", + "name": "615", "members": [ { "name": "data", - "type": "721" + "type": "726" } ], "meta-type": "object" }, { - "name": "611", + "name": "616", "members": [ { "name": "data", - "type": "722" + "type": "727" } ], "meta-type": "object" }, { - "name": "612", + "name": "617", "members": [ { "name": "lctrl-lalt" @@ -18570,12 +18813,12 @@ "meta-type": "builtin" }, { - "name": "[613]", - "element-type": "613", + "name": "[618]", + "element-type": "618", "meta-type": "array" }, { - "name": "613", + "name": "618", "members": [ { "name": "name", @@ -18588,13 +18831,13 @@ { "name": "transform", "default": null, - "type": "723" + "type": "728" } ], "meta-type": "object" }, { - "name": "614", + "name": "619", "members": [ { "name": "abort" @@ -18653,17 +18896,17 @@ ] }, { - "name": "615", + "name": "620", "members": [ { "name": "data", - "type": "724" + "type": "729" } ], "meta-type": "object" }, { - "name": "616", + "name": "621", "members": [ { "name": "data", @@ -18673,7 +18916,7 @@ "meta-type": "object" }, { - "name": "617", + "name": "622", "members": [ { "name": "data", @@ -18683,7 +18926,7 @@ "meta-type": "object" }, { - "name": "618", + "name": "623", "members": [ { "name": "data", @@ -18693,7 +18936,7 @@ "meta-type": "object" }, { - "name": "619", + "name": "624", "members": [ { "name": "data", @@ -18703,7 +18946,7 @@ "meta-type": "object" }, { - "name": "620", + "name": "625", "members": [ { "name": "data", @@ -18713,7 +18956,7 @@ "meta-type": "object" }, { - "name": "621", + "name": "626", "members": [ { "name": "data", @@ -18723,7 +18966,7 @@ "meta-type": "object" }, { - "name": "622", + "name": "627", "members": [ { "name": "data", @@ -18733,7 +18976,7 @@ "meta-type": "object" }, { - "name": "623", + "name": "628", "members": [ { "name": "data", @@ -18743,7 +18986,7 @@ "meta-type": "object" }, { - "name": "624", + "name": "629", "members": [ { "name": "individual" @@ -18759,7 +19002,7 @@ ] }, { - "name": "625", + "name": "630", "members": [ { "name": "string" @@ -18799,12 +19042,12 @@ ] }, { - "name": "[626]", - "element-type": "626", + "name": "[631]", + "element-type": "631", "meta-type": "array" }, { - "name": "626", + "name": "631", "members": [ { "name": "name", @@ -18819,12 +19062,12 @@ "meta-type": "object" }, { - "name": "[627]", - "element-type": "627", + "name": "[632]", + "element-type": "632", "meta-type": "array" }, { - "name": "627", + "name": "632", "members": [ { "name": "name", @@ -18848,12 +19091,12 @@ "meta-type": "object" }, { - "name": "[628]", - "element-type": "628", + "name": "[633]", + "element-type": "633", "meta-type": "array" }, { - "name": "628", + "name": "633", "members": [ { "name": "case", @@ -18867,12 +19110,12 @@ "meta-type": "object" }, { - "name": "[629]", - "element-type": "629", + "name": "[634]", + "element-type": "634", "meta-type": "array" }, { - "name": "629", + "name": "634", "members": [ { "name": "type", @@ -18882,7 +19125,7 @@ "meta-type": "object" }, { - "name": "630", + "name": "635", "members": [ { "name": "deny" @@ -18898,12 +19141,12 @@ ] }, { - "name": "[631]", - "element-type": "631", + "name": "[636]", + "element-type": "636", "meta-type": "array" }, { - "name": "631", + "name": "636", "members": [ { "name": "match", @@ -18911,18 +19154,18 @@ }, { "name": "policy", - "type": "630" + "type": "635" }, { "name": "format", "default": null, - "type": "725" + "type": "730" } ], "meta-type": "object" }, { - "name": "632", + "name": "637", "members": [ { "name": "all" @@ -18942,7 +19185,7 @@ ] }, { - "name": "633", + "name": "638", "members": [ { "name": "before" @@ -18958,7 +19201,7 @@ ] }, { - "name": "634", + "name": "639", "members": [ { "name": "ctrl-ctrl" @@ -18990,7 +19233,7 @@ ] }, { - "name": "635", + "name": "640", "members": [ { "name": "raw" @@ -19006,7 +19249,7 @@ ] }, { - "name": "636", + "name": "641", "members": [ { "name": "iops-total", @@ -19107,7 +19350,7 @@ "meta-type": "object" }, { - "name": "637", + "name": "642", "members": [ { "name": "client" @@ -19123,7 +19366,7 @@ ] }, { - "name": "638", + "name": "643", "members": [ { "name": "uninitialized" @@ -19151,7 +19394,7 @@ ] }, { - "name": "639", + "name": "644", "members": [ { "name": "memory" @@ -19175,7 +19418,7 @@ ] }, { - "name": "640", + "name": "645", "members": [ { "name": "access-latency" @@ -19207,7 +19450,7 @@ ] }, { - "name": "641", + "name": "646", "members": [ { "name": "none" @@ -19227,7 +19470,7 @@ ] }, { - "name": "642", + "name": "647", "members": [ { "name": "none" @@ -19247,7 +19490,7 @@ ] }, { - "name": "643", + "name": "648", "members": [ { "name": "id", @@ -19286,7 +19529,7 @@ "meta-type": "object" }, { - "name": "644", + "name": "649", "members": [ { "name": "id", @@ -19309,7 +19552,7 @@ "meta-type": "object" }, { - "name": "645", + "name": "650", "members": [ { "name": "id", @@ -19348,7 +19591,7 @@ "meta-type": "object" }, { - "name": "646", + "name": "651", "members": [ { "name": "id", @@ -19375,7 +19618,7 @@ "meta-type": "object" }, { - "name": "647", + "name": "652", "members": [ { "name": "string" @@ -19399,7 +19642,7 @@ ] }, { - "name": "648", + "name": "653", "members": [ { "name": "mixing-engine", @@ -19429,7 +19672,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19440,7 +19683,7 @@ "meta-type": "object" }, { - "name": "649", + "name": "654", "members": [ { "name": "mixing-engine", @@ -19470,7 +19713,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19496,7 +19739,7 @@ "meta-type": "object" }, { - "name": "650", + "name": "655", "members": [ { "name": "mixing-engine", @@ -19526,7 +19769,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19542,7 +19785,7 @@ "meta-type": "object" }, { - "name": "651", + "name": "656", "members": [ { "name": "mixing-engine", @@ -19572,7 +19815,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19608,7 +19851,7 @@ "meta-type": "object" }, { - "name": "652", + "name": "657", "members": [ { "name": "mixing-engine", @@ -19638,7 +19881,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19664,7 +19907,7 @@ "meta-type": "object" }, { - "name": "653", + "name": "658", "members": [ { "name": "mixing-engine", @@ -19694,7 +19937,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19720,7 +19963,7 @@ "meta-type": "object" }, { - "name": "654", + "name": "659", "members": [ { "name": "mixing-engine", @@ -19750,7 +19993,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19776,7 +20019,7 @@ "meta-type": "object" }, { - "name": "655", + "name": "660", "members": [ { "name": "mixing-engine", @@ -19806,7 +20049,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19822,7 +20065,7 @@ "meta-type": "object" }, { - "name": "656", + "name": "661", "members": [ { "name": "desc", @@ -19837,7 +20080,7 @@ "meta-type": "object" }, { - "name": "657", + "name": "662", "members": [ { "name": "device", @@ -19861,27 +20104,27 @@ "meta-type": "object" }, { - "name": "658", + "name": "663", "members": [ { "name": "bus", - "type": "727" + "type": "732" }, { "name": "devices", "default": null, - "type": "[516]" + "type": "[520]" } ], "meta-type": "object" }, { - "name": "[659]", - "element-type": "659", + "name": "[664]", + "element-type": "664", "meta-type": "array" }, { - "name": "659", + "name": "664", "members": [ { "name": "bar", @@ -19913,7 +20156,7 @@ "meta-type": "object" }, { - "name": "660", + "name": "665", "members": [ { "type": "int" @@ -19928,7 +20171,7 @@ "meta-type": "alternate" }, { - "name": "661", + "name": "666", "members": [ { "name": "cumulative" @@ -19956,7 +20199,7 @@ ] }, { - "name": "662", + "name": "667", "members": [ { "name": "bytes" @@ -19980,7 +20223,7 @@ ] }, { - "name": "663", + "name": "668", "members": [ { "name": "protocols", @@ -19995,7 +20238,7 @@ "meta-type": "object" }, { - "name": "664", + "name": "669", "members": [ { "name": "builtin" @@ -20015,7 +20258,7 @@ ] }, { - "name": "665", + "name": "670", "members": [ { "name": "cache-data-parity" @@ -20083,7 +20326,7 @@ ] }, { - "name": "666", + "name": "671", "members": [ { "name": "unknown" @@ -20111,7 +20354,7 @@ ] }, { - "name": "667", + "name": "672", "members": [ { "name": "qcow2" @@ -20139,57 +20382,57 @@ ] }, { - "name": "668", + "name": "673", "members": [ { "name": "data", - "type": "728" + "type": "733" } ], "meta-type": "object" }, { - "name": "669", + "name": "674", "members": [ { "name": "data", - "type": "729" + "type": "734" } ], "meta-type": "object" }, { - "name": "670", + "name": "675", "members": [ { "name": "data", - "type": "730" + "type": "735" } ], "meta-type": "object" }, { - "name": "671", + "name": "676", "members": [ { "name": "data", - "type": "731" + "type": "736" } ], "meta-type": "object" }, { - "name": "672", + "name": "677", "members": [ { "name": "data", - "type": "732" + "type": "737" } ], "meta-type": "object" }, { - "name": "673", + "name": "678", "members": [ { "name": "l1_update" @@ -20389,7 +20632,7 @@ ] }, { - "name": "674", + "name": "679", "members": [ { "name": "read" @@ -20421,7 +20664,7 @@ ] }, { - "name": "675", + "name": "680", "members": [ { "name": "inet" @@ -20433,12 +20676,12 @@ ] }, { - "name": "676", + "name": "681", "members": [ { "name": "template", "default": null, - "type": "677" + "type": "682" }, { "name": "main-header", @@ -20489,7 +20732,7 @@ "meta-type": "object" }, { - "name": "677", + "name": "682", "members": [ { "name": "none" @@ -20513,7 +20756,7 @@ ] }, { - "name": "678", + "name": "683", "members": [ { "name": "aes" @@ -20529,7 +20772,7 @@ ] }, { - "name": "679", + "name": "684", "members": [ { "name": "key-secret", @@ -20540,7 +20783,7 @@ "meta-type": "object" }, { - "name": "680", + "name": "685", "members": [ { "name": "key-secret", @@ -20551,7 +20794,7 @@ "meta-type": "object" }, { - "name": "681", + "name": "686", "members": [ { "name": "aes" @@ -20563,7 +20806,7 @@ ] }, { - "name": "682", + "name": "687", "members": [ { "name": "luks" @@ -20583,7 +20826,7 @@ ] }, { - "name": "683", + "name": "688", "members": [ { "name": "key-secret", @@ -20593,7 +20836,7 @@ "meta-type": "object" }, { - "name": "684", + "name": "689", "members": [ { "name": "key-secret", @@ -20603,7 +20846,7 @@ "meta-type": "object" }, { - "name": "685", + "name": "690", "members": [ { "name": "key-secret", @@ -20613,7 +20856,7 @@ "meta-type": "object" }, { - "name": "686", + "name": "691", "members": [ { "name": "none" @@ -20633,11 +20876,11 @@ ] }, { - "name": "687", + "name": "692", "members": [ { "name": "type", - "type": "733" + "type": "738" }, { "name": "hash", @@ -20647,7 +20890,7 @@ "meta-type": "object" }, { - "name": "688", + "name": "693", "members": [ { "name": "off" @@ -20671,7 +20914,7 @@ ] }, { - "name": "689", + "name": "694", "members": [ { "name": "aes-128" @@ -20727,7 +20970,7 @@ ] }, { - "name": "690", + "name": "695", "members": [ { "name": "ecb" @@ -20751,7 +20994,7 @@ ] }, { - "name": "691", + "name": "696", "members": [ { "name": "plain" @@ -20771,7 +21014,7 @@ ] }, { - "name": "692", + "name": "697", "members": [ { "name": "md5" @@ -20807,28 +21050,28 @@ ] }, { - "name": "693", + "name": "698", "tag": "format", "variants": [ { "case": "qcow", - "type": "679" + "type": "684" }, { "case": "luks", - "type": "735" + "type": "740" } ], "members": [ { "name": "format", - "type": "734" + "type": "739" } ], "meta-type": "object" }, { - "name": "694", + "name": "699", "members": [ { "name": "v2" @@ -20844,7 +21087,7 @@ ] }, { - "name": "695", + "name": "700", "members": [ { "name": "zlib" @@ -20860,16 +21103,16 @@ ] }, { - "name": "696", + "name": "701", "tag": "format", "variants": [ { "case": "luks", - "type": "736" + "type": "741" }, { "case": "luks2", - "type": "737" + "type": "742" }, { "case": "luks-any", @@ -20879,13 +21122,13 @@ "members": [ { "name": "format", - "type": "682" + "type": "687" } ], "meta-type": "object" }, { - "name": "697", + "name": "702", "members": [ { "name": "dynamic" @@ -20901,7 +21144,7 @@ ] }, { - "name": "698", + "name": "703", "members": [ { "name": "monolithicSparse" @@ -20929,7 +21172,7 @@ ] }, { - "name": "699", + "name": "704", "members": [ { "name": "ide" @@ -20953,7 +21196,7 @@ ] }, { - "name": "700", + "name": "705", "members": [ { "name": "dynamic" @@ -20969,7 +21212,7 @@ ] }, { - "name": "701", + "name": "706", "members": [ { "name": "active" @@ -20985,12 +21228,12 @@ ] }, { - "name": "702", + "name": "707", "tag": "format", "variants": [ { "case": "luks", - "type": "738" + "type": "743" }, { "case": "qcow", @@ -21000,13 +21243,13 @@ "members": [ { "name": "format", - "type": "734" + "type": "739" } ], "meta-type": "object" }, { - "name": "703", + "name": "708", "members": [ { "name": "logfile", @@ -21036,7 +21279,7 @@ "meta-type": "object" }, { - "name": "704", + "name": "709", "members": [ { "name": "logfile", @@ -21056,7 +21299,7 @@ "meta-type": "object" }, { - "name": "705", + "name": "710", "members": [ { "name": "logfile", @@ -21070,7 +21313,7 @@ }, { "name": "addr", - "type": "344" + "type": "348" }, { "name": "tls-creds", @@ -21121,7 +21364,7 @@ "meta-type": "object" }, { - "name": "706", + "name": "711", "members": [ { "name": "logfile", @@ -21135,18 +21378,18 @@ }, { "name": "remote", - "type": "344" + "type": "348" }, { "name": "local", "default": null, - "type": "344" + "type": "348" } ], "meta-type": "object" }, { - "name": "707", + "name": "712", "members": [ { "name": "logfile", @@ -21162,7 +21405,7 @@ "meta-type": "object" }, { - "name": "708", + "name": "713", "members": [ { "name": "logfile", @@ -21182,7 +21425,7 @@ "meta-type": "object" }, { - "name": "709", + "name": "714", "members": [ { "name": "logfile", @@ -21203,7 +21446,7 @@ "meta-type": "object" }, { - "name": "710", + "name": "715", "members": [ { "name": "logfile", @@ -21223,7 +21466,7 @@ "meta-type": "object" }, { - "name": "711", + "name": "716", "members": [ { "name": "logfile", @@ -21243,7 +21486,7 @@ "meta-type": "object" }, { - "name": "712", + "name": "717", "members": [ { "name": "logfile", @@ -21269,7 +21512,7 @@ "meta-type": "object" }, { - "name": "713", + "name": "718", "members": [ { "name": "logfile", @@ -21289,7 +21532,7 @@ "meta-type": "object" }, { - "name": "714", + "name": "719", "members": [ { "name": "logfile", @@ -21325,7 +21568,7 @@ "meta-type": "object" }, { - "name": "715", + "name": "720", "members": [ { "name": "logfile", @@ -21346,7 +21589,7 @@ "meta-type": "object" }, { - "name": "716", + "name": "721", "members": [ { "name": "path", @@ -21362,7 +21605,7 @@ "meta-type": "object" }, { - "name": "717", + "name": "722", "members": [ { "name": "chardev", @@ -21372,7 +21615,7 @@ "meta-type": "object" }, { - "name": "718", + "name": "723", "members": [ { "name": "unmapped" @@ -22028,11 +22271,11 @@ ] }, { - "name": "719", + "name": "724", "members": [ { "name": "key", - "type": "396" + "type": "400" }, { "name": "down", @@ -22042,11 +22285,11 @@ "meta-type": "object" }, { - "name": "720", + "name": "725", "members": [ { "name": "button", - "type": "739" + "type": "744" }, { "name": "down", @@ -22056,11 +22299,11 @@ "meta-type": "object" }, { - "name": "721", + "name": "726", "members": [ { "name": "axis", - "type": "740" + "type": "745" }, { "name": "value", @@ -22070,11 +22313,11 @@ "meta-type": "object" }, { - "name": "722", + "name": "727", "members": [ { "name": "type", - "type": "741" + "type": "746" }, { "name": "slot", @@ -22086,7 +22329,7 @@ }, { "name": "axis", - "type": "740" + "type": "745" }, { "name": "value", @@ -22096,7 +22339,7 @@ "meta-type": "object" }, { - "name": "723", + "name": "728", "members": [ { "name": "persistent", @@ -22107,13 +22350,13 @@ "meta-type": "object" }, { - "name": "724", + "name": "729", "members": [ ], "meta-type": "object" }, { - "name": "725", + "name": "730", "members": [ { "name": "exact" @@ -22129,7 +22372,7 @@ ] }, { - "name": "726", + "name": "731", "members": [ { "name": "u8" @@ -22165,7 +22408,7 @@ ] }, { - "name": "727", + "name": "732", "members": [ { "name": "number", @@ -22181,21 +22424,21 @@ }, { "name": "io_range", - "type": "742" + "type": "747" }, { "name": "memory_range", - "type": "742" + "type": "747" }, { "name": "prefetchable_range", - "type": "742" + "type": "747" } ], "meta-type": "object" }, { - "name": "728", + "name": "733", "members": [ { "name": "compat", @@ -22233,22 +22476,22 @@ { "name": "encrypt", "default": null, - "type": "743" + "type": "748" }, { "name": "bitmaps", "default": null, - "type": "[744]" + "type": "[749]" }, { "name": "compression-type", - "type": "695" + "type": "700" } ], "meta-type": "object" }, { - "name": "729", + "name": "734", "members": [ { "name": "create-type", @@ -22264,34 +22507,34 @@ }, { "name": "extents", - "type": "[745]" + "type": "[750]" } ], "meta-type": "object" }, { - "name": "730", + "name": "735", "members": [ { "name": "cipher-alg", - "type": "689" + "type": "694" }, { "name": "cipher-mode", - "type": "690" + "type": "695" }, { "name": "ivgen-alg", - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", - "type": "692" + "type": "697" }, { "name": "payload-offset", @@ -22307,24 +22550,24 @@ }, { "name": "slots", - "type": "[746]" + "type": "[751]" } ], "meta-type": "object" }, { - "name": "731", + "name": "736", "members": [ { "name": "encryption-format", "default": null, - "type": "682" + "type": "687" } ], "meta-type": "object" }, { - "name": "732", + "name": "737", "members": [ { "name": "extent-size-hint", @@ -22335,7 +22578,7 @@ "meta-type": "object" }, { - "name": "733", + "name": "738", "members": [ { "name": "md5" @@ -22355,7 +22598,7 @@ ] }, { - "name": "734", + "name": "739", "members": [ { "name": "qcow" @@ -22371,7 +22614,7 @@ ] }, { - "name": "735", + "name": "740", "members": [ { "name": "key-secret", @@ -22381,27 +22624,27 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" }, { "name": "cipher-mode", "default": null, - "type": "690" + "type": "695" }, { "name": "ivgen-alg", "default": null, - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "iter-time", @@ -22412,7 +22655,7 @@ "meta-type": "object" }, { - "name": "736", + "name": "741", "members": [ { "name": "key-secret", @@ -22421,13 +22664,13 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" } ], "meta-type": "object" }, { - "name": "737", + "name": "742", "members": [ { "name": "key-secret", @@ -22436,17 +22679,17 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" } ], "meta-type": "object" }, { - "name": "738", + "name": "743", "members": [ { "name": "state", - "type": "701" + "type": "706" }, { "name": "new-secret", @@ -22477,7 +22720,7 @@ "meta-type": "object" }, { - "name": "739", + "name": "744", "members": [ { "name": "left" @@ -22525,7 +22768,7 @@ ] }, { - "name": "740", + "name": "745", "members": [ { "name": "x" @@ -22541,7 +22784,7 @@ ] }, { - "name": "741", + "name": "746", "members": [ { "name": "begin" @@ -22569,7 +22812,7 @@ ] }, { - "name": "742", + "name": "747", "members": [ { "name": "base", @@ -22583,12 +22826,12 @@ "meta-type": "object" }, { - "name": "743", + "name": "748", "tag": "format", "variants": [ { "case": "luks", - "type": "730" + "type": "735" }, { "case": "aes", @@ -22598,18 +22841,18 @@ "members": [ { "name": "format", - "type": "678" + "type": "683" } ], "meta-type": "object" }, { - "name": "[744]", - "element-type": "744", + "name": "[749]", + "element-type": "749", "meta-type": "array" }, { - "name": "744", + "name": "749", "members": [ { "name": "name", @@ -22621,18 +22864,18 @@ }, { "name": "flags", - "type": "[747]" + "type": "[752]" } ], "meta-type": "object" }, { - "name": "[745]", - "element-type": "745", + "name": "[750]", + "element-type": "750", "meta-type": "array" }, { - "name": "745", + "name": "750", "members": [ { "name": "filename", @@ -22660,12 +22903,12 @@ "meta-type": "object" }, { - "name": "[746]", - "element-type": "746", + "name": "[751]", + "element-type": "751", "meta-type": "array" }, { - "name": "746", + "name": "751", "members": [ { "name": "active", @@ -22689,12 +22932,12 @@ "meta-type": "object" }, { - "name": "[747]", - "element-type": "747", + "name": "[752]", + "element-type": "752", "meta-type": "array" }, { - "name": "747", + "name": "752", "members": [ { "name": "in-use" @@ -22729,6 +22972,18 @@ { "name": "cxl-inject-uncorrectable-errors" }, + { + "name": "cxl-inject-poison" + }, + { + "name": "cxl-inject-memory-module-event" + }, + { + "name": "cxl-inject-dram-event" + }, + { + "name": "cxl-inject-general-media-event" + }, { "name": "query-cryptodev" }, @@ -22870,9 +23125,6 @@ { "name": "x-query-ramblock" }, - { - "name": "x-query-profile" - }, { "name": "x-query-opcount" }, @@ -23441,10 +23693,6 @@ "name": "pc-i440fx-7.2-machine", "parent": "generic-pc-machine" }, - { - "name": "tpm-crb", - "parent": "device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -23461,13 +23709,17 @@ "name": "usb-redir", "parent": "usb-device" }, + { + "name": "virtio-rng-device", + "parent": "virtio-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "virtio-crypto-device", - "parent": "virtio-device" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "chardev-testdev", @@ -23481,6 +23733,10 @@ "name": "Icelake-Server-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "Haswell-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "sev-guest", "parent": "confidential-guest-support" @@ -23510,16 +23766,16 @@ "parent": "pit-common" }, { - "name": "Haswell-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "tpm-crb", + "parent": "device" }, { "name": "rtl8139", "parent": "pci-device" }, { - "name": "virtio-rng-device", - "parent": "virtio-device" + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pci-bridge", @@ -23534,8 +23790,8 @@ "parent": "pcie-root-port-base" }, { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "ich9-usb-uhci5", @@ -23906,8 +24162,8 @@ "parent": "pci-ehci-usb" }, { - "name": "mch", - "parent": "pci-device" + "name": "pc-q35-3.0-machine", + "parent": "generic-pc-machine" }, { "name": "virtio-input-host-pci", @@ -23918,8 +24174,8 @@ "parent": "pc-dimm" }, { - "name": "pc-q35-3.0-machine", - "parent": "generic-pc-machine" + "name": "mch", + "parent": "pci-device" }, { "name": "Icelake-Server-v5-x86_64-cpu", @@ -23994,16 +24250,16 @@ "parent": "chardev-ringbuf" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "i82557a", + "parent": "pci-device" }, { "name": "chardev-udp", @@ -24022,8 +24278,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "migration", @@ -24057,6 +24313,10 @@ "name": "vhost-user-vga", "parent": "vhost-user-vga-base-type" }, + { + "name": "SapphireRapids-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "Skylake-Client-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -24129,21 +24389,21 @@ "name": "ide-cf", "parent": "ide-device" }, - { - "name": "vhost-scsi", - "parent": "vhost-scsi-common" - }, { "name": "usb-tablet", "parent": "usb-hid" }, + { + "name": "sd-card", + "parent": "device" + }, { "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "sd-card", - "parent": "device" + "name": "vhost-scsi", + "parent": "vhost-scsi-common" }, { "name": "pc-q35-4.0.1-machine", @@ -24165,14 +24425,14 @@ "name": "esp", "parent": "device" }, - { - "name": "ne2k_pci", - "parent": "pci-device" - }, { "name": "IvyBridge-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -24334,8 +24594,8 @@ "parent": "virtio-serial-pci-base" }, { - "name": "main-loop", - "parent": "event-loop-base" + "name": "vhost-user-scmi-pci", + "parent": "vhost-user-scmi-pci-base" }, { "name": "xen-bridge", @@ -24397,13 +24657,17 @@ "name": "vhost-user-blk-pci-non-transitional", "parent": "vhost-user-blk-pci-base" }, + { + "name": "Cooperlake-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "cirrus-vga", "parent": "pci-device" }, { - "name": "Cooperlake-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "main-loop", + "parent": "event-loop-base" }, { "name": "kvm32-v1-x86_64-cpu", @@ -24494,8 +24758,8 @@ "parent": "e1000-base" }, { - "name": "vhost-user-scsi", - "parent": "vhost-scsi-common" + "name": "igbvf", + "parent": "pci-device" }, { "name": "pxb-pcie-bus", @@ -24506,8 +24770,8 @@ "parent": "pci-device" }, { - "name": "igbvf", - "parent": "pci-device" + "name": "vhost-user-scsi", + "parent": "vhost-scsi-common" }, { "name": "PIIX4_PM", @@ -24601,14 +24865,14 @@ "name": "pci-ohci", "parent": "pci-device" }, - { - "name": "virtio-tablet-device", - "parent": "virtio-input-hid-device" - }, { "name": "Haswell-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "virtio-tablet-device", + "parent": "virtio-input-hid-device" + }, { "name": "EPYC-Genoa-x86_64-cpu", "parent": "x86_64-cpu" @@ -24654,11 +24918,11 @@ "parent": "usb-device" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -24785,13 +25049,17 @@ "name": "x-remote-iommu", "parent": "object" }, + { + "name": "port92", + "parent": "isa-device" + }, { "name": "pc-i440fx-2.4-machine", "parent": "generic-pc-machine" }, { - "name": "port92", - "parent": "isa-device" + "name": "vhost-user-scmi", + "parent": "virtio-device" }, { "name": "isa-cirrus-vga", @@ -25274,20 +25542,20 @@ "parent": "object" }, { - "name": "pxb-bus", - "parent": "PCI" + "name": "virtio-mmio", + "parent": "sys-bus-device" }, { "name": "KnightsMill-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pentium2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pxb-bus", + "parent": "PCI" }, { - "name": "virtio-mmio", - "parent": "sys-bus-device" + "name": "pentium2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Broadwell-v1-x86_64-cpu", @@ -25861,6 +26129,10 @@ "name": "base-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "GraniteRapids-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "hyperv-synic", "parent": "device" @@ -25949,10 +26221,6 @@ "name": "sd-bus", "parent": "bus" }, - { - "name": "virtio-vga", - "parent": "virtio-vga-base-type" - }, { "name": "filter-dump", "parent": "netfilter" @@ -26002,8 +26270,12 @@ "parent": "virtio-blk-pci-base" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "virtio-vga", + "parent": "virtio-vga-base-type" + }, + { + "name": "GraniteRapids-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "authz-pam", @@ -26057,6 +26329,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -26469,6 +26747,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -26907,6 +27191,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -27207,6 +27497,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -27258,8 +27554,8 @@ "type": "uint4" }, { - "default-value": 4294967295, - "name": "x-pci-sub-vendor-id", + "default-value": 0, + "name": "x-igd-gms", "type": "uint32" }, { @@ -27298,9 +27594,9 @@ "type": "str" }, { - "default-value": false, - "name": "x-enable-migration", - "type": "bool" + "default-value": 4294967295, + "name": "x-pci-sub-vendor-id", + "type": "uint32" }, { "default-value": false, @@ -27314,9 +27610,9 @@ "type": "bool" }, { - "default-value": 0, - "name": "x-igd-gms", - "type": "uint32" + "default-value": false, + "name": "x-no-kvm-intx", + "type": "bool" }, { "default-value": 1100, @@ -27324,9 +27620,10 @@ "type": "uint32" }, { - "default-value": false, - "name": "x-no-kvm-intx", - "type": "bool" + "default-value": "auto", + "name": "enable-migration", + "description": "on/off/auto", + "type": "OnOffAuto" }, { "default-value": false, @@ -27781,6 +28078,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28117,6 +28420,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28241,6 +28550,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28318,6 +28633,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28460,6 +28781,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28822,6 +29149,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28986,6 +29319,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29452,6 +29791,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29579,6 +29924,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29927,6 +30278,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -30185,6 +30542,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -30792,6 +31155,10 @@ "name": "x-vendor-cpuid-only", "type": "bool" }, + { + "name": "pbrsb-no", + "type": "bool" + }, { "name": "vmx-unrestricted-guest", "type": "bool" @@ -31297,6 +31664,10 @@ "name": "ds-cpl", "type": "bool" }, + { + "name": "vmx-ept-execonly", + "type": "bool" + }, { "name": "fsrm", "type": "bool" @@ -31326,7 +31697,7 @@ "type": "bool" }, { - "name": "vmx-ept-execonly", + "name": "vmx-exit-clear-bndcfgs", "type": "bool" }, { @@ -31354,7 +31725,7 @@ "type": "bool" }, { - "name": "vmx-exit-clear-bndcfgs", + "name": "psdp-no", "type": "bool" }, { @@ -31763,10 +32134,18 @@ "name": "vmx-cr8-store-exit", "type": "bool" }, + { + "name": "sbdr-ssdp-no", + "type": "bool" + }, { "name": "kvm-mmu", "type": "bool" }, + { + "name": "vmx-ept-1gb", + "type": "bool" + }, { "name": "nrip-save", "type": "bool" @@ -31832,7 +32211,7 @@ "type": "bool" }, { - "name": "vmx-ept-1gb", + "name": "fbsdp-no", "type": "bool" }, { @@ -32188,6 +32567,10 @@ "name": "xgetbv1", "type": "bool" }, + { + "name": "mcdt-no", + "type": "bool" + }, { "name": "spec-ctrl", "type": "bool" @@ -32582,7 +32965,7 @@ "numa-mem-supported": false, "default-cpu-type": "qemu64-x86_64-cpu", "acpi": true, - "cpu-max": 288, + "cpu-max": 1024, "deprecated": false, "default-ram-id": "pc.ram", "alias": "q35" @@ -33914,6 +34297,63 @@ "migration-safe": true, "deprecated": false }, + { + "name": "SapphireRapids-v2", + "typename": "SapphireRapids-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "SapphireRapids-v1", "typename": "SapphireRapids-v1-x86_64-cpu", @@ -34704,6 +35144,129 @@ "migration-safe": true, "deprecated": false }, + { + "name": "GraniteRapids-v1", + "typename": "GraniteRapids-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "amx-fp16", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no", + "pbrsb-no", + "prefetchiti", + "mcdt-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "GraniteRapids", + "typename": "GraniteRapids-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "amx-fp16", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no", + "pbrsb-no", + "prefetchiti", + "mcdt-no" + ], + "alias-of": "GraniteRapids-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-v4", "typename": "EPYC-v4-x86_64-cpu", @@ -35884,6 +36447,10 @@ }, { "parameters": [ + { + "name": "chroot", + "type": "string" + }, { "name": "async-teardown", "type": "boolean" @@ -37046,6 +37613,10 @@ { "state": false, "capability": "postcopy-preempt" + }, + { + "state": false, + "capability": "switchover-ack" } ], "id": "libvirt-46" @@ -37111,6 +37682,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -37240,6 +37812,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": true, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -37267,6 +37840,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -37322,6 +37896,7 @@ "tsc-adjust": true, "vnmi": false, "kvm-steal-time": true, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": true, "vmx-zero-len-inject": false, @@ -37361,6 +37936,7 @@ "fsrm": false, "fsrs": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -37483,6 +38059,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -37612,6 +38189,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": true, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -37639,6 +38217,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -37694,6 +38273,7 @@ "tsc-adjust": true, "vnmi": false, "kvm-steal-time": true, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": true, "vmx-zero-len-inject": false, @@ -37733,6 +38313,7 @@ "fsrm": false, "fsrs": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -37861,6 +38442,7 @@ "gfni": false, "ibrs-all": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -38029,6 +38611,7 @@ "kvm_nopiodelay": true, "tm": false, "hv-enforce-cpuid": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -38066,6 +38649,7 @@ "sgx-tokenkey": false, "cldemote": false, "vmx-ept": false, + "pbrsb-no": false, "hv-tlbflush-direct": true, "xfd": false, "hv-reenlightenment": true, @@ -38145,6 +38729,7 @@ "tsc-adjust": true, "tsc_adjust": true, "kvm-steal-time": true, + "psdp-no": false, "kvm_steal_time": true, "avx512-vp2intersect": false, "kvmclock": true, @@ -38189,6 +38774,7 @@ "fsrs": false, "fsrm": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "vmx-store-lma": false, @@ -38619,7 +39205,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38628,7 +39213,6 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38642,7 +39226,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38652,7 +39235,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "xsaves", "split-lock-detect" @@ -38667,7 +39249,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38677,7 +39258,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38691,7 +39271,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38701,7 +39280,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38715,7 +39293,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38725,7 +39302,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38744,12 +39320,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38767,12 +39341,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38789,12 +39361,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38813,12 +39383,10 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38837,11 +39405,9 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38858,12 +39424,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v3", @@ -38883,12 +39447,10 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v2", @@ -38908,11 +39470,9 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v1", @@ -38928,9 +39488,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38946,9 +39504,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38965,9 +39521,7 @@ "hle", "invpcid", "rtm", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38984,8 +39538,6 @@ "hle", "invpcid", "rtm", - "rdseed", - "3dnowprefetch", "xsavec" ], "static": false, @@ -39000,9 +39552,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v3", @@ -39020,9 +39570,7 @@ "hle", "invpcid", "rtm", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v2", @@ -39040,8 +39588,6 @@ "hle", "invpcid", "rtm", - "rdseed", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v1", @@ -39049,6 +39595,50 @@ "migration-safe": true, "deprecated": false }, + { + "name": "SapphireRapids-v2", + "typename": "SapphireRapids-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "xsavec", + "xsaves", + "xfd" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "SapphireRapids-v1", "typename": "SapphireRapids-v1-x86_64-cpu", @@ -39061,7 +39651,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39074,7 +39663,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "bus-lock-detect", "serialize", "tsx-ldtrk", @@ -39087,17 +39675,9 @@ "ssbd", "avx-vnni", "avx512-bf16", - "3dnowprefetch", - "wbnoinvd", "xsavec", "xsaves", - "xfd", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xfd" ], "static": false, "migration-safe": true, @@ -39115,7 +39695,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39128,7 +39707,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "bus-lock-detect", "serialize", "tsx-ldtrk", @@ -39141,17 +39719,9 @@ "ssbd", "avx-vnni", "avx512-bf16", - "3dnowprefetch", - "wbnoinvd", "xsavec", "xsaves", - "xfd", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xfd" ], "alias-of": "SapphireRapids-v1", "static": false, @@ -39230,7 +39800,6 @@ "typename": "Opteron_G5-v1-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "tbm", @@ -39245,7 +39814,6 @@ "typename": "Opteron_G5-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "tbm", @@ -39261,7 +39829,6 @@ "typename": "Opteron_G4-v1-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "nrip-save" @@ -39275,7 +39842,6 @@ "typename": "Opteron_G4-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "nrip-save" @@ -39391,14 +39957,12 @@ "x2apic", "tsc-deadline", "avx512f", - "rdseed", "avx512pf", "avx512er", "avx512cd", "avx512-vpopcntdq", "avx512-4vnniw", - "avx512-4fmaps", - "3dnowprefetch" + "avx512-4fmaps" ], "static": false, "migration-safe": true, @@ -39411,14 +39975,12 @@ "x2apic", "tsc-deadline", "avx512f", - "rdseed", "avx512pf", "avx512er", "avx512cd", "avx512-vpopcntdq", "avx512-4vnniw", - "avx512-4fmaps", - "3dnowprefetch" + "avx512-4fmaps" ], "alias-of": "KnightsMill-v1", "static": false, @@ -39483,7 +40045,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39496,20 +40057,11 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -39525,7 +40077,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39538,20 +40089,11 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -39567,7 +40109,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39580,19 +40121,10 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -39608,7 +40140,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39622,15 +40153,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -39646,7 +40169,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39659,8 +40181,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "static": false, @@ -39679,7 +40199,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39692,8 +40211,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "static": false, @@ -39710,7 +40227,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39723,8 +40239,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "alias-of": "Icelake-Server-v2", @@ -39744,7 +40258,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39757,8 +40270,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "alias-of": "Icelake-Server-v1", @@ -39886,20 +40397,112 @@ "migration-safe": true, "deprecated": false }, + { + "name": "GraniteRapids-v1", + "typename": "GraniteRapids-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "amx-fp16", + "xsavec", + "xsaves", + "xfd", + "prefetchiti", + "mcdt-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "GraniteRapids", + "typename": "GraniteRapids-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "amx-fp16", + "xsavec", + "xsaves", + "xfd", + "prefetchiti", + "mcdt-no" + ], + "alias-of": "GraniteRapids-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-v4", "typename": "EPYC-v4-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", "ibpb", "nrip-save", "xsavec", @@ -39913,16 +40516,13 @@ "name": "EPYC-v3", "typename": "EPYC-v3-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", "ibpb", "nrip-save", "xsavec", @@ -39936,11 +40536,9 @@ "name": "EPYC-v2", "typename": "EPYC-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -39955,11 +40553,9 @@ "name": "EPYC-v1", "typename": "EPYC-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "nrip-save", @@ -39973,18 +40569,13 @@ "name": "EPYC-Rome-v4", "typename": "EPYC-Rome-v4-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40000,18 +40591,13 @@ "name": "EPYC-Rome-v3", "typename": "EPYC-Rome-v3-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40028,18 +40614,13 @@ "name": "EPYC-Rome-v2", "typename": "EPYC-Rome-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40056,18 +40637,13 @@ "name": "EPYC-Rome-v1", "typename": "EPYC-Rome-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "amd-stibp", "nrip-save", @@ -40082,18 +40658,13 @@ "name": "EPYC-Rome", "typename": "EPYC-Rome-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "amd-stibp", "nrip-save", @@ -40111,19 +40682,14 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", "vpclmulqdq", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40147,18 +40713,13 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40177,18 +40738,13 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40206,11 +40762,9 @@ "name": "EPYC-IBPB", "typename": "EPYC-IBPB-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40230,7 +40784,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -40243,17 +40796,13 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "avx512-bf16", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40281,7 +40830,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -40294,17 +40842,13 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "avx512-bf16", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40329,11 +40873,9 @@ "name": "EPYC", "typename": "EPYC-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "nrip-save", @@ -40348,10 +40890,8 @@ "name": "Dhyana-v2", "typename": "Dhyana-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40367,10 +40907,8 @@ "name": "Dhyana-v1", "typename": "Dhyana-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40385,10 +40923,8 @@ "name": "Dhyana", "typename": "Dhyana-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40406,16 +40942,12 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsaves" ], "static": false, "migration-safe": true, @@ -40427,15 +40959,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "static": false, "migration-safe": true, @@ -40447,15 +40975,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "static": false, "migration-safe": true, @@ -40467,15 +40991,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "alias-of": "Denverton-v1", "static": false, @@ -40494,7 +41014,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40504,15 +41023,8 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -40530,7 +41042,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40540,14 +41051,7 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40565,7 +41069,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40575,14 +41078,7 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "alias-of": "Cooperlake-v1", "static": false, @@ -40618,7 +41114,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40626,13 +41121,8 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -40648,7 +41138,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40656,12 +41145,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40677,7 +41161,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40685,12 +41168,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40708,7 +41186,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40716,12 +41193,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40739,14 +41211,12 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "avx512vnni", "spec-ctrl", "ssbd", - "3dnowprefetch", "xsavec" ], "static": false, @@ -40763,7 +41233,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40771,12 +41240,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "alias-of": "Cascadelake-Server-v3", "static": false, @@ -40795,14 +41259,12 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "avx512vnni", "spec-ctrl", "ssbd", - "3dnowprefetch", "xsavec" ], "alias-of": "Cascadelake-Server-v1", @@ -40818,9 +41280,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "static": false, "migration-safe": true, @@ -40836,9 +41296,7 @@ "hle", "invpcid", "rtm", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "static": false, "migration-safe": true, @@ -40851,9 +41309,7 @@ "pcid", "x2apic", "tsc-deadline", - "invpcid", - "rdseed", - "3dnowprefetch" + "invpcid" ], "static": false, "migration-safe": true, @@ -40868,9 +41324,7 @@ "tsc-deadline", "hle", "invpcid", - "rtm", - "rdseed", - "3dnowprefetch" + "rtm" ], "static": false, "migration-safe": true, @@ -40884,9 +41338,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "alias-of": "Broadwell-v4", "static": false, @@ -40900,9 +41352,7 @@ "pcid", "x2apic", "tsc-deadline", - "invpcid", - "rdseed", - "3dnowprefetch" + "invpcid" ], "alias-of": "Broadwell-v2", "static": false, @@ -40919,9 +41369,7 @@ "hle", "invpcid", "rtm", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "alias-of": "Broadwell-v3", "static": false, @@ -40937,9 +41385,7 @@ "tsc-deadline", "hle", "invpcid", - "rtm", - "rdseed", - "3dnowprefetch" + "rtm" ], "alias-of": "Broadwell-v1", "static": false, @@ -40995,7 +41441,7 @@ "aes": true, "vmx-apicv-xapic": false, "mmx": true, - "rdpid": false, + "rdpid": true, "arat": true, "vmx-page-walk-4": false, "vmx-page-walk-5": false, @@ -41003,6 +41449,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": false, "intel-pt": false, @@ -41031,7 +41478,7 @@ "vmx-ept-execonly": false, "vmx-exit-save-efer": false, "vmx-invept-all-context": false, - "wbnoinvd": false, + "wbnoinvd": true, "avx512f": false, "msr": true, "mce": true, @@ -41062,7 +41509,7 @@ "avx512-vpopcntdq": false, "phe": false, "extapic": false, - "3dnowprefetch": false, + "3dnowprefetch": true, "vmx-vmfunc": false, "vmx-activity-shutdown": false, "sgx1": false, @@ -41132,6 +41579,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": false, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": false, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -41159,6 +41607,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -41214,6 +41663,7 @@ "tsc-adjust": false, "vnmi": false, "kvm-steal-time": false, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": false, "vmx-zero-len-inject": false, @@ -41253,6 +41703,7 @@ "fsrm": true, "fsrs": true, "fsrc": true, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -41306,7 +41757,7 @@ "lmce": false, "perfctr-nb": false, "rdrand": true, - "rdseed": false, + "rdseed": true, "cmpccxadd": false, "avx512-4vnniw": false, "vme": false, @@ -41314,7 +41765,7 @@ "dtes64": false, "mtrr": true, "rdtscp": true, - "xsaveerptr": false, + "xsaveerptr": true, "pse36": true, "kvm-pv-tlb-flush": false, "vmx-activity-wait-sipi": false, @@ -41367,7 +41818,7 @@ "aes": true, "vmx-apicv-xapic": false, "mmx": true, - "rdpid": false, + "rdpid": true, "arat": true, "vmx-page-walk-4": false, "vmx-page-walk-5": false, @@ -41375,6 +41826,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": false, "intel-pt": false, @@ -41403,7 +41855,7 @@ "vmx-ept-execonly": false, "vmx-exit-save-efer": false, "vmx-invept-all-context": false, - "wbnoinvd": false, + "wbnoinvd": true, "avx512f": false, "msr": true, "mce": true, @@ -41434,7 +41886,7 @@ "avx512-vpopcntdq": false, "phe": false, "extapic": false, - "3dnowprefetch": false, + "3dnowprefetch": true, "vmx-vmfunc": false, "vmx-activity-shutdown": false, "sgx1": false, @@ -41504,6 +41956,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": false, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": false, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -41531,6 +41984,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -41586,6 +42040,7 @@ "tsc-adjust": false, "vnmi": false, "kvm-steal-time": false, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": false, "vmx-zero-len-inject": false, @@ -41625,6 +42080,7 @@ "fsrm": true, "fsrs": true, "fsrc": true, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -41678,7 +42134,7 @@ "lmce": false, "perfctr-nb": false, "rdrand": true, - "rdseed": false, + "rdseed": true, "cmpccxadd": false, "avx512-4vnniw": false, "vme": false, @@ -41686,7 +42142,7 @@ "dtes64": false, "mtrr": true, "rdtscp": true, - "xsaveerptr": false, + "xsaveerptr": true, "pse36": true, "kvm-pv-tlb-flush": false, "vmx-activity-wait-sipi": false, @@ -41843,7 +42299,7 @@ "numa-mem-supported": false, "default-cpu-type": "qemu64-x86_64-cpu", "acpi": true, - "cpu-max": 288, + "cpu-max": 1024, "deprecated": false, "default-ram-id": "pc.ram", "alias": "q35" diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 475496a8c8..d61720468a 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -209,7 +209,7 @@ <flag name='run-with.async-teardown'/> <version>8000050</version> <microcodeVersion>43100245</microcodeVersion> - <package>v8.0.0-1739-g5f9dd6a8ce</package> + <package>v8.0.0-2835-g361d539735</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> @@ -230,6 +230,7 @@ <property name='ibrs-all' type='boolean' value='false'/> <property name='vmx-desc-exit' type='boolean' value='false'/> <property name='pause-filter' type='boolean' value='true' migratable='yes'/> + <property name='mcdt-no' type='boolean' value='false'/> <property name='bus-lock-detect' type='boolean' value='false'/> <property name='xsavec' type='boolean' value='true' migratable='yes'/> <property name='intel-pt' type='boolean' value='false'/> @@ -359,6 +360,7 @@ <property name='vmx-tsc-offset' type='boolean' value='false'/> <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/> <property name='tm' type='boolean' value='false'/> + <property name='fbsdp-no' type='boolean' value='false'/> <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/> <property name='vmx-rdtsc-exit' type='boolean' value='false'/> <property name='hypervisor' type='boolean' value='true' migratable='yes'/> @@ -386,6 +388,7 @@ <property name='cldemote' type='boolean' value='false'/> <property name='sgx-tokenkey' type='boolean' value='false'/> <property name='vmx-ept' type='boolean' value='false'/> + <property name='pbrsb-no' type='boolean' value='false'/> <property name='xfd' type='boolean' value='false'/> <property name='kvm-mmu' type='boolean' value='false'/> <property name='sse4.2' type='boolean' value='true' migratable='yes'/> @@ -441,6 +444,7 @@ <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='vnmi' type='boolean' value='false'/> <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/> + <property name='psdp-no' type='boolean' value='false'/> <property name='avx512-vp2intersect' type='boolean' value='false'/> <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> @@ -480,6 +484,7 @@ <property name='fsrm' type='boolean' value='false'/> <property name='fsrs' type='boolean' value='false'/> <property name='fsrc' type='boolean' value='false'/> + <property name='sbdr-ssdp-no' type='boolean' value='false'/> <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/> <property name='vmx-io-bitmap' type='boolean' value='false'/> <property name='umip' type='boolean' value='true' migratable='yes'/> @@ -859,6 +864,56 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='kvm' name='SapphireRapids-v2' typename='SapphireRapids-v2-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + </cpu> <cpu type='kvm' name='SapphireRapids-v1' typename='SapphireRapids-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='hle'/> @@ -1309,6 +1364,114 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='kvm' name='GraniteRapids-v1' typename='GraniteRapids-v1-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='amx-fp16'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + <blocker name='pbrsb-no'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> + <cpu type='kvm' name='GraniteRapids' typename='GraniteRapids-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='amx-fp16'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + <blocker name='pbrsb-no'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> <cpu type='kvm' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='no'> <blocker name='xsaves'/> </cpu> @@ -1732,7 +1895,7 @@ <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-7.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> - <machine type='kvm' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> + <machine type='kvm' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> @@ -1792,7 +1955,7 @@ <property name='aes' type='boolean' value='true' migratable='yes'/> <property name='vmx-apicv-xapic' type='boolean' value='false'/> <property name='mmx' type='boolean' value='true' migratable='yes'/> - <property name='rdpid' type='boolean' value='false'/> + <property name='rdpid' type='boolean' value='true' migratable='yes'/> <property name='arat' type='boolean' value='true' migratable='yes'/> <property name='vmx-page-walk-4' type='boolean' value='false'/> <property name='vmx-page-walk-5' type='boolean' value='false'/> @@ -1800,6 +1963,7 @@ <property name='ibrs-all' type='boolean' value='false'/> <property name='vmx-desc-exit' type='boolean' value='false'/> <property name='pause-filter' type='boolean' value='false'/> + <property name='mcdt-no' type='boolean' value='false'/> <property name='bus-lock-detect' type='boolean' value='false'/> <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> @@ -1828,7 +1992,7 @@ <property name='vmx-ept-execonly' type='boolean' value='false'/> <property name='vmx-exit-save-efer' type='boolean' value='false'/> <property name='vmx-invept-all-context' type='boolean' value='false'/> - <property name='wbnoinvd' type='boolean' value='false'/> + <property name='wbnoinvd' type='boolean' value='true' migratable='yes'/> <property name='avx512f' type='boolean' value='false'/> <property name='msr' type='boolean' value='true' migratable='yes'/> <property name='mce' type='boolean' value='true' migratable='yes'/> @@ -1859,7 +2023,7 @@ <property name='avx512-vpopcntdq' type='boolean' value='false'/> <property name='phe' type='boolean' value='false'/> <property name='extapic' type='boolean' value='false'/> - <property name='3dnowprefetch' type='boolean' value='false'/> + <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/> <property name='vmx-vmfunc' type='boolean' value='false'/> <property name='vmx-activity-shutdown' type='boolean' value='false'/> <property name='sgx1' type='boolean' value='false'/> @@ -1929,6 +2093,7 @@ <property name='vmx-tsc-offset' type='boolean' value='false'/> <property name='kvm-nopiodelay' type='boolean' value='false'/> <property name='tm' type='boolean' value='false'/> + <property name='fbsdp-no' type='boolean' value='false'/> <property name='kvmclock-stable-bit' type='boolean' value='false'/> <property name='vmx-rdtsc-exit' type='boolean' value='false'/> <property name='hypervisor' type='boolean' value='true' migratable='yes'/> @@ -1956,6 +2121,7 @@ <property name='cldemote' type='boolean' value='false'/> <property name='sgx-tokenkey' type='boolean' value='false'/> <property name='vmx-ept' type='boolean' value='false'/> + <property name='pbrsb-no' type='boolean' value='false'/> <property name='xfd' type='boolean' value='false'/> <property name='kvm-mmu' type='boolean' value='false'/> <property name='sse4.2' type='boolean' value='true' migratable='yes'/> @@ -2011,6 +2177,7 @@ <property name='tsc-adjust' type='boolean' value='false'/> <property name='vnmi' type='boolean' value='false'/> <property name='kvm-steal-time' type='boolean' value='false'/> + <property name='psdp-no' type='boolean' value='false'/> <property name='avx512-vp2intersect' type='boolean' value='false'/> <property name='kvmclock' type='boolean' value='false'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> @@ -2050,6 +2217,7 @@ <property name='fsrm' type='boolean' value='true' migratable='yes'/> <property name='fsrs' type='boolean' value='true' migratable='yes'/> <property name='fsrc' type='boolean' value='true' migratable='yes'/> + <property name='sbdr-ssdp-no' type='boolean' value='false'/> <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/> <property name='vmx-io-bitmap' type='boolean' value='false'/> <property name='umip' type='boolean' value='true' migratable='yes'/> @@ -2103,7 +2271,7 @@ <property name='lmce' type='boolean' value='false'/> <property name='perfctr-nb' type='boolean' value='false'/> <property name='rdrand' type='boolean' value='true' migratable='yes'/> - <property name='rdseed' type='boolean' value='false'/> + <property name='rdseed' type='boolean' value='true' migratable='yes'/> <property name='cmpccxadd' type='boolean' value='false'/> <property name='avx512-4vnniw' type='boolean' value='false'/> <property name='vme' type='boolean' value='false'/> @@ -2111,7 +2279,7 @@ <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> <property name='rdtscp' type='boolean' value='true' migratable='yes'/> - <property name='xsaveerptr' type='boolean' value='false'/> + <property name='xsaveerptr' type='boolean' value='true' migratable='yes'/> <property name='pse36' type='boolean' value='true' migratable='yes'/> <property name='kvm-pv-tlb-flush' type='boolean' value='false'/> <property name='vmx-activity-wait-sipi' type='boolean' value='false'/> @@ -2174,7 +2342,6 @@ <cpu type='tcg' name='Snowridge-v4' typename='Snowridge-v4-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2183,14 +2350,12 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='Snowridge-v3' typename='Snowridge-v3-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2200,7 +2365,6 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='split-lock-detect'/> @@ -2208,7 +2372,6 @@ <cpu type='tcg' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2218,14 +2381,12 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> <cpu type='tcg' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2235,14 +2396,12 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2252,7 +2411,6 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> @@ -2263,12 +2421,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> @@ -2279,12 +2435,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'> @@ -2294,12 +2448,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'> @@ -2311,12 +2463,10 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'> @@ -2328,11 +2478,9 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'> @@ -2342,12 +2490,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'> @@ -2359,12 +2505,10 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'> @@ -2376,11 +2520,9 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v4' typename='Skylake-Client-v4-x86_64-cpu' usable='no'> @@ -2388,9 +2530,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> @@ -2399,9 +2539,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'> @@ -2411,9 +2549,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'> @@ -2423,8 +2559,6 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='no'> @@ -2432,9 +2566,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'> @@ -2444,9 +2576,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'> @@ -2456,10 +2586,45 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> + <cpu type='tcg' name='SapphireRapids-v2' typename='SapphireRapids-v2-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + </cpu> <cpu type='tcg' name='SapphireRapids-v1' typename='SapphireRapids-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> @@ -2469,7 +2634,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2482,7 +2646,6 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='bus-lock-detect'/> <blocker name='serialize'/> <blocker name='tsx-ldtrk'/> @@ -2495,17 +2658,9 @@ <blocker name='ssbd'/> <blocker name='avx-vnni'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='xfd'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='SapphireRapids' typename='SapphireRapids-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2516,7 +2671,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2529,7 +2683,6 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='bus-lock-detect'/> <blocker name='serialize'/> <blocker name='tsx-ldtrk'/> @@ -2542,17 +2695,9 @@ <blocker name='ssbd'/> <blocker name='avx-vnni'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='xfd'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> @@ -2576,7 +2721,6 @@ <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> @@ -2584,7 +2728,6 @@ </cpu> <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> @@ -2592,14 +2735,12 @@ </cpu> <cpu type='tcg' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='nrip-save'/> </cpu> <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='nrip-save'/> @@ -2626,27 +2767,23 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='avx512f'/> - <blocker name='rdseed'/> <blocker name='avx512pf'/> <blocker name='avx512er'/> <blocker name='avx512cd'/> <blocker name='avx512-vpopcntdq'/> <blocker name='avx512-4vnniw'/> <blocker name='avx512-4fmaps'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='avx512f'/> - <blocker name='rdseed'/> <blocker name='avx512pf'/> <blocker name='avx512er'/> <blocker name='avx512cd'/> <blocker name='avx512-vpopcntdq'/> <blocker name='avx512-4vnniw'/> <blocker name='avx512-4fmaps'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> @@ -2673,7 +2810,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2686,20 +2822,11 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2708,7 +2835,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2721,20 +2847,11 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v4' typename='Icelake-Server-v4-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2743,7 +2860,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2756,19 +2872,10 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2777,7 +2884,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2791,15 +2897,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2808,7 +2906,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2821,8 +2918,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'> @@ -2834,7 +2929,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2847,8 +2941,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'> @@ -2858,7 +2950,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2871,8 +2962,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'> @@ -2884,7 +2973,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2897,8 +2985,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'> @@ -2961,44 +3047,116 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='tcg' name='GraniteRapids-v1' typename='GraniteRapids-v1-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='amx-fp16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> + <cpu type='tcg' name='GraniteRapids' typename='GraniteRapids-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='amx-fp16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> <cpu type='tcg' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> <blocker name='ibpb'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> <blocker name='ibpb'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3006,29 +3164,22 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v4' typename='EPYC-Rome-v4-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3037,18 +3188,13 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v3' typename='EPYC-Rome-v3-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3058,18 +3204,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v2' typename='EPYC-Rome-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3079,18 +3220,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='amd-stibp'/> <blocker name='nrip-save'/> @@ -3098,18 +3234,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='amd-stibp'/> <blocker name='nrip-save'/> @@ -3119,19 +3250,14 @@ <cpu type='tcg' name='EPYC-Milan-v2' typename='EPYC-Milan-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='vpclmulqdq'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3148,18 +3274,13 @@ <cpu type='tcg' name='EPYC-Milan-v1' typename='EPYC-Milan-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3171,18 +3292,13 @@ <cpu type='tcg' name='EPYC-Milan' typename='EPYC-Milan-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3192,11 +3308,9 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3208,7 +3322,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -3221,17 +3334,13 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='avx512-bf16'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3252,7 +3361,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -3265,17 +3373,13 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='avx512-bf16'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3292,21 +3396,17 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Dhyana-v2' typename='Dhyana-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3315,10 +3415,8 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3326,10 +3424,8 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3339,55 +3435,39 @@ <cpu type='tcg' name='Denverton-v3' typename='Denverton-v3-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Cooperlake-v2' typename='Cooperlake-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3398,7 +3478,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3408,15 +3487,8 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Cooperlake-v1' typename='Cooperlake-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3427,7 +3499,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3437,14 +3508,7 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Cooperlake' typename='Cooperlake-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3455,7 +3519,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3465,14 +3528,7 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/> @@ -3483,7 +3539,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3491,13 +3546,8 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v4' typename='Cascadelake-Server-v4-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3506,7 +3556,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3514,12 +3563,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3528,7 +3572,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3536,12 +3579,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3552,7 +3590,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3560,12 +3597,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3576,14 +3608,12 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'> @@ -3593,7 +3623,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3601,12 +3630,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3617,14 +3641,12 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'> @@ -3632,9 +3654,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3643,17 +3663,13 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3662,25 +3678,19 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3689,9 +3699,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3700,8 +3708,6 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> @@ -3718,7 +3724,7 @@ <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-7.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> - <machine type='tcg' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> + <machine type='tcg' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> -- 2.41.0

2 1

[PATCH 0/2] storage: Fix returning of locked objects from 'virStoragePoolObjListSearch'
by Peter Krempa 18 Jul '23

18 Jul '23

Patch 1 improves chances to reproduce the bug. https://bugzilla.redhat.com/show_bug.cgi?id=2222210 Peter Krempa (2): file reproducer storage: Fix returning of locked objects from 'virStoragePoolObjListSearch' src/conf/virstorageobj.c | 7 ++++++- src/storage/storage_util.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.41.0

2 3

[PATCH] conf: domcaps: Add 'async-teardown' domain capability
by Boris Fiuczynski 18 Jul '23

18 Jul '23

Add async-teardown to the features list in domain capabilities allowing high level management to introspect the availability of the asynchronous teardown feature. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- docs/formatdomaincaps.rst | 6 ++++++ src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/schemas/domaincaps.rng | 9 +++++++++ src/qemu/qemu_capabilities.c | 1 + tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.ppc.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0.s390x.xml | 1 + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 + 74 files changed, 87 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 9dae941d18..0f8015d4dd 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -647,6 +647,7 @@ capabilities. All features occur as children of the main ``features`` element. <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev> <cbitpos>47</cbitpos> <reduced-phys-bits>1</reduced-phys-bits> @@ -711,6 +712,11 @@ presence of the ``backup`` element even if ``supported='no'`` implies that the ``VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA`` flag for ``virDomainUndefine`` is supported. +async-teardown +^^^^^^^^^^^^^^ + +Reports whether the asynchronous teardown feature can be enabled. + s390-pv capability ^^^^^^^^^^^^^^^^^^ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index c076af7808..2fa5756184 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virDomainCapsFeature, "genid", "backingStoreInput", "backup", + "async-teardown", "s390-pv", ); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 2624269eab..01bcfa2e39 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -248,6 +248,7 @@ typedef enum { VIR_DOMAIN_CAPS_FEATURE_GENID, VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, VIR_DOMAIN_CAPS_FEATURE_BACKUP, + VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, VIR_DOMAIN_CAPS_FEATURE_S390_PV, VIR_DOMAIN_CAPS_FEATURE_LAST diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng index 19bd6f7128..99ef148d44 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -300,6 +300,9 @@ <optional> <ref name="backup"/> </optional> + <optional> + <ref name="async-teardown"/> + </optional> <optional> <ref name="s390-pv"/> </optional> @@ -315,6 +318,12 @@ </element> </define> + <define name="async-teardown"> + <element name="async-teardown"> + <ref name="supported"/> + </element> + </define> + <define name="gic"> <element name="gic"> <ref name="supported"/> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9f4b17208..338608f0a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6296,6 +6296,7 @@ static const struct virQEMUCapsDomainFeatureCapabilityTuple domCapsTuples[] = { { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID }, { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_LAST }, { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_INCREMENTAL_BACKUP }, + { VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN }, }; diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index f408c2a969..f6c9622a56 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -248,6 +248,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 4427634d7c..3e9485c7d0 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index 981a06856d..9aa1d946ae 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -194,6 +194,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index 981a06856d..9aa1d946ae 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -194,6 +194,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index a3289573bd..770a67bff1 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -162,6 +162,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c35bed1326..da271825f9 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -268,6 +268,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='no'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index cbe083f1f1..513ca3caf4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -248,6 +248,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 6b68d4f2a5..64a6b7dea7 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -250,6 +250,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml index 20a8c9a583..7ee0dcf664 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml @@ -147,6 +147,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 39b1b4c1f2..95366f3edf 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index f84aec44c9..c8cd609bc8 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml index 833cb4bb2e..1f0fc66f53 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml @@ -150,6 +150,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index f84aec44c9..c8cd609bc8 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index 4b3f490942..c80fbb8ec6 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -169,6 +169,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 603d842dfe..c8338b0889 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -250,6 +250,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index cdbbe86ede..3f170d469f 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 8950900e72..097ffce9f9 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index 6f92de2b6c..7a04ea6c12 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -133,6 +133,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index 1ef28a71e4..ba0785dcf9 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 46a3a44cdd..1474488d7b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index 20a8c9a583..7ee0dcf664 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -147,6 +147,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index edb622240e..ec89689a36 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index af01bdfbe9..a36255f6f8 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml index 833cb4bb2e..1f0fc66f53 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -150,6 +150,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index af01bdfbe9..a36255f6f8 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index b465ad1030..538b790ba3 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -169,6 +169,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 9dbf118713..99faaad866 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -270,6 +270,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='no'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 09db834535..1b4f379bbb 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b1a2be10e6..b8e9a26e68 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -253,6 +253,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 29b95a836f..2b99ae36b6 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -267,6 +267,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 67889c4572..010fc6916e 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -209,6 +209,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 67889c4572..010fc6916e 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -209,6 +209,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index f0a8b196f5..df3708f801 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -271,6 +271,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='yes'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 693ae0a7f1..652cc0ef8d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -253,6 +253,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index a161d6aa20..628684c171 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 7bfe6f802c..ab0aae0439 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -267,6 +267,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 8c4f8cc860..8f1a0bcb29 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 0449f562df..50be45c069 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index f15111c590..a670f306dd 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -269,6 +269,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index 241e893df6..424f7cf606 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -216,6 +216,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index 241e893df6..424f7cf606 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -216,6 +216,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index a9f7aefbc9..94edf1878e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -168,6 +168,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index fa1f7a2316..6cd7ac6616 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml index bcabf66d2a..d51de8273f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml @@ -170,6 +170,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index e793278d41..e5f05ab1a7 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -255,6 +255,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 6ff9df5766..6e067c8c20 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -270,6 +270,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 6aa5e78612..51a579218f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -215,6 +215,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 6aa5e78612..51a579218f 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -215,6 +215,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 78f8d3cac4..f8b72ce7af 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -173,6 +173,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 1d1505f757..603ad39077 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -255,6 +255,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 047763bd43..5cceec1882 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index b8621b5efd..858085883f 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -268,6 +268,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index f3a436d859..52a578a733 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -166,6 +166,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 95452bb0a4..de378e74c7 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index d6dc93d957..ff25d4bffb 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -177,6 +177,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index d0029c65da..3fba78a251 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -260,6 +260,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index a5744e41fa..86079797c9 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -258,6 +258,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index a5744e41fa..86079797c9 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -258,6 +258,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 59ace0a0b2..eee1859c1c 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -152,6 +152,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index fecb7e4a0a..52d6cfe929 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -260,6 +260,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index ef2637ab26..efe9d3eb52 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -261,6 +261,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index 5254d8807a..6ce952d910 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -153,6 +153,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index cde1d70f09..1e2001ee09 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -263,6 +263,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml index 68aa0d6189..43de2072b9 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -156,6 +156,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index ebae9e34d6..04e63d752c 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -261,6 +261,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index effa6f6630..f8165fe212 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index c36bac3fd2..ea9e085af5 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 6b78a718b0..d70b639503 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -278,6 +278,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <s390-pv supported='yes'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 48e9444deb..51a104798f 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> -- 2.41.0

2 2

[libvirt PATCH] docs: expand clangd instructions
by Jonathon Jongsma 18 Jul '23

18 Jul '23

Add some additional information about running clangd for LSP when clang is not your normal compiler. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/clangd.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/clangd.rst b/docs/clangd.rst index 93570ae178..25529948f6 100644 --- a/docs/clangd.rst +++ b/docs/clangd.rst @@ -40,6 +40,14 @@ Create a separate build directory with a ``clangd`` compatible CC=clang CXX=clang++ meson setup build-clang +There are a small number of source files that are generated as part of the +build process. In order to navigate this generated source code, you should also +execute a build in this directory: + +:: + + ninja -C build-clang + Point ``clangd`` (v12 or later) at the correct ``compile_commands.json`` by placing the following into a ``.clangd`` file in the root of the project: @@ -49,3 +57,12 @@ Point ``clangd`` (v12 or later) at the correct --- CompileFlags: CompilationDatabase: "build-clang" + + +Please note that if you are not using clang for your daily development, the +``build-clang`` directory can get out of sync with the current state of the +project over time. When you update your git checkout, new files may be added or +configuration options changed and ``clangd`` may start to behave unpredictably. +In this case, you will need to update your compilation database by doing a new +build in the ``build-clang`` directory. This should allow clangd to work +reliably again. -- 2.41.0

3 2

[PATCH] qemu: Add NUMA node automatically for memory hotplug
by Michal Privoznik 17 Jul '23

17 Jul '23

Up until v2.11.0-rc2~19^2~3 QEMU used to require at least one NUMA node to be configured when memory hotplug was enabled. After that commit, QEMU automatically adds a NUMA node if none was specified on the cmd line. Reflect this in domain XML, i.e. explicitly add a NUMA node into our domain definition if needed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 53 ++++++++++++++++++- ...emory-hotplug-ppc64-nonuma-abi-update.args | 11 ++-- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 7 ++- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3700b3e711..a9ed5f5901 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4807,6 +4807,51 @@ qemuDomainDefTsegPostParse(virDomainDef *def, } +static int +qemuDomainDefNumaAutoAdd(virDomainDef *def, + unsigned int parseFlags) +{ + bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + unsigned long long initialMem; + size_t i; + + if (!abiUpdate || + !virDomainDefHasMemoryHotplug(def) || + virDomainNumaGetNodeCount(def->numa) > 0) { + return 0; + } + + initialMem = virDomainDefGetMemoryInitial(def); + + if (!def->numa) + def->numa = virDomainNumaNew(); + + virDomainNumaSetNodeCount(def->numa, 1); + virDomainNumaSetNodeMemorySize(def->numa, 0, initialMem); + + for (i = 0; i < def->nmems; i++) { + virDomainMemoryDef *mem = def->mems[i]; + + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + if (mem->targetNode == -1) + mem->targetNode = 0; + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + } + + return 0; +} + + /** * qemuDomainDefNumaCPUsRectify: * @numa: pointer to numa definition @@ -4841,8 +4886,12 @@ qemuDomainDefNumaCPUsRectify(virDomainDef *def, static int qemuDomainDefNumaCPUsPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps, + unsigned int parseFlags) { + if (qemuDomainDefNumaAutoAdd(def, parseFlags) < 0) + return -1; + return qemuDomainDefNumaCPUsRectify(def, qemuCaps); } @@ -4914,7 +4963,7 @@ qemuDomainDefPostParse(virDomainDef *def, if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) return -1; - if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps) < 0) + if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps, parseFlags) < 0) return -1; return 0; diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index 83bfb1123c..18ae15aa0b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -10,13 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ +-machine pseries,usb=off,dump-guest-core=off \ -accel kvm \ -cpu POWER9 \ --m size=1048576k,slots=16,maxmem=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1073741824}' \ +-m size=1310720k,slots=16,maxmem=4194304k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1342177280}' \ +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}' \ --device '{"driver":"pc-dimm","memdev":"memdimm0","id":"dimm0","slot":0}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \ -object '{"qom-type":"memory-backend-ram","id":"memdimm1","size":536870912}' \ --device '{"driver":"pc-dimm","memdev":"memdimm1","id":"dimm1","slot":1}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","slot":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml index d0be98f140..c4677dc977 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml @@ -2,7 +2,7 @@ <name>QEMUGuest1</name> <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid> <maxMemory slots='16' unit='KiB'>4194304</maxMemory> - <memory unit='KiB'>2097152</memory> + <memory unit='KiB'>2098177</memory> <currentMemory unit='KiB'>2097152</currentMemory> <vcpu placement='static'>1</vcpu> <os> @@ -11,6 +11,9 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> + <numa> + <cell id='0' cpus='0' memory='1049601' unit='KiB'/> + </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> @@ -29,12 +32,14 @@ <memory model='dimm'> <target> <size unit='KiB'>524288</size> + <node>0</node> </target> <address type='dimm' slot='0'/> </memory> <memory model='dimm'> <target> <size unit='KiB'>524288</size> + <node>0</node> </target> <address type='dimm' slot='1'/> </memory> -- 2.41.0

2 1

Add blocksize properties to libvirt
by Андрей Ячменёв 17 Jul '23

17 Jul '23

2 1

[PATCH] Added support for vendor and product for qemu ide-hd
by Benedek Major 17 Jul '23

17 Jul '23

The XML-Schema specifies two tags vendor and product for the disk type. But they only apply to the SCSI bus, even though the QEMU driver ide-hd and ide-cd have support for the command line argument -model. The model corresponds to words 27-46 of the IDENTIFY PACKET DEVICE response from the ATAPI spec. Words 27-46 is a 40 Char space for the model number of the device. The model number is built by combining the vendor and the product fields with a single space as separator in the middle. Therefore I would say, that vendor and product pretty much correlate to the model field in QEMU, so the ide disk should also have the possibility of adding vendor and product to it. The tests got changed to incorporate the new error message which now contains that the ide and sata bus also supports vendor and product. Also the xml to command line tests got updated, to have both fields present for testing. The command generator reordered a bit too, to only include disk->vendor and disk->product into the json generation, when the scsi bus is selected. The same logic applies to the ide and sata bus. Signed-off-by: Benedek Major <benedek(a)major.onl> --- src/qemu/qemu_command.c | 21 ++++++++++++++++--- src/qemu/qemu_validate.c | 6 ++++-- .../disk-sata-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 2 ++ ...csi-disk-vpd-build-error.x86_64-latest.err | 2 +- .../disk-sata-device.x86_64-latest.xml | 2 ++ 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ad224571f3..903872091f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1943,8 +1943,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "p:physical_block_size", physical_block_size, "A:wwn", &wwn, "p:rotation_rate", disk->rotation_rate, - "S:vendor", disk->vendor, - "S:product", disk->product, "T:removable", removable, "S:write-cache", qemuOnOffAuto(writeCache), "p:cyls", disk->geometry.cylinders, @@ -1956,7 +1954,24 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "S:rerror", rpolicy, NULL) < 0) return NULL; - + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { + /* add vendor and product in SCSI section, since only SCSI supports + * vendor and product tag*/ + if (virJSONValueObjectAdd(&props, + "S:vendor", disk->vendor, + "S:product", disk->product, + NULL) < 0) + return NULL; + } + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE || disk->bus == VIR_DOMAIN_DISK_BUS_SATA) { + /* Repurpose vendor and product, since IDE-Disk only supports model, + * which per ATAPI spec is the combination of vendor and product + * separated by a single space*/ + if (virJSONValueObjectAdd(&props, + "S:model", g_strconcat(disk->vendor, " ", disk->product, NULL), + NULL) < 0) + return NULL; + } return g_steal_pointer(&props); } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..e7312bf789 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2871,9 +2871,11 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, } if (disk->vendor || disk->product) { - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI + && disk->bus != VIR_DOMAIN_DISK_BUS_IDE + && disk->bus != VIR_DOMAIN_DISK_BUS_SATA) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); + _("Only scsi, sata and ide disk supports vendor and product")); return -1; } diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index b60d9b16d4..296f8f1ee0 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUG uest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ +-device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1,"model":"Seagate ST3500418AS"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxml2argvdata/disk-sata-device.xml index a9def2923e..51eb472dcc 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.xml +++ b/tests/qemuxml2argvdata/disk-sata-device.xml @@ -19,6 +19,8 @@ <source dev='/dev/HostVG/QEMUG uest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <vendor>Seagate</vendor> + <product>ST3500418AS</product> </disk> <controller type='usb' index='0'/> <controller type='sata' index='0'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err index f70b7a774f..fd77b3feb0 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err @@ -1 +1 @@ -unsupported configuration: Only scsi disk supports vendor and product +unsupported configuration: Only scsi, sata and ide disk supports vendor and product diff --git a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml index cd20f5185b..6caedf66a5 100644 --- a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml @@ -21,6 +21,8 @@ <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUG uest1'/> <target dev='sda' bus='sata'/> + <vendor>Seagate</vendor> + <product>ST3500418AS</product> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0' model='piix3-uhci'> -- 2.41.0

3 2