- Devel - libvirt List Archives

[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 19 Jul '23

19 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 19 Jul '23

19 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 19 Jul '23

19 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