testQemuInfoSetArgs: Move argument fetching to the loop

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 <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-08-17 14:24:13 +02:00
parent 6545a23277
commit 0ceb802ad9

View File

@ -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) {