[libvirt] [libvirt PATCH v2 44/44] Deprecate QEMU_CAPS_MACHINE_USB_OPT

Ján Tomko jtomko at redhat.com
Mon Apr 9 15:27:51 UTC 2018 

Implied by QEMU >= 1.3.0.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_capabilities.c                                          | 4 ----
 src/qemu/qemu_capabilities.h                                          | 2 +-
 src/qemu/qemu_command.c                                               | 3 +--
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml                    | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml                     | 1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml                    | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml                     | 1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml                     | 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml                       | 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml                       | 1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml                       | 1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml                      | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml                       | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml                       | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml                      | 1 -
 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args                 | 2 +-
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args                         | 2 +-
 [ ... ]
 tests/qemuxml2argvdata/watchdog-injectnmi.args                        | 2 +-
 tests/qemuxml2argvdata/watchdog.args                                  | 2 +-
 tests/qemuxml2argvdata/x86-kvm-32-on-64.args                          | 2 +-
 tests/qemuxml2argvtest.c                                              | 3 +--
 634 files changed, 613 insertions(+), 639 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 59456b2d5d..721b1361c1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3757,10 +3757,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
 
     virQEMUCapsInitQMPBasicArch(qemuCaps);
 
-    /* USB option is supported v1.3.0 onwards */
-    if (qemuCaps->version >= 1003000)
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT);
-
     /* WebSockets were introduced between 1.3.0 and 1.3.1 */
     if (qemuCaps->version >= 1003001)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 594cc19213..9476985b11 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -239,7 +239,7 @@ typedef enum {
     /* 135 */
     X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */
     X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/
-    QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */
+    X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */
     QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */
     QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */
 
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7061089b03..4775d06121 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7016,8 +7016,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
     /* To avoid the collision of creating USB controllers when calling
      * machine->init in QEMU, it needs to set usb=off
      */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT))
-        virBufferAddLit(&buf, ",usb=off");
+    virBufferAddLit(&buf, ",usb=off");
 
     if (vmport) {
         if (!virQEMUCapsSupportsVmport(qemuCaps, def)) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index f49df85865..25ad2dff27 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -67,7 +67,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index f9e2959b99..97b74749e1 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index e8eaa7939b..75fcf8ff5f 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 7892381f34..e97d4b920b 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index cb60f7a3b5..88616e57f0 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 9704f84457..91f80a277f 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index dc85732b25..c599b66f56 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 449cfcf05a..9e95b68457 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 0bc5479264..cf0648fbfd 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 46d6ab2ffa..82ed3e6390 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index c0870d28b1..d19f35dbba 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index f7fe6646c4..24220943f2 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 9e148915cb..f6801ecd5a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 794ea38af4..f6556ee3dd 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8962aec411..fc3d9d757d 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 687b5b9844..b1bb3e7bd2 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -54,7 +54,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 2bfb0ae493..f3611e1922 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index ac97bb5c3d..0e48180275 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 97bc0bc25a..a585af453c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index b66da6c78a..55c121c596 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 7f574e7f89..1ac60bb403 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7fb3e9a819..831a768977 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 791019e3d6..4998edf7a0 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 66eb5f9ced..d29994bbfd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -34,7 +34,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='machine-usb-opt'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 2397a19987..d813a96a13 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='machine-usb-opt'/>
   <flag name='tpm-passthrough'/>
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 4ef4490f33..d7a891c83c 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=tcg,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
 -cpu cortex-a53 \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 2ad4c2e76a..8aefc7d44a 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest \
 -S \
--machine virt,accel=tcg,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
 -cpu cortex-a57 \
 -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
 readonly=on \

[ ... etc ... ]

diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 5fd89bd6d7..3e0bd59889 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
--machine pc,accel=tcg,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 3cf06f370a..7f9ad338fb 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name kvm \
 -S \
--machine pc,accel=kvm,dump-guest-core=off \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -cpu qemu32 \
 -m 4096 \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b6b0b61ee5..aeb3ebd185 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -744,8 +744,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_MACHINE_SMM_OPT,
             QEMU_CAPS_VIRTIO_SCSI);
-    DO_TEST("machine-usb-opt",
-            QEMU_CAPS_MACHINE_USB_OPT);
+    DO_TEST("machine-usb-opt", NONE);
     DO_TEST("machine-vmport-opt",
             QEMU_CAPS_MACHINE_VMPORT_OPT);
     DO_TEST("kvm", NONE);
-- 
2.16.1

More information about the libvir-list mailing list