[libvirt] [RESEND PATCH 11/44] Deprecate QEMU_CAPS_NO_USER_CONFIG

Ján Tomko jtomko at redhat.com
Tue Apr 3 10:17:42 UTC 2018 

Implied by QEMU >= 1.2.0.

Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used
when QEMU_CAPS_NO_USER_CONFIG is unsupported.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_capabilities.c                                         | 1 -
 src/qemu/qemu_capabilities.h                                         | 2 +-
 src/qemu/qemu_command.c                                              | 5 +----
 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml                     | 1 -
 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml                     | 1 -
 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                        | 1 +
 [...]
 tests/qemuxml2argvdata/watchdog-injectnmi.args                       | 1 +
 tests/qemuxml2argvdata/watchdog.args                                 | 1 +
 tests/qemuxml2argvdata/x86-kvm-32-on-64.args                         | 1 +
 636 files changed, 608 insertions(+), 204 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 334c3c135..18d0e0739 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3654,7 +3654,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index df8c197cd..5393f6eeb 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -178,7 +178,7 @@ typedef enum {
     QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */
     QEMU_CAPS_SCSI_CD, /* -device scsi-cd */
     QEMU_CAPS_IDE_CD, /* -device ide-cd */
-    QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */
+    X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */
 
     /* 95 */
     QEMU_CAPS_HDA_MICRO, /* -device hda-micro */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8b883b208..29383a6c2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10057,10 +10057,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     }
 
     /* Disable global config files and default devices */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG))
-        virCommandAddArg(cmd, "-no-user-config");
-    else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NODEFCONFIG))
-        virCommandAddArg(cmd, "-nodefconfig");
+    virCommandAddArg(cmd, "-no-user-config");
     virCommandAddArg(cmd, "-nodefaults");
 
     if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index ccd76cf8f..5a080e9ad 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 7691d01ca..37b287b2f 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 46b88f218..8ded41708 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 47ac2eaf2..6fcc7f1c5 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 7b5ac5c4e..58227aca1 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 69c7e2258..3a06c7642 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 900f5fbbc..545eb2b51 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -47,7 +47,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 8408a3476..44f08ad06 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -46,7 +46,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index d0a07be5a..cef0a6a38 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 59900c4a4..7b179059e 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 3aaf8abfc..ef02bac5b 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index d765aa08f..585f1daa0 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -47,7 +47,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 195566568..ea6791e69 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -46,7 +46,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 7a5f4bb2f..17659c37f 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index c32effb6c..130a604f7 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index b9f3b65e5..8c9afec91 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index c524588d7..e1245953b 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 59aed9b1f..136385b86 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index fb1333fec..76c6ab2a6 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -46,7 +46,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 89d032467..2d16d4133 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 0ce1780f9..efe2d4ac4 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index da1b370c1..7445253c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index c532e5cee..4d8d24682 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 9fd8684bb..584ec7870 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 9fa07c8e7..cee011d5f 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -46,7 +46,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index d534e4714..e4060518b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='transaction'/>
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
-  <flag name='no-user-config'/>
   <flag name='dump-guest-memory'/>
   <flag name='balloon-event'/>
   <flag name='bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index fa7c4fd65..6ad3e2b17 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='block-job-async'/>
   <flag name='scsi-cd'/>
   <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
   <flag name='hda-micro'/>
   <flag name='dump-guest-memory'/>
   <flag name='nec-usb-xhci'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 21a3f591d..92da7122a 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
--nodefconfig \
+-no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
 path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 0d3b47768..e7af5a6d6 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -17,6 +17,7 @@ unit=1 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
+-no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
 server,nowait \

[...]

diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 73854f9e3..c2a505e1e 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
+-no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
 server,nowait \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index fe89e1fc3..3360fda13 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -13,6 +13,7 @@ QEMU_AUDIO_DRV=none \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nographic \
+-no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\
 nowait \
-- 
2.16.1

More information about the libvir-list mailing list