[PATCH 37/44] Deprecate QEMU_CAPS_DTB

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                       |  1 -
 src/qemu/qemu_capabilities.h                       |  2 +-
 src/qemu/qemu_command.c                            | 11 ++---------
 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/qemuxml2argvtest.c                           | 16 ++++------------
 tests/qemuxml2xmltest.c                            |  3 ---
 32 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 44fc038e4..2db7d9c48 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3627,7 +3627,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5b7f83580..854227bd2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -233,7 +233,7 @@ typedef enum {
     QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */
     QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */
     QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */
-    QEMU_CAPS_DTB, /* -dtb file */
+    X_QEMU_CAPS_DTB, /* -dtb file */
     QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */
 
     /* 135 */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 114af9119..ed04a2a35 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6352,15 +6352,8 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
         virCommandAddArgList(cmd, "-initrd", def->os.initrd, NULL);
     if (def->os.cmdline)
         virCommandAddArgList(cmd, "-append", def->os.cmdline, NULL);
-    if (def->os.dtb) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DTB)) {
-            virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
-        } else {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("dtb is not supported with this QEMU binary"));
-            goto error;
-        }
-    }
+    if (def->os.dtb)
+        virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
     if (def->os.slic_table) {
         virBuffer buf = VIR_BUFFER_INITIALIZER;
         virCommandAddArg(cmd, "-acpitable");
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 3e76a2073..aebc7a157 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 7895ccce7..b5a94ba4b 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 69ee300ce..21f0d7ded 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 21c4ad973..a903d80e2 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index f3ee50041..197f43846 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index f794d7f10..c8d2daa77 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 3b6b16920..79b06ef5c 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 1116d192d..398b7b09b 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 05c6858a2..e7a724844 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 0ab17a241..46066f1d8 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index c1eedd42d..5872a6254 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 7dc83c54f..5e2ad4dba 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 8b7ef6d7a..568f0f710 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 1c81a887b..67919f1b8 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 8a1c0feef..2252636ae 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 9c86bf079..ff5f820eb 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8062bcf75..e9aef8e36 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 663bb01bf..815ad2e7f 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index dfe686c5c..da7de1d7f 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 6b0f54489..77cc540d7 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 0069f639e..cfdee30b3 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 489b82d4b..ba7a5ebb5 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index b1413fe34..c547abef7 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 4d5706853..4d4e66160 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index c4647a6d7..c37d90fac 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 4c88f62df..665122e72 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='virtio-ccw'/>
-  <flag name='dtb'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
   <flag name='machine-usb-opt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 896813522..5c0e8cddf 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='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='dtb'/>
   <flag name='megasas'/>
   <flag name='ipv6-migration'/>
   <flag name='machine-opt'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ba1434dc3..f0a4fa141 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1453,7 +1453,7 @@ mymain(void)
     DO_TEST("balloon-ccw-deflate",
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
     DO_TEST("balloon-mmio-deflate",
-            QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
     DO_TEST("balloon-device-deflate-off",
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
@@ -1934,8 +1934,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_SCLPCONSOLE);
 
     DO_TEST("ppc-dtb",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_DTB);
+            QEMU_CAPS_KVM);
     DO_TEST("ppce500-serial",
             QEMU_CAPS_KVM);
 
@@ -2304,21 +2303,18 @@ mymain(void)
             QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
 
     DO_TEST("arm-vexpressa9-nodevs",
-            QEMU_CAPS_DTB);
+            NONE);
     DO_TEST("arm-vexpressa9-basic",
-            QEMU_CAPS_DTB);
+            NONE);
     DO_TEST("arm-vexpressa9-virtio",
-            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_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_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
@@ -2328,7 +2324,6 @@ mymain(void)
        but virtio-mmio is always used unless PCI addresses are manually
        specified. */
     DO_TEST("aarch64-virtio-pci-default",
-            QEMU_CAPS_DTB,
             QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
@@ -2338,7 +2333,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_PL011,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-            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,
@@ -2348,7 +2342,6 @@ 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_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,
@@ -2367,7 +2360,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_VNC);
     DO_TEST("aarch64-aavmf-virtio-mmio",
-            QEMU_CAPS_DTB,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
     DO_TEST("aarch64-virt-default-nic",
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 32309a0e9..20b07f32c 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1027,11 +1027,9 @@ mymain(void)
     DO_TEST("smbios-multiple-type2", NONE);
 
     DO_TEST("aarch64-aavmf-virtio-mmio",
-            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_DTB,
             QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
@@ -1040,7 +1038,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("aarch64-virtio-pci-manual-addresses",
-            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,
-- 
2.16.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux