This capability tracks whether "usb-host" device has "hostdevice" attribute. This attribute allows us to specify full path to the USB device ("/dev/bus/usb/$bus/$dev") but more importantly, since QEMU uses qemu_open() for this attribute it allows us to pass pre-opened FD and have QEMU not bother with opening the file at all. The attribute was added in v5.1.0-rc0~71^2~1 QEMU commit. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 3 + .../caps_1.5.3.x86_64.replies | 126 ++++++++++++-- .../caps_1.6.0.x86_64.replies | 126 ++++++++++++-- .../caps_1.7.0.x86_64.replies | 126 ++++++++++++-- .../caps_2.1.1.x86_64.replies | 126 ++++++++++++-- .../caps_2.10.0.aarch64.replies | 134 +++++++++++++-- .../caps_2.10.0.ppc64.replies | 130 ++++++++++++-- .../caps_2.10.0.s390x.replies | 134 +++++++++++++-- .../caps_2.10.0.x86_64.replies | 146 +++++++++++++--- .../caps_2.11.0.s390x.replies | 134 +++++++++++++-- .../caps_2.11.0.x86_64.replies | 146 +++++++++++++--- .../caps_2.12.0.aarch64.replies | 150 +++++++++++++--- .../caps_2.12.0.ppc64.replies | 142 ++++++++++++--- .../caps_2.12.0.s390x.replies | 142 ++++++++++++--- .../caps_2.12.0.x86_64.replies | 162 ++++++++++++++---- .../caps_2.4.0.x86_64.replies | 126 ++++++++++++-- .../caps_2.5.0.x86_64.replies | 130 ++++++++++++-- .../caps_2.6.0.aarch64.replies | 134 +++++++++++++-- .../caps_2.6.0.ppc64.replies | 130 ++++++++++++-- .../caps_2.6.0.x86_64.replies | 130 ++++++++++++-- .../caps_2.7.0.s390x.replies | 130 ++++++++++++-- .../caps_2.7.0.x86_64.replies | 130 ++++++++++++-- .../caps_2.8.0.s390x.replies | 134 +++++++++++++-- .../caps_2.8.0.x86_64.replies | 130 ++++++++++++-- .../caps_2.9.0.ppc64.replies | 130 ++++++++++++-- .../caps_2.9.0.s390x.replies | 134 +++++++++++++-- .../caps_2.9.0.x86_64.replies | 146 +++++++++++++--- .../caps_3.0.0.ppc64.replies | 142 ++++++++++++--- .../caps_3.0.0.riscv32.replies | 138 +++++++++++++-- .../caps_3.0.0.riscv64.replies | 138 +++++++++++++-- .../caps_3.0.0.s390x.replies | 142 ++++++++++++--- .../caps_3.0.0.x86_64.replies | 162 ++++++++++++++---- .../caps_3.1.0.ppc64.replies | 142 ++++++++++++--- .../caps_3.1.0.x86_64.replies | 162 ++++++++++++++---- .../caps_4.0.0.aarch64.replies | 150 +++++++++++++--- .../caps_4.0.0.ppc64.replies | 142 ++++++++++++--- .../caps_4.0.0.riscv32.replies | 138 +++++++++++++-- .../caps_4.0.0.riscv64.replies | 138 +++++++++++++-- .../caps_4.0.0.s390x.replies | 142 ++++++++++++--- .../caps_4.0.0.x86_64.replies | 162 ++++++++++++++---- .../caps_4.1.0.x86_64.replies | 154 ++++++++++++++--- .../caps_4.2.0.aarch64.replies | 154 ++++++++++++++--- .../caps_4.2.0.ppc64.replies | 142 ++++++++++++--- .../caps_4.2.0.s390x.replies | 142 ++++++++++++--- .../caps_4.2.0.x86_64.replies | 154 ++++++++++++++--- .../caps_5.0.0.aarch64.replies | 154 ++++++++++++++--- .../caps_5.0.0.ppc64.replies | 142 ++++++++++++--- .../caps_5.0.0.riscv64.replies | 138 +++++++++++++-- .../caps_5.0.0.x86_64.replies | 154 ++++++++++++++--- .../caps_5.1.0.x86_64.replies | 158 ++++++++++++++--- .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.replies | 158 ++++++++++++++--- .../caps_5.2.0.x86_64.xml | 1 + 54 files changed, 6097 insertions(+), 974 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2cc0c61588..ad25a30f2d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -597,6 +597,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "spapr-tpm-proxy", "numa.hmat", "blockdev-hostdev-scsi", + + /* 380 */ + "usb-host.hostdevice", ); @@ -1391,6 +1394,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPort[] = { "hotplug", QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, NULL }, }; +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBHost[] = { + { "hostdevice", QEMU_CAPS_USB_HOST_HOSTDEVICE, NULL }, +}; + static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = { { "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, NULL }, }; @@ -1649,6 +1656,9 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "pcie-root-port", virQEMUCapsDevicePropsPCIeRootPort, G_N_ELEMENTS(virQEMUCapsDevicePropsPCIeRootPort), QEMU_CAPS_DEVICE_PCIE_ROOT_PORT }, + { "usb-host", virQEMUCapsDevicePropsUSBHost, + G_N_ELEMENTS(virQEMUCapsDevicePropsUSBHost), + -1 }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5d08941538..1a3fafd1a6 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -578,6 +578,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_NUMA_HMAT, /* -numa hmat */ QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs */ + /* 380 */ + QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index e74273e0d3..82b07dc86e 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -2148,9 +2148,111 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-33" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-33" +} + { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2223,12 +2325,12 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2306,34 +2408,34 @@ "name": "qemu64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3034,12 +3136,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3049,7 +3151,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index 60af5aa0b3..0b52132c9b 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -2189,9 +2189,111 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-33" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-33" +} + { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2272,12 +2374,12 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2355,34 +2457,34 @@ "name": "qemu64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -2985,12 +3087,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3012,7 +3114,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 6dfa888dff..c7fca735bc 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -2206,9 +2206,111 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-33" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-33" +} + { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2297,12 +2399,12 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2380,34 +2482,34 @@ "name": "qemu64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3200,12 +3302,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3227,7 +3329,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index cd35b2984b..18419f1e44 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -2619,9 +2619,111 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-33" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-33" +} + { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2726,12 +2828,12 @@ "cpu-max": 255 } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2812,36 +2914,36 @@ "name": "qemu64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ "tpm-tis" ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ "passthrough" ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3701,12 +3803,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3728,7 +3830,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index c75d4ab8a7..34fbe27f6a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -5004,9 +5004,111 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5273,12 +5375,12 @@ "cpu-max": 1 } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5444,34 +5546,34 @@ "static": false } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6616,12 +6718,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6671,12 +6773,12 @@ "capability": "return-path" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -16399,12 +16501,12 @@ "meta-type": "object" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-gic-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -16420,7 +16522,7 @@ "kernel": true } ], - "id": "libvirt-37" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 9b19d4ebd8..b047ff839b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -5089,9 +5089,111 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5209,12 +5311,12 @@ "cpu-max": 1 } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -7390,34 +7492,34 @@ "static": false } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -8557,12 +8659,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -8612,12 +8714,12 @@ "capability": "return-path" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -18340,7 +18442,7 @@ "meta-type": "object" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 4f7d17b4fe..fb4c41f0cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -3411,9 +3411,111 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-28" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-28" +} + { "execute": "query-machines", - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -3461,12 +3563,12 @@ "cpu-max": 248 } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -4000,34 +4102,34 @@ "migration-safe": true } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5132,12 +5234,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5187,12 +5289,12 @@ "capability": "return-path" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -14915,7 +15017,7 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -14926,7 +15028,7 @@ "name": "host" } }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -14966,7 +15068,7 @@ } } }, - "id": "libvirt-35" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index d5deea9b3c..65e810828c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -4557,9 +4557,111 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4748,12 +4850,12 @@ "alias": "q35" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5088,36 +5190,36 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-40" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -6396,12 +6498,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -6451,12 +6553,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -16179,7 +16281,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -16190,7 +16292,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -16369,7 +16471,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -16550,7 +16652,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -16793,7 +16895,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -16807,7 +16909,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -16986,7 +17088,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -17167,7 +17269,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -17410,7 +17512,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 3096559c13..44af322589 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -3538,9 +3538,111 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-29" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-29" +} + { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3593,12 +3695,12 @@ "cpu-max": 248 } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4132,35 +4234,35 @@ "migration-safe": true } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ "emulator" ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5281,12 +5383,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -5344,12 +5446,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -15217,7 +15319,7 @@ "meta-type": "object" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -15228,7 +15330,7 @@ "name": "host" } }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -15267,7 +15369,7 @@ } } }, - "id": "libvirt-36" + "id": "libvirt-37" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 75ca78f75e..3cd255584e 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -4584,9 +4584,111 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4775,12 +4877,12 @@ "cpu-max": 288 } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5094,24 +5196,24 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -5119,12 +5221,12 @@ "passthrough", "emulator" ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -6419,12 +6521,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -6482,12 +6584,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -16355,7 +16457,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -16366,7 +16468,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -16546,7 +16648,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -16728,7 +16830,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -16973,7 +17075,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -16987,7 +17089,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -17167,7 +17269,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -17349,7 +17451,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -17594,7 +17696,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index b99913ed37..9a6bc9465f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -5361,12 +5361,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5420,7 +5522,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5428,7 +5530,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5482,7 +5584,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5490,7 +5592,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5605,12 +5707,12 @@ "type": "child<irq>" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5907,7 +6009,7 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5915,7 +6017,7 @@ "arguments": { "typename": "virt-2.12-machine" }, - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6045,12 +6147,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6226,35 +6328,35 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -7419,12 +7521,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -7486,12 +7588,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -18859,12 +18961,12 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -18880,7 +18982,7 @@ "kernel": false } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 98ce528b1a..2cce753407 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -5265,12 +5265,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5324,7 +5426,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5332,7 +5434,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5382,12 +5484,12 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5525,7 +5627,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5533,7 +5635,7 @@ "arguments": { "typename": "pseries-2.12-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5694,12 +5796,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7895,35 +7997,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -9079,12 +9181,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -9146,12 +9248,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -20519,7 +20621,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 66543f62ee..1a043d80c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -3625,12 +3625,114 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-29" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-29" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3684,7 +3786,7 @@ "type": "string" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3692,7 +3794,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3742,12 +3844,12 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3805,12 +3907,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4345,35 +4447,35 @@ "migration-safe": true } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-33" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-34" + "id": "libvirt-35" } { "return": [ "emulator" ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -5498,12 +5600,12 @@ "option": "drive" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5565,12 +5667,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -16938,7 +17040,7 @@ "meta-type": "object" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -16949,7 +17051,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -16987,7 +17089,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 1e3ba0885a..94dba58d95 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -4751,12 +4751,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4810,7 +4912,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4818,7 +4920,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -4868,7 +4970,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -4876,7 +4978,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -5898,12 +6000,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -6102,12 +6204,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -6621,12 +6723,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -6634,12 +6736,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -6647,12 +6749,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -7939,12 +8041,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -8006,12 +8108,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -19379,12 +19481,12 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -19394,7 +19496,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -19405,7 +19507,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -19595,7 +19697,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -19787,7 +19889,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -20042,7 +20144,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -20056,7 +20158,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -20246,7 +20348,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -20438,7 +20540,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -20693,7 +20795,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index e6bf39de8a..0a4c644e99 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -3224,9 +3224,111 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3355,12 +3457,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3450,36 +3552,36 @@ "name": "qemu64" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-40" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4487,12 +4589,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -4522,7 +4624,7 @@ "capability": "events" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 0f83583fab..1f4a3d860e 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -3255,9 +3255,111 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-34" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-34" +} + { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3394,12 +3496,12 @@ "cpu-max": 255 } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3489,36 +3591,36 @@ "name": "qemu64" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -4563,12 +4665,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -4602,12 +4704,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -12152,7 +12254,7 @@ "meta-type": "array" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 44f5227452..af9cd31512 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -3569,9 +3569,111 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-29" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-29" +} + { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3746,12 +3848,12 @@ "cpu-max": 1 } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3850,34 +3952,34 @@ "name": "pxa270" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4849,12 +4951,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4888,12 +4990,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -12898,12 +13000,12 @@ "meta-type": "array" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-gic-capabilities", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -12919,7 +13021,7 @@ "kernel": true } ], - "id": "libvirt-36" + "id": "libvirt-37" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 8f4aba565b..6e59c39a72 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -3773,9 +3773,111 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3847,12 +3949,12 @@ "cpu-max": 255 } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5154,34 +5256,34 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6148,12 +6250,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6187,12 +6289,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -14197,7 +14299,7 @@ "meta-type": "array" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 6c46e13987..1a44108160 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -3349,9 +3349,111 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-35" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-35" +} + { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3464,12 +3566,12 @@ "cpu-max": 255 } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3559,36 +3661,36 @@ "name": "qemu64" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "passthrough" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -4682,12 +4784,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4721,12 +4823,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -12731,7 +12833,7 @@ "meta-type": "array" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index a23af1e004..5bbf65c9d2 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -2556,9 +2556,111 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-28" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-28" +} + { "execute": "query-machines", - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2591,12 +2693,12 @@ "cpu-max": 248 } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2605,34 +2707,34 @@ "name": "host" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3568,12 +3670,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3607,12 +3709,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -11968,7 +12070,7 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 97d885fc96..6ffffbbc99 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -3535,9 +3535,111 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-35" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-35" +} + { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3686,12 +3788,12 @@ "cpu-max": 255 } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3784,36 +3886,36 @@ "name": "qemu64" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "passthrough" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -4911,12 +5013,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4950,12 +5052,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -13311,7 +13413,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index da9ef050b6..a8271ea151 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2829,9 +2829,111 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-28" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-28" +} + { "execute": "query-machines", - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2869,12 +2971,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3200,34 +3302,34 @@ "migration-safe": true } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4188,12 +4290,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4231,12 +4333,12 @@ "capability": "x-colo" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -13006,7 +13108,7 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -13017,7 +13119,7 @@ "name": "host" } }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -13043,7 +13145,7 @@ } } }, - "id": "libvirt-35" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 119fefbf9a..05c5479956 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -3677,9 +3677,111 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-35" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-35" +} + { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3848,12 +3950,12 @@ "cpu-max": 255 } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4059,36 +4161,36 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "passthrough" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -5211,12 +5313,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -5254,12 +5356,12 @@ "capability": "x-colo" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -14029,7 +14131,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index 71916f6372..547d20d307 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -4332,9 +4332,111 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4447,12 +4549,12 @@ "cpu-max": 1 } ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -6628,34 +6730,34 @@ "static": false } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7765,12 +7867,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -7812,12 +7914,12 @@ "capability": "release-ram" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -17103,7 +17205,7 @@ "meta-type": "object" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 3aca949683..b7e4875f7e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -3110,9 +3110,111 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-28" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-28" +} + { "execute": "query-machines", - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -3155,12 +3257,12 @@ "cpu-max": 248 } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -3550,34 +3652,34 @@ "migration-safe": true } ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4652,12 +4754,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4699,12 +4801,12 @@ "capability": "release-ram" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -13990,7 +14092,7 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -14001,7 +14103,7 @@ "name": "host" } }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -14028,7 +14130,7 @@ } } }, - "id": "libvirt-35" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 5cff9c485b..4548cb55b6 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -4101,9 +4101,111 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4282,12 +4384,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -4569,36 +4671,36 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-40" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -5847,12 +5949,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -5894,12 +5996,12 @@ "capability": "release-ram" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -15185,7 +15287,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -15196,7 +15298,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -15375,7 +15477,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -15556,7 +15658,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -15797,7 +15899,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -15811,7 +15913,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -15990,7 +16092,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -16171,7 +16273,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -16412,7 +16514,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index 79891dac7f..01e4dc6acf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -5349,12 +5349,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5404,7 +5506,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5412,7 +5514,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5462,12 +5564,12 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5610,7 +5712,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5618,7 +5720,7 @@ "arguments": { "typename": "pseries-3.0-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5789,12 +5891,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7990,35 +8092,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -9148,12 +9250,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -9223,12 +9325,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -21387,7 +21489,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index 8159b26d19..ce4ca95602 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1539,12 +1539,114 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-25" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-25" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1594,7 +1696,7 @@ "type": "string" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1602,7 +1704,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1652,12 +1754,12 @@ "type": "string" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1694,7 +1796,7 @@ "cpu-max": 1 } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1702,7 +1804,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1807,23 +1909,23 @@ "type": "string" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-29" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1831,12 +1933,12 @@ "passthrough", "emulator" ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2961,12 +3063,12 @@ "option": "drive" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3036,12 +3138,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -14716,5 +14818,5 @@ "meta-type": "object" } ], - "id": "libvirt-33" + "id": "libvirt-34" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 995ca86784..fa04d448d4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1539,12 +1539,114 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-25" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-25" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1594,7 +1696,7 @@ "type": "string" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1602,7 +1704,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1652,12 +1754,12 @@ "type": "string" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1694,7 +1796,7 @@ "cpu-max": 1 } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1702,7 +1804,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1807,23 +1909,23 @@ "type": "string" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-29" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-29" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1831,12 +1933,12 @@ "passthrough", "emulator" ], - "id": "libvirt-30" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2961,12 +3063,12 @@ "option": "drive" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3036,12 +3138,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -14716,5 +14818,5 @@ "meta-type": "object" } ], - "id": "libvirt-33" + "id": "libvirt-34" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 48b5a0ee01..4fb761a90c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3783,12 +3783,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3838,7 +3940,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3846,7 +3948,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3896,12 +3998,12 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3964,12 +4066,12 @@ "cpu-max": 248 } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4520,35 +4622,35 @@ "migration-safe": true } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5708,12 +5810,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5783,12 +5885,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -17463,7 +17565,7 @@ "meta-type": "object" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -17474,7 +17576,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -17516,7 +17618,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index c683f672f7..e42971ceeb 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -4886,12 +4886,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4941,7 +5043,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4949,7 +5051,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -4999,7 +5101,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5007,7 +5109,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -6061,12 +6163,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -6275,12 +6377,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -6717,12 +6819,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -6730,12 +6832,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -6743,12 +6845,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -8047,12 +8149,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -8122,12 +8224,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -20007,16 +20109,16 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20031,7 +20133,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -20224,7 +20326,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -20419,7 +20521,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -20682,7 +20784,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -20696,7 +20798,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -20889,7 +20991,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -21084,7 +21186,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -21347,7 +21449,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index e6429c253c..2c50759c4d 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -5403,12 +5403,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5469,7 +5571,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -5477,7 +5579,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5537,12 +5639,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5690,7 +5792,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5698,7 +5800,7 @@ "arguments": { "typename": "pseries-3.1-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5872,12 +5974,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -8073,35 +8175,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -9236,12 +9338,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -9311,12 +9413,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -21184,7 +21286,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index e0e1edddf1..5688c7bb09 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -4928,12 +4928,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4994,7 +5096,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5002,7 +5104,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5062,7 +5164,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5070,7 +5172,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -6172,12 +6274,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -6396,12 +6498,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -6920,12 +7022,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -6933,12 +7035,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -6946,12 +7048,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -8225,12 +8327,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -8300,12 +8402,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -20490,16 +20592,16 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20514,7 +20616,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -20716,7 +20818,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -20920,7 +21022,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -21195,7 +21297,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -21209,7 +21311,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -21411,7 +21513,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -21615,7 +21717,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -21890,7 +21992,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies index ddd77ba48a..3ecddb8b5a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies @@ -5828,12 +5828,114 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-31" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-31" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5898,7 +6000,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -5906,7 +6008,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5970,7 +6072,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5978,7 +6080,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6093,12 +6195,12 @@ "type": "child<irq>" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6440,7 +6542,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6448,7 +6550,7 @@ "arguments": { "typename": "virt-4.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6583,12 +6685,12 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6779,34 +6881,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -7954,12 +8056,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -8033,12 +8135,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -20125,12 +20227,12 @@ ] } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -20146,7 +20248,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies index 356e12aa01..d11d901976 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies @@ -5883,12 +5883,114 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-32" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-32" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5953,7 +6055,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -5961,7 +6063,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6025,12 +6127,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6183,7 +6285,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6191,7 +6293,7 @@ "arguments": { "typename": "pseries-4.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6390,12 +6492,12 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -8591,34 +8693,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -9761,12 +9863,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -9840,12 +9942,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -21903,7 +22005,7 @@ ] } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 93fd47e8d3..58550d12c1 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -4002,12 +4002,114 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-32" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-32" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4072,7 +4174,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4080,7 +4182,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4144,12 +4246,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4186,7 +4288,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4194,7 +4296,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -4299,34 +4401,34 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -5598,12 +5700,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -5677,12 +5779,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -17961,5 +18063,5 @@ ] } ], - "id": "libvirt-40" + "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 448c9d2402..f16901c5b7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -4002,12 +4002,114 @@ "id": "libvirt-31a" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-32" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-32" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4072,7 +4174,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4080,7 +4182,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4144,12 +4246,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4186,7 +4288,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4194,7 +4296,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -4299,34 +4401,34 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -5598,12 +5700,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -5677,12 +5779,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -17961,5 +18063,5 @@ ] } ], - "id": "libvirt-40" + "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies index d81d5c8003..b3c900cde9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies @@ -4057,12 +4057,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4127,7 +4229,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4135,7 +4237,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -4199,12 +4301,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4277,12 +4379,12 @@ "cpu-max": 248 } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4857,34 +4959,34 @@ "migration-safe": true } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6027,12 +6129,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6106,12 +6208,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -18279,7 +18381,7 @@ ] } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -18290,7 +18392,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -18335,7 +18437,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index 8ac67e0b75..f944924bf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -5153,12 +5153,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5223,7 +5325,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5231,7 +5333,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5295,7 +5397,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5303,7 +5405,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -6421,12 +6523,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -6645,12 +6747,12 @@ "alias": "q35" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -7167,12 +7269,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -7180,12 +7282,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -7193,12 +7295,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -8480,12 +8582,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -8559,12 +8661,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -21029,16 +21131,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -21053,7 +21155,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -21257,7 +21359,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -21463,7 +21565,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -21742,7 +21844,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -21756,7 +21858,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -21960,7 +22062,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -22166,7 +22268,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -22445,7 +22547,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies index 5c3c706651..c2a9ecde7b 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies @@ -5446,12 +5446,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5516,7 +5618,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5524,7 +5626,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5588,7 +5690,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5596,7 +5698,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -6761,12 +6863,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -7090,12 +7192,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -8240,12 +8342,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -8253,12 +8355,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -8266,12 +8368,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -9545,12 +9647,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -9624,12 +9726,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -22214,16 +22316,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -22238,7 +22340,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -22446,7 +22548,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -22460,7 +22562,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -22668,7 +22770,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies index a16ba89aeb..68f67d6dd8 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies @@ -6200,12 +6200,114 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-31" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-31" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -6270,7 +6372,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -6278,7 +6380,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6342,7 +6444,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6350,7 +6452,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6537,12 +6639,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7100,7 +7202,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7108,7 +7210,7 @@ "arguments": { "typename": "virt-4.2-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -7261,12 +7363,12 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -7457,34 +7559,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -8652,12 +8754,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -8735,12 +8837,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -21311,12 +21413,12 @@ ] } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -21332,7 +21434,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -21343,7 +21445,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -21373,7 +21475,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies index 95ec00a651..b3db60a972 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies @@ -6005,12 +6005,114 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-32" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-32" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6075,7 +6177,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6083,7 +6185,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6147,12 +6249,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6414,7 +6516,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6422,7 +6524,7 @@ "arguments": { "typename": "pseries-4.2-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -6621,12 +6723,12 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -8822,34 +8924,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -9988,12 +10090,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -10071,12 +10173,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -22305,7 +22407,7 @@ ] } ], - "id": "libvirt-41" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies index 9250132d45..f87a7aa812 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -4319,12 +4319,114 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-30" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4389,7 +4491,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -4397,7 +4499,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -4461,12 +4563,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4593,12 +4695,12 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -5205,34 +5307,34 @@ "migration-safe": true } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6379,12 +6481,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6462,12 +6564,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -19089,7 +19191,7 @@ ] } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -19100,7 +19202,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -19154,7 +19256,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies index c09ebb5460..f4d868efe1 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies @@ -5686,12 +5686,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5756,7 +5858,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -5764,7 +5866,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5828,7 +5930,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -5836,7 +5938,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -7390,12 +7492,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -7787,12 +7889,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -9175,12 +9277,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -9188,12 +9290,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -9201,12 +9303,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -10492,12 +10594,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -10575,12 +10677,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -23499,16 +23601,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -23523,7 +23625,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -23825,7 +23927,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -23839,7 +23941,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -24141,7 +24243,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies index 9e683ef979..5d3eeff868 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies @@ -6689,12 +6689,114 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-31" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-31" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -6764,7 +6866,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -6772,7 +6874,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6841,7 +6943,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -6849,7 +6951,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -7053,12 +7155,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7646,7 +7748,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -7654,7 +7756,7 @@ "arguments": { "typename": "virt-5.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -7802,12 +7904,12 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -8003,24 +8105,24 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -8028,12 +8130,12 @@ "passthrough", "emulator" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -9191,12 +9293,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -9274,12 +9376,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -22659,12 +22761,12 @@ ] } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -22680,7 +22782,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -22691,7 +22793,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -22722,7 +22824,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies index a046b099b6..5fb320d9c3 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies @@ -6686,12 +6686,114 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-33" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-33" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6761,7 +6863,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -6769,7 +6871,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -6838,12 +6940,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -7113,7 +7215,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -7121,7 +7223,7 @@ "arguments": { "typename": "pseries-5.0-machine" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -7330,12 +7432,12 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -9541,24 +9643,24 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-39" } { "return": [ "tpm-spapr" ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -9566,12 +9668,12 @@ "passthrough", "emulator" ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -10708,12 +10810,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -10791,12 +10893,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -24117,7 +24219,7 @@ ] } ], - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies index e2307a646e..f2791e7659 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies @@ -4665,12 +4665,114 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-32" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-32" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4740,7 +4842,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -4748,7 +4850,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4817,12 +4919,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4880,7 +4982,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4888,7 +4990,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -4978,34 +5080,34 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -6271,12 +6373,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -6354,12 +6456,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -19898,5 +20000,5 @@ ] } ], - "id": "libvirt-40" + "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies index f10d2f4cce..87e63c99e0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies @@ -6174,12 +6174,114 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "default-value": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6249,7 +6351,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6257,7 +6359,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6326,7 +6428,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6334,7 +6436,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -7900,12 +8002,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -8281,12 +8383,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -9831,12 +9933,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -9844,12 +9946,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -9857,12 +9959,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -11138,12 +11240,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -11221,12 +11323,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -24955,16 +25057,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -24979,7 +25081,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -25282,7 +25384,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -25296,7 +25398,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -25599,7 +25701,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies index d2eb609031..a6480ca994 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies @@ -6287,12 +6287,118 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "name": "hostdevice", + "type": "str" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6362,7 +6468,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6370,7 +6476,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6439,7 +6545,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6447,7 +6553,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -8033,12 +8139,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -8430,12 +8536,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -10137,12 +10243,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -10150,12 +10256,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -10163,12 +10269,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -11463,12 +11569,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -11546,12 +11652,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -25710,16 +25816,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -25734,7 +25840,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -26042,7 +26148,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -26056,7 +26162,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -26364,7 +26470,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 7496ff1379..987beb965e 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -242,6 +242,7 @@ <flag name='intel-iommu.aw-bits'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='usb-host.hostdevice'/> <version>5001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies index fb6f6477d9..91f883408d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -6295,12 +6295,118 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-36" +} + +{ + "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": true, + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "hostbus", + "type": "uint32" + }, + { + "default-value": 4, + "name": "isobufs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "vendorid", + "type": "uint32" + }, + { + "default-value": 0, + "name": "productid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "name": "hostdevice", + "type": "str" + }, + { + "default-value": 0, + "name": "hostaddr", + "type": "uint32" + }, + { + "default-value": true, + "name": "suppress-remote-wake", + "type": "bool" + }, + { + "default-value": 2, + "name": "loglevel", + "type": "uint32" + }, + { + "default-value": 32, + "name": "isobsize", + "type": "uint32" + }, + { + "default-value": false, + "name": "guest-resets-all", + "type": "bool" + }, + { + "default-value": true, + "name": "guest-reset", + "type": "bool" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "attached", + "type": "bool" + } + ], + "id": "libvirt-36" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6370,7 +6476,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -6378,7 +6484,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6447,7 +6553,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -6455,7 +6561,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -8041,12 +8147,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -8504,12 +8610,12 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -10211,12 +10317,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -10224,12 +10330,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -10237,12 +10343,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-44" } { @@ -11537,12 +11643,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -11620,12 +11726,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -25841,16 +25947,16 @@ ] } ], - "id": "libvirt-45" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-47" } { - "id": "libvirt-46", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -25865,7 +25971,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -26173,7 +26279,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -26187,7 +26293,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -26495,7 +26601,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 151bd18137..8d4726a492 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -242,6 +242,7 @@ <flag name='intel-iommu.aw-bits'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='usb-host.hostdevice'/> <version>5001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.26.2

This originally started as bug 1595525 in which namespaces and libusb used in QEMU were not playing nicely with each other. The problem was that libusb built a cache of USB devices it saw (which was a very limited set because of the namespace) and then expected to receive udev events to keep the cache in sync. But those udev events didn't come because on hotplug when we mknod() devices in the namespace no udev event is generated. And what is worse - libusb failed to open a device that wasn't in the cache. Without going further into what the problem was, libusb added a new API for opening USB devices that avoids using cache which QEMU incorporated and exposes under "hostdevice" attribute. What is even nicer is that QEMU uses qemu_open() for path provided in the attribute and thus FD passing could be used. Except qemu_open() expects so called FD sets instead of `getfd' and these are not implemented in Libvirt, yet. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1877218 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_command.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd98b0a97c..4f85848d32 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4460,16 +4460,21 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysUSBPtr usbsrc = &dev->source.subsys.u.usb; - if (!dev->missing && !usbsrc->bus && !usbsrc->device) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("USB host device is missing bus/device information")); - return NULL; - } - virBufferAddLit(&buf, "usb-host"); if (!dev->missing) { - virBufferAsprintf(&buf, ",hostbus=%d,hostaddr=%d", - usbsrc->bus, usbsrc->device); + if (usbsrc->bus == 0 && usbsrc->device == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("USB host device is missing bus/device information")); + return NULL; + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_HOSTDEVICE)) { + virBufferAsprintf(&buf, ",hostdevice=/dev/bus/usb/%03d/%03d", + usbsrc->bus, usbsrc->device); + } else { + virBufferAsprintf(&buf, ",hostbus=%d,hostaddr=%d", + usbsrc->bus, usbsrc->device); + } } virBufferAsprintf(&buf, ",id=%s", dev->info->alias); if (dev->info->bootIndex) -- 2.26.2