External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: add va_arg enum handling

Browse Source 
This establishes a pattern that will allow us to make test macros
more general purpose, by taking optional arguments. The general
format will be:

DO_TEST_FULL(...
             ARG_FOO, <value1>,
             ARG_BAR, <value2>)

ARG_X are just enum values that we look for in the va_args and know
how to interpret.

Implement this for the existing implicit qemuCaps va_args

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-13 18:25:21 -04:00
parent 6433783be3
commit fdf6c89ee7
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/qemuxml2argvtest.c
View File

@ -624,14 +624,47 @@ testCompareXMLToArgv(const void *data)
return ret;
}
typedef enum {
ARG_QEMU_CAPS,
/* ARG_END is our va_args sentinel. The value QEMU_CAPS_LATEST is
* necessary to handle the DO_TEST(..., NONE) case, which through macro
* magic will give the va_args list:
*
* ARG_QEMU_CAPS, NONE, QEMU_CAPS_LAST, ARG_END
*
* SetArgs consumes the first item, hands off control to virQEMUCapsX
* virQEMUCapsX sees NONE aka QEMU_CAPS_LAST, returns to SetArgs.
* SetArgs sees QEMU_CAPS_LAST aka ARG_END, and exits the parse loop.
* If ARG_END != QEMU_CAPS_LAST, this last step would generate an error.
*/
ARG_END = QEMU_CAPS_LAST,
} testInfoArgName;
static int
testInfoSetArgs(struct testInfo *info, ...)
{
va_list argptr;
int ret = 0;
testInfoArgName argname;
int ret = -1;
va_start(argptr, info);
while ((argname = va_arg(argptr, testInfoArgName)) < ARG_END) {
switch (argname) {
case ARG_QEMU_CAPS:
virQEMUCapsSetVAList(info->qemuCaps, argptr);
break;
case ARG_END:
default:
fprintf(stderr, "Unexpected test info argument");
goto cleanup;
}
}
ret = 0;
cleanup:
va_end(argptr);
return ret;
@ -822,7 +855,8 @@ mymain(void)
}; \
if (testInitQEMUCaps(&info, gic) < 0) \
return EXIT_FAILURE; \
if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST) < 0) \
if (testInfoSetArgs(&info, ARG_QEMU_CAPS, \
__VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \
return EXIT_FAILURE; \
if (virTestRun("QEMU XML-2-ARGV " name, \
testCompareXMLToArgv, &info) < 0) \