This will be used later on to choose the modern implementation of the functions we need to mock instead of the default, and broken, one. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/virmock.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/virmock.h b/tests/virmock.h index 914d5141c9..d35b1176fc 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -302,4 +302,17 @@ } \ } while (0) +# define VIR_MOCK_REAL_INIT_VERSIONED(name, version) \ + do { \ + if (real_##name == NULL && \ + !(real_##name = dlvsym(RTLD_NEXT, \ + #name, \ + version))) { \ + fprintf(stderr, "Missing symbol '%s@%s'\n", \ + #name, \ + version); \ + abort(); \ + } \ + } while (0) + #endif /* __VIR_MOCK_H__ */ -- 2.14.3

The latter is a glibc extension that's not available on other operating systems, notably FreeBSD. So far we have worked around the issue through gnulib, but that makes it difficult to use mocking in our test suite, so just drop it in favor of the portable alternative. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/storage/storage_backend_fs.c | 2 +- src/util/virfile.c | 2 +- src/util/virpci.c | 2 +- tests/virstoragetest.c | 10 +++++----- tests/virtestmock.c | 13 ++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9b0fcf92c5..37f02f0712 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -823,7 +823,7 @@ virStorageFileBackendFileGetUniqueIdentifier(virStorageSourcePtr src) virStorageFileBackendFsPrivPtr priv = src->drv->priv; if (!priv->canonpath) { - if (!(priv->canonpath = canonicalize_file_name(src->path))) { + if (!(priv->canonpath = realpath(src->path, NULL))) { virReportSystemError(errno, _("can't canonicalize path '%s'"), src->path); return NULL; diff --git a/src/util/virfile.c b/src/util/virfile.c index e12a584ca1..270906a009 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1597,7 +1597,7 @@ virFileResolveLinkHelper(const char *linkpath, return VIR_STRDUP_QUIET(*resultpath, linkpath) < 0 ? -1 : 0; } - *resultpath = canonicalize_file_name(linkpath); + *resultpath = realpath(linkpath, NULL); return *resultpath == NULL ? -1 : 0; } diff --git a/src/util/virpci.c b/src/util/virpci.c index 23932558e9..1108d2a7c1 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2622,7 +2622,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) return NULL; } - device_path = canonicalize_file_name(device_link); + device_path = realpath(device_link, NULL); if (device_path == NULL) { virReportSystemError(errno, _("Failed to resolve device link '%s'"), diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index b032d8b93f..ff95292698 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -171,7 +171,7 @@ testPrepImages(void) fprintf(stderr, "unable to create directory %s\n", datadir "/dir"); goto cleanup; } - if (!(canondir = canonicalize_file_name(absdir))) { + if (!(canondir = realpath(absdir, NULL))) { virReportOOMError(); goto cleanup; } @@ -186,7 +186,7 @@ testPrepImages(void) fprintf(stderr, "unable to create raw file\n"); goto cleanup; } - if (!(canonraw = canonicalize_file_name(absraw))) { + if (!(canonraw = realpath(absraw, NULL))) { virReportOOMError(); goto cleanup; } @@ -206,7 +206,7 @@ testPrepImages(void) "-F", "raw", "-b", "raw", "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) goto skip; - if (!(canonqcow2 = canonicalize_file_name(absqcow2))) { + if (!(canonqcow2 = realpath(absqcow2, NULL))) { virReportOOMError(); goto cleanup; } @@ -220,7 +220,7 @@ testPrepImages(void) virCommandAddArg(cmd, "wrap"); if (virCommandRun(cmd, NULL) < 0) goto skip; - if (!(canonwrap = canonicalize_file_name(abswrap))) { + if (!(canonwrap = realpath(abswrap, NULL))) { virReportOOMError(); goto cleanup; } @@ -233,7 +233,7 @@ testPrepImages(void) virCommandAddArg(cmd, "qed"); if (virCommandRun(cmd, NULL) < 0) goto skip; - if (!(canonqed = canonicalize_file_name(absqed))) { + if (!(canonqed = realpath(absqed, NULL))) { virReportOOMError(); goto cleanup; } diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 688945d805..9dcff1bd75 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -133,12 +133,11 @@ checkPath(const char *path) virAsprintfQuiet(&relPath, "./%s", path) < 0) goto error; - /* Le sigh. Both canonicalize_file_name() and realpath() - * expect @path to exist otherwise they return an error. So - * if we are called over an non-existent file, this could - * return an error. In that case do our best and hope we will - * catch possible error. */ - if ((fullPath = canonicalize_file_name(relPath ? relPath : path))) { + /* Le sigh. realpath() expects @path to exist, otherwise it will + * return an error. So if we are called over an non-existent file, + * this could return an error. In that case do our best and hope we + * will catch possible errors. */ + if ((fullPath = realpath(relPath ? relPath : path, NULL))) { path = fullPath; } else { /* Yeah, our worst nightmares just became true. Path does @@ -148,7 +147,7 @@ checkPath(const char *path) virFileRemoveLastComponent(crippledPath); - if ((fullPath = canonicalize_file_name(crippledPath))) + if ((fullPath = realpath(crippledPath, NULL))) path = fullPath; } -- 2.14.3

We're no longer using canonicalize_file_name(), so we have no use for the gnulib module any more. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- bootstrap.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index 9559922fce..fb56872c4d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -29,7 +29,6 @@ c-ctype c-strcase c-strcasestr calloc-posix -canonicalize-lgpl chown clock-time close -- 2.14.3

Clang complains about it: virfilewrapper.c:270:27: error: second argument to 'va_arg' is of promotable type 'mode_t' (aka 'unsigned short'); this va_arg has undefined behavior because arguments will be promoted to 'int' [-Werror,-Wvarargs] mode = va_arg(ap, mode_t); ^~~~~~ The issue was raised[1] when the patch was posted, but apparently not acted upon. Implement the suggested fix. [1] https://www.redhat.com/archives/libvir-list/2017-October/msg00127.html Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/virpcimock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 001b320683..915327e91e 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -994,11 +994,11 @@ open(const char *path, int flags, ...) if (flags & O_CREAT) { va_list ap; - mode_t mode; + int mode; va_start(ap, flags); - mode = va_arg(ap, mode_t); + mode = va_arg(ap, int); va_end(ap); - ret = real_open(newpath ? newpath : path, flags, mode); + ret = real_open(newpath ? newpath : path, flags, (mode_t) mode); } else { ret = real_open(newpath ? newpath : path, flags); } -- 2.14.3

While the current amount of mocking works just fine on most of our target platforms, it somehow causes issues when using Clang on FreeBSD. Work around the issue by mocking a couple more functions. It's not pretty, but it makes qemuxml2argvtest pass on FreeBSD at long last. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- If anyone can figure out a better way to make this work, please speak up. This is the sanest I've been able to come up with, and not for lack of trying. tests/qemuxml2argvmock.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index adab5c9111..6d78063f00 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -55,25 +55,45 @@ time_t time(time_t *t) return ret; } +bool +virNumaIsAvailable(void) +{ + return true; +} + int virNumaGetMaxNode(void) { - const int maxnodesNum = 7; - - return maxnodesNum; + return 7; } -#if WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET -/* - * In case libvirt is compiled with full NUMA support, we need to mock - * this function in order to fake what numa nodes are available. - */ +/* We shouldn't need to mock virNumaNodeIsAvailable() and *definitely* not + * virNumaNodesetIsAvailable(), but it seems to be the only way to get + * mocking to work with Clang on FreeBSD, so keep these duplicates around + * until we figure out a cleaner solution */ bool virNumaNodeIsAvailable(int node) { return node >= 0 && node <= virNumaGetMaxNode(); } -#endif /* WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET */ + +bool +virNumaNodesetIsAvailable(virBitmapPtr nodeset) +{ + ssize_t bit = -1; + + if (!nodeset) + return true; + + while ((bit = virBitmapNextSetBit(nodeset, bit)) >= 0) { + if (virNumaNodeIsAvailable(bit)) + continue; + + return false; + } + + return true; +} char * virTPMCreateCancelPath(const char *devpath) -- 2.14.3