External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: Rename testInfo* to testQemuInfo*

Browse Source 
In preparation for moving these bits to a shared place, rename them
to match one of the testutilsqemu.c function prefixes. Rename
info->flags handling too as it will need to be moved

testInfoSetPaths isn't renamed because it will stay local

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-31 11:32:18 -04:00
parent 180bf85c72
commit 4234676a78
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/qemuxml2argvtest.c
View File

@ -294,9 +294,9 @@ typedef enum {
FLAG_FIPS = 1 << 2, FLAG_FIPS = 1 << 2,
FLAG_REAL_CAPS = 1 << 3, FLAG_REAL_CAPS = 1 << 3,
FLAG_SKIP_LEGACY_CPUS = 1 << 4, FLAG_SKIP_LEGACY_CPUS = 1 << 4,
} virQemuXML2ArgvTestFlags; } testQemuInfoFlags;
struct testInfo { struct testQemuInfo {
const char *name; const char *name;
char *infile; char *infile;
char *outfile; char *outfile;
@ -380,7 +380,7 @@ testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
static int static int
testUpdateQEMUCaps(const struct testInfo *info, testUpdateQEMUCaps(const struct testQemuInfo *info,
virDomainObjPtr vm, virDomainObjPtr vm,
virCapsPtr caps) virCapsPtr caps)
{ {
@ -427,7 +427,7 @@ testCheckExclusiveFlags(int flags)
static int static int
testCompareXMLToArgv(const void *data) testCompareXMLToArgv(const void *data)
{ {
struct testInfo *info = (void *) data; struct testQemuInfo *info = (void *) data;
char *migrateURI = NULL; char *migrateURI = NULL;
char *actualargv = NULL; char *actualargv = NULL;
unsigned int flags = info->flags; unsigned int flags = info->flags;
@ -605,14 +605,14 @@ typedef enum {
ARG_CAPS_ARCH, ARG_CAPS_ARCH,
ARG_CAPS_VER, ARG_CAPS_VER,
ARG_END, ARG_END,
} testInfoArgName; } testQemuInfoArgName;
static int static int
testInfoSetArgs(struct testInfo *info, testQemuInfoSetArgs(struct testQemuInfo *info,
virHashTablePtr capslatest, ...) virHashTablePtr capslatest, ...)
{ {
va_list argptr; va_list argptr;
testInfoArgName argname; testQemuInfoArgName argname;
virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr qemuCaps = NULL;
int gic = GIC_NONE; int gic = GIC_NONE;
char *capsarch = NULL; char *capsarch = NULL;
@ -622,7 +622,7 @@ testInfoSetArgs(struct testInfo *info,
int ret = -1; int ret = -1;
va_start(argptr, capslatest); va_start(argptr, capslatest);
argname = va_arg(argptr, testInfoArgName); argname = va_arg(argptr, testQemuInfoArgName);
while (argname != ARG_END) { while (argname != ARG_END) {
switch (argname) { switch (argname) {
case ARG_QEMU_CAPS: case ARG_QEMU_CAPS:
@ -684,7 +684,7 @@ testInfoSetArgs(struct testInfo *info,
goto cleanup; goto cleanup;
} }
argname = va_arg(argptr, testInfoArgName); argname = va_arg(argptr, testQemuInfoArgName);
} }
if (!!capsarch ^ !!capsver) { if (!!capsarch ^ !!capsver) {
@ -740,7 +740,7 @@ testInfoSetArgs(struct testInfo *info,
} }
static void static void
testInfoClear(struct testInfo *info) testQemuInfoClear(struct testQemuInfo *info)
{ {
VIR_FREE(info->infile); VIR_FREE(info->infile);
VIR_FREE(info->outfile); VIR_FREE(info->outfile);
@ -748,7 +748,7 @@ testInfoClear(struct testInfo *info)
} }
static int static int
testInfoSetPaths(struct testInfo *info, testInfoSetPaths(struct testQemuInfo *info,
const char *suffix) const char *suffix)
{ {
if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml",
@ -884,11 +884,11 @@ mymain(void)
*/ */
# define DO_TEST_INTERNAL(_name, _suffix, ...) \ # define DO_TEST_INTERNAL(_name, _suffix, ...) \
do { \ do { \
static struct testInfo info = { \ static struct testQemuInfo info = { \
.name = _name, \ .name = _name, \
}; \ }; \
if (testInfoSetArgs(&info, capslatest, \ if (testQemuInfoSetArgs(&info, capslatest, \
__VA_ARGS__, ARG_END) < 0) \ __VA_ARGS__, ARG_END) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (testInfoSetPaths(&info, _suffix) < 0) { \ if (testInfoSetPaths(&info, _suffix) < 0) { \
VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \ VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \
@ -897,7 +897,7 @@ mymain(void)
if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \ if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \
testCompareXMLToArgv, &info) < 0) \ testCompareXMLToArgv, &info) < 0) \
ret = -1; \ ret = -1; \
testInfoClear(&info); \ testQemuInfoClear(&info); \
} while (0) } while (0)
# define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \ # define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \