External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuxml2argvtest: Rename extraFlags as qemuCaps

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-08-03 09:49:42 +02:00
parent d037d8006f
commit 98c69644a5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/qemuxml2argvtest.c
View File

@ -267,7 +267,7 @@ typedef enum {
static int testCompareXMLToArgvFiles(const char *xml, static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline, const char *cmdline,
virQEMUCapsPtr extraFlags, virQEMUCapsPtr qemuCaps,
const char *migrateURI, const char *migrateURI,
virQemuXML2ArgvTestFlags flags, virQemuXML2ArgvTestFlags flags,
unsigned int parseFlags) unsigned int parseFlags)
@ -314,7 +314,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0) if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0)
goto out; goto out;
virQEMUCapsSetList(extraFlags, virQEMUCapsSetList(qemuCaps,
QEMU_CAPS_NO_ACPI, QEMU_CAPS_NO_ACPI,
QEMU_CAPS_LAST); QEMU_CAPS_LAST);
@ -325,7 +325,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
} }
virQEMUCapsFilterByMachineType(extraFlags, vm->def->os.machine); virQEMUCapsFilterByMachineType(qemuCaps, vm->def->os.machine);
log = virTestLogContentAndReset(); log = virTestLogContentAndReset();
VIR_FREE(log); VIR_FREE(log);
@ -333,7 +333,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (vm->def->os.arch == VIR_ARCH_X86_64 || if (vm->def->os.arch == VIR_ARCH_X86_64 ||
vm->def->os.arch == VIR_ARCH_I686) { vm->def->os.arch == VIR_ARCH_I686) {
virQEMUCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS);
} }
for (i = 0; i < vm->def->nhostdevs; i++) { for (i = 0; i < vm->def->nhostdevs; i++) {
@ -390,7 +390,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
struct testInfo { struct testInfo {
const char *name; const char *name;
virQEMUCapsPtr extraFlags; virQEMUCapsPtr qemuCaps;
const char *migrateFrom; const char *migrateFrom;
int migrateFd; int migrateFd;
unsigned int flags; unsigned int flags;
@ -418,17 +418,17 @@ testCompareXMLToArgvHelper(const void *data)
abs_srcdir, info->name) < 0) abs_srcdir, info->name) < 0)
goto cleanup; goto cleanup;
if (virQEMUCapsGet(info->extraFlags, QEMU_CAPS_MONITOR_JSON)) if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_MONITOR_JSON))
flags |= FLAG_JSON; flags |= FLAG_JSON;
if (virQEMUCapsGet(info->extraFlags, QEMU_CAPS_ENABLE_FIPS)) if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_ENABLE_FIPS))
flags |= FLAG_FIPS; flags |= FLAG_FIPS;
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->name, if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->name,
info->extraFlags) < 0) info->qemuCaps) < 0)
goto cleanup; goto cleanup;
result = testCompareXMLToArgvFiles(xml, args, info->extraFlags, result = testCompareXMLToArgvFiles(xml, args, info->qemuCaps,
migrateURI, flags, info->parseFlags); migrateURI, flags, info->parseFlags);
cleanup: cleanup:
@ -475,13 +475,13 @@ testPrepareExtraFlags(struct testInfo *info,
{ {
int ret = -1; int ret = -1;
if (!(info->extraFlags = virQEMUCapsNew())) if (!(info->qemuCaps = virQEMUCapsNew()))
goto out; goto out;
if (testAddCPUModels(info->extraFlags, skipLegacyCPUs) < 0) if (testAddCPUModels(info->qemuCaps, skipLegacyCPUs) < 0)
goto out; goto out;
if (testQemuCapsSetGIC(info->extraFlags, gic) < 0) if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)
goto out; goto out;
ret = 0; ret = 0;
@ -553,11 +553,11 @@ mymain(void)
}; \ }; \
if (testPrepareExtraFlags(&info, skipLegacyCPUs, gic) < 0) \ if (testPrepareExtraFlags(&info, skipLegacyCPUs, gic) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\ virQEMUCapsSetList(info.qemuCaps, __VA_ARGS__, QEMU_CAPS_LAST); \
if (virTestRun("QEMU XML-2-ARGV " name, \ if (virTestRun("QEMU XML-2-ARGV " name, \
testCompareXMLToArgvHelper, &info) < 0) \ testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \ ret = -1; \
virObjectUnref(info.extraFlags); \ virObjectUnref(info.qemuCaps); \
} while (0) } while (0)
# define DO_TEST(name, ...) \ # define DO_TEST(name, ...) \