qemu: deprecate QEMU_CAPS_NODEFCONFIG

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Fixed-up-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4fb586f1d9c7e28aa1ddf8e5b0a2cee5e682658f..522fcd5e282ae675d9c4c4d7db6593cb9197e8ed 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2f15da0729145f1bcb143918bd8ccf27a81c2b32..6b29d66e4557ce8d831abce1afe5114308198dfb 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -99,7 +99,7 @@ typedef enum {
     /* 35 */
     QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */
     QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
-    QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
+    X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
     QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */
     X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
 

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 3cc8c22c26de5036333501766f00b48cbb5ef760..9c95914dc03b3e94a72f292b75c355b024d219ea 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 617759bf8662d057ce39825858cc463f5ab946fc..c1d81359487788cfc23c4939b956f01cf50fa683 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index a02826bb093818acdb08408d4ed3b10eb1f99fd2..f65dfdffd881b8d43ca791faf269a83a41cf9790 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 49458e74398bd673f1bae7fd331d6699615e9544..7d4a1cc0fd9dc97316eb26a4da97d46503bcf5e2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index c74e636dc1776e8fe13b92a8ac36f76ef1451952..4069facdda1d45cdf75ad08891e14428180d1f36 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index cfac4d99ae13863320a09cf67696144e0925c16e..a11ed25cf68992379b6008396927e5c82a2d1cf0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 0b105afaec93762b60fc3a19d2c6cf6893d4aef1..c9ebfa2b32aacf623e4b3dd0b66beb4262640bf1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index a2eb37e9facddcd69824d296baad9e0bfc601831..1964e177ebe65b6a8632b5e21b707d2e03777c87 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 23ba2678f7173fdbe668eb2c14a3cf346b5ec6e2..77c91cdea89bf8a0ee46fcf0b14825ef0144c446 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 1eadfb6cc06a49b33104f6864a344240346aa870..149c0eed112b706cec838458c56f7e7232eee3c9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 34f5567146ac19dede63554e18e673b85682b0c0..f1a34d820ed16eca2a4dd39281828477b31a2484 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index bd675a946fb418715478702310dad99e507e0cf9..02ed911679f5e8bb52e44f34b2f1c1ea254d7cfc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 821ddca4f5b588618cd9c5f62f51a8d02817e0f7..6c36b12818dea927fc0fdbb2092984473a3ff7e0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index f2cfab0a7939da4c3b6ce1d6b641acdb415f3f38..d7adef1cb10a80e8b8eb897c60f2b3a285c3deb2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index fa3140ffd46ca5b52077be13ba543b59b288ab6a..a364ea2f8f619f0455a4be2cd8d34ba0b7975510 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 4217dc9c3bed9a0a4d1b197d39b56311ebde61f2..f22d8cdcee93dd7f0eb5b6870cf81dc1bb071296 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index eaab5d467423aa0c660baba9441a02d87cc08e02..b8d1b53da91127a2147668f1c1a1d80725352b75 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index d519a93a9847a7aec9898cdcb2d97d54bb139cce..7d6cfe7f247b0019ab5af3230da29104447f9476 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 80bb743f3b8321868565f24834ec5c50a07e03c5..e931d62ad55b33d1dcd9bcde02e193cbe72a6f6c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index a20a762227b288e3b6be1ad1978a8596a4cbe1ee..4062b4cafb67d8dd08064243f5e962a62f196818 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 6f66983e707b337937c91c58cab247f93f245a3b..3b95db75f62f8e0f928b3a1d9518ce8b31b5fdb3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index b8b4a5f22c511cadca6b34fa9060b0eec2ce6904..be68a33ab0d687bcea4aaa38ef5f9455f96726f4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index f45a5023dbbab7f3656aa3bb19208167de6ba3f1..3c4714b66d2530e6b93df4b87168f1aa96fd755d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 5031a9450d947398302b031b0bded217bdf13a73..911d80d5d442df15a60614bede415d21664fefa7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 2078c4533c6cbcb1ea22c347d86267a8b2a03c71..09683ec56d1a3f5ceb3b61303eae67e0ab60bb8a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b279e48ee0252a387c063a6f5f7b028ecbb20e73..b11c45c4688f3c10c3bf1ca26be3b1ffffe4724d 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -823,7 +823,7 @@ mymain(void)
     DO_TEST("q35-noacpi-nouefi", NONE);
     DO_TEST("q35-acpi-nouefi", NONE);
 
-    DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("clock-utc", NONE);
     DO_TEST("clock-localtime", NONE);
     DO_TEST("clock-localtime-basis-localtime", NONE);
     DO_TEST("clock-variable", NONE);
@@ -939,10 +939,8 @@ mymain(void)
             QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("floppy-drive-fat",
             QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST("disk-drive-readonly-disk",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("disk-drive-readonly-no-device",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("disk-drive-readonly-disk", NONE);
+    DO_TEST("disk-drive-readonly-no-device", NONE);
     DO_TEST("disk-drive-fmt-qcow",
             QEMU_CAPS_DRIVE_BOOT);
     DO_TEST_PARSE_ERROR("disk-drive-fmt-cow", QEMU_CAPS_DRIVE_BOOT);
@@ -975,7 +973,7 @@ mymain(void)
     DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-wrong-secrettype", NONE);
     DO_TEST_PARSE_ERROR("disk-drive-network-source-auth-both", NONE);
     DO_TEST("disk-drive-network-iscsi-lun",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_BLOCK);
     DO_TEST("disk-drive-network-gluster",
             QEMU_CAPS_GLUSTER_DEBUG_LEVEL);
@@ -1001,66 +999,49 @@ mymain(void)
                         QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST_FAILURE("disk-usb-nosupport", NONE);
     DO_TEST("disk-usb-device",
-            QEMU_CAPS_DEVICE_USB_STORAGE,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_USB_STORAGE);
     DO_TEST("disk-usb-device-removable",
             QEMU_CAPS_DEVICE_USB_STORAGE,
-            QEMU_CAPS_USB_STORAGE_REMOVABLE, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_STORAGE_REMOVABLE);
     DO_TEST_FAILURE("disk-usb-pci",
-                    QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
+                    QEMU_CAPS_DEVICE_USB_STORAGE);
     DO_TEST("disk-scsi-device",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-device-auto",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-disk-split",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-scsi-disk-wwn",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-scsi-disk-vpd",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_DISK_WWN);
-    DO_TEST("disk-scsi-vscsi",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("disk-scsi-vscsi", NONE);
     DO_TEST("disk-scsi-virtio-scsi",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-num_queues",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-cmd_per_lun",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-max_sectors",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-ioeventfd",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-scsi-megasas",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_MEGASAS);
     DO_TEST("disk-scsi-mptsas1068",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_MPTSAS1068,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-sata-device",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
+            QEMU_CAPS_ICH9_AHCI);
     DO_TEST("disk-aio",
             QEMU_CAPS_DRIVE_AIO);
-    DO_TEST("disk-source-pool",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("disk-source-pool-mode",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("disk-source-pool", NONE);
+    DO_TEST("disk-source-pool-mode", NONE);
     DO_TEST("disk-ioeventfd",
             QEMU_CAPS_VIRTIO_IOEVENTFD,
             QEMU_CAPS_VIRTIO_TX_ALG,
@@ -1077,7 +1058,7 @@ mymain(void)
     DO_TEST("disk-snapshot", NONE);
     DO_TEST_PARSE_ERROR("disk-same-targets",
                         QEMU_CAPS_SCSI_LSI,
-                        QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
+                        QEMU_CAPS_DEVICE_USB_STORAGE);
     DO_TEST_PARSE_ERROR("disk-drive-address-conflict",
                         QEMU_CAPS_ICH9_AHCI);
     DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict",
@@ -1164,7 +1145,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_CHARDEV_SPICEVMC,
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("graphics-spice-compression",
             QEMU_CAPS_SPICE,
@@ -1179,7 +1159,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_QXL);
     DO_TEST("graphics-spice-usb-redir",
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_REDIR,
@@ -1224,11 +1203,9 @@ mymain(void)
     DO_TEST("net-user-addr", NONE);
     DO_TEST("net-virtio", NONE);
     DO_TEST("net-virtio-device",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG);
-    DO_TEST("net-virtio-disable-offloads",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("net-virtio-netdev",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_VIRTIO_TX_ALG);
+    DO_TEST("net-virtio-disable-offloads", NONE);
+    DO_TEST("net-virtio-netdev", NONE);
     DO_TEST("net-virtio-s390",
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("net-virtio-ccw",
@@ -1245,23 +1222,17 @@ mymain(void)
     DO_TEST("net-server", NONE);
     DO_TEST("net-mcast", NONE);
     DO_TEST("net-udp", NONE);
-    DO_TEST("net-hostdev",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("net-hostdev", NONE);
     DO_TEST("net-hostdev-multidomain",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
-    DO_TEST_FAILURE("net-hostdev-multidomain",
-                    QEMU_CAPS_NODEFCONFIG);
+    DO_TEST_FAILURE("net-hostdev-multidomain", NONE);
     DO_TEST("net-hostdev-vfio",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("net-hostdev-vfio-multidomain",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
     DO_TEST_FAILURE("net-hostdev-vfio-multidomain",
-                    QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI);
+                    QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_FAILURE("net-hostdev-fail",
-                    QEMU_CAPS_NODEFCONFIG,
                     QEMU_CAPS_DEVICE_VFIO_PCI);
 
 
@@ -1270,7 +1241,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_CHARDEV_LOGFILE);
     DO_TEST("serial-spiceport",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE,
@@ -1284,46 +1254,34 @@ mymain(void)
             QEMU_CAPS_DEVICE_ISA_SERIAL);
 
     DO_TEST("serial-vc-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-pty-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-dev-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-dev-chardev-iobase",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-file-chardev",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_CHARDEV_FILE_APPEND);
     DO_TEST("serial-unix-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-tcp-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-udp-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-tcp-telnet-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     driver.config->chardevTLS = 1;
     DO_TEST("serial-tcp-tlsx509-chardev",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
     driver.config->chardevTLSx509verify = 1;
     DO_TEST("serial-tcp-tlsx509-chardev-verify",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
     driver.config->chardevTLSx509verify = 0;
     DO_TEST("serial-tcp-tlsx509-chardev-notls",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
     VIR_FREE(driver.config->chardevTLSx509certdir);
@@ -1334,13 +1292,11 @@ mymain(void)
         return EXIT_FAILURE;
 # ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
     DO_TEST("serial-tcp-tlsx509-secret-chardev",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_SECRET,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
 # else
     DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev",
-                    QEMU_CAPS_NODEFCONFIG,
                     QEMU_CAPS_OBJECT_SECRET,
                     QEMU_CAPS_DEVICE_ISA_SERIAL,
                     QEMU_CAPS_OBJECT_TLS_CREDS_X509);
@@ -1348,156 +1304,109 @@ mymain(void)
     driver.config->chardevTLS = 0;
     VIR_FREE(driver.config->chardevTLSx509certdir);
     DO_TEST("serial-many-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("parallel-tcp-chardev",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("parallel-parport-chardev",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
+    DO_TEST("parallel-tcp-chardev", NONE);
+    DO_TEST("parallel-parport-chardev", NONE);
     DO_TEST("console-compat-chardev",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("pci-serial-dev-chardev",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
 
-    DO_TEST("channel-guestfwd",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("channel-virtio",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("channel-virtio-state",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("channel-virtio-auto",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("channel-virtio-autoassign",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("channel-virtio-autoadd",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("console-virtio",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("channel-guestfwd", NONE);
+    DO_TEST("channel-virtio", NONE);
+    DO_TEST("channel-virtio-state", NONE);
+    DO_TEST("channel-virtio-auto", NONE);
+    DO_TEST("channel-virtio-autoassign", NONE);
+    DO_TEST("channel-virtio-autoadd", NONE);
+    DO_TEST("console-virtio", NONE);
     DO_TEST("console-virtio-many",
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("console-virtio-s390",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("console-virtio-ccw",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("console-sclp",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_SCLPCONSOLE);
     DO_TEST("channel-spicevmc",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("channel-spicevmc-old",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_DEVICE_SPICEVMC,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("channel-virtio-default",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_CHARDEV_SPICEVMC);
-    DO_TEST("channel-virtio-unix",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("channel-virtio-unix", NONE);
 
     DO_TEST("smartcard-host",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CCID_EMULATED);
     DO_TEST("smartcard-host-certificates",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CCID_EMULATED);
     DO_TEST("smartcard-passthrough-tcp",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CCID_PASSTHRU);
     DO_TEST("smartcard-passthrough-spicevmc",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CCID_PASSTHRU,
             QEMU_CAPS_CHARDEV_SPICEVMC);
     DO_TEST("smartcard-controller",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CCID_EMULATED);
 
     DO_TEST("chardev-reconnect",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_CHARDEV_RECONNECT,
             QEMU_CAPS_USB_REDIR,
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_EGD,
             QEMU_CAPS_CCID_PASSTHRU);
     DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout",
-                        QEMU_CAPS_NODEFCONFIG,
                         QEMU_CAPS_CHARDEV_RECONNECT);
     DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path",
-                        QEMU_CAPS_NODEFCONFIG,
                         QEMU_CAPS_CHARDEV_RECONNECT);
 
-    DO_TEST("usb-controller",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("usb-controller", NONE);
     DO_TEST("usb-piix3-controller",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_PIIX3_USB_UHCI);
     DO_TEST("usb-ich9-ehci-addr",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST("input-usbmouse-addr",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("input-usbmouse-addr", NONE);
     DO_TEST("usb-ich9-companion",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_ICH9_USB_EHCI1);
     DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_ICH9_USB_EHCI1);
     DO_TEST("usb-ich9-autoassign",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_HUB);
     DO_TEST("usb-hub",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST("usb-hub-autoadd",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST("usb-hub-autoadd-deluxe",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR("usb-hub-conflict",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR("usb-hub-nonexistent",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST("usb-port-missing",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST_FAILURE("usb-bus-missing",
-                    QEMU_CAPS_USB_HUB,
-                    QEMU_CAPS_NODEFCONFIG);
+                    QEMU_CAPS_USB_HUB);
     DO_TEST("usb-ports",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR("usb-ports-out-of-range",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST("usb-port-autoassign",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_USB_HUB);
     DO_TEST("usb-redir",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_REDIR,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_CHARDEV_SPICEVMC);
     DO_TEST("usb-redir-boot",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_REDIR,
@@ -1506,7 +1415,6 @@ mymain(void)
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_USB_REDIR_BOOTINDEX);
     DO_TEST("usb-redir-filter",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_REDIR,
@@ -1514,25 +1422,19 @@ mymain(void)
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_USB_REDIR_FILTER);
     DO_TEST("usb-redir-filter-version",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_REDIR,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_USB_REDIR_FILTER);
     DO_TEST("usb1-usb2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST("usb-none",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST_PARSE_ERROR("usb-none-other",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("usb-none", NONE);
+    DO_TEST_PARSE_ERROR("usb-none-other", NONE);
     DO_TEST_PARSE_ERROR("usb-none-hub",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-none-usbtablet",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST_PARSE_ERROR("usb-none-usbtablet", NONE);
     DO_TEST("usb-controller-default-q35",
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_PCI_OHCI,
@@ -1552,18 +1454,15 @@ mymain(void)
                     QEMU_CAPS_PCI_OHCI,
                     QEMU_CAPS_PIIX3_USB_UHCI);
     DO_TEST("usb-controller-xhci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_NEC_USB_XHCI,
             QEMU_CAPS_NEC_USB_XHCI_PORTS);
     DO_TEST("usb-xhci-autoassign",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_NEC_USB_XHCI,
             QEMU_CAPS_NEC_USB_XHCI_PORTS,
             QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_NEC_USB_XHCI,
             QEMU_CAPS_NEC_USB_XHCI_PORTS);
@@ -1577,67 +1476,56 @@ mymain(void)
     DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE);
 
     DO_TEST("watchdog", NONE);
-    DO_TEST("watchdog-device", QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("watchdog-device", NONE);
     DO_TEST("watchdog-dump", NONE);
     DO_TEST("watchdog-injectnmi", NONE);
     DO_TEST("watchdog-diag288",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
-    DO_TEST("balloon-device", QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("balloon-device-deflate", QEMU_CAPS_NODEFCONFIG,
+    DO_TEST("balloon-device", NONE);
+    DO_TEST("balloon-device-deflate",
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
-    DO_TEST("balloon-ccw-deflate", QEMU_CAPS_NODEFCONFIG,
+    DO_TEST("balloon-ccw-deflate",
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
-    DO_TEST("balloon-mmio-deflate", QEMU_CAPS_NODEFCONFIG,
+    DO_TEST("balloon-mmio-deflate",
             QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
-    DO_TEST("balloon-device-deflate-off", QEMU_CAPS_NODEFCONFIG,
+    DO_TEST("balloon-device-deflate-off",
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
-    DO_TEST("balloon-device-auto",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("balloon-device-period", QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("balloon-device-auto", NONE);
+    DO_TEST("balloon-device-period", NONE);
     DO_TEST("sound", NONE);
     DO_TEST("sound-device",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO,
             QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
             QEMU_CAPS_OBJECT_USB_AUDIO);
     DO_TEST("fs9p",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV,
+            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT);
     DO_TEST("fs9p-ccw",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV,
+            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
     DO_TEST("hostdev-usb-address", NONE);
-    DO_TEST("hostdev-usb-address-device",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("hostdev-usb-address-device", NONE);
     DO_TEST("hostdev-usb-address-device-boot",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX,
+            QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_USB_HOST_BOOTINDEX);
     DO_TEST("hostdev-pci-address", NONE);
-    DO_TEST("hostdev-pci-address-device",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("hostdev-pci-address-device", NONE);
     DO_TEST("hostdev-vfio",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio-multidomain",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
     DO_TEST("hostdev-mdev-precreated",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_FAILURE("hostdev-vfio-multidomain",
-                    QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("pci-rom",
-            QEMU_CAPS_NODEFCONFIG);
+                    QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST("pci-rom", NONE);
 
     DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE);
     DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE, NONE);
@@ -1782,13 +1670,10 @@ mymain(void)
             QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH);
 
     DO_TEST("multifunction-pci-device",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_SCSI_LSI);
 
-    DO_TEST("monitor-json",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("monitor-json", NONE);
     DO_TEST("no-shutdown",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_NO_SHUTDOWN);
 
     DO_TEST("seclabel-dynamic", NONE);
@@ -1806,60 +1691,48 @@ mymain(void)
 
     DO_TEST("pseries-basic",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-vio",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-usb-default",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PCI_OHCI);
     DO_TEST("pseries-usb-multi",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PCI_OHCI);
     DO_TEST("pseries-vio-user-assigned",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST_PARSE_ERROR("pseries-vio-address-clash",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
+    DO_TEST_PARSE_ERROR("pseries-vio-address-clash", NONE);
     DO_TEST("pseries-nvram",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_NVRAM);
     DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_USB_KBD,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-cpu-exact",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST_PARSE_ERROR("pseries-no-parallel",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
+    DO_TEST_PARSE_ERROR("pseries-no-parallel", NONE);
 
     qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64);
     DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-machine-max-cpu-compat",
             QEMU_CAPS_KVM,
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT,
-            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST_FAILURE("pseries-cpu-compat-power9",
                     QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
                     QEMU_CAPS_KVM);
@@ -1868,29 +1741,23 @@ mymain(void)
     DO_TEST("pseries-cpu-compat-power9",
             QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     qemuTestSetHostCPU(driver.caps, NULL);
 
     qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE);
 
     DO_TEST("pseries-panic-missing",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-panic-no-address",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_DEVICE_SPAPR_VTY,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST_FAILURE("pseries-panic-address",
-                    QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-                    QEMU_CAPS_NODEFCONFIG);
+                    QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
 
     DO_TEST("pseries-phb-simple",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-phb-default-missing",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-phb-numa-node",
             QEMU_CAPS_NUMA,
@@ -1903,31 +1770,25 @@ mymain(void)
     DO_TEST_PARSE_ERROR("pseries-phb-invalid-target-index-3", NONE);
 
     DO_TEST("pseries-many-devices",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-many-buses-1",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-many-buses-2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-hostdevs-1",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-3",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
@@ -1943,66 +1804,51 @@ mymain(void)
     DO_TEST_PARSE_ERROR("pseries-features-invalid-machine", NONE);
 
     DO_TEST("pseries-serial-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial+console-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial-compat",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
     DO_TEST("pseries-serial-usb",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_QEMU_XHCI,
             QEMU_CAPS_DEVICE_USB_SERIAL);
     DO_TEST("pseries-console-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-console-virtio",
-            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST_PARSE_ERROR("pseries-serial-invalid-machine", NONE);
 
     DO_TEST("mach-virt-serial-native",
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_PL011);
     DO_TEST("mach-virt-serial+console-native",
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_PL011);
     DO_TEST("mach-virt-serial-compat",
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_PL011);
     DO_TEST("mach-virt-serial-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
     DO_TEST("mach-virt-serial-usb",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_QEMU_XHCI,
             QEMU_CAPS_DEVICE_USB_SERIAL);
     DO_TEST("mach-virt-console-native",
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("mach-virt-console-virtio",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_PL011);
+    DO_TEST("mach-virt-console-virtio", NONE);
     DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE);
 
     DO_TEST("disk-ide-drive-split",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_IDE_CD);
     DO_TEST("disk-ide-wwn",
             QEMU_CAPS_IDE_CD,
@@ -2010,7 +1856,6 @@ mymain(void)
 
     DO_TEST("disk-geometry", NONE);
     DO_TEST("disk-blockio",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO);
 
     DO_TEST("video-device-pciaddr-default",
@@ -2089,7 +1934,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_EGD);
     DO_TEST("virtio-rng-ccw",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390,
@@ -2097,47 +1941,38 @@ mymain(void)
             QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("s390-allow-bogus-usb-none",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("s390-allow-bogus-usb-controller",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_BOOTINDEX,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("s390-panic-no-address",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST_FAILURE("s390-panic-address",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("s390-panic-missing",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST_PARSE_ERROR("s390-no-parallel",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
     DO_TEST("s390-serial",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_SCLPCONSOLE);
     DO_TEST("s390-serial-2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_SCLPCONSOLE,
             QEMU_CAPS_DEVICE_SCLPLMCONSOLE);
     DO_TEST("s390-serial-console",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390,
             QEMU_CAPS_DEVICE_SCLPCONSOLE);
@@ -2526,21 +2361,21 @@ mymain(void)
             QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
 
     DO_TEST("arm-vexpressa9-nodevs",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
+            QEMU_CAPS_DTB);
     DO_TEST("arm-vexpressa9-basic",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
+            QEMU_CAPS_DTB);
     DO_TEST("arm-vexpressa9-virtio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("arm-virt-virtio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
 
     DO_TEST("aarch64-virt-virtio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
@@ -2550,7 +2385,7 @@ mymain(void)
        but virtio-mmio is always used unless PCI addresses are manually
        specified. */
     DO_TEST("aarch64-virtio-pci-default",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
@@ -2560,7 +2395,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2570,7 +2405,7 @@ mymain(void)
     /* Example of using virtio-pci with no explicit PCI controller
        but with manual PCI addresses */
     DO_TEST("aarch64-virtio-pci-manual-addresses",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2578,26 +2413,25 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-video-virtio-gpu-pci",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX,
+            QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX);
     DO_TEST("aarch64-video-default",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX,
+            QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_VNC);
     DO_TEST("aarch64-aavmf-virtio-mmio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("aarch64-virt-default-nic",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO);
     qemuTestSetHostArch(driver.caps, VIR_ARCH_AARCH64);
     DO_TEST("aarch64-cpu-passthrough",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_KVM);
     DO_TEST_GIC("aarch64-gic-none", GIC_NONE,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
@@ -2676,14 +2510,13 @@ mymain(void)
                         QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
                         QEMU_CAPS_MACH_VIRT_GIC_VERSION);
     DO_TEST("aarch64-kvm-32-on-64",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_KVM, QEMU_CAPS_CPU_AARCH64_OFF);
     DO_TEST_FAILURE("aarch64-kvm-32-on-64",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_KVM);
     DO_TEST("aarch64-pci-serial",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_PCI_SERIAL,
             QEMU_CAPS_CHARDEV_LOGFILE,
             QEMU_CAPS_OBJECT_GPEX,
@@ -2691,7 +2524,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT);
     DO_TEST("aarch64-traditional-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2711,13 +2543,13 @@ mymain(void)
     DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY);
     DO_TEST("no-kvm-pit-device", NONE);
 
-    DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC,
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC,
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("panic",
+            QEMU_CAPS_DEVICE_PANIC);
+    DO_TEST("panic-double",
+            QEMU_CAPS_DEVICE_PANIC);
 
-    DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC,
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("panic-no-address",
+            QEMU_CAPS_DEVICE_PANIC);
 
     DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS);
 
@@ -2900,10 +2732,10 @@ mymain(void)
     DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS);
 
     DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
-    DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG,
+    DO_TEST("usb-long-port-path",
             QEMU_CAPS_USB_HUB);
     DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid",
-                        QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB);
+                        QEMU_CAPS_USB_HUB);
 
     DO_TEST("acpi-table", NONE);
     DO_TEST("intel-iommu",

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 8d1d5852be7b3fd6d442729932f79b6ad4e31b02..d5010d2973e1e9352cad50d2beeedeb3814d6a6c 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -381,22 +381,22 @@ mymain(void)
     DO_TEST("disk-drive-network-vxhs", NONE);
     DO_TEST("disk-drive-network-tlsx509-vxhs", NONE);
     DO_TEST("disk-scsi-device",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI);
+            QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-vscsi", NONE);
     DO_TEST("disk-scsi-virtio-scsi",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-num_queues",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-cmd_per_lun",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-max_sectors",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-ioeventfd",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-scsi-megasas",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS);
+            QEMU_CAPS_SCSI_MEGASAS);
     DO_TEST("disk-scsi-mptsas1068",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MPTSAS1068,
+            QEMU_CAPS_SCSI_MPTSAS1068,
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-mirror-old", NONE);
     DO_TEST("disk-mirror", NONE);
@@ -504,7 +504,7 @@ mymain(void)
     DO_TEST("iothreads-disk-virtio-ccw",
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("iothreads-virtio-scsi-pci",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("iothreads-virtio-scsi-ccw",
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_CCW,
             QEMU_CAPS_VIRTIO_S390);
@@ -559,10 +559,10 @@ mymain(void)
     DO_TEST("numad-static-vcpu-no-numatune", NONE);
 
     DO_TEST("disk-scsi-lun-passthrough-sgio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI,
+            QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-scsi-disk-vpd",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI,
+            QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-source-pool", NONE);
     DO_TEST("disk-source-pool-mode", NONE);
@@ -583,10 +583,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
 
     DO_TEST("pseries-phb-simple",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-phb-default-missing",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-phb-numa-node",
             QEMU_CAPS_NUMA,
@@ -594,31 +592,25 @@ mymain(void)
             QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE);
 
     DO_TEST("pseries-many-devices",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-many-buses-1",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-many-buses-2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-hostdevs-1",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-2",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-3",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
@@ -630,64 +622,50 @@ mymain(void)
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
 
     DO_TEST("pseries-serial-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial+console-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial-compat",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-serial-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
     DO_TEST("pseries-serial-usb",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_QEMU_XHCI,
             QEMU_CAPS_DEVICE_USB_SERIAL);
     DO_TEST("pseries-console-native",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
     DO_TEST("pseries-console-virtio",
-            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_NODEFCONFIG);
-
-    DO_TEST("mach-virt-serial-native",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("mach-virt-serial+console-native",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("mach-virt-serial-compat",
-            QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
+
+    DO_TEST("mach-virt-serial-native", NONE);
+    DO_TEST("mach-virt-serial+console-native", NONE);
+    DO_TEST("mach-virt-serial-compat", NONE);
     DO_TEST("mach-virt-serial-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
     DO_TEST("mach-virt-serial-usb",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_QEMU_XHCI,
             QEMU_CAPS_DEVICE_USB_SERIAL);
-    DO_TEST("mach-virt-console-native",
-            QEMU_CAPS_NODEFCONFIG);
-    DO_TEST("mach-virt-console-virtio",
-            QEMU_CAPS_NODEFCONFIG);
+    DO_TEST("mach-virt-console-native", NONE);
+    DO_TEST("mach-virt-console-virtio", NONE);
 
     DO_TEST("balloon-device-auto", NONE);
     DO_TEST("balloon-device-period", NONE);
     DO_TEST("channel-virtio-auto", NONE);
     DO_TEST("console-compat-auto", NONE);
     DO_TEST("disk-scsi-device-auto",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI);
+            QEMU_CAPS_SCSI_LSI);
     DO_TEST("console-virtio", NONE);
     DO_TEST("serial-target-port-auto", NONE);
     DO_TEST("graphics-listen-network2", NONE);
@@ -1057,11 +1035,11 @@ mymain(void)
     DO_TEST("smbios-multiple-type2", NONE);
 
     DO_TEST("aarch64-aavmf-virtio-mmio",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("aarch64-virtio-pci-default",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
@@ -1070,7 +1048,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-virtio-pci-manual-addresses",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
+            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -1078,12 +1056,11 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-video-virtio-gpu-pci",
-            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX,
+            QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX);
     DO_TEST("aarch64-pci-serial",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_DEVICE_PCI_SERIAL,
             QEMU_CAPS_CHARDEV_LOGFILE,
             QEMU_CAPS_OBJECT_GPEX,
@@ -1091,7 +1068,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT);
     DO_TEST("aarch64-traditional-pci",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1099,7 +1075,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);
     DO_TEST("aarch64-video-default",
-            QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_OBJECT_GPEX,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,