usb-storage was replaced with usb-bot.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
src/qemu/qemu_capabilities.c | 9 +-
src/qemu/qemu_capabilities.h | 2 +-
.../qemucapabilitiesdata/caps_10.0.0_s390x.replies | 223 ++++-------------
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 -
.../caps_10.0.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 -
.../caps_5.2.0_aarch64.replies | 223 +++++------------
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0_ppc64.replies | 211 ++++-------------
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 -
.../caps_5.2.0_riscv64.replies | 199 ++++------------
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0_x86_64.replies | 243 ++++++-------------
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 -
.../caps_6.0.0_aarch64.replies | 221 +++++------------
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.0.0_x86_64.replies | 241 ++++++-------------
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_6.1.0_x86_64.replies | 247 ++++++-------------
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 -
.../caps_6.2.0_aarch64.replies | 227 +++++-------------
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0_ppc64.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0_x86_64.replies | 251 ++++++--------------
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
.../caps_7.0.0_aarch64+hvf.replies | 231 +++++-------------
.../caps_7.0.0_aarch64+hvf.xml | 1 -
.../caps_7.0.0_aarch64.replies | 231 +++++-------------
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0_ppc64.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0_x86_64.replies | 251 ++++++--------------
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_7.1.0_ppc64.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_7.1.0_x86_64.replies | 251 ++++++--------------
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 -
.../caps_7.2.0_x86_64+hvf.replies | 263 ++++++---------------
.../qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
.../qemucapabilitiesdata/caps_7.2.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
.../caps_8.0.0_riscv64.replies | 211 ++++-------------
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_8.0.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_8.1.0_s390x.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 -
.../qemucapabilitiesdata/caps_8.1.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
.../caps_8.2.0_aarch64.replies | 239 +++++--------------
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_8.2.0_armv7l.replies | 239 +++++--------------
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 -
.../caps_8.2.0_loongarch64.replies | 223 ++++-------------
.../caps_8.2.0_loongarch64.xml | 1 -
.../qemucapabilitiesdata/caps_8.2.0_s390x.replies | 215 ++++-------------
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 -
.../qemucapabilitiesdata/caps_8.2.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_9.0.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 -
.../caps_9.1.0_riscv64.replies | 219 ++++-------------
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_9.1.0_s390x.replies | 219 ++++-------------
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 -
.../qemucapabilitiesdata/caps_9.1.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_9.2.0_s390x.replies | 219 ++++-------------
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 -
.../qemucapabilitiesdata/caps_9.2.0_x86_64.replies | 263 ++++++---------------
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 -
74 files changed, 2136 insertions(+), 6387 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b253cb407e8334320cc8ecd49d28d2481d82e9b4..5e81cf3c9db240f8b7d3e82b9dd69288b63d1d4d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -279,7 +279,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"dmi-to-pci-bridge", /* QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE */
"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", /* X_QEMU_CAPS_DEVICE_USB_STORAGE */
"usb-storage.removable", /* X_QEMU_CAPS_USB_STORAGE_REMOVABLE */
/* 155 */
@@ -1294,7 +1294,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "pci-bridge", QEMU_CAPS_DEVICE_PCI_BRIDGE },
{ "vfio-pci", QEMU_CAPS_DEVICE_VFIO_PCI },
{ "i82801b11-bridge", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE },
- { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE },
{ "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO },
{ "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA },
{ "pvpanic", QEMU_CAPS_DEVICE_PANIC },
@@ -1501,9 +1500,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER, NULL },
};
-static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
-};
-
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = {
{ "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY, NULL },
};
@@ -1664,9 +1660,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 a2e5b3f9d663e8d781d42c4d09dced9d6d7a4cdd..f7bac2edeee10cd1dabd1a3869b2c10c1642b69d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -257,7 +257,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
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 */
+ X_QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
X_QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
/* 155 */
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
index 4efd689e3d2ca3db97431bf04cb8be433178c293..bdf9c713bd357a941322d70d55ae2ca997581518 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
@@ -27719,139 +27719,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"
@@ -27863,7 +27740,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28158,7 +28035,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28166,7 +28043,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28277,7 +28154,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28285,11 +28162,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"
@@ -28301,7 +28178,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28584,7 +28461,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28592,7 +28469,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28732,7 +28609,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28740,7 +28617,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28850,7 +28727,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28858,7 +28735,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28999,7 +28876,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -29007,7 +28884,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29103,7 +28980,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29111,7 +28988,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29203,7 +29080,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29211,7 +29088,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29494,7 +29371,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29502,7 +29379,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29774,7 +29651,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29782,7 +29659,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30065,7 +29942,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30073,12 +29950,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30086,7 +29963,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30176,7 +30053,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30184,7 +30061,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30263,12 +30140,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30543,7 +30420,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30551,7 +30428,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30666,12 +30543,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31381,32 +31258,32 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32659,12 +32536,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32758,7 +32635,7 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32769,7 +32646,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32841,7 +32718,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32852,7 +32729,7 @@
"name": "host"
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -33008,7 +32885,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index f5ac4b811a5497453803c40f8bb937e0c8bc9405..501978048e1fccaa53dcfc05c1c9693fd275dedf 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -23,7 +23,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='usb-storage'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
index 5f6b39b7e01a1c82ba92953673a5dc8a0d0c44ec..c3d47d9753d891e368ab29daea457f476122eebe 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
@@ -29015,135 +29015,12 @@
"id": "libvirt-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"
}
{
@@ -29159,7 +29036,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -29167,7 +29044,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29305,7 +29182,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29313,7 +29190,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29404,7 +29281,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29412,7 +29289,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29568,7 +29445,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29576,7 +29453,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29871,7 +29748,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29879,7 +29756,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29990,7 +29867,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29998,7 +29875,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -30278,7 +30155,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -30286,7 +30163,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30580,7 +30457,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30588,11 +30465,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"
@@ -30604,7 +30481,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30714,7 +30591,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30722,7 +30599,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30810,7 +30687,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30818,7 +30695,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30909,7 +30786,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30917,7 +30794,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30959,7 +30836,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30967,7 +30844,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31136,7 +31013,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31144,7 +31021,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31240,7 +31117,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31248,7 +31125,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31340,7 +31217,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31348,7 +31225,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31648,7 +31525,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31656,7 +31533,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31928,7 +31805,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31936,12 +31813,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -31949,7 +31826,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -32043,7 +31920,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -32051,7 +31928,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -32130,7 +32007,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -32138,7 +32015,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -34284,12 +34161,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34945,7 +34822,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34953,7 +34830,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -35072,7 +34949,7 @@
"type": "bool"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -35080,7 +34957,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -35287,12 +35164,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -37876,12 +37753,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -37889,12 +37766,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -37902,12 +37779,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -39430,12 +39307,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -39529,16 +39406,16 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -39547,11 +39424,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "Could not open '/dev/sgx_vepc': No such file or directory"
@@ -39566,7 +39443,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39967,7 +39844,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39981,7 +39858,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -40382,7 +40259,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -40397,7 +40274,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -40909,7 +40786,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index 10bea8bf3031b83e6a0fed2c55c5ee021c4d3692..67380e79a2af731dbebe428d6ca89640051c1869 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 8859a4bb0f4ba3eb6fb61d681f5ecd0414e7d488..958632e4d7b41580e0d6e3144b5f6fdaf7f8c037 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
@@ -19466,123 +19466,16 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-16"
-}
-
-{
- "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-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19594,7 +19487,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19689,7 +19582,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19697,7 +19590,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19750,7 +19643,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19758,7 +19651,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19969,7 +19862,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19977,7 +19870,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20060,7 +19953,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20068,11 +19961,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"
@@ -20084,7 +19977,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -20304,7 +20197,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -20312,11 +20205,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"
@@ -20328,7 +20221,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20426,7 +20319,7 @@
"type": "int"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20434,7 +20327,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20476,7 +20369,7 @@
"type": "uint64"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20484,7 +20377,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20605,7 +20498,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20613,7 +20506,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20711,7 +20604,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20719,7 +20612,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20795,7 +20688,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20803,7 +20696,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20814,7 +20707,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20822,12 +20715,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20835,7 +20728,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20905,7 +20798,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20913,7 +20806,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20982,7 +20875,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20990,7 +20883,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21199,12 +21092,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21941,7 +21834,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21949,7 +21842,7 @@
"arguments": {
"typename": "virt-5.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22112,7 +22005,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22120,7 +22013,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22205,12 +22098,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22444,24 +22337,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"
}
{
@@ -22469,12 +22362,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23642,12 +23535,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -23725,12 +23618,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -23746,7 +23639,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -23757,7 +23650,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -23789,7 +23682,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -23804,7 +23697,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -23836,7 +23729,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 753460b91de2e11514923b8a7d5ce6e8eb79fce2..6172dd12a9c20c7a2acf502e203bd0231db4eee9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 c61131cd1d1285196334cb6bec28d4ff0533f2e2..46143cb5a097d6bdfb3abc6c3884d80b1634455e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
@@ -19119,123 +19119,16 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-16"
-}
-
-{
- "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-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19247,7 +19140,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19342,7 +19235,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19350,7 +19243,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19403,7 +19296,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19411,7 +19304,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19622,7 +19515,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19630,7 +19523,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19713,7 +19606,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19721,11 +19614,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"
@@ -19737,7 +19630,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19957,7 +19850,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19965,11 +19858,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"
@@ -19981,7 +19874,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20079,7 +19972,7 @@
"type": "int"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20087,7 +19980,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20178,7 +20071,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20186,7 +20079,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20228,7 +20121,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20236,7 +20129,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20357,7 +20250,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20365,7 +20258,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20463,7 +20356,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20471,7 +20364,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20547,7 +20440,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20555,7 +20448,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20566,7 +20459,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20574,12 +20467,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20587,7 +20480,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20657,7 +20550,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20665,7 +20558,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20734,12 +20627,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21059,7 +20952,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21067,7 +20960,7 @@
"arguments": {
"typename": "pseries-5.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21271,7 +21164,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21279,7 +21172,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21364,12 +21257,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -24015,24 +23908,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"
}
{
@@ -24040,12 +23933,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25192,12 +25085,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25275,7 +25168,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 f3124b48932a30e32d8a7ce5d30c522620e46c64..e02f92264f82fe4fd0621575f15969bf34190a4f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 c30e64364c74b59fababe08c0424a6406ec69a57..5f4623e0873aeab56e4bc6af9754e063a18cd728 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
@@ -17416,123 +17416,16 @@
"id": "libvirt-16"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-17"
-}
-
-{
- "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-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"
@@ -17544,7 +17437,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17639,7 +17532,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17647,7 +17540,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17700,7 +17593,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17708,7 +17601,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17931,7 +17824,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17939,7 +17832,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18034,7 +17927,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18042,11 +17935,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"
@@ -18058,7 +17951,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18278,7 +18171,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18286,11 +18179,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"
@@ -18302,7 +18195,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18400,7 +18293,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18408,7 +18301,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18529,7 +18422,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18537,7 +18430,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18635,7 +18528,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18643,7 +18536,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18719,7 +18612,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18727,7 +18620,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18738,7 +18631,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18746,12 +18639,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18759,7 +18652,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18829,7 +18722,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18837,7 +18730,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18906,12 +18799,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18965,7 +18858,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18973,7 +18866,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19063,7 +18956,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19071,7 +18964,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19156,32 +19049,32 @@
"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"
}
{
@@ -20457,12 +20350,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -20540,5 +20433,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 2d2fa54f6b41c91eb9f5d246fb954bfb8618b0dc..1ba772457264d71ed997135bf95331bc144a2728 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -38,7 +38,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 6b43caf403e0056c358bccfbc6099bbdb2716bd4..151f5ad96257b454389f67b2dd59701f38559454 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
@@ -18635,119 +18635,12 @@
"id": "libvirt-16"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-17"
-}
-
-{
- "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18763,7 +18656,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18771,7 +18664,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18866,7 +18759,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18874,7 +18767,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18927,7 +18820,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18935,7 +18828,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19053,7 +18946,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19061,7 +18954,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19284,7 +19177,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19292,7 +19185,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19387,7 +19280,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19395,7 +19288,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19513,7 +19406,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19521,7 +19414,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19741,7 +19634,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19749,11 +19642,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"
@@ -19765,7 +19658,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19863,7 +19756,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19871,7 +19764,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19929,7 +19822,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19937,7 +19830,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19990,7 +19883,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19998,7 +19891,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20040,7 +19933,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20048,7 +19941,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20169,7 +20062,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20177,7 +20070,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20275,7 +20168,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20283,7 +20176,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20359,7 +20252,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20367,7 +20260,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20567,7 +20460,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20575,7 +20468,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20586,7 +20479,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20594,12 +20487,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20607,7 +20500,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20677,7 +20570,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20685,7 +20578,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20754,7 +20647,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20762,7 +20655,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -22360,12 +22253,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22823,7 +22716,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22831,7 +22724,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22916,7 +22809,7 @@
"type": "string"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22924,7 +22817,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -23049,12 +22942,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24835,12 +24728,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24848,12 +24741,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -24861,12 +24754,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -26150,12 +26043,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -26233,16 +26126,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26257,7 +26150,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26566,7 +26459,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26580,7 +26473,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -26889,7 +26782,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -26904,7 +26797,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -27213,7 +27106,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 2da3ee42c1c5597a3856244a52d80d6129793959..d086352147958e06f88ded589ed48bce13edf242 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -42,7 +42,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 c882c27c289d07a92ac6fa903b366ac855391c99..3f160d4f88cbf31744fe53dcc0bbf32b1a82deb5 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
@@ -21249,121 +21249,16 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-16"
-}
-
-{
- "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-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -21375,7 +21270,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -21480,7 +21375,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -21488,7 +21383,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -21551,7 +21446,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -21559,7 +21454,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21792,7 +21687,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21800,7 +21695,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21883,7 +21778,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21891,11 +21786,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"
@@ -21907,7 +21802,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -22144,7 +22039,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -22152,11 +22047,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"
@@ -22168,7 +22063,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -22266,7 +22161,7 @@
"type": "int"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -22274,7 +22169,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22316,7 +22211,7 @@
"type": "uint64"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22324,7 +22219,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -22455,7 +22350,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -22463,7 +22358,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22559,7 +22454,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22567,7 +22462,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22647,7 +22542,7 @@
"type": "int32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22655,7 +22550,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22666,7 +22561,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22674,12 +22569,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22687,7 +22582,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22757,7 +22652,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22765,7 +22660,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22834,7 +22729,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22842,7 +22737,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23051,12 +22946,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23835,7 +23730,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23843,7 +23738,7 @@
"arguments": {
"typename": "virt-6.0-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24029,7 +23924,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24037,7 +23932,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24135,12 +24030,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -24380,24 +24275,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"
}
{
@@ -24405,12 +24300,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25598,12 +25493,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25685,12 +25580,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -25706,7 +25601,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -25717,7 +25612,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -25749,7 +25644,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -25764,7 +25659,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -25796,7 +25691,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 3559e545514e45cb917ae163667669dc36aab231..1744a88b747a58f635cc9cd06afbf205b0d38ec5 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -35,7 +35,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 a4715eab67d8a00b7c2bd73500c3af53149570f8..2923ddd3ce8b461d45f0dc1962b398cbd9311ca4 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
@@ -20283,117 +20283,12 @@
"id": "libvirt-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": "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20409,7 +20304,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20417,7 +20312,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20522,7 +20417,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20530,7 +20425,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20593,7 +20488,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20601,7 +20496,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20729,7 +20624,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20737,7 +20632,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20982,7 +20877,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20990,7 +20885,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21085,7 +20980,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21093,7 +20988,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21226,7 +21121,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21234,7 +21129,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21471,7 +21366,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21479,11 +21374,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"
@@ -21495,7 +21390,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21593,7 +21488,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21601,7 +21496,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21659,7 +21554,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21667,7 +21562,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21730,7 +21625,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21738,7 +21633,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21780,7 +21675,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21788,7 +21683,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21919,7 +21814,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21927,7 +21822,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22023,7 +21918,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22031,7 +21926,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22111,7 +22006,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22119,7 +22014,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22341,7 +22236,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22349,7 +22244,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22360,7 +22255,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22368,12 +22263,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22381,7 +22276,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22455,7 +22350,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22463,7 +22358,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22532,7 +22427,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22540,7 +22435,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -24186,12 +24081,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24638,7 +24533,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24646,7 +24541,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -24744,7 +24639,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -24752,7 +24647,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24897,12 +24792,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -26726,12 +26621,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26739,12 +26634,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26752,12 +26647,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -28065,12 +27960,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -28152,12 +28047,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28167,7 +28062,7 @@
"cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28178,7 +28073,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -28499,7 +28394,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -28513,7 +28408,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -28834,7 +28729,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -28849,7 +28744,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -29170,7 +29065,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 7f060769234e895042cb75af39100cb810bdc2fa..2a0e387298fbb2ce2a8666f9780a30a7eb6edf84 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 d9dac1d32fb1a326556578f13780fea515543d9e..68085740c9c65da336cb2d62145d593649189129 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
@@ -20504,123 +20504,12 @@
"id": "libvirt-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": "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20636,7 +20525,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20644,7 +20533,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20754,7 +20643,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20762,7 +20651,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20825,7 +20714,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20833,7 +20722,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20961,7 +20850,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20969,7 +20858,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21208,7 +21097,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21216,7 +21105,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21305,7 +21194,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21313,7 +21202,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21450,7 +21339,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21458,7 +21347,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21695,7 +21584,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21703,11 +21592,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"
@@ -21719,7 +21608,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21817,7 +21706,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21825,7 +21714,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21883,7 +21772,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21891,7 +21780,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21954,7 +21843,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21962,7 +21851,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22004,7 +21893,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22012,7 +21901,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22148,7 +22037,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22156,7 +22045,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22252,7 +22141,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22260,7 +22149,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22340,7 +22229,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22348,7 +22237,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22570,7 +22459,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22578,7 +22467,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22589,7 +22478,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22597,12 +22486,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22610,7 +22499,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22689,7 +22578,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22697,7 +22586,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22771,7 +22660,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22779,7 +22668,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -24437,12 +24326,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24907,7 +24796,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24915,7 +24804,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25018,7 +24907,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25026,7 +24915,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25185,12 +25074,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27202,12 +27091,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27215,12 +27104,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27228,12 +27117,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -28553,12 +28442,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -28640,16 +28529,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "Failed to open /dev/sev: No such file or directory"
@@ -28664,7 +28553,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -28987,7 +28876,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29001,7 +28890,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -29324,7 +29213,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -29339,7 +29228,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -29662,7 +29551,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index c755d6ac8ad0a0064b5b1f1ab3d2bd517909088e..f4f0af4855e119dd667fbf3bf93d71a65bca99b3 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 ae738f342fbc559b452bd4de165f5e0c1dadd27a..81ae7364dc3e1eac73b7e45e08b02a4fc97f4786 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
@@ -22059,127 +22059,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"
@@ -22191,7 +22080,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -22301,7 +22190,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -22309,7 +22198,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22372,7 +22261,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22380,7 +22269,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22619,7 +22508,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22627,7 +22516,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -22716,7 +22605,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -22724,11 +22613,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"
@@ -22740,7 +22629,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -22977,7 +22866,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -22985,11 +22874,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"
@@ -23001,7 +22890,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -23099,7 +22988,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -23107,7 +22996,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -23149,7 +23038,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -23157,7 +23046,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23293,7 +23182,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23301,7 +23190,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23397,7 +23286,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23405,7 +23294,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23485,7 +23374,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23493,7 +23382,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23504,7 +23393,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23512,12 +23401,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -23525,7 +23414,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23600,7 +23489,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23608,7 +23497,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23682,7 +23571,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23690,7 +23579,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23899,12 +23788,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24748,7 +24637,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24756,7 +24645,7 @@
"arguments": {
"typename": "virt-6.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24952,7 +24841,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24960,7 +24849,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25063,12 +24952,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -25314,24 +25203,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"
}
{
@@ -25339,12 +25228,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -26681,12 +26570,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -26768,12 +26657,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26789,7 +26678,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26800,7 +26689,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26832,7 +26721,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26847,7 +26736,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -26879,7 +26768,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 ee2520863eb4236146ad2dda0929c9b4374a08bb..16b40978f840c2eee41d1ddca254b072cc395f63 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 20429d676be36c182618965ce0363c4cfac36e13..00542813ae370434c590a237d37c1770c2b62f94 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
@@ -23961,127 +23961,16 @@
"id": "libvirt-15"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-16"
-}
-
-{
- "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-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -24093,7 +23982,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24203,7 +24092,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24211,7 +24100,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24274,7 +24163,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24282,7 +24171,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24521,7 +24410,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24529,7 +24418,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24618,7 +24507,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24626,11 +24515,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"
@@ -24642,7 +24531,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24879,7 +24768,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24887,11 +24776,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"
@@ -24903,7 +24792,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25001,7 +24890,7 @@
"type": "int"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25009,7 +24898,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25105,7 +24994,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25113,7 +25002,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25155,7 +25044,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25163,7 +25052,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25299,7 +25188,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25307,11 +25196,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-28",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -25323,7 +25212,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25403,7 +25292,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25411,7 +25300,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25422,7 +25311,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25430,12 +25319,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25443,7 +25332,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25518,7 +25407,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25526,7 +25415,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -25600,12 +25489,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -25968,7 +25857,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -25976,7 +25865,7 @@
"arguments": {
"typename": "pseries-6.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26208,7 +26097,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26216,7 +26105,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26319,12 +26208,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28976,24 +28865,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"
}
{
@@ -29001,12 +28890,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30129,12 +30018,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30216,7 +30105,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 fa36e1a46b4e9973fd3699379f59a3699a2b3671..51ae03237e13eaa547c008755ff976c63db5b094 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -34,7 +34,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 3e692f6ae1063b64962dbd5b6f561510e0cb7c57..aa3f943294bdc9c12ab79e1c4fb87c351399504e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
@@ -23648,123 +23648,12 @@
"id": "libvirt-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": "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -23780,7 +23669,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -23788,7 +23677,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -23898,7 +23787,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -23906,7 +23795,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -23969,7 +23858,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -23977,7 +23866,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24105,7 +23994,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24113,7 +24002,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24352,7 +24241,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24360,7 +24249,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24449,7 +24338,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24457,7 +24346,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -24598,7 +24487,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -24606,7 +24495,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -24843,7 +24732,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -24851,11 +24740,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"
@@ -24867,7 +24756,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -24965,7 +24854,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -24973,7 +24862,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25031,7 +24920,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25039,7 +24928,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25102,7 +24991,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25110,7 +24999,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25152,7 +25041,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25160,7 +25049,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25296,7 +25185,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25304,7 +25193,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25400,7 +25289,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25408,7 +25297,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25488,7 +25377,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25496,7 +25385,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -25718,7 +25607,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -25726,7 +25615,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -25737,7 +25626,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -25745,12 +25634,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -25758,7 +25647,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25837,7 +25726,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25845,7 +25734,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25919,7 +25808,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25927,7 +25816,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27667,12 +27556,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28155,7 +28044,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28163,7 +28052,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28266,7 +28155,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28274,7 +28163,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -28438,12 +28327,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30467,12 +30356,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -30480,12 +30369,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -30493,12 +30382,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31818,12 +31707,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -31905,16 +31794,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -31923,11 +31812,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -31942,7 +31831,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -32275,7 +32164,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -32289,7 +32178,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -32622,7 +32511,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -32637,7 +32526,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -32970,7 +32859,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index d46495114615cb88bc22a90e20a3b8368f77f874..f5ac67f057ee73a6ae1923319887059553fe37b2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 5f2374722800bad1ff6b08ea94377d1360b14032..5acd14287b99a77127d4fdb7eb90416b922ddf7e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
@@ -25310,127 +25310,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"
@@ -25442,7 +25331,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25552,7 +25441,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25560,7 +25449,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25623,7 +25512,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25631,7 +25520,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25870,7 +25759,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25878,7 +25767,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25967,7 +25856,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25975,11 +25864,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"
@@ -25991,7 +25880,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26228,7 +26117,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26236,11 +26125,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"
@@ -26252,7 +26141,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26350,7 +26239,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26358,7 +26247,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26400,7 +26289,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26408,7 +26297,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26544,7 +26433,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26552,7 +26441,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26648,7 +26537,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26656,7 +26545,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26736,7 +26625,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26744,7 +26633,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26971,7 +26860,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26979,7 +26868,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27194,7 +27083,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27202,12 +27091,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"return": [],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27215,7 +27104,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27290,7 +27179,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27298,7 +27187,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27372,7 +27261,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27380,7 +27269,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27589,12 +27478,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28464,7 +28353,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28472,7 +28361,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28673,7 +28562,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28681,7 +28570,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28784,12 +28673,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29035,24 +28924,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"
}
{
@@ -29060,12 +28949,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30406,12 +30295,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -30493,12 +30382,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -30514,7 +30403,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -30525,7 +30414,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -30558,7 +30447,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -30573,7 +30462,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -30606,7 +30495,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 243f8fcd44385a503fc286b5290a9bf37bc5a113..6084dc0a7ee7c5ec4dc9585f4de6163ef2128b92 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -39,7 +39,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 aefbbc0daeb32f31a2f03a108b09546b1dabbf5f..6f8c02cd96b65660927f0296cb68a4bae5d5e284 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
@@ -25310,127 +25310,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"
@@ -25442,7 +25331,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25552,7 +25441,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25560,7 +25449,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25623,7 +25512,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25631,7 +25520,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25870,7 +25759,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25878,7 +25767,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25967,7 +25856,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25975,11 +25864,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"
@@ -25991,7 +25880,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26228,7 +26117,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26236,11 +26125,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"
@@ -26252,7 +26141,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26350,7 +26239,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26358,7 +26247,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26400,7 +26289,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26408,7 +26297,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26544,7 +26433,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26552,7 +26441,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26648,7 +26537,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26656,7 +26545,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26736,7 +26625,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26744,7 +26633,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26971,7 +26860,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26979,7 +26868,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27194,7 +27083,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27202,12 +27091,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"return": [],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27215,7 +27104,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27290,7 +27179,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27298,7 +27187,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27372,7 +27261,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27380,7 +27269,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27589,12 +27478,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28464,7 +28353,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28472,7 +28361,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28673,7 +28562,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28681,7 +28570,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28784,12 +28673,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29035,24 +28924,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"
}
{
@@ -29060,12 +28949,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30406,12 +30295,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -30493,12 +30382,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -30514,7 +30403,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -30525,7 +30414,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -30558,7 +30447,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -30573,7 +30462,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -30606,7 +30495,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 e9357948ce78b955c2f8335dab00ee149faeff1e..8ab10509cb4979aa9fb850a33813506f2afe3fed 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 f60e965148a0b967de05cca64f5dfb0e0bc7ebdf..37d45cea18d6193d2925ec47af2e39220497122f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
@@ -24374,127 +24374,16 @@
"id": "libvirt-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": "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-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"
@@ -24506,7 +24395,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24616,7 +24505,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24624,7 +24513,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24687,7 +24576,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24695,7 +24584,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24934,7 +24823,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24942,7 +24831,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25031,7 +24920,7 @@
"type": "size"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25039,11 +24928,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"
@@ -25055,7 +24944,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25292,7 +25181,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25300,11 +25189,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"
@@ -25316,7 +25205,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25414,7 +25303,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25422,7 +25311,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25518,7 +25407,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25526,7 +25415,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25568,7 +25457,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25576,7 +25465,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25712,7 +25601,7 @@
"type": "size"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25720,7 +25609,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25816,7 +25705,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25824,7 +25713,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25904,7 +25793,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25912,7 +25801,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26127,7 +26016,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26135,12 +26024,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"return": [],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26148,7 +26037,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26227,7 +26116,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26235,7 +26124,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26309,12 +26198,12 @@
"type": "int"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26686,7 +26575,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26694,7 +26583,7 @@
"arguments": {
"typename": "pseries-7.0-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26926,7 +26815,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26934,7 +26823,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27037,12 +26926,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29568,24 +29457,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"
}
{
@@ -29593,12 +29482,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30785,12 +30674,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30872,7 +30761,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 2cc543379c8a03df3b3c50239c0206071fbd9fa4..6709d820008cc5df0f34f75a5819769b918f550a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 ee3b9bc1e8623044bdbd533af514bbb44c117e0e..811611387f0ccafb6598dc41cb8782676a4ff94f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
@@ -23964,123 +23964,12 @@
"id": "libvirt-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": "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24096,7 +23985,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24104,7 +23993,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24214,7 +24103,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24222,7 +24111,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24285,7 +24174,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24293,7 +24182,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24421,7 +24310,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24429,7 +24318,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24668,7 +24557,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24676,7 +24565,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24765,7 +24654,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24773,7 +24662,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -24914,7 +24803,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -24922,7 +24811,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25159,7 +25048,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25167,11 +25056,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"
@@ -25183,7 +25072,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25281,7 +25170,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25289,7 +25178,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25352,7 +25241,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25360,7 +25249,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25423,7 +25312,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25431,7 +25320,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25473,7 +25362,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25481,7 +25370,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25617,7 +25506,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25625,7 +25514,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25721,7 +25610,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25729,7 +25618,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25809,7 +25698,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -25817,7 +25706,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26050,7 +25939,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26058,7 +25947,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26273,7 +26162,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26281,12 +26170,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26294,7 +26183,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26373,7 +26262,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26381,7 +26270,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26455,7 +26344,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26463,7 +26352,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28219,12 +28108,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28725,7 +28614,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28733,7 +28622,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28836,7 +28725,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28844,7 +28733,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -29021,12 +28910,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31086,12 +30975,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31099,12 +30988,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31112,12 +31001,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -32441,12 +32330,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -32528,16 +32417,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -32546,7 +32435,7 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32567,7 +32456,7 @@
}
]
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32578,7 +32467,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -32915,7 +32804,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -32929,7 +32818,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -33266,7 +33155,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -33281,7 +33170,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -33618,7 +33507,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index ecd229c49ca3ef0cd3f125b1fa3e46a697a5b3b4..aee473d0c8ccef5591624624f4a3b50f125074c8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 5c21b5e85c6981f630b9918a007ede9db2f7e9fc..8029e093f0b69d28245638e7ca7094fd094fb5de 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
@@ -25064,127 +25064,16 @@
"id": "libvirt-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": "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-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"
@@ -25196,7 +25085,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25306,7 +25195,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25314,7 +25203,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25377,7 +25266,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25385,7 +25274,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25624,7 +25513,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25632,7 +25521,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25721,7 +25610,7 @@
"type": "size"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25729,11 +25618,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"
@@ -25745,7 +25634,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25982,7 +25871,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25990,11 +25879,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"
@@ -26006,7 +25895,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26104,7 +25993,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26112,7 +26001,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26208,7 +26097,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26216,7 +26105,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26258,7 +26147,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26266,7 +26155,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26402,7 +26291,7 @@
"type": "size"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26410,7 +26299,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26506,7 +26395,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26514,7 +26403,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26594,7 +26483,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26602,7 +26491,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26817,7 +26706,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26825,12 +26714,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"return": [],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26838,7 +26727,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26917,7 +26806,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26925,7 +26814,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26999,12 +26888,12 @@
"type": "int"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27385,7 +27274,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27393,7 +27282,7 @@
"arguments": {
"typename": "pseries-7.1-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27635,7 +27524,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27643,7 +27532,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27756,12 +27645,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30275,24 +30164,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"
}
{
@@ -30300,12 +30189,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -31492,12 +31381,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31587,7 +31476,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 fc12e5de3d8052ce3b98f81439e78f8f2603ffed..1ccbb862547ee65b8ea19cde8a27911779af00b1 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -39,7 +39,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 9f578c5e42c040232841e92016bc04b1dd0c30ca..cea356d90144700e78ad197568170c6e5671a999 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
@@ -24682,123 +24682,12 @@
"id": "libvirt-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": "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-17"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24814,7 +24703,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24822,7 +24711,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24932,7 +24821,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24940,7 +24829,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25003,7 +24892,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25011,7 +24900,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25139,7 +25028,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25147,7 +25036,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25386,7 +25275,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25394,7 +25283,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25483,7 +25372,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25491,7 +25380,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25632,7 +25521,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25640,7 +25529,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25877,7 +25766,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25885,11 +25774,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"
@@ -25901,7 +25790,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25999,7 +25888,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26007,7 +25896,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26075,7 +25964,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26083,7 +25972,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26146,7 +26035,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26154,7 +26043,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26196,7 +26085,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26204,7 +26093,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26340,7 +26229,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26348,7 +26237,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26444,7 +26333,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26452,7 +26341,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26532,7 +26421,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26540,7 +26429,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26773,7 +26662,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26781,7 +26670,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26996,7 +26885,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27004,12 +26893,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27017,7 +26906,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27096,7 +26985,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27104,7 +26993,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27178,7 +27067,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27186,7 +27075,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28979,12 +28868,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29503,7 +29392,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29511,7 +29400,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29624,7 +29513,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29632,7 +29521,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -29824,12 +29713,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31768,12 +31657,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31781,12 +31670,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31794,12 +31683,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -33123,12 +33012,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -33218,16 +33107,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -33236,11 +33125,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -33255,7 +33144,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33593,7 +33482,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33607,7 +33496,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -33945,7 +33834,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -33960,7 +33849,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -34298,7 +34187,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 70893b9f0dc32037f90745bbc37baa6f670ecbcb..2d71d8c4e5c10be852978f449e74b0929d7d3444 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 36c762608cc4d88e4f53c22aba1030caf307e449..5553142df5b425bb3a3587bba120ae65aae40aae 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
@@ -25776,139 +25776,16 @@
"id": "libvirt-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"
@@ -25920,7 +25797,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26030,7 +25907,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26038,7 +25915,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26101,7 +25978,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26109,7 +25986,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26354,7 +26231,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26362,7 +26239,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26457,7 +26334,7 @@
"type": "size"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26465,11 +26342,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"
@@ -26481,7 +26358,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26724,7 +26601,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26732,11 +26609,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"
@@ -26748,7 +26625,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26852,7 +26729,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26860,7 +26737,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26996,7 +26873,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27004,7 +26881,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27100,7 +26977,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27108,7 +26985,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27194,7 +27071,7 @@
"type": "int32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27202,7 +27079,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27423,7 +27300,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27431,12 +27308,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27444,7 +27321,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27528,7 +27405,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27536,7 +27413,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27615,12 +27492,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27723,7 +27600,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27731,7 +27608,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27844,12 +27721,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30159,32 +30036,32 @@
"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"
}
{
@@ -31500,12 +31377,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31595,5 +31472,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 d6e236b6f02f4440b556fbcb08291e99e605fe73..2da01a886d83cd3070cd04aa6ecce29f513d7a80 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -38,7 +38,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 e4b50cdef1fe1a38ddb8923771b83e6a726cd095..ad0b9b15fae0a234af862c04caa36a5d237de6eb 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
@@ -25592,135 +25592,12 @@
"id": "libvirt-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"
}
{
@@ -25736,7 +25613,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25744,7 +25621,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25854,7 +25731,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25862,7 +25739,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25925,7 +25802,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25933,7 +25810,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26061,7 +25938,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26069,7 +25946,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26314,7 +26191,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26322,7 +26199,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26417,7 +26294,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26425,7 +26302,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26566,7 +26443,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26574,7 +26451,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26817,7 +26694,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26825,11 +26702,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"
@@ -26841,7 +26718,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26945,7 +26822,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26953,7 +26830,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27026,7 +26903,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27034,7 +26911,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27097,7 +26974,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27105,7 +26982,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27147,7 +27024,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27155,7 +27032,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27291,7 +27168,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27299,7 +27176,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27395,7 +27272,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27403,7 +27280,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27489,7 +27366,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27497,7 +27374,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27736,7 +27613,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27744,7 +27621,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27965,7 +27842,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27973,12 +27850,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27986,7 +27863,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28070,7 +27947,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28078,7 +27955,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28157,7 +28034,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28165,7 +28042,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29958,12 +29835,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30500,7 +30377,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30508,7 +30385,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30621,7 +30498,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30629,7 +30506,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30821,12 +30698,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -32765,12 +32642,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -32778,12 +32655,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -32791,12 +32668,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -34120,12 +33997,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -34215,16 +34092,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -34233,11 +34110,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -34252,7 +34129,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34590,7 +34467,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34604,7 +34481,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34942,7 +34819,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34957,7 +34834,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -35295,7 +35172,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
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 8b5211cd2c55c1c22517bed71605757baefc3d82..3d53fe8b61db23d5ce35300b778fc8d47053f32d 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 e0bda325bd50543d80c65d0a512ec9fac9289452..0ffc835830cc6907f1a525933ad63c0751dff0d3 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
@@ -25592,135 +25592,12 @@
"id": "libvirt-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"
}
{
@@ -25736,7 +25613,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25744,7 +25621,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25854,7 +25731,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25862,7 +25739,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25925,7 +25802,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25933,7 +25810,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26061,7 +25938,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26069,7 +25946,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26314,7 +26191,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26322,7 +26199,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26417,7 +26294,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26425,7 +26302,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26566,7 +26443,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26574,7 +26451,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26817,7 +26694,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26825,11 +26702,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"
@@ -26841,7 +26718,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26945,7 +26822,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26953,7 +26830,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27026,7 +26903,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27034,7 +26911,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27097,7 +26974,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27105,7 +26982,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27147,7 +27024,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27155,7 +27032,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27291,7 +27168,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27299,7 +27176,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27395,7 +27272,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27403,7 +27280,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27489,7 +27366,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27497,7 +27374,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27736,7 +27613,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27744,7 +27621,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27965,7 +27842,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27973,12 +27850,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27986,7 +27863,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28070,7 +27947,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28078,7 +27955,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28157,7 +28034,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28165,7 +28042,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29958,12 +29835,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30500,7 +30377,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30508,7 +30385,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30621,7 +30498,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30629,7 +30506,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30821,12 +30698,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -32765,12 +32642,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -32778,12 +32655,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -32791,12 +32668,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -34120,12 +33997,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -34215,16 +34092,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -34233,11 +34110,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -34252,7 +34129,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34590,7 +34467,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34604,7 +34481,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34942,7 +34819,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34957,7 +34834,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -35295,7 +35172,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 053bf864a423ff5b0e3fb56af2a4e5c2a88d6746..1bbdc92c9e65f8d85afac00ba80ab119a6658f9a 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 59250e3751641c78bdf822ad2d53b6fd838b3438..c8438dffba1504b05ecec0c438887352cf4ccc91 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
@@ -24413,139 +24413,16 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-storage"
- },
- "id": "libvirt-16"
-}
-
-{
- "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-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -24557,7 +24434,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24667,7 +24544,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24675,7 +24552,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24920,7 +24797,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24928,7 +24805,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25023,7 +24900,7 @@
"type": "size"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25031,11 +24908,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25047,7 +24924,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25290,7 +25167,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25298,11 +25175,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25314,7 +25191,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25418,7 +25295,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25426,7 +25303,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25562,7 +25439,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25570,11 +25447,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -25586,7 +25463,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25672,7 +25549,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25680,7 +25557,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25901,7 +25778,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25909,12 +25786,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
"return": [],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25922,7 +25799,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26006,7 +25883,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26014,7 +25891,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26093,12 +25970,12 @@
"type": "int"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26173,7 +26050,7 @@
"default-ram-id": "riscv_virt_board.ram"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26181,7 +26058,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26314,7 +26191,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26322,7 +26199,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26435,24 +26312,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"
}
{
@@ -26460,12 +26337,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27827,12 +27704,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27922,5 +27799,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 6623669985b6326a9b60a64cca630385c0ea5537..a795b1dd80cd23ebbedba9e8ae4b580c505a76f9 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -33,7 +33,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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 4e4f9e6db4561b3ecee0b550f1c0b2f71d7584cf..d8adeeb284ff49e36597ce6a45ee3eef47f18e8c 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
@@ -26953,135 +26953,12 @@
"id": "libvirt-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"
}
{
@@ -27097,7 +26974,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -27105,7 +26982,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27215,7 +27092,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27223,7 +27100,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27286,7 +27163,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27294,7 +27171,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -27422,7 +27299,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -27430,7 +27307,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -27675,7 +27552,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -27683,7 +27560,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27778,7 +27655,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27786,7 +27663,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27932,7 +27809,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27940,7 +27817,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28183,7 +28060,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28191,11 +28068,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"
@@ -28207,7 +28084,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -28311,7 +28188,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -28319,7 +28196,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28392,7 +28269,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28400,7 +28277,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -28463,7 +28340,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -28471,7 +28348,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -28513,7 +28390,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -28521,7 +28398,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28657,7 +28534,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28665,7 +28542,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28761,7 +28638,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28769,7 +28646,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28855,7 +28732,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28863,7 +28740,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29107,7 +28984,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29115,7 +28992,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29336,7 +29213,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29344,12 +29221,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -29357,7 +29234,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29441,7 +29318,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29449,7 +29326,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29528,7 +29405,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29536,7 +29413,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -31353,12 +31230,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31974,7 +31851,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31982,7 +31859,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32095,7 +31972,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32103,7 +31980,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32295,12 +32172,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -34346,12 +34223,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -34359,12 +34236,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -34372,12 +34249,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -35818,12 +35695,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -35913,16 +35790,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -35931,11 +35808,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -35950,7 +35827,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -36293,7 +36170,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -36307,7 +36184,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -36650,7 +36527,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -36665,7 +36542,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -37114,7 +36991,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index aa3d4e2d140e132f06bf9f90b348ebb73aab3e41..71e356ba9185d7253dd349afe9c067f11dda4f0f 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<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_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
index 5630cf71ae152f50024cf13f285bc3ea062e6bca..c099af1e45cf18c7e795cd16606fe701bfa8706d 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
@@ -26000,139 +26000,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"
@@ -26144,7 +26021,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26401,7 +26278,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26409,7 +26286,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26504,7 +26381,7 @@
"type": "size"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26512,11 +26389,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26528,7 +26405,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26783,7 +26660,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26791,7 +26668,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26925,7 +26802,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26933,7 +26810,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27037,7 +26914,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27045,7 +26922,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27170,7 +27047,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27178,11 +27055,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -27194,7 +27071,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27280,7 +27157,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27288,7 +27165,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27521,7 +27398,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27529,7 +27406,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27802,7 +27679,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27810,12 +27687,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"return": [],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27823,7 +27700,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27908,7 +27785,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27916,7 +27793,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27995,12 +27872,12 @@
"type": "int"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28275,7 +28152,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28283,7 +28160,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28396,12 +28273,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29165,32 +29042,32 @@
"deprecated": 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"
}
{
@@ -30413,12 +30290,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30516,7 +30393,7 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30527,7 +30404,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30576,7 +30453,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 49002d3caf9ea55c5a5796167bffc09603002d10..e55ea14d02de093fe611a3fced1f416168e11afb 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -20,7 +20,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='usb-storage'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
index 4e6c0257e4dd23417dc7235fe4cf61790d7a26a1..e959171299cc75507e07641645390a541bc482f7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
@@ -27584,135 +27584,12 @@
"id": "libvirt-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"
}
{
@@ -27728,7 +27605,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -27736,7 +27613,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27858,7 +27735,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27866,7 +27743,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27941,7 +27818,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27949,7 +27826,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28089,7 +27966,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28097,7 +27974,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28354,7 +28231,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28362,7 +28239,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28457,7 +28334,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28465,7 +28342,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28627,7 +28504,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28635,7 +28512,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28890,7 +28767,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28898,11 +28775,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"
@@ -28914,7 +28791,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29018,7 +28895,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29026,7 +28903,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29099,7 +28976,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29107,7 +28984,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29182,7 +29059,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29190,7 +29067,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29232,7 +29109,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29240,7 +29117,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29388,7 +29265,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29396,7 +29273,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29492,7 +29369,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29500,7 +29377,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29586,7 +29463,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29594,7 +29471,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29850,7 +29727,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29858,7 +29735,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30091,7 +29968,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30099,12 +29976,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30112,7 +29989,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30201,7 +30078,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30209,7 +30086,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30288,7 +30165,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30296,7 +30173,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -32193,12 +32070,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32834,7 +32711,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32842,7 +32719,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32955,7 +32832,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32963,7 +32840,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -33151,12 +33028,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -35538,12 +35415,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -35551,12 +35428,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -35564,12 +35441,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -37027,12 +36904,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -37130,16 +37007,16 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -37148,11 +37025,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -37167,7 +37044,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37530,7 +37407,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37544,7 +37421,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -37907,7 +37784,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -37922,7 +37799,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -38391,7 +38268,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index f24cfe70a431a2ffcb9f1a7cc640ad84ce21bec7..74a0c66cf55df45aeb1a70babd2bc5c1b84c2f03 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='kvm-pit-lost-tick-policy'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
index 247cf11b74dc5ef0a877480bb672faa24f9648a2..a346c8c092bc621fbc7bd8bb7de5f566dc9ae1c8 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
@@ -29187,139 +29187,16 @@
"id": "libvirt-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"
@@ -29331,7 +29208,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29453,7 +29330,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29461,7 +29338,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29723,7 +29600,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29731,7 +29608,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29831,7 +29708,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29839,11 +29716,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"
@@ -29855,7 +29732,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -30110,7 +29987,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -30118,11 +29995,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"
@@ -30134,7 +30011,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30238,7 +30115,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30246,7 +30123,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -30288,7 +30165,7 @@
"type": "uint64"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -30296,7 +30173,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30449,7 +30326,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30457,7 +30334,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30553,7 +30430,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30561,7 +30438,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30647,7 +30524,7 @@
"type": "int32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30655,7 +30532,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30910,7 +30787,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30918,7 +30795,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31151,7 +31028,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31159,12 +31036,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31172,7 +31049,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31262,7 +31139,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31270,7 +31147,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31349,7 +31226,7 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31357,7 +31234,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31566,12 +31443,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -32683,7 +32560,7 @@
"default-ram-id": "ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -32691,7 +32568,7 @@
"arguments": {
"typename": "virt-8.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -32927,7 +32804,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -32935,7 +32812,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -33048,12 +32925,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -33347,12 +33224,12 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33360,12 +33237,12 @@
"tpm-tis",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33373,12 +33250,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -34743,12 +34620,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -34846,12 +34723,12 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -34867,7 +34744,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -34878,7 +34755,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -34911,7 +34788,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -34926,11 +34803,11 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
- "id": "libvirt-46",
+ "id": "libvirt-45",
"error": {
"class": "GenericError",
"desc": "Parameter 'hv-passthrough' is unexpected"
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index 5d2c6ad0034e4633ea84073fc0498fcea8117a5e..155414b9f9530b43f3db20afe1320e4b183ad8d0 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
index da066ec0892b4ac7beb2fa7f6e8ece62364c0083..392e9fb04f2895cc4ba9c7d9bddaee23bccc43f9 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
@@ -29421,139 +29421,16 @@
"id": "libvirt-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"
@@ -29565,7 +29442,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29687,7 +29564,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29695,7 +29572,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29957,7 +29834,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29965,7 +29842,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -30065,7 +29942,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -30073,11 +29950,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"
@@ -30089,7 +29966,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -30344,7 +30221,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -30352,11 +30229,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"
@@ -30368,7 +30245,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30472,7 +30349,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30480,7 +30357,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -30522,7 +30399,7 @@
"type": "uint64"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -30530,7 +30407,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30683,7 +30560,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30691,7 +30568,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30787,7 +30664,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30795,7 +30672,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30881,7 +30758,7 @@
"type": "int32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30889,7 +30766,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -31144,7 +31021,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -31152,7 +31029,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31385,7 +31262,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -31393,12 +31270,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"return": [],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31406,7 +31283,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31500,7 +31377,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31508,7 +31385,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31587,7 +31464,7 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31595,7 +31472,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31737,12 +31614,12 @@
"type": "link<irq>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -32800,7 +32677,7 @@
"default-ram-id": "ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -32808,7 +32685,7 @@
"arguments": {
"typename": "virt-8.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -33044,7 +32921,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -33052,7 +32929,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -33165,12 +33042,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -33392,12 +33269,12 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33405,12 +33282,12 @@
"tpm-tis",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33418,12 +33295,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -34905,12 +34782,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -35008,12 +34885,12 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -35029,7 +34906,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -35040,11 +34917,11 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
- "id": "libvirt-45",
+ "id": "libvirt-44",
"error": {
"class": "GenericError",
"desc": "The CPU type 'host' requires KVM"
@@ -35063,11 +34940,11 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
- "id": "libvirt-46",
+ "id": "libvirt-45",
"error": {
"class": "GenericError",
"desc": "The CPU type 'host' requires KVM"
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index 41f83f5cd349cd3eebef4b3b30533a17e4569139..3b83d40a34fe0e964ea8ce482eb6740b63acc663 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -38,7 +38,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
index d9ab0a2c23be8b8b710d57d80d6f003992a3d211..8f9b31f6d5283ff5b17bc8354429ff973fde4fb1 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
@@ -26338,139 +26338,16 @@
"id": "libvirt-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"
@@ -26482,7 +26359,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26604,7 +26481,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26612,7 +26489,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26874,7 +26751,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26882,7 +26759,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26982,7 +26859,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26990,11 +26867,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"
@@ -27006,7 +26883,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27261,7 +27138,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27269,11 +27146,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"
@@ -27285,7 +27162,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27389,7 +27266,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27397,7 +27274,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27439,7 +27316,7 @@
"type": "uint64"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27447,7 +27324,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27600,7 +27477,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27608,7 +27485,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27704,7 +27581,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27712,7 +27589,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27798,7 +27675,7 @@
"type": "int32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27806,7 +27683,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -28039,7 +27916,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -28047,12 +27924,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28060,7 +27937,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"
}
{
@@ -28276,7 +28153,7 @@
"default-ram-id": "ram"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28284,7 +28161,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28416,7 +28293,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28424,7 +28301,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28537,12 +28414,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28566,32 +28443,32 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29906,12 +29783,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30009,7 +29886,7 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30020,11 +29897,11 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
- "id": "libvirt-42",
+ "id": "libvirt-41",
"error": {
"class": "GenericError",
"desc": "The CPU type 'host' is not a recognized LoongArch CPU type"
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index 04ea12a28a453a40ee3878cc836e5ef05261012b..fe4a7d7409331f6687b155f432248385bf7a287e 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -37,7 +37,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
index f7fa980213f9e9fbfe956b268e215f9b6e50e1f9..f52c2314cb22f81cfcc0f2886a13bb50289c63c4 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
@@ -26678,139 +26678,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"
@@ -26822,7 +26699,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27084,7 +26961,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27092,7 +26969,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27192,7 +27069,7 @@
"type": "size"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27200,11 +27077,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -27216,7 +27093,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -27471,7 +27348,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -27479,7 +27356,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27613,7 +27490,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27621,7 +27498,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27725,7 +27602,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27733,7 +27610,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27863,7 +27740,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27871,11 +27748,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -27887,7 +27764,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27973,7 +27850,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27981,7 +27858,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28214,7 +28091,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28222,7 +28099,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -28495,7 +28372,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -28503,12 +28380,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"return": [],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -28516,7 +28393,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28606,7 +28483,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28614,7 +28491,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28693,12 +28570,12 @@
"type": "int"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28983,7 +28860,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28991,7 +28868,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29104,12 +28981,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29873,32 +29750,32 @@
"deprecated": 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"
}
{
@@ -31129,12 +31006,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -31232,7 +31109,7 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -31243,7 +31120,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31292,7 +31169,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index 5fe7bda1fbf8e62e6181eda5237f1c183950f0c3..2839a0d93100fc26aa93d36b802189b5ee1f6ef4 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -20,7 +20,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='usb-storage'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
index 0d1ec5aa7ced7a6bdade90c1651c52fab2add7a5..6a2dc7576c336459cd5ad8ad6128a780dddd7d8c 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
@@ -28159,135 +28159,12 @@
"id": "libvirt-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"
}
{
@@ -28303,7 +28180,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28311,7 +28188,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28433,7 +28310,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28441,7 +28318,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28516,7 +28393,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28524,7 +28401,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28664,7 +28541,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28672,7 +28549,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28934,7 +28811,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28942,7 +28819,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29042,7 +28919,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29050,7 +28927,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29308,7 +29185,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29316,7 +29193,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -29571,7 +29448,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -29579,11 +29456,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"
@@ -29595,7 +29472,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29699,7 +29576,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29707,7 +29584,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29780,7 +29657,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29788,7 +29665,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29863,7 +29740,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29871,7 +29748,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29913,7 +29790,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29921,7 +29798,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30074,7 +29951,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30082,7 +29959,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30178,7 +30055,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30186,7 +30063,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30272,7 +30149,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30280,7 +30157,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30541,7 +30418,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30549,7 +30426,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30782,7 +30659,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30790,12 +30667,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30803,7 +30680,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30897,7 +30774,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30905,7 +30782,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30984,7 +30861,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30992,7 +30869,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -32905,12 +32782,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33526,7 +33403,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33534,7 +33411,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33647,7 +33524,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33655,7 +33532,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -33843,12 +33720,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -36230,12 +36107,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -36243,12 +36120,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -36256,12 +36133,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -37732,12 +37609,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -37835,16 +37712,16 @@
"capability": "dirty-limit"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -37853,11 +37730,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -37872,7 +37749,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -38239,7 +38116,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -38253,7 +38130,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -38620,7 +38497,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -38635,7 +38512,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -39108,7 +38985,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index 02e8dcc6a0d79470ca90b468b5fd754e075f7506..fcf2b70ac47cd02e53daedb52b96e518e9e7a1fe 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='kvm-pit-lost-tick-policy'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
index bbe061599675a5fe11565124c5c1999ded18d58f..f03485f81f216b176d4150a771bde860e0acce95 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
@@ -28366,135 +28366,12 @@
"id": "libvirt-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"
}
{
@@ -28510,7 +28387,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28518,7 +28395,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28640,7 +28517,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28648,7 +28525,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28723,7 +28600,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28731,7 +28608,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28871,7 +28748,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28879,7 +28756,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29141,7 +29018,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29149,7 +29026,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29249,7 +29126,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29257,7 +29134,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29515,7 +29392,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29523,7 +29400,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -29778,7 +29655,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -29786,11 +29663,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"
@@ -29802,7 +29679,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29906,7 +29783,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29914,7 +29791,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29987,7 +29864,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29995,7 +29872,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30070,7 +29947,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30078,7 +29955,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30120,7 +29997,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30128,7 +30005,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30281,7 +30158,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30289,7 +30166,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30385,7 +30262,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30393,7 +30270,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30479,7 +30356,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30487,7 +30364,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30748,7 +30625,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30756,7 +30633,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31000,7 +30877,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31008,12 +30885,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -31021,7 +30898,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31115,7 +30992,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31123,7 +31000,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31202,7 +31079,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31210,7 +31087,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -33127,12 +33004,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33768,7 +33645,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33776,7 +33653,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33889,7 +33766,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33897,7 +33774,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -34089,12 +33966,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -36476,12 +36353,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -36489,12 +36366,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -36502,12 +36379,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -37982,12 +37859,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -38089,16 +37966,16 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -38107,11 +37984,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -38126,7 +38003,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -38494,7 +38371,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -38508,7 +38385,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -38876,7 +38753,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -38891,7 +38768,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -39365,7 +39242,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index d3efa5b5ff7e026d5e0fc791572c3db0efa02630..109747cb7a4ff2bb05fc76d0281d4d7e95ba6e76 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -41,7 +41,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='kvm-pit-lost-tick-policy'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
index be28dfe141436a54e90b3c9513f3c7486414392a..5849bfc8cdc62928f55e6e8b157f7fa92fab2465 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
@@ -27651,139 +27651,16 @@
"id": "libvirt-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"
@@ -27795,7 +27672,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27917,7 +27794,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27925,7 +27802,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28204,7 +28081,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28212,7 +28089,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28323,7 +28200,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28331,11 +28208,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"
@@ -28347,7 +28224,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28614,7 +28491,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28622,11 +28499,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"
@@ -28638,7 +28515,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28748,7 +28625,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28756,7 +28633,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28909,7 +28786,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28917,7 +28794,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29013,7 +28890,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29021,7 +28898,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29113,7 +28990,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29121,7 +28998,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29377,7 +29254,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29385,12 +29262,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"return": [],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29398,7 +29275,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29492,7 +29369,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29500,7 +29377,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29579,12 +29456,12 @@
"type": "int"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29659,7 +29536,7 @@
"default-ram-id": "riscv_virt_board.ram"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29667,7 +29544,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29823,7 +29700,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29831,7 +29708,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29944,12 +29821,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30033,24 +29910,24 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30058,12 +29935,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -31477,12 +31354,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31576,7 +31453,7 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31587,11 +31464,11 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "The requested expansion type is not supported"
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index 438aed84a26185a06dffe42c71fd2efa69b7c54c..0f54a661eb77b08fb4f883cd0ea9a139b007a8a6 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -37,7 +37,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
index bf97ecb6cbb50924e88dc82ed902ebe46111454b..3289dd1f43801606b70affcff17e136d2f4a8954 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
@@ -27547,139 +27547,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"
@@ -27691,7 +27568,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27970,7 +27847,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27978,7 +27855,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28089,7 +27966,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28097,11 +27974,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"
@@ -28113,7 +27990,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28380,7 +28257,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28388,7 +28265,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28528,7 +28405,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28536,7 +28413,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28646,7 +28523,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28654,7 +28531,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28795,7 +28672,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28803,7 +28680,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -28899,7 +28776,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -28907,7 +28784,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28999,7 +28876,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29007,7 +28884,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29263,7 +29140,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29271,7 +29148,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29544,7 +29421,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29552,12 +29429,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29565,7 +29442,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29655,7 +29532,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29663,7 +29540,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29742,12 +29619,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30052,7 +29929,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30060,7 +29937,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30173,12 +30050,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30816,32 +30693,32 @@
"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"
}
{
@@ -32080,12 +31957,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32179,7 +32056,7 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32190,7 +32067,7 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32262,7 +32139,7 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32273,7 +32150,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32345,7 +32222,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index eabef7c2b4677a9ec532fd21bc44912fa9dfc126..7fdac34dcba4d51a362cbb845b131d02c52d1f7e 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -23,7 +23,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='usb-storage'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
index afe76c8b7a6591c444d2bb51adb6b0c5f7748270..3faab9dc0f26c2aa668223ffc83045bb6b331e6f 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
@@ -28681,135 +28681,12 @@
"id": "libvirt-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"
}
{
@@ -28825,7 +28702,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28833,7 +28710,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28955,7 +28832,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28963,7 +28840,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29038,7 +28915,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29046,7 +28923,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29186,7 +29063,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29194,7 +29071,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29473,7 +29350,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29481,7 +29358,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29592,7 +29469,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29600,7 +29477,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29854,7 +29731,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -29862,7 +29739,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30129,7 +30006,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30137,11 +30014,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"
@@ -30153,7 +30030,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30263,7 +30140,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30271,7 +30148,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30344,7 +30221,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30352,7 +30229,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30427,7 +30304,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30435,7 +30312,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30477,7 +30354,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30485,7 +30362,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30638,7 +30515,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30646,7 +30523,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30742,7 +30619,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -30750,7 +30627,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30842,7 +30719,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -30850,7 +30727,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31123,7 +31000,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31131,7 +31008,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31387,7 +31264,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31395,12 +31272,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -31408,7 +31285,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31502,7 +31379,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31510,7 +31387,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31589,7 +31466,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31597,7 +31474,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -33646,12 +33523,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34267,7 +34144,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34275,7 +34152,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -34388,7 +34265,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -34396,7 +34273,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -34588,12 +34465,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -37144,12 +37021,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -37157,12 +37034,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -37170,12 +37047,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -38658,12 +38535,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -38757,16 +38634,16 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -38775,11 +38652,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "Could not open '/dev/sgx_vepc': No such file or directory"
@@ -38794,7 +38671,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39172,7 +39049,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39186,7 +39063,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -39564,7 +39441,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -39579,7 +39456,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -40067,7 +39944,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index db87bb13537e89becb6242e3816171c54da9bb49..c4b44ae392a6ffd06503c422e01934b74caa91d1 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='kvm-pit-lost-tick-policy'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
index 043f6318755e7cc6f7bec62a610bef50fbb28087..ec523946baf335a63fe470b5a6be3e959185da01 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
@@ -27654,139 +27654,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"
@@ -27798,7 +27675,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28083,7 +27960,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28091,7 +27968,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28202,7 +28079,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28210,11 +28087,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"
@@ -28226,7 +28103,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28499,7 +28376,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28507,7 +28384,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28652,7 +28529,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28660,7 +28537,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28770,7 +28647,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28778,7 +28655,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28924,7 +28801,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28932,7 +28809,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29028,7 +28905,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -29036,7 +28913,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29128,7 +29005,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29136,7 +29013,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29398,7 +29275,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29406,7 +29283,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29689,7 +29566,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29697,12 +29574,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"return": [],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29710,7 +29587,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29800,7 +29677,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29808,7 +29685,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29887,12 +29764,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30207,7 +30084,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -30215,7 +30092,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30328,12 +30205,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30971,32 +30848,32 @@
"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"
}
{
@@ -32239,12 +32116,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32338,7 +32215,7 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32349,7 +32226,7 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32421,7 +32298,7 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32432,7 +32309,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32504,7 +32381,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index 43a00004ea53f355045b93b5af8d07eeb7fded55..6434a9b41e80142f3c4c0a69e0777f57a00e93e6 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -23,7 +23,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='usb-storage'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
index dac7ca1f3f2cea2a61fbe5140df6ec8700c37248..0890bc85d5085443ddc91cf49692bc6870d9172a 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
@@ -28842,135 +28842,12 @@
"id": "libvirt-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"
}
{
@@ -28986,7 +28863,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28994,7 +28871,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29132,7 +29009,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -29140,7 +29017,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29231,7 +29108,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -29239,7 +29116,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29395,7 +29272,7 @@
"type": "int32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -29403,7 +29280,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29698,7 +29575,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -29706,7 +29583,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29817,7 +29694,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -29825,7 +29702,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -30105,7 +29982,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -30113,7 +29990,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30396,7 +30273,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -30404,11 +30281,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"
@@ -30420,7 +30297,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30530,7 +30407,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -30538,7 +30415,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30616,7 +30493,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -30624,7 +30501,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30715,7 +30592,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -30723,7 +30600,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30765,7 +30642,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -30773,7 +30650,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30942,7 +30819,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -30950,7 +30827,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31046,7 +30923,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -31054,7 +30931,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31146,7 +31023,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -31154,7 +31031,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31443,7 +31320,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -31451,7 +31328,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31723,7 +31600,7 @@
"type": "child<virtio-iommu-device>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -31731,12 +31608,12 @@
"arguments": {
"typename": "usb-bot"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -31744,7 +31621,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31838,7 +31715,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -31846,7 +31723,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31925,7 +31802,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -31933,7 +31810,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -34075,12 +33952,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34716,7 +34593,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -34724,7 +34601,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -34842,7 +34719,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -34850,7 +34727,7 @@
"arguments": {
"typename": "generic-pc-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -35048,12 +34925,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -37496,12 +37373,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -37509,12 +37386,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -37522,12 +37399,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -39020,12 +38897,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -39119,16 +38996,16 @@
"capability": "mapped-ram"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or directory"
@@ -39137,11 +39014,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "Could not open '/dev/sgx_vepc': No such file or directory"
@@ -39156,7 +39033,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39556,7 +39433,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -39570,7 +39447,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -39970,7 +39847,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -39985,7 +39862,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
@@ -40496,7 +40373,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-51"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index 4bf25e81af051db0b65e5c68588014082b44507d..0881d35a5e74941e14c888f4d94b6bbd9cb8ccef 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -40,7 +40,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='usb-storage'/>
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='kvm-pit-lost-tick-policy'/>
--
2.48.1© 2016 - 2025 Red Hat, Inc.