NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Reorder functions

Browse Source 
testCompareXMLToArgv will soon need to call a few function which are
defined further in the code. Let's move them up a bit.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-08-03 10:47:00 +02:00
parent 2f37088183
commit 30de7164ef
1 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
tests/qemuxml2argvtest.c
View File

@ -274,6 +274,59 @@ struct testInfo {
unsigned int parseFlags; unsigned int parseFlags;
}; };
static int
testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
{
const char *newModels[] = {
"Opteron_G3", "Opteron_G2", "Opteron_G1",
"Nehalem", "Penryn", "Conroe",
"Haswell-noTSX", "Haswell",
};
const char *legacyModels[] = {
"n270", "athlon", "pentium3", "pentium2", "pentium",
"486", "coreduo", "kvm32", "qemu32", "kvm64",
"core2duo", "phenom", "qemu64",
};
if (virQEMUCapsAddCPUDefinitions(caps, newModels,
ARRAY_CARDINALITY(newModels)) < 0)
return -1;
if (skipLegacy)
return 0;
if (virQEMUCapsAddCPUDefinitions(caps, legacyModels,
ARRAY_CARDINALITY(legacyModels)) < 0)
return -1;
return 0;
}
static int
testPrepareExtraFlags(struct testInfo *info,
bool skipLegacyCPUs,
int gic)
{
int ret = -1;
if (!(info->qemuCaps = virQEMUCapsNew()))
goto cleanup;
if (testAddCPUModels(info->qemuCaps, skipLegacyCPUs) < 0)
goto cleanup;
if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)
goto cleanup;
ret = 0;
cleanup:
return ret;
}
static int static int
testCompareXMLToArgv(const void *data) testCompareXMLToArgv(const void *data)
{ {
@ -424,57 +477,6 @@ testCompareXMLToArgv(const void *data)
} }
static int
testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
{
const char *newModels[] = {
"Opteron_G3", "Opteron_G2", "Opteron_G1",
"Nehalem", "Penryn", "Conroe",
"Haswell-noTSX", "Haswell",
};
const char *legacyModels[] = {
"n270", "athlon", "pentium3", "pentium2", "pentium",
"486", "coreduo", "kvm32", "qemu32", "kvm64",
"core2duo", "phenom", "qemu64",
};
if (virQEMUCapsAddCPUDefinitions(caps, newModels,
ARRAY_CARDINALITY(newModels)) < 0)
return -1;
if (skipLegacy)
return 0;
if (virQEMUCapsAddCPUDefinitions(caps, legacyModels,
ARRAY_CARDINALITY(legacyModels)) < 0)
return -1;
return 0;
}
static int
testPrepareExtraFlags(struct testInfo *info,
bool skipLegacyCPUs,
int gic)
{
int ret = -1;
if (!(info->qemuCaps = virQEMUCapsNew()))
goto cleanup;
if (testAddCPUModels(info->qemuCaps, skipLegacyCPUs) < 0)
goto cleanup;
if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)
goto cleanup;
ret = 0;
cleanup:
return ret;
}
static int static int
mymain(void) mymain(void)
{ {