From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 19 Feb 2016 12:25:38 +0000 (+0100)
Subject: test: qemuxml2argv: Drop QEMU_CAPS_DEVICE uses
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b6c40bd5e1fa5da6a7a7b33d0302ce9661a9e289;p=libvirt.git

test: qemuxml2argv: Drop QEMU_CAPS_DEVICE uses

Since commit 51045df01b3c, the QEMU_CAPS_DEVICE capability is enabled
automatically and shouldn't be passed as an argument to DO_TEST();
however, commit 998a936c4c1a accidentally introduced few such uses.
---

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 349e6edcec..bb80c22a13 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1700,18 +1700,18 @@ mymain(void)
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
     DO_TEST_FAILURE("aarch64-gic-v3",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST);
-    DO_TEST("aarch64-gic-host", QEMU_CAPS_DEVICE,
+    DO_TEST("aarch64-gic-host",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_FAILURE("aarch64-gic-host", QEMU_CAPS_DEVICE,
+    DO_TEST_FAILURE("aarch64-gic-host",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST);
-    DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_DEVICE,
+    DO_TEST_PARSE_ERROR("aarch64-gic-invalid",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_DEVICE,
+    DO_TEST_FAILURE("aarch64-gic-not-virt",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_FAILURE("aarch64-gic-not-arm", QEMU_CAPS_DEVICE,
+    DO_TEST_FAILURE("aarch64-gic-not-arm",
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);