mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
tests: Drop dirname argument from testQemuCapsIterate()
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:
parent
3fe020a038
commit
45dff4bbfa
@ -221,7 +221,7 @@ mymain(void)
|
||||
if (testQemuDataInit(&data) < 0)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
if (testQemuCapsIterate(data.dataDir, ".replies", doCapsTest, &data) < 0)
|
||||
if (testQemuCapsIterate(".replies", doCapsTest, &data) < 0)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
/*
|
||||
|
@ -212,7 +212,7 @@ mymain(void)
|
||||
if (testQemuDataInit(&data) < 0)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
if (testQemuCapsIterate(data.inputDir, ".xml", doCapsTest, &data) < 0)
|
||||
if (testQemuCapsIterate(".xml", doCapsTest, &data) < 0)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
return (data.ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||
|
@ -903,8 +903,7 @@ testQemuGetLatestCaps(void)
|
||||
|
||||
|
||||
int
|
||||
testQemuCapsIterate(const char *dirname,
|
||||
const char *suffix,
|
||||
testQemuCapsIterate(const char *suffix,
|
||||
testQemuCapsIterateCallback callback,
|
||||
void *opaque)
|
||||
{
|
||||
@ -916,10 +915,10 @@ testQemuCapsIterate(const char *dirname,
|
||||
if (!callback)
|
||||
return 0;
|
||||
|
||||
if (virDirOpen(&dir, dirname) < 0)
|
||||
if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0)
|
||||
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 *base = NULL;
|
||||
char *archName = NULL;
|
||||
|
@ -99,8 +99,7 @@ virHashTablePtr testQemuGetLatestCaps(void);
|
||||
typedef int (*testQemuCapsIterateCallback)(const char *base,
|
||||
const char *archName,
|
||||
void *opaque);
|
||||
int testQemuCapsIterate(const char *dirname,
|
||||
const char *suffix,
|
||||
int testQemuCapsIterate(const char *suffix,
|
||||
testQemuCapsIterateCallback callback,
|
||||
void *opaque);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user