From: Peter Krempa Date: Tue, 17 Aug 2021 12:09:16 +0000 (+0200) Subject: testQemuInfoSetArgs: Remove hack for double QEMU_CAPS_LAST in caps list X-Git-Tag: v7.7.0-rc1~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6545a23277743762ec751bfe0c2301b1315f7885;p=thirdparty%2Flibvirt.git 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 Reviewed-by: Ján Tomko --- diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 32119e30c2..c86f7f2e39 100644 --- 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: