External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Drop dirname argument from testQemuCapsIterate()

Browse Source 
As evidenced by all existing callers, the only directory it makes
sense to use is TEST_QEMU_CAPS_PATH, so let's just bake that into
the function.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-04-16 12:33:14 +02:00
parent 3fe020a038
commit 45dff4bbfa
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemucapabilitiestest.c
View File

@ -221,7 +221,7 @@ mymain(void)
if (testQemuDataInit(&data) < 0) if (testQemuDataInit(&data) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
if (testQemuCapsIterate(data.dataDir, ".replies", doCapsTest, &data) < 0) if (testQemuCapsIterate(".replies", doCapsTest, &data) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
/* /*

2
tests/qemucaps2xmltest.c
View File

@ -212,7 +212,7 @@ mymain(void)
if (testQemuDataInit(&data) < 0) if (testQemuDataInit(&data) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
if (testQemuCapsIterate(data.inputDir, ".xml", doCapsTest, &data) < 0) if (testQemuCapsIterate(".xml", doCapsTest, &data) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
return (data.ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (data.ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;

7
tests/testutilsqemu.c
View File

@ -903,8 +903,7 @@ testQemuGetLatestCaps(void)
int int
testQemuCapsIterate(const char *dirname, testQemuCapsIterate(const char *suffix,
const char *suffix,
testQemuCapsIterateCallback callback, testQemuCapsIterateCallback callback,
void *opaque) void *opaque)
{ {
@ -916,10 +915,10 @@ testQemuCapsIterate(const char *dirname,
if (!callback) if (!callback)
return 0; return 0;
if (virDirOpen(&dir, dirname) < 0) if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0)
goto cleanup; goto cleanup;
while ((rc = virDirRead(dir, &ent, dirname) > 0)) { while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH) > 0)) {
char *tmp = ent->d_name; char *tmp = ent->d_name;
char *base = NULL; char *base = NULL;
char *archName = NULL; char *archName = NULL;

3
tests/testutilsqemu.h
View File

@ -99,8 +99,7 @@ virHashTablePtr testQemuGetLatestCaps(void);
typedef int (*testQemuCapsIterateCallback)(const char *base, typedef int (*testQemuCapsIterateCallback)(const char *base,
const char *archName, const char *archName,
void *opaque); void *opaque);
int testQemuCapsIterate(const char *dirname, int testQemuCapsIterate(const char *suffix,
const char *suffix,
testQemuCapsIterateCallback callback, testQemuCapsIterateCallback callback,
void *opaque); void *opaque);