From 0ceb802ad9b72b0716d51b0ddf6be1cc99c54a98 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 17 Aug 2021 14:24:13 +0200 Subject: [PATCH] testQemuInfoSetArgs: Move argument fetching to the loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the last patch removed the hack which needed lookahead to see whether all QEMU_CAPS_ were parsed we can move the fetching of the arguments into the loop. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/testutilsqemu.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index c86f7f2e39..5ff373e954 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -697,8 +697,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info, abort(); va_start(argptr, capslatest); - argname = va_arg(argptr, testQemuInfoArgName); - while (argname != ARG_END) { + while ((argname = va_arg(argptr, testQemuInfoArgName)) != ARG_END) { switch (argname) { case ARG_QEMU_CAPS: fakeCapsUsed = true; @@ -740,8 +739,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info, fprintf(stderr, "Unexpected test info argument"); goto cleanup; } - - argname = va_arg(argptr, testQemuInfoArgName); } if (!!capsarch ^ !!capsver) {