Re: [libvirt] [libvirt PATCH v2 37/44] Deprecate QEMU_CAPS_DTB

[Andrea Bolognani]

On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> @@ -2347,21 +2346,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);

NONE goes on the first line in both cases.

Reviewed-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

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

[libvirt] [libvirt PATCH v2 37/44] Deprecate QEMU_CAPS_DTB

[Ján Tomko]

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_capabilities.c   |  1 -
 src/qemu/qemu_capabilities.h   |  2 +-
 src/qemu/qemu_command.c| 11 ++-
 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 ---
 30 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2a26aecdd2..ca8fdf62a8 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3629,7 +3629,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 4f3934f1a9..645156c42f 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 cea3517258..45722aa1fe 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6347,15 +6347,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.5.3.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 69ee300ce7..21f0d7ded8 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 @@
   
   
   
-  
   
   
   
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 21c4ad9730..a903d80e2c 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 @@
   
   
   
-  
   
   
   
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index f3ee50041d..197f43846d 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 @@
   
   
   
-  
   
   
   
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index