testQemuInfoSetArgs: Remove hack for double QEMU_CAPS_LAST in caps list

The callers don't use it any more. Remove it to avoid fragility of the
test suite.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 32119e30c2b8aeb7cb51e3a7107c683ae3c55427..c86f7f2e392ee4e880437cc90064396dacc123c2 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -705,23 +705,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
 
             while ((flag = va_arg(argptr, int)) < QEMU_CAPS_LAST)
                 virQEMUCapsSet(fakeCaps, flag);
-
-            /* Some tests are run with NONE capabilities, which is just
-             * another name for QEMU_CAPS_LAST. If that is the case the
-             * arguments look like this :
-             *
-             *   ARG_QEMU_CAPS, NONE, QEMU_CAPS_LAST, ARG_END
-             *
-             * Fetch one argument more and if it is QEMU_CAPS_LAST then
-             * break from the switch() to force getting next argument
-             * in the line. If it is not QEMU_CAPS_LAST then we've
-             * fetched real ARG_* and we must process it.
-             */
-            if ((flag = va_arg(argptr, int)) != QEMU_CAPS_LAST) {
-                argname = flag;
-                continue;
-            }
-
             break;
 
         case ARG_GIC: