We initially claimed to only support the most recent macOS release, which is currently 10.15. Our Travis CI, however, is validating 10.14.4 / XCode 10.3. For almost all of our other platforms, we support multiple releases to some degree. This change brings macOS in line with other long life distros, covering the most recent & most recent but one for a 2 year overlap. With this docs change our CI is now actually testing our minimum version. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- docs/platforms.html.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/platforms.html.in b/docs/platforms.html.in index a037074e1f..5c90f1dd7a 100644 --- a/docs/platforms.html.in +++ b/docs/platforms.html.in @@ -74,8 +74,17 @@ <h3>macOS</h3> <p> - The project supports building with the current version of macOS, - with the current homebrew package set available. + The project aims to support the most recent major version + at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <p> + Note that to compile libvirt will require extra packages + to be made available on the macOS host. It is recommended + to use <a href="https://brew.sh/">HomeBrew</a> since this + is what libvirt CI tests with, however, <a herf="https://www.macports.org/">MacPorts</a> + is an alternative option that is likely to work. </p> <h3>FreeBSD</h3> -- 2.24.1

When using GNULIB with Winsock, libvirt will never see the normal HANDLE objects, instead GNULIB guarantees that libvirt gets a C runtime file descriptor. The GNULIB poll impl also expects to get C runtime file descriptors rather than HANDLE objects. Document this behaviour so that it is clear to applications providing event loop implementations if they need Windows portability. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/syntax-check.mk | 2 +- include/libvirt/libvirt-event.h | 4 ++++ src/util/virevent.c | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 19a11ce348..8de82e9872 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2238,7 +2238,7 @@ exclude_file_name_regexp--sc_prohibit_strdup = \ ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c|tests/commandhelper\.c|tools/nss/libvirt_nss_(leases|macs)\.c$$) exclude_file_name_regexp--sc_prohibit_close = \ - (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/(vir.+mock\.c|commandhelper\.c|qemusecuritymock\.c)|tools/nss/libvirt_nss_(leases|macs)\.c)$$) + (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/vir(file|event)\.c|src/libvirt-stream\.c|tests/(vir.+mock\.c|commandhelper\.c|qemusecuritymock\.c)|tools/nss/libvirt_nss_(leases|macs)\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ (^tests/(virhostcpu|virpcitest)data/|docs/js/.*\.js|docs/fonts/.*\.woff|\.diff|tests/virconfdata/no-newline\.conf$$) diff --git a/include/libvirt/libvirt-event.h b/include/libvirt/libvirt-event.h index 734dbdcbc1..facdc3a3ec 100644 --- a/include/libvirt/libvirt-event.h +++ b/include/libvirt/libvirt-event.h @@ -67,6 +67,10 @@ typedef void (*virEventHandleCallback)(int watch, int fd, int events, void *opaq * listen for specific events. The same file handle can be registered * multiple times provided the requested event sets are non-overlapping * + * @fd will always be a C runtime file descriptor. On Windows + * the _get_osfhandle() method can be used if a HANDLE is required + * instead. + * * If the opaque user data requires free'ing when the handle * is unregistered, then a 2nd callback can be supplied for * this purpose. This callback needs to be invoked from a clean stack. diff --git a/src/util/virevent.c b/src/util/virevent.c index f6c797724e..fd5d8f5bf1 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -60,6 +60,13 @@ static virEventRemoveTimeoutFunc removeTimeoutImpl; * requires that an event loop has previously been registered with * virEventRegisterImpl() or virEventRegisterDefaultImpl(). * + * @fd must always always be a C runtime file descriptor. On Windows + * if the caller only has a HANDLE, the _open_osfhandle() method can + * be used to open an associated C runtime file descriptor for use + * with this API. After opening a runtime file descriptor, CloseHandle() + * must not be used, instead close() will close the runtime file + * descriptor and its original associated HANDLE. + * * Returns -1 if the file handle cannot be registered, otherwise a handle * watch number to be used for updating and unregistering for events. */ -- 2.24.1

Eliminate direct use of normal setenv/unsetenv calls in favour of GLib's wrapper. This eliminates two gnulib modules Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/security/virt-aa-helper.c | 4 +-- src/util/virsystemd.c | 4 +-- src/vbox/vbox_XPCOMCGlue.c | 4 +-- tests/libxlxml2domconfigtest.c | 4 +-- tests/lxcxml2xmltest.c | 2 +- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemusecuritytest.c | 4 +-- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvtest.c | 24 ++++++------- tests/qemuxml2xmltest.c | 4 +-- tests/securityselinuxhelper.c | 4 +-- tests/testutils.c | 8 ++--- tests/testutils.h | 4 +-- tests/testutilsqemu.c | 4 +-- tests/vircgrouptest.c | 16 ++++----- tests/virfiletest.c | 4 +-- tests/virhostdevtest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcitest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virsystemdtest.c | 46 ++++++++++++------------- tests/virtimetest.c | 4 +-- tools/virt-login-shell-helper.c | 12 +++---- 28 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f623ff965f..feb03b0aa9 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1447,11 +1447,11 @@ main(int argc, char **argv) /* clear the environment */ environ = NULL; - if (setenv("PATH", "/sbin:/usr/sbin", 1) != 0) + if (g_setenv("PATH", "/sbin:/usr/sbin", 1) == FALSE) vah_error(ctl, 1, _("could not set PATH")); /* ensure the traditional IFS setting */ - if (setenv("IFS", " \t\n", 1) != 0) + if (g_setenv("IFS", " \t\n", 1) == FALSE) vah_error(ctl, 1, _("could not set IFS")); if (!(progname = strrchr(argv[0], '/'))) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 2acb54d41e..96d43e5440 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -854,8 +854,8 @@ virSystemdGetListenFDs(void) return 0; } - unsetenv("LISTEN_PID"); - unsetenv("LISTEN_FDS"); + g_unsetenv("LISTEN_PID"); + g_unsetenv("LISTEN_FDS"); VIR_DEBUG("Got %u file descriptors", nfds); diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index f48a78a923..4151d20909 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -104,9 +104,9 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, */ if (setAppHome) { if (dir != NULL) { - setenv("VBOX_APP_HOME", dir, 1 /* always override */); + g_setenv("VBOX_APP_HOME", dir, 1 /* always override */); } else { - unsetenv("VBOX_APP_HOME"); + g_unsetenv("VBOX_APP_HOME"); } } diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 35f0ce8f7d..f3b8c8bffd 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -160,8 +160,8 @@ mymain(void) * results. In order to detect things that just work by a blind * chance, we need to set an virtual timezone that no libvirt * developer resides in. */ - if (setenv("TZ", "VIR00:30", 1) < 0) { - perror("setenv"); + if (g_setenv("TZ", "VIR00:30", 1) == FALSE) { + perror("g_setenv"); return EXIT_FAILURE; } diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 7b05f7d016..f7457e719a 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -75,7 +75,7 @@ mymain(void) /* Unset or set all envvars here that are copied in lxcdBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); + g_setenv("PATH", "/bin", 1); DO_TEST("systemd"); DO_TEST("hostdev"); diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 4d6904a592..b27c0e362a 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -175,7 +175,7 @@ mymain(void) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); + g_setenv("PATH", "/bin", 1); /* Test a normal user redefine */ DO_TEST_OUT("redefine", 0); diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index 6bff5d14f5..ebdfea7eca 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -160,7 +160,7 @@ mymain(void) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); + g_setenv("PATH", "/bin", 1); DO_TEST_OUT("all_parameters", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", TEST_INTERNAL); diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 906d594ace..dffe47c386 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -70,7 +70,7 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) fakehome = g_strdup(abs_srcdir "/qemufirmwaredata/home/user/.config"); - setenv("XDG_CONFIG_HOME", fakehome, 1); + g_setenv("XDG_CONFIG_HOME", fakehome, 1); if (qemuFirmwareFetchConfigs(&fwList, false) < 0) return -1; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 6ab2d9b0f4..e7fe8da0b7 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -603,7 +603,7 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 7de0d72410..455306b0c2 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -67,7 +67,7 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); if (qemuTestDriverInit(&driver) < 0) { VIR_FREE(fakerootdir); diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 380c3fed8c..bf34eb2f71 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -111,7 +111,7 @@ testDomain(const void *opaque) /* Mocking is enabled only when this env variable is set. * See mock code for explanation. */ - if (setenv(ENVVAR, "1", 0) < 0) + if (g_setenv(ENVVAR, "1", 0) == FALSE) return -1; if (qemuSecuritySetAllLabel(data->driver, vm, NULL, false) < 0) @@ -124,7 +124,7 @@ testDomain(const void *opaque) ret = 0; cleanup: - unsetenv(ENVVAR); + g_unsetenv(ENVVAR); freePaths(); return ret; } diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index cc1e523841..6ff7923099 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -68,7 +68,7 @@ testVUPrecedence(const void *opaque G_GNUC_UNUSED) fakehome = g_strdup(abs_srcdir "/qemuvhostuserdata/home/user/.config"); - setenv("XDG_CONFIG_HOME", fakehome, 1); + g_setenv("XDG_CONFIG_HOME", fakehome, 1); if (qemuVhostUserFetchConfigs(&vuList, false) < 0) return -1; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bfbed5c31d..cc34d0caee 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -618,15 +618,15 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); /* Set the timezone because we are mocking the time() function. * If we don't do that, then localtime() may return unpredictable * results. In order to detect things that just work by a blind * chance, we need to set an virtual timezone that no libvirt * developer resides in. */ - if (setenv("TZ", "VIR00:30", 1) < 0) { - perror("setenv"); + if (g_setenv("TZ", "VIR00:30", 1) == FALSE) { + perror("g_setenv"); return EXIT_FAILURE; } @@ -797,15 +797,15 @@ mymain(void) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); - setenv("USER", "test", 1); - setenv("LOGNAME", "test", 1); - setenv("HOME", "/home/test", 1); - unsetenv("TMPDIR"); - unsetenv("LD_PRELOAD"); - unsetenv("LD_LIBRARY_PATH"); - unsetenv("QEMU_AUDIO_DRV"); - unsetenv("SDL_AUDIODRIVER"); + g_setenv("PATH", "/bin", 1); + g_setenv("USER", "test", 1); + g_setenv("LOGNAME", "test", 1); + g_setenv("HOME", "/home/test", 1); + g_unsetenv("TMPDIR"); + g_unsetenv("LD_PRELOAD"); + g_unsetenv("LD_LIBRARY_PATH"); + g_unsetenv("QEMU_AUDIO_DRV"); + g_unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", NONE); DO_TEST("minimal-sandbox", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 34c2ec8c5f..6463cf81e2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -147,7 +147,7 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); /* Required for tpm-emulator tests */ @@ -234,7 +234,7 @@ mymain(void) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); + g_setenv("PATH", "/bin", 1); DO_TEST("minimal", NONE); DO_TEST_CAPS_LATEST("genid"); diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 8b90ddada9..50d4f40dc5 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -145,7 +145,7 @@ int setcon_raw(const char *context) errno = EINVAL; return -1; } - return setenv("FAKE_SELINUX_CONTEXT", context, 1); + return g_setenv("FAKE_SELINUX_CONTEXT", context, 1); } int setcon(const char *context) @@ -224,7 +224,7 @@ int security_disable(void) return -1; } - return setenv("FAKE_SELINUX_DISABLED", "1", 1); + return g_setenv("FAKE_SELINUX_DISABLED", "1", 1); } int security_getenforce(void) diff --git a/tests/testutils.c b/tests/testutils.c index 6efc877d0c..5bc108a6c3 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -127,7 +127,7 @@ virTestRun(const char *title, /* Some test are fragile about environ settings. If that's * the case, don't poison it. */ if (getenv("VIR_TEST_MOCK_PROGNAME")) - setenv("VIR_TEST_MOCK_TESTNAME", title, 1); + g_setenv("VIR_TEST_MOCK_TESTNAME", title, 1); if (testCounter == 0 && !virTestGetVerbose()) fprintf(stderr, " "); @@ -176,7 +176,7 @@ virTestRun(const char *title, fprintf(stderr, "!"); } - unsetenv("VIR_TEST_MOCK_TESTNAME"); + g_unsetenv("VIR_TEST_MOCK_TESTNAME"); return ret; } @@ -836,7 +836,7 @@ virTestSetEnvPath(void) } if (new_path && - setenv("PATH", new_path, 1) < 0) + g_setenv("PATH", new_path, 1) < 0) goto cleanup; ret = 0; @@ -870,7 +870,7 @@ int virTestMain(int argc, if (STRPREFIX(progname, "lt-")) progname += 3; - setenv("VIR_TEST_MOCK_PROGNAME", progname, 1); + g_setenv("VIR_TEST_MOCK_PROGNAME", progname, 1); virFileActivateDirOverrideForProg(argv[0]); diff --git a/tests/testutils.h b/tests/testutils.h index dcb7cc4c04..74785b7fb8 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -121,7 +121,7 @@ int virTestMain(int argc, #ifdef __APPLE__ # define PRELOAD_VAR "DYLD_INSERT_LIBRARIES" # define FORCE_FLAT_NAMESPACE \ - setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1); + g_setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1); # define MOCK_EXT ".dylib" #else # define PRELOAD_VAR "LD_PRELOAD" @@ -143,7 +143,7 @@ int virTestMain(int argc, } else { \ newenv = g_strdup_printf("%s:%s", lib, preload); \ } \ - setenv(PRELOAD_VAR, newenv, 1); \ + g_setenv(PRELOAD_VAR, newenv, 1); \ FORCE_FLAT_NAMESPACE \ execv(argv[0], argv); \ } \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index d077f8cd2d..4ca72446da 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -260,10 +260,10 @@ qemuTestSetHostCPU(virQEMUDriverPtr driver, cpu = cpuPower8; } - unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); + g_unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); if (cpu) { if (cpu->model) - setenv("VIR_TEST_MOCK_FAKE_HOST_CPU", cpu->model, 1); + g_setenv("VIR_TEST_MOCK_FAKE_HOST_CPU", cpu->model, 1); } if (driver) { if (cpu) diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 5e9f619a84..cde07518ef 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -187,7 +187,7 @@ testCgroupDetectMounts(const void *args) virBuffer buf = VIR_BUFFER_INITIALIZER; size_t i; - setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); + g_setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); parsed = g_strdup_printf("%s/vircgroupdata/%s.parsed", abs_srcdir, data->file); @@ -215,7 +215,7 @@ testCgroupDetectMounts(const void *args) result = 0; cleanup: - unsetenv("VIR_CGROUP_MOCK_FILENAME"); + g_unsetenv("VIR_CGROUP_MOCK_FILENAME"); VIR_FREE(parsed); virCgroupFree(&group); virBufferFreeAndReset(&buf); @@ -994,13 +994,13 @@ initFakeFS(const char *mode, abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); if (mode) - setenv("VIR_CGROUP_MOCK_MODE", mode, 1); + g_setenv("VIR_CGROUP_MOCK_MODE", mode, 1); if (filename) - setenv("VIR_CGROUP_MOCK_FILENAME", filename, 1); + g_setenv("VIR_CGROUP_MOCK_FILENAME", filename, 1); return fakerootdir; } @@ -1012,9 +1012,9 @@ cleanupFakeFS(char *fakerootdir) virFileDeleteTree(fakerootdir); VIR_FREE(fakerootdir); - unsetenv("LIBVIRT_FAKE_ROOT_DIR"); - unsetenv("VIR_CGROUP_MOCK_MODE"); - unsetenv("VIR_CGROUP_MOCK_FILENAME"); + g_unsetenv("LIBVIRT_FAKE_ROOT_DIR"); + g_unsetenv("VIR_CGROUP_MOCK_MODE"); + g_unsetenv("VIR_CGROUP_MOCK_FILENAME"); } static int diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 781c640e2b..4d69df5b56 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -327,7 +327,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) mtabFile = g_strdup_printf(abs_srcdir "/virfiledata/%s", data->mtabFile); - if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) { + if (g_setenv("LIBVIRT_MTAB", mtabFile, 1) == FALSE) { fprintf(stderr, "Unable to set env variable\n"); goto cleanup; } @@ -343,7 +343,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) ret = 0; cleanup: VIR_FREE(mtabFile); - unsetenv("LIBVIRT_MTAB"); + g_unsetenv("LIBVIRT_MTAB"); return ret; #endif } diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index ffd7ce1aab..1c648f466a 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -603,7 +603,7 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); # define DO_TEST(fnc) \ do { \ diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 6c01336420..2210c8cc91 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -111,7 +111,7 @@ mymain(void) { int ret = 0; - setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); testTLSInit(KEYFILE); diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 997cf5a372..59924c7037 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -239,7 +239,7 @@ mymain(void) { int ret = 0; - setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); testTLSInit(KEYFILE); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 68fe9c8345..922f241d54 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -334,7 +334,7 @@ mymain(void) abort(); } - setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); # define DO_TEST(fnc) \ do { \ diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 8e62fc4519..4e50cd74b3 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -171,7 +171,7 @@ mymain(void) if (virTestRun("Test alloc reuse", testAllocReuse, NULL) < 0) ret = -1; - setenv("LIBVIRT_TEST_IPV4ONLY", "really", 1); + g_setenv("LIBVIRT_TEST_IPV4ONLY", "really", 1); if (virTestRun("Test IPv4-only alloc all", testAllocAll, NULL) < 0) ret = -1; diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index b5624241bb..583d7efd65 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -236,7 +236,7 @@ static int testCreateNoSystemd(const void *opaque G_GNUC_UNUSED) }; int rv; - setenv("FAIL_NO_SERVICE", "1", 1); + g_setenv("FAIL_NO_SERVICE", "1", 1); if ((rv = virSystemdCreateMachine("demo", "qemu", @@ -246,11 +246,11 @@ static int testCreateNoSystemd(const void *opaque G_GNUC_UNUSED) false, 0, NULL, NULL, 0)) == 0) { - unsetenv("FAIL_NO_SERVICE"); + g_unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; } - unsetenv("FAIL_NO_SERVICE"); + g_unsetenv("FAIL_NO_SERVICE"); if (rv != -2) { fprintf(stderr, "%s", "Unexpected create machine error\n"); @@ -270,7 +270,7 @@ static int testCreateSystemdNotRunning(const void *opaque G_GNUC_UNUSED) }; int rv; - setenv("FAIL_NOT_REGISTERED", "1", 1); + g_setenv("FAIL_NOT_REGISTERED", "1", 1); if ((rv = virSystemdCreateMachine("demo", "qemu", @@ -280,11 +280,11 @@ static int testCreateSystemdNotRunning(const void *opaque G_GNUC_UNUSED) false, 0, NULL, NULL, 0)) == 0) { - unsetenv("FAIL_NOT_REGISTERED"); + g_unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; } - unsetenv("FAIL_NOT_REGISTERED"); + g_unsetenv("FAIL_NOT_REGISTERED"); if (rv != -2) { fprintf(stderr, "%s", "Unexpected create machine error\n"); @@ -304,7 +304,7 @@ static int testCreateBadSystemd(const void *opaque G_GNUC_UNUSED) }; int rv; - setenv("FAIL_BAD_SERVICE", "1", 1); + g_setenv("FAIL_BAD_SERVICE", "1", 1); if ((rv = virSystemdCreateMachine("demo", "qemu", @@ -314,11 +314,11 @@ static int testCreateBadSystemd(const void *opaque G_GNUC_UNUSED) false, 0, NULL, NULL, 0)) == 0) { - unsetenv("FAIL_BAD_SERVICE"); + g_unsetenv("FAIL_BAD_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; } - unsetenv("FAIL_BAD_SERVICE"); + g_unsetenv("FAIL_BAD_SERVICE"); if (rv != -1) { fprintf(stderr, "%s", "Unexpected create machine error\n"); @@ -445,7 +445,7 @@ static int testPMSupportHelper(const void *opaque) const struct testPMSupportData *data = opaque; for (i = 0; i < 4; i++) { - setenv("RESULT_SUPPORT", results[i], 1); + g_setenv("RESULT_SUPPORT", results[i], 1); if ((rv = data->tested(&result)) < 0) { fprintf(stderr, "%s", "Unexpected canSuspend error\n"); return -1; @@ -455,12 +455,12 @@ static int testPMSupportHelper(const void *opaque) fprintf(stderr, "Unexpected result for answer '%s'\n", results[i]); goto error; } - unsetenv("RESULT_SUPPORT"); + g_unsetenv("RESULT_SUPPORT"); } return 0; error: - unsetenv("RESULT_SUPPORT"); + g_unsetenv("RESULT_SUPPORT"); return -1; } @@ -470,14 +470,14 @@ static int testPMSupportHelperNoSystemd(const void *opaque) bool result; const struct testPMSupportData *data = opaque; - setenv("FAIL_NO_SERVICE", "1", 1); + g_setenv("FAIL_NO_SERVICE", "1", 1); if ((rv = data->tested(&result)) == 0) { - unsetenv("FAIL_NO_SERVICE"); + g_unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected canSuspend success\n"); return -1; } - unsetenv("FAIL_NO_SERVICE"); + g_unsetenv("FAIL_NO_SERVICE"); if (rv != -2) { fprintf(stderr, "%s", "Unexpected canSuspend error\n"); @@ -493,14 +493,14 @@ static int testPMSupportSystemdNotRunning(const void *opaque) bool result; const struct testPMSupportData *data = opaque; - setenv("FAIL_NOT_REGISTERED", "1", 1); + g_setenv("FAIL_NOT_REGISTERED", "1", 1); if ((rv = data->tested(&result)) == 0) { - unsetenv("FAIL_NOT_REGISTERED"); + g_unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected canSuspend success\n"); return -1; } - unsetenv("FAIL_NOT_REGISTERED"); + g_unsetenv("FAIL_NOT_REGISTERED"); if (rv != -2) { fprintf(stderr, "%s", "Unexpected canSuspend error\n"); @@ -567,13 +567,13 @@ testActivation(bool useNames) g_snprintf(nfdstr, sizeof(nfdstr), "%zu", 1 + nsockIP); g_snprintf(pidstr, sizeof(pidstr), "%lld", (long long)getpid()); - setenv("LISTEN_FDS", nfdstr, 1); - setenv("LISTEN_PID", pidstr, 1); + g_setenv("LISTEN_FDS", nfdstr, 1); + g_setenv("LISTEN_PID", pidstr, 1); if (useNames) - setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), 1); + g_setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), 1); else - unsetenv("LISTEN_FDNAMES"); + g_unsetenv("LISTEN_FDNAMES"); map[0].name = "demo-unix.socket"; map[0].family = AF_UNIX; @@ -640,7 +640,7 @@ testActivationEmpty(const void *opaque G_GNUC_UNUSED) { virSystemdActivationPtr act; - unsetenv("LISTEN_FDS"); + g_unsetenv("LISTEN_FDS"); if (virSystemdGetActivation(NULL, 0, &act) < 0) return -1; diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 1eb321858b..4860bf758f 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -79,8 +79,8 @@ testTimeLocalOffset(const void *args) const testTimeLocalOffsetData *data = args; long actual; - if (setenv("TZ", data->zone, 1) < 0) { - perror("setenv"); + if (g_setenv("TZ", data->zone, 1) == FALSE) { + perror("g_setenv"); return -1; } tzset(); diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c index ace8733968..87735833d9 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -382,13 +382,13 @@ main(int argc, char **argv) } clearenv(); - setenv("PATH", "/bin:/usr/bin", 1); - setenv("SHELL", shcmd, 1); - setenv("USER", name, 1); - setenv("LOGNAME", name, 1); - setenv("HOME", homedir, 1); + g_setenv("PATH", "/bin:/usr/bin", 1); + g_setenv("SHELL", shcmd, 1); + g_setenv("USER", name, 1); + g_setenv("LOGNAME", name, 1); + g_setenv("HOME", homedir, 1); if (term) - setenv("TERM", term, 1); + g_setenv("TERM", term, 1); if (execv(shcmd, (char *const*) shargv) < 0) { virReportSystemError(errno, _("Unable to exec shell %s"), -- 2.24.1

The g_fsync() API provides the same Windows portability as GNULIB does for fsync(). Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virfile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 9514dfd75c..9a71d13d57 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1772,7 +1772,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, goto cleanup; } - ignore_value(fsync(lfd)); + ignore_value(g_fsync(lfd)); cleanup: VIR_FREE(lbuf); diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f2d8810813..c1a6b44f4b 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -384,7 +384,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, } } - if (fsync(fd) < 0) { + if (g_fsync(fd) < 0) { ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); diff --git a/src/util/virfile.c b/src/util/virfile.c index 0f0d607c59..1784895575 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -519,7 +519,7 @@ virFileRewrite(const char *path, goto cleanup; } - if (fsync(fd) < 0) { + if (g_fsync(fd) < 0) { virReportSystemError(errno, _("cannot sync file '%s'"), newfile); goto cleanup; -- 2.24.1

The g_pattern_match function_simple is an acceptably close approximation of fnmatch for libvirt's needs. In contrast to fnmatch(), the '/' character can be matched by the wildcards, there are no '[...]' character ranges and '*' and '?' can not be escaped to include them literally in a pattern. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/qemu/qemu_firmware.c | 4 +--- src/remote/libvirtd.conf.in | 8 ++++++-- src/rpc/virnetsaslcontext.c | 11 +---------- src/rpc/virnettlscontext.c | 10 +--------- src/util/virlog.c | 5 ++--- tests/virconfdata/libvirtd.conf | 8 ++++++-- tests/virconfdata/libvirtd.out | 8 ++++++-- tools/virt-login-shell-helper.c | 5 ++--- 8 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index f62ce90ac9..6a76d355f5 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -20,8 +20,6 @@ #include <config.h> -#include <fnmatch.h> - #include "qemu_firmware.h" #include "qemu_interop_config.h" #include "configmake.h" @@ -921,7 +919,7 @@ qemuFirmwareMatchesMachineArch(const qemuFirmware *fw, continue; for (j = 0; j < fw->targets[i]->nmachines; j++) { - if (fnmatch(fw->targets[i]->machines[j], machine, 0) == 0) + if (g_pattern_match_simple(fw->targets[i]->machines[j], machine)) return true; } } diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index f984ce0478..34741183cc 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -262,7 +262,9 @@ # # "C=GB,ST=London,L=London,O=Red Hat,CN=*" # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards: +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks @@ -288,7 +290,9 @@ # # &quot;*(a)EXAMPLE.COM&quot; # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards. +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 01ff41b778..e7ed8f4390 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -20,8 +20,6 @@ #include <config.h> -#include <fnmatch.h> - #include "virnetsaslcontext.h" #include "virnetmessage.h" @@ -155,17 +153,10 @@ int virNetSASLContextCheckIdentity(virNetSASLContextPtr ctxt, } while (*wildcards) { - int rv = fnmatch(*wildcards, identity, 0); - if (rv == 0) { + if (g_pattern_match_simple(*wildcards, identity)) { ret = 1; goto cleanup; /* Successful match */ } - if (rv != FNM_NOMATCH) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed TLS whitelist regular expression '%s'"), - *wildcards); - goto cleanup; - } wildcards++; } diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 08944f6771..44f0dfce77 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -21,7 +21,6 @@ #include <config.h> #include <unistd.h> -#include <fnmatch.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -361,15 +360,8 @@ virNetTLSContextCheckCertDNWhitelist(const char *dname, const char *const*wildcards) { while (*wildcards) { - int ret = fnmatch(*wildcards, dname, 0); - if (ret == 0) /* Successful match */ + if (g_pattern_match_simple(*wildcards, dname)) return 1; - if (ret != FNM_NOMATCH) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed TLS whitelist regular expression '%s'"), - *wildcards); - return -1; - } wildcards++; } diff --git a/src/util/virlog.c b/src/util/virlog.c index 6bae56e2e3..aa98024e1c 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -36,7 +36,6 @@ #if HAVE_SYS_UN_H # include <sys/un.h> #endif -#include <fnmatch.h> #include "virerror.h" #include "virlog.h" @@ -488,7 +487,7 @@ virLogSourceUpdate(virLogSourcePtr source) size_t i; for (i = 0; i < virLogNbFilters; i++) { - if (fnmatch(virLogFilters[i]->match, source->name, 0) == 0) { + if (g_pattern_match_simple(virLogFilters[i]->match, source->name)) { priority = virLogFilters[i]->priority; break; } @@ -1338,7 +1337,7 @@ virLogFilterNew(const char *match, return NULL; } - /* We must treat 'foo' as equiv to '*foo*' for fnmatch + /* We must treat 'foo' as equiv to '*foo*' for g_pattern_match * todo substring matches, so add 2 extra bytes */ if (VIR_ALLOC_N_QUIET(mdup, mlen + 3) < 0) diff --git a/tests/virconfdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf index 602aa08d92..791d6c972b 100644 --- a/tests/virconfdata/libvirtd.conf +++ b/tests/virconfdata/libvirtd.conf @@ -183,7 +183,9 @@ tls_no_verify_certificate = 1 # # "C=GB,ST=London,L=London,O=Red Hat,CN=*" # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards. +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks @@ -200,7 +202,9 @@ tls_allowed_dn_list = ["DN1", "DN2"] # # &quot;*(a)EXAMPLE.COM&quot; # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards. +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks diff --git a/tests/virconfdata/libvirtd.out b/tests/virconfdata/libvirtd.out index d3f2bd20a7..cfdd23fd21 100644 --- a/tests/virconfdata/libvirtd.out +++ b/tests/virconfdata/libvirtd.out @@ -147,7 +147,9 @@ tls_no_verify_certificate = 1 # # "C=GB,ST=London,L=London,O=Red Hat,CN=*" # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards. +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks @@ -162,7 +164,9 @@ tls_allowed_dn_list = [ "DN1", "DN2" ] # # &quot;*(a)EXAMPLE.COM&quot; # -# See the POSIX fnmatch function for the format of the wildcards. +# See the g_pattern_match function for the format of the wildcards. +# +# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.... # # NB If this is an empty list, no client can connect, so comment out # entirely rather than using empty list to disable these checks diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c index 87735833d9..e3aefc2c06 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -19,7 +19,6 @@ */ #include <config.h> -#include <fnmatch.h> #include <getopt.h> #include <signal.h> #include <stdarg.h> @@ -67,14 +66,14 @@ static int virLoginShellAllowedUser(virConfPtr conf, for (i = 0; i < ngroups; i++) { if (!(gname = virGetGroupName(groups[i]))) continue; - if (fnmatch(entry, gname, 0) == 0) { + if (g_pattern_match_simple(entry, gname)) { ret = 0; goto cleanup; } VIR_FREE(gname); } } else { - if (fnmatch(entry, name, 0) == 0) { + if (g_pattern_match_simple(entry, name)) { ret = 0; goto cleanup; } -- 2.24.1

The last_component() method is a GNULIB custom function that returns a pointer to the base name in the path. This is similar to g_path_get_basename() but without the malloc. The extra malloc is no trouble for libvirt's needs so we can use g_path_get_basename(). Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/conf/node_device_conf.c | 2 +- src/node_device/node_device_udev.c | 12 ++++++------ src/rpc/virnetsocket.c | 5 ++--- src/storage/storage_backend_disk.c | 9 ++++----- src/storage/storage_util.c | 3 +-- src/util/virmdev.c | 12 +++++++----- src/util/virnetdev.c | 5 ++--- src/util/virpci.c | 17 ++++++++--------- tests/testutils.c | 7 +++---- tests/testutils.h | 2 -- tests/virpcimock.c | 3 +-- 11 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a02c8fe306..9b206abadc 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2448,7 +2448,7 @@ virNodeDeviceGetSCSITargetCaps(const char *sysfsPath, if (!(dir = mdir_name(sysfsPath))) return -1; - rport = g_strdup(last_component(dir)); + rport = g_path_get_basename(dir); if (!virFCIsCapableRport(rport)) goto cleanup; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index eedcd123a3..4b33dc25d8 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -23,7 +23,6 @@ #include <pciaccess.h> #include <scsi/scsi.h> -#include "dirname.h" #include "node_device_conf.h" #include "node_device_event.h" #include "node_device_driver.h" @@ -602,10 +601,10 @@ udevProcessSCSIHost(struct udev_device *device G_GNUC_UNUSED, virNodeDeviceDefPtr def) { virNodeDevCapSCSIHostPtr scsi_host = &def->caps->data.scsi_host; - char *filename = NULL; + g_autofree char *filename = NULL; char *str; - filename = last_component(def->sysfs_path); + filename = g_path_get_basename(def->sysfs_path); if (!(str = STRSKIP(filename, "host")) || virStrToLong_ui(str, NULL, 0, &scsi_host->host) < 0) { @@ -711,9 +710,10 @@ udevProcessSCSIDevice(struct udev_device *device G_GNUC_UNUSED, int ret = -1; unsigned int tmp = 0; virNodeDevCapSCSIPtr scsi = &def->caps->data.scsi; - char *filename = NULL, *p = NULL; + g_autofree char *filename = NULL; + char *p = NULL; - filename = last_component(def->sysfs_path); + filename = g_path_get_basename(def->sysfs_path); if (virStrToLong_ui(filename, &p, 10, &scsi->host) < 0 || p == NULL || virStrToLong_ui(p + 1, &p, 10, &scsi->bus) < 0 || p == NULL || @@ -1038,7 +1038,7 @@ udevProcessMediatedDevice(struct udev_device *dev, goto cleanup; } - data->type = g_strdup(last_component(canonicalpath)); + data->type = g_path_get_basename(canonicalpath); uuidstr = udev_device_get_sysname(dev); if ((iommugrp = virMediatedDeviceGetIOMMUGroupNum(uuidstr)) < 0) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index f072afe857..16a527e399 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -55,7 +55,6 @@ #include "virprobe.h" #include "virprocess.h" #include "virstring.h" -#include "dirname.h" #include "passfd.h" #if WITH_SSH2 @@ -668,7 +667,7 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.len = sizeof(remoteAddr.data.un); if (spawnDaemon) { - const char *binname; + g_autofree char *binname = NULL; if (spawnDaemon && !binary) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -677,7 +676,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } - if (!(binname = last_component(binary)) || binname[0] == '\0') { + if (!(binname = g_path_get_basename(binary)) || binname[0] == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot determine basename for binary '%s'"), binary); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 45d1257f3d..00e8b1aa13 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -22,7 +22,6 @@ #include <config.h> #include <unistd.h> -#include "dirname.h" #include "virerror.h" #include "virlog.h" #include "storage_backend_disk.h" @@ -777,10 +776,10 @@ virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, unsigned int flags) { char *part_num = NULL; - char *dev_name; + g_autofree char *dev_name = NULL; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); char *src_path = def->source.devices[0].path; - char *srcname = last_component(src_path); + g_autofree char *srcname = g_path_get_basename(src_path); bool isDevMapperDevice; g_autofree char *devpath = NULL; g_autoptr(virCommand) cmd = NULL; @@ -800,7 +799,7 @@ virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, * in both places */ isDevMapperDevice = virIsDevMapperDevice(vol->target.path); if (isDevMapperDevice) { - dev_name = last_component(vol->target.path); + dev_name = g_path_get_basename(vol->target.path); } else { if (virFileResolveLink(vol->target.path, &devpath) < 0) { virReportSystemError(errno, @@ -808,7 +807,7 @@ virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, vol->target.path); return -1; } - dev_name = last_component(devpath); + dev_name = g_path_get_basename(devpath); } VIR_DEBUG("dev_name=%s, srcname=%s", dev_name, srcname); diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 58225c09f5..ebc262278d 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -26,7 +26,6 @@ #include <sys/statvfs.h> #include <sys/param.h> #include <dirent.h> -#include "dirname.h" #ifdef __linux__ # include <sys/ioctl.h> # include <linux/fs.h> @@ -1519,7 +1518,7 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, unsigned int flags) { int fd, mode = 0; - char *base = last_component(path); + g_autofree char *base = g_path_get_basename(path); bool noerror = (flags & VIR_STORAGE_VOL_OPEN_NOERROR); if (g_lstat(path, sb) < 0) { diff --git a/src/util/virmdev.c b/src/util/virmdev.c index cd52a91ffd..c2499c0a20 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -18,7 +18,6 @@ #include <config.h> -#include "dirname.h" #include "virmdev.h" #include "virlog.h" #include "virerror.h" @@ -207,6 +206,7 @@ char * virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) { g_autofree char *result_path = NULL; + g_autofree char *result_file = NULL; g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); char *vfio_path = NULL; @@ -226,7 +226,9 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) return NULL; } - vfio_path = g_strdup_printf("/dev/vfio/%s", last_component(result_path)); + result_file = g_path_get_basename(result_path); + + vfio_path = g_strdup_printf("/dev/vfio/%s", result_file); return vfio_path; } @@ -236,13 +238,13 @@ int virMediatedDeviceGetIOMMUGroupNum(const char *uuidstr) { g_autofree char *vfio_path = NULL; - char *group_num_str = NULL; + g_autofree char *group_num_str = NULL; unsigned int group_num = -1; if (!(vfio_path = virMediatedDeviceGetIOMMUGroupDev(uuidstr))) return -1; - group_num_str = last_component(vfio_path); + group_num_str = g_path_get_basename(vfio_path); ignore_value(virStrToLong_ui(group_num_str, NULL, 10, &group_num)); return group_num; @@ -501,7 +503,7 @@ virMediatedDeviceTypeReadAttrs(const char *sysfspath, if (VIR_ALLOC(tmp) < 0) return -1; - tmp->id = g_strdup(last_component(sysfspath)); + tmp->id = g_path_get_basename(sysfspath); /* @name sysfs attribute is optional, so getting ENOENT is fine */ MDEV_GET_SYSFS_ATTR("name", &tmp->name, virFileReadValueString, true); diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 43d2fb06cf..03e276a972 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -18,7 +18,6 @@ #include <config.h> -#include "dirname.h" #include "virnetdev.h" #include "viralloc.h" #include "virnetlink.h" @@ -1096,7 +1095,7 @@ virNetDevIsPCIDevice(const char *devpath) { char *subsys_link = NULL; char *abs_path = NULL; - char *subsys = NULL; + g_autofree char *subsys = NULL; bool ret = false; subsys_link = g_strdup_printf("%s/subsystem", devpath); @@ -1111,7 +1110,7 @@ virNetDevIsPCIDevice(const char *devpath) goto cleanup; } - subsys = last_component(abs_path); + subsys = g_path_get_basename(abs_path); ret = STRPREFIX(subsys, "pci"); cleanup: diff --git a/src/util/virpci.c b/src/util/virpci.c index 99a8002743..06d855a95b 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -30,7 +30,6 @@ #include <sys/stat.h> #include <unistd.h> -#include "dirname.h" #include "virlog.h" #include "vircommand.h" #include "virerror.h" @@ -265,7 +264,7 @@ virPCIDeviceGetDriverPathAndName(virPCIDevicePtr dev, char **path, char **name) } /* path = "/sys/bus/pci/drivers/${drivername}" */ - *name = g_strdup(last_component(*path)); + *name = g_path_get_basename(*path); /* name = "${drivername}" */ ret = 0; @@ -1926,7 +1925,7 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) g_autofree char *devName = NULL; g_autofree char *devPath = NULL; g_autofree char *groupPath = NULL; - const char *groupNumStr; + g_autofree char *groupNumStr = NULL; unsigned int groupNum; devName = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->bus, @@ -1943,7 +1942,7 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) return -1; } - groupNumStr = last_component(groupPath); + groupNumStr = g_path_get_basename(groupPath); if (virStrToLong_ui(groupNumStr, NULL, 10, &groupNum) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("device %s iommu_group symlink %s has " @@ -1979,7 +1978,7 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) { g_autofree char *devPath = NULL; g_autofree char *groupPath = NULL; - char *groupDev = NULL; + g_autofree char *groupFile = NULL; if (!(devPath = virPCIFile(dev->name, "iommu_group"))) return NULL; @@ -1995,9 +1994,9 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) dev->name, devPath); return NULL; } - groupDev = g_strdup_printf("/dev/vfio/%s", last_component(groupPath)); + groupFile = g_path_get_basename(groupPath); - return groupDev; + return g_strdup_printf("/dev/vfio/%s", groupFile); } static int @@ -2207,7 +2206,7 @@ virPCIDeviceAddressPtr virPCIGetDeviceAddressFromSysfsLink(const char *device_link) { virPCIDeviceAddressPtr bdf = NULL; - char *config_address = NULL; + g_autofree char *config_address = NULL; g_autofree char *device_path = NULL; if (!virFileExists(device_link)) { @@ -2223,7 +2222,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) return NULL; } - config_address = last_component(device_path); + config_address = g_path_get_basename(device_path); if (VIR_ALLOC(bdf) < 0) return NULL; diff --git a/tests/testutils.c b/tests/testutils.c index 5bc108a6c3..7c4e5b4b2e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -37,7 +37,6 @@ #include "virlog.h" #include "vircommand.h" #include "virrandom.h" -#include "dirname.h" #include "virprocess.h" #include "virstring.h" @@ -57,8 +56,6 @@ static unsigned int testRegenerate = -1; static size_t testCounter; static virBitmapPtr testBitmap; -char *progname; - virArch virTestHostArch = VIR_ARCH_X86_64; virArch @@ -857,6 +854,8 @@ int virTestMain(int argc, size_t noutputs = 0; virLogOutputPtr output = NULL; virLogOutputPtr *outputs = NULL; + g_autofree char *baseprogname = NULL; + const char *progname; if (getenv("VIR_TEST_FILE_ACCESS")) VIR_TEST_PRELOAD(VIR_TEST_MOCK("virtest")); @@ -866,7 +865,7 @@ int virTestMain(int argc, VIR_TEST_PRELOAD(lib); va_end(ap); - progname = last_component(argv[0]); + progname = baseprogname = g_path_get_basename(argv[0]); if (STRPREFIX(progname, "lt-")) progname += 3; diff --git a/tests/testutils.h b/tests/testutils.h index 74785b7fb8..fbd0856d4b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -36,8 +36,6 @@ # define fprintf virFilePrintf #endif -extern char *progname; - /* Makefile.am provides these two definitions */ #if !defined(abs_srcdir) || !defined(abs_builddir) # error Fix Makefile.am diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 6048118d5c..92b6f810d8 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -28,7 +28,6 @@ # include "viralloc.h" # include "virstring.h" # include "virfile.h" -# include "dirname.h" static int (*real_access)(const char *path, int mode); static int (*real_open)(const char *path, int flags, ...); @@ -884,7 +883,7 @@ static int pci_driver_handle_change(int fd G_GNUC_UNUSED, const char *path) { int ret; - const char *file = last_component(path); + g_autofree char *file = g_path_get_basename(path); if (STREQ(file, "bind")) ret = pci_driver_handle_bind(path); -- 2.24.1

On Thu, Jan 02, 2020 at 05:42:30PM +0100, Fabiano Fidêncio wrote: Yes, - if (!(binname = g_path_get_basename(binary)) || binname[0] == '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot determine basename for binary '%s'"), - binary); - goto cleanup; - } - + binname = g_path_get_basename(binary); I'm going to leave this as is, as we have so much file name building code already that just printfs. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/conf/node_device_conf.c | 4 +--- src/locking/lock_driver_sanlock.c | 6 +----- src/qemu/qemu_driver.c | 7 ++----- src/qemu/qemu_tpm.c | 33 +++---------------------------- src/security/virt-aa-helper.c | 4 +--- src/util/virfile.c | 6 +----- src/util/virstoragefile.c | 13 ++---------- src/vmware/vmware_conf.c | 7 ++----- 8 files changed, 13 insertions(+), 67 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 9b206abadc..4cf5b6e3d7 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -30,7 +30,6 @@ #include "virstring.h" #include "node_device_conf.h" #include "device_conf.h" -#include "dirname.h" #include "virxml.h" #include "virbuffer.h" #include "viruuid.h" @@ -2445,8 +2444,7 @@ virNodeDeviceGetSCSITargetCaps(const char *sysfsPath, VIR_DEBUG("Checking if '%s' is an FC remote port", scsi_target->name); /* /sys/devices/[...]/host0/rport-0:0-0/target0:0:0 -> rport-0:0-0 */ - if (!(dir = mdir_name(sysfsPath))) - return -1; + dir = g_path_get_dirname(sysfsPath); rport = g_path_get_basename(dir); diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index c8936c301c..088255a111 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -31,7 +31,6 @@ #include <sanlock_resource.h> #include <sanlock_admin.h> -#include "dirname.h" #include "lock_driver.h" #include "virlog.h" #include "virerror.h" @@ -239,10 +238,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) int perms = 0600; VIR_DEBUG("Lockspace %s does not yet exist", path); - if (!(dir = mdir_name(path))) { - virReportOOMError(); - goto error; - } + dir = g_path_get_dirname(path); if (stat(dir, &st) < 0 || !S_ISDIR(st.st_mode)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to create lockspace %s: parent directory" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec8faf384c..9dffeefce7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -99,7 +99,6 @@ #include "vircgroup.h" #include "virperf.h" #include "virnuma.h" -#include "dirname.h" #include "netdev_bandwidth_conf.h" #include "virqemu.h" #include "virdomainsnapshotobjlist.h" @@ -850,10 +849,8 @@ qemuStateInitialize(bool privileged, (int)cfg->group); goto error; } - if (!(channeldir = mdir_name(cfg->channelTargetDir))) { - virReportOOMError(); - goto error; - } + channeldir = g_path_get_dirname(cfg->channelTargetDir); + if (chown(channeldir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 91ab5bca9e..28800a100c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -40,7 +40,6 @@ #include "virstring.h" #include "virpidfile.h" #include "configmake.h" -#include "dirname.h" #include "qemu_tpm.h" #include "virtpm.h" #include "secret_util.h" @@ -83,26 +82,6 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorageDir, } -/* - * virtTPMGetTPMStorageDir: - * - * @storagepath: directory for swtpm's persistent state - * - * Derive the 'TPMStorageDir' from the storagepath by searching - * for the last '/'. - */ -static char * -qemuTPMGetTPMStorageDir(const char *storagepath) -{ - char *ret = mdir_name(storagepath); - - if (!ret) - virReportOOMError(); - - return ret; -} - - /* * qemuTPMEmulatorInitStorage * @@ -147,10 +126,7 @@ qemuTPMCreateEmulatorStorage(const char *storagepath, gid_t swtpm_group) { int ret = -1; - char *swtpmStorageDir = qemuTPMGetTPMStorageDir(storagepath); - - if (!swtpmStorageDir) - return -1; + char *swtpmStorageDir = g_path_get_dirname(storagepath); if (qemuTPMEmulatorInitStorage(swtpmStorageDir) < 0) goto cleanup; @@ -183,12 +159,9 @@ qemuTPMCreateEmulatorStorage(const char *storagepath, static void qemuTPMDeleteEmulatorStorage(virDomainTPMDefPtr tpm) { - char *path = qemuTPMGetTPMStorageDir(tpm->data.emulator.storagepath); + g_autofree char *path = g_path_get_dirname(tpm->data.emulator.storagepath); - if (path) { - ignore_value(virFileDeleteTree(path)); - VIR_FREE(path); - } + ignore_value(virFileDeleteTree(path)); } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index feb03b0aa9..9c34ac92c2 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "vircommand.h" #include "virlog.h" -#include "dirname.h" #include "driver.h" #include "security_driver.h" @@ -754,8 +753,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi */ pathdir = g_strdup(path); while (!virFileExists(pathdir)) { - if ((pathtmp = mdir_name(pathdir)) == NULL) - goto cleanup; + pathtmp = g_path_get_dirname(pathdir); VIR_FREE(pathdir); pathdir = g_steal_pointer(&pathtmp); } diff --git a/src/util/virfile.c b/src/util/virfile.c index 1ce909b033..d5e4d0a289 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -37,7 +37,6 @@ #endif #include <unistd.h> #include <dirent.h> -#include <dirname.h> #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R # include <mntent.h> #endif @@ -1886,10 +1885,7 @@ int virFileIsMountPoint(const char *file) int ret; struct stat sb1, sb2; - if (!(parent = mdir_name(file))) { - virReportOOMError(); - return -1; - } + parent = g_path_get_dirname(file); VIR_DEBUG("Comparing '%s' to '%s'", file, parent); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e280a646b7..c9f3e5f865 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -36,7 +36,6 @@ #include "virstring.h" #include "virutil.h" #include "viruri.h" -#include "dirname.h" #include "virbuffer.h" #include "virjson.h" #include "virstorageencryption.h" @@ -1690,15 +1689,10 @@ virStorageFileChainLookup(virStorageSourcePtr chain, if (nameIsFile && virStorageSourceIsLocalStorage(chain)) { if (*parent && virStorageSourceIsLocalStorage(*parent)) - parentDir = mdir_name((*parent)->path); + parentDir = g_path_get_dirname((*parent)->path); else parentDir = g_strdup("."); - if (!parentDir) { - virReportOOMError(); - goto error; - } - int result = virFileRelLinkPointsTo(parentDir, name, chain->path); @@ -2658,10 +2652,7 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, /* store relative name */ def->relPath = g_strdup(rel); - if (!(dirname = mdir_name(parent->path))) { - virReportOOMError(); - return NULL; - } + dirname = g_path_get_dirname(parent->path); if (STRNEQ(dirname, "/")) { def->path = g_strdup_printf("%s/%s", dirname, rel); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 290e0e898d..0256f1832f 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -24,7 +24,6 @@ #include "vircommand.h" #include "cpu/cpu.h" -#include "dirname.h" #include "viralloc.h" #include "virfile.h" #include "viruuid.h" @@ -270,8 +269,7 @@ vmwareExtractVersion(struct vmware_driver *driver) char *bin = NULL; char *vmwarePath = NULL; - if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) - goto cleanup; + vmwarePath = g_path_get_dirname(driver->vmrun); switch (driver->type) { case VMWARE_DRIVER_PLAYER: @@ -477,8 +475,7 @@ vmwareExtractPid(const char * vmxPath) char *tmp = NULL; int pid_value = -1; - if ((vmxDir = mdir_name(vmxPath)) == NULL) - goto cleanup; + vmxDir = g_path_get_dirname(vmxPath); logFilePath = g_strdup_printf("%s/vmware.log", vmxDir); -- 2.24.1

commandhelper.c is not converted since this is a standalone program only run on UNIX, so can rely on getcwd(). Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/util/virfile.c | 5 +---- tools/vsh.c | 16 +++------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index d5e4d0a289..9787086f3d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3187,10 +3187,7 @@ virFileAbsPath(const char *path, char **abspath) if (path[0] == '/') { *abspath = g_strdup(path); } else { - g_autofree char *buf = getcwd(NULL, 0); - - if (buf == NULL) - return -1; + g_autofree char *buf = g_get_current_dir(); *abspath = g_strdup_printf("%s/%s", buf, path); } diff --git a/tools/vsh.c b/tools/vsh.c index a2f33e01aa..a36b6bfe23 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3296,21 +3296,11 @@ const vshCmdInfo info_pwd[] = { bool cmdPwd(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { - char *cwd; - bool ret = true; - char ebuf[1024]; + g_autofree char *cwd = g_get_current_dir(); - cwd = getcwd(NULL, 0); - if (!cwd) { - vshError(ctl, _("pwd: cannot get current directory: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); - ret = false; - } else { - vshPrint(ctl, _("%s\n"), cwd); - VIR_FREE(cwd); - } + vshPrint(ctl, _("%s\n"), cwd); - return ret; + return true; } const vshCmdInfo info_quit[] = { -- 2.24.1

g_networking_init() does the same as our custom code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- m4/virt-glib.m4 | 2 +- src/libvirt.c | 25 ++----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/m4/virt-glib.m4 b/m4/virt-glib.m4 index eb2c77b25b..03e51711c0 100644 --- a/m4/virt-glib.m4 +++ b/m4/virt-glib.m4 @@ -24,7 +24,7 @@ AC_DEFUN([LIBVIRT_ARG_GLIB], [ AC_DEFUN([LIBVIRT_CHECK_GLIB],[ GLIB_REQUIRED=2.48.0 - LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0], [$GLIB_REQUIRED]) + LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0 gio-2.0], [$GLIB_REQUIRED]) if test "$with_glib" = "no" ; then AC_MSG_ERROR([glib-2.0, gobject-2.0 >= $GLIB_REQUIRED are required for libvirt]) diff --git a/src/libvirt.c b/src/libvirt.c index c741ebe311..f1ffc97261 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -26,15 +26,12 @@ #include <unistd.h> #include <sys/wait.h> #include <time.h> +#include <gio/gnetworking.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include "getpass.h" -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -#endif - #ifdef WITH_CURL # include <curl/curl.h> #endif @@ -211,21 +208,6 @@ static virConnectAuth virConnectAuthDefault = { */ virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault; -#if HAVE_WINSOCK2_H -static int -virWinsockInit(void) -{ - WORD winsock_version, err; - WSADATA winsock_data; - - /* http://msdn2.microsoft.com/en-us/library/ms742213.aspx */ - winsock_version = MAKEWORD(2, 2); - err = WSAStartup(winsock_version, &winsock_data); - return err == 0 ? 0 : -1; -} -#endif - - static bool virGlobalError; static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; @@ -261,10 +243,7 @@ virGlobalInit(void) VIR_DEBUG("register drivers"); -#if HAVE_WINSOCK2_H - if (virWinsockInit() == -1) - goto error; -#endif + g_networking_init(); #ifdef HAVE_LIBINTL_H if (!bindtextdomain(PACKAGE, LOCALEDIR)) -- 2.24.1

* canonicalize-lgpl: replaced by realpath()/g_canonicalize_filename() * clock-gettime: replaced by g_get_(real|monotonic)_time * dirname-lgpl: replaced by g_path_get_dirname() * fclose: we aren't affected by any portability problems it fixes * fdatasync: every platform we call fdatasync on has it present * fsync: replaced by g_fsync() * fnmatch: replaced by g_pattern_match() * getcwd-lgpl: replaced by g_get_current_dir() * gethostname: replaced by g_get_hostname() * gettimeofday: replaced by g_get_(real|monotonic)_time * setenv: replaced by g_setenv() * strptime: replaced by GDateTime * timegm: replaced by GDateTime * unsetenv: replaced by g_unsetenv() Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- bootstrap.conf | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 0a8b591418..3d9243fa01 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -20,27 +20,17 @@ gnulib_modules=' accept bind -canonicalize-lgpl chown -clock-time close connect configmake -dirname-lgpl environ -fclose fcntl fcntl-h -fdatasync -fnmatch -fsync getaddrinfo -getcwd-lgpl -gethostname getpass getpeername getsockname -gettimeofday intprops ioctl largefile @@ -61,23 +51,19 @@ posix-shell pthread_sigmask recv send -setenv setsockopt sigaction sigpipe socket stat-time strchrnul -strptime strtok_r sys_stat sys_wait termios time_r -timegm ttyname_r uname -unsetenv verify waitpid warnings -- 2.24.1