Instead of relying on GNULIb's uname() impl, directly use the Windows API for determining CPU architecture. Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virarch.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/util/virarch.c b/src/util/virarch.c index b132e178c3..f088b6b676 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -21,7 +21,12 @@ #include <config.h> -#include <sys/utsname.h> +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +#else +# include <sys/utsname.h> +#endif #include "virlog.h" #include "virarch.h" @@ -154,6 +159,50 @@ virArch virArchFromString(const char *archstr) * uname 'machine' field, since this will canonicalize * architecture names like 'amd64' into 'x86_64'. */ +#ifdef WIN32 + +/* + * Missing in ming64 headers 6.0.0, but defined as '12' in: + * + * https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-... + */ +# ifndef PROCESSOR_ARCHITECTURE_ARM64 +# define PROCESSOR_ARCHITECTURE_ARM64 12 +# endif + +virArch virArchFromHost(void) +{ + SYSTEM_INFO info; + + GetSystemInfo(&info); + + switch (info.wProcessorArchitecture) { + case PROCESSOR_ARCHITECTURE_AMD64: + return VIR_ARCH_X86_64; + case PROCESSOR_ARCHITECTURE_IA64: + return VIR_ARCH_ITANIUM; + case PROCESSOR_ARCHITECTURE_INTEL: + case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64: + return VIR_ARCH_I686; + case PROCESSOR_ARCHITECTURE_MIPS: + return VIR_ARCH_MIPS; + case PROCESSOR_ARCHITECTURE_ALPHA: + return VIR_ARCH_ALPHA; + case PROCESSOR_ARCHITECTURE_PPC: + return VIR_ARCH_PPC; + case PROCESSOR_ARCHITECTURE_SHX: + return VIR_ARCH_SH4; + case PROCESSOR_ARCHITECTURE_ARM: + return VIR_ARCH_ARMV7L; + case PROCESSOR_ARCHITECTURE_ARM64: + return VIR_ARCH_AARCH64; + default: + VIR_WARN("Unknown host arch '%d', report to libvir-list@redhat.com", + info.wProcessorArchitecture); + return VIR_ARCH_NONE; + } +} +#else /* !WIN32 */ virArch virArchFromHost(void) { struct utsname ut; @@ -184,3 +233,4 @@ virArch virArchFromHost(void) return arch; } +#endif /* !WIN32 */ -- 2.24.1

The strchrnul function doesn't exist on Windows and rather than attempt to implement it, it is simpler to just avoid its usage, as any callers are easily adapted. Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/openvz/openvz_conf.c | 4 +++- src/security/security_selinux.c | 16 ++++++++-------- src/util/vircgroup.c | 10 +++++++--- src/util/virdnsmasq.c | 9 +++++++-- src/util/virsysinfo.c | 14 ++++++++------ tests/testutils.c | 2 +- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e9ee1a7bf4..1ec42c1d93 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -245,7 +245,9 @@ openvzReadNetworkConf(virDomainDefPtr def, /*parse string*/ do { - char *next = strchrnul(p, ','); + char *next = strchr(p, ','); + if (!next) + next = strchr(p, '\0'); if (STRPREFIX(p, "ifname=")) { /* skip in libvirt */ } else if (STRPREFIX(p, "host_ifname=")) { diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 21279e7622..2fd9c113f3 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -721,14 +721,14 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) goto error; } - ptr = strchrnul(data->domain_context, '\n'); - if (ptr && *ptr == '\n') { + ptr = strchr(data->domain_context, '\n'); + if (ptr) { *ptr = '\0'; ptr++; if (*ptr != '\0') { data->alt_domain_context = g_strdup(ptr); - ptr = strchrnul(data->alt_domain_context, '\n'); - if (ptr && *ptr == '\n') + ptr = strchr(data->alt_domain_context, '\n'); + if (ptr) *ptr = '\0'; } } @@ -743,12 +743,12 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) goto error; } - ptr = strchrnul(data->file_context, '\n'); - if (ptr && *ptr == '\n') { + ptr = strchr(data->file_context, '\n'); + if (ptr) { *ptr = '\0'; data->content_context = g_strdup(ptr + 1); - ptr = strchrnul(data->content_context, '\n'); - if (ptr && *ptr == '\n') + ptr = strchr(data->content_context, '\n'); + if (ptr) *ptr = '\0'; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index dff2f6fd3a..526ce9da03 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -174,9 +174,13 @@ virCgroupPartitionNeedsEscaping(const char *path) if (STRPREFIX(line, "#subsys_name")) continue; - tmp = strchrnul(line, ' '); - *tmp = '\0'; - len = tmp - line; + tmp = strchr(line, ' '); + if (tmp) { + *tmp = '\0'; + len = tmp - line; + } else { + len = strlen(line); + } if (STRPREFIX(path, line) && path[len] == '.') { diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 2555f3110f..adc6f96bb6 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -640,6 +640,7 @@ dnsmasqCapsSet(dnsmasqCapsPtr caps, static int dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) { + int len; const char *p; caps->noRefresh = true; @@ -675,10 +676,14 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) return 0; fail: - p = strchrnul(buf, '\n'); + p = strchr(buf, '\n'); + if (!p) + len = strlen(buf); + else + len = p - buf; virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse %s version number in '%.*s'"), - caps->binaryPath, (int) (p - buf), buf); + caps->binaryPath, len, buf); return -1; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index c526c0322f..4cc4523be0 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -460,18 +460,20 @@ virSysinfoReadARM(void) return g_steal_pointer(&ret); } -static char * +static const char * virSysinfoParseS390Delimited(const char *base, const char *name, char **value, char delim1, char delim2) { const char *start; - char *end; + const char *end; if (delim1 != delim2 && (start = strstr(base, name)) && (start = strchr(start, delim1))) { start += 1; - end = strchrnul(start, delim2); + end = strchr(start, delim2); + if (!end) + end = start + strlen(start); virSkipSpaces(&start); *value = g_strndup(start, end - start); virTrimSpaces(*value, NULL); @@ -480,7 +482,7 @@ virSysinfoParseS390Delimited(const char *base, const char *name, char **value, return NULL; } -static char * +static const char * virSysinfoParseS390Line(const char *base, const char *name, char **value) { return virSysinfoParseS390Delimited(base, name, value, ':', '\n'); @@ -521,7 +523,7 @@ virSysinfoParseS390System(const char *base, virSysinfoSystemDefPtr *sysdef) static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { - char *tmp_base; + const char *tmp_base; char *manufacturer = NULL; char *procline = NULL; char *ncpu = NULL; @@ -555,7 +557,7 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) } /* now, for each processor found, extract the frequency information */ - tmp_base = (char *) base; + tmp_base = base; while ((tmp_base = strstr(tmp_base, "cpu number")) && (tmp_base = virSysinfoParseS390Line(tmp_base, "cpu number", &ncpu))) { diff --git a/tests/testutils.c b/tests/testutils.c index b490609e36..248f9ee8be 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1200,7 +1200,7 @@ virTestCounterReset(const char *prefix) virtTestCounter = 0; ignore_value(virStrcpyStatic(virtTestCounterStr, prefix)); - virtTestCounterPrefixEndOffset = strchrnul(virtTestCounterStr, '\0'); + virtTestCounterPrefixEndOffset = virtTestCounterStr + strlen(virtTestCounterStr); } -- 2.24.1

The mgetgroups function is a GNULIB custom wrapper around getgrouplist(). This implements a simplified version of that code directly. Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/internal.h | 4 ++++ src/util/virutil.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/internal.h b/src/internal.h index 4b0286e237..4a63984cec 100644 --- a/src/internal.h +++ b/src/internal.h @@ -155,6 +155,10 @@ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define VIR_WARNINGS_NO_POINTER_SIGN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wpointer-sign\"") + #if HAVE_SUGGEST_ATTRIBUTE_FORMAT # define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") \ diff --git a/src/util/virutil.c b/src/util/virutil.c index 87ca16c088..77460c9577 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -66,7 +66,6 @@ # include <sys/un.h> #endif -#include "mgetgroups.h" #include "virerror.h" #include "virlog.h" #include "virbuffer.h" @@ -980,6 +979,11 @@ virDoesGroupExist(const char *name) } + +/* Work around an incompatibility of OS X 10.11: getgrouplist + accepts int *, not gid_t *, and int and gid_t differ in sign. */ +VIR_WARNINGS_NO_POINTER_SIGN + /* Compute the list of primary and supplementary groups associated * with @uid, and including @gid in the list (unless it is -1), * storing a malloc'd result into @list. If uid is -1 or doesn't exist in the @@ -1000,11 +1004,28 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) /* invalid users have no supplementary groups */ if (uid != (uid_t)-1 && virGetUserEnt(uid, &user, &primary, NULL, NULL, true) >= 0) { - if ((ret = mgetgroups(user, primary, list)) < 0) { - virReportSystemError(errno, - _("cannot get group list for '%s'"), user); - ret = -1; - goto cleanup; + int nallocgrps = 10; + gid_t *grps = g_new(gid_t, nallocgrps); + + while (1) { + int nprevallocgrps = nallocgrps; + int rv; + + rv = getgrouplist(user, primary, grps, &nallocgrps); + + /* Some systems (like Darwin) have a bug where they + never increase max_n_groups. */ + if (rv < 0 && nprevallocgrps == nallocgrps) + nallocgrps *= 2; + + /* either shrinks to actual size, or enlarges to new size */ + grps = g_renew(gid_t, grps, nallocgrps); + + if (rv >= 0) { + ret = rv; + *list = grps; + break; + } } } @@ -1029,6 +1050,8 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) return ret; } +VIR_WARNINGS_RESET + /* Set the real and effective uid and gid to the given values, as well * as all the supplementary groups, so that the process has all the -- 2.24.1

Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virhostcpu.c | 1 - src/util/virhostmem.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 0bde532a0c..81293eea8c 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -22,7 +22,6 @@ #include <config.h> #include <dirent.h> -#include <sys/utsname.h> #include <fcntl.h> #ifndef WIN32 # include <sys/ioctl.h> diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index f37d1ad588..9097716f54 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -21,7 +21,6 @@ #include <config.h> -#include <sys/utsname.h> #include <fcntl.h> #include <unistd.h> -- 2.24.1

The gnulib stat-time.h header provides wrapper functions to hide the differences in 'struct stat' between various platforms. Linux and FreeBSD support the same names, except for birthtime which Linux only provides in the new 'statx()' syscall we're not using. macOS has completely different naming. Since we only rely on this code in one place we just use conditionals at time of need. Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/storage/storage_util.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 987d937b04..7bbcfde064 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -71,7 +71,6 @@ #include "virfile.h" #include "virjson.h" #include "virqemu.h" -#include "stat-time.h" #include "virstring.h" #include "virxml.h" #include "virfdstream.h" @@ -1830,10 +1829,22 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, if (!target->timestamps && VIR_ALLOC(target->timestamps) < 0) return -1; - target->timestamps->atime = get_stat_atime(sb); - target->timestamps->btime = get_stat_birthtime(sb); - target->timestamps->ctime = get_stat_ctime(sb); - target->timestamps->mtime = get_stat_mtime(sb); + +#ifdef __APPLE__ + target->timestamps->atime = sb->st_atimespec; + target->timestamps->btime = sb->st_birthtimespec; + target->timestamps->ctime = sb->st_ctimespec; + target->timestamps->mtime = sb->st_mtimespec; +#else /* ! __APPLE__ */ + target->timestamps->atime = sb->st_atim; +# ifdef __linux__ + target->timestamps->btime = (struct timespec){0, 0}; +# else /* ! __linux__ */ + target->timestamps->btime = sb->st_birthtim; +# endif /* ! __linux__ */ + target->timestamps->ctime = sb->st_ctim; + target->timestamps->mtime = sb->st_mtim; +#endif /* ! __APPLE__ */ target->type = VIR_STORAGE_TYPE_FILE; -- 2.24.1

The Windows platform does not have the signal handling support we need, so it must be disabled in several parts of the codebase. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/rpc/virnetclient.c | 33 ++++++++++++++++++++------- src/rpc/virnetdaemon.c | 39 ++++++++++++++++++++++++++------ src/rpc/virnetdaemon.h | 4 ++++ tools/virsh-domain.c | 51 +++++++++++++++++++++++++++++++++--------- tools/virsh.c | 6 ----- tools/virt-admin.c | 5 ----- tools/vsh.c | 17 +++++++++----- 7 files changed, 113 insertions(+), 42 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 000b937cdd..031a99711f 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -838,16 +838,19 @@ int virNetClientSetTLSSession(virNetClientPtr client, char buf[1]; int len; struct pollfd fds[1]; + +#ifndef WIN32 sigset_t oldmask, blockedsigs; sigemptyset(&blockedsigs); -#ifdef SIGWINCH +# ifdef SIGWINCH sigaddset(&blockedsigs, SIGWINCH); -#endif -#ifdef SIGCHLD +# endif +# ifdef SIGCHLD sigaddset(&blockedsigs, SIGCHLD); -#endif +# endif sigaddset(&blockedsigs, SIGPIPE); +#endif /* !WIN32 */ virObjectLock(client); @@ -873,19 +876,23 @@ int virNetClientSetTLSSession(virNetClientPtr client, else fds[0].events = POLLOUT; +#ifndef WIN32 /* Block SIGWINCH from interrupting poll in curses programs, * then restore the original signal mask again immediately * after the call (RHBZ#567931). Same for SIGCHLD and SIGPIPE * at the suggestion of Paolo Bonzini and Daniel Berrange. */ ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); +#endif /* !WIN32 */ repoll: ret = poll(fds, G_N_ELEMENTS(fds), -1); if (ret < 0 && (errno == EAGAIN || errno == EINTR)) goto repoll; +#ifndef WIN32 ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); +#endif /* !WIN32 */ } ret = virNetTLSContextCheckCertificate(tls, client->tls); @@ -901,15 +908,19 @@ int virNetClientSetTLSSession(virNetClientPtr client, fds[0].revents = 0; fds[0].events = POLLIN; +#ifndef WIN32 /* Block SIGWINCH from interrupting poll in curses programs */ ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); +#endif /* !WIN32 */ repoll2: ret = poll(fds, G_N_ELEMENTS(fds), -1); if (ret < 0 && (errno == EAGAIN || errno == EINTR)) goto repoll2; +#ifndef WIN32 ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); +#endif /* !WIN32 */ len = virNetTLSSessionRead(client->tls, buf, 1); if (len < 0 && errno != ENOMSG) { @@ -1562,7 +1573,9 @@ static int virNetClientIOEventLoop(virNetClientPtr client, for (;;) { char ignore; +#ifndef WIN32 sigset_t oldmask, blockedsigs; +#endif /* !WIN32 */ int timeout = -1; virNetMessagePtr msg = NULL; @@ -1603,27 +1616,31 @@ static int virNetClientIOEventLoop(virNetClientPtr client, * can stuff themselves on the queue */ virObjectUnlock(client); +#ifndef WIN32 /* Block SIGWINCH from interrupting poll in curses programs, * then restore the original signal mask again immediately * after the call (RHBZ#567931). Same for SIGCHLD and SIGPIPE * at the suggestion of Paolo Bonzini and Daniel Berrange. */ sigemptyset(&blockedsigs); -#ifdef SIGWINCH +# ifdef SIGWINCH sigaddset(&blockedsigs, SIGWINCH); -#endif -#ifdef SIGCHLD +# endif +# ifdef SIGCHLD sigaddset(&blockedsigs, SIGCHLD); -#endif +# endif sigaddset(&blockedsigs, SIGPIPE); ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); +#endif /* !WIN32 */ repoll: ret = poll(fds, G_N_ELEMENTS(fds), timeout); if (ret < 0 && (errno == EAGAIN || errno == EINTR)) goto repoll; +#ifndef WIN32 ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); +#endif /* !WIN32 */ virObjectLock(client); diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 570930436a..aa77e984ab 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -37,14 +37,11 @@ #include "virstring.h" #include "virsystemd.h" -#ifndef SA_SIGINFO -# define SA_SIGINFO 0 -#endif - #define VIR_FROM_THIS VIR_FROM_RPC VIR_LOG_INIT("rpc.netdaemon"); +#ifndef WIN32 typedef struct _virNetDaemonSignal virNetDaemonSignal; typedef virNetDaemonSignal *virNetDaemonSignalPtr; @@ -54,17 +51,20 @@ struct _virNetDaemonSignal { virNetDaemonSignalFunc func; void *opaque; }; +#endif /* !WIN32 */ struct _virNetDaemon { virObjectLockable parent; bool privileged; +#ifndef WIN32 size_t nsignals; virNetDaemonSignalPtr *signals; int sigread; int sigwrite; int sigwatch; +#endif /* !WIN32 */ virHashTablePtr servers; virJSONValuePtr srvObject; @@ -84,10 +84,9 @@ static void virNetDaemonDispose(void *obj) { virNetDaemonPtr dmn = obj; +#ifndef WIN32 size_t i; - VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd); - for (i = 0; i < dmn->nsignals; i++) { sigaction(dmn->signals[i]->signum, &dmn->signals[i]->oldaction, NULL); VIR_FREE(dmn->signals[i]); @@ -97,6 +96,9 @@ virNetDaemonDispose(void *obj) VIR_FORCE_CLOSE(dmn->sigwrite); if (dmn->sigwatch > 0) virEventRemoveHandle(dmn->sigwatch); +#endif /* !WIN32 */ + + VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd); virHashFree(dmn->servers); @@ -119,7 +121,9 @@ virNetDaemonPtr virNetDaemonNew(void) { virNetDaemonPtr dmn; +#ifndef WIN32 struct sigaction sig_action; +#endif /* !WIN32 */ if (virNetDaemonInitialize() < 0) return NULL; @@ -130,16 +134,21 @@ virNetDaemonNew(void) if (!(dmn->servers = virHashCreate(5, virObjectFreeHashData))) goto error; +#ifndef WIN32 dmn->sigwrite = dmn->sigread = -1; +#endif /* !WIN32 */ + dmn->privileged = geteuid() == 0; dmn->autoShutdownInhibitFd = -1; if (virEventRegisterDefaultImpl() < 0) goto error; +#ifndef WIN32 memset(&sig_action, 0, sizeof(sig_action)); sig_action.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sig_action, NULL); +#endif /* !WIN32 */ return dmn; @@ -587,7 +596,7 @@ virNetDaemonRemoveShutdownInhibition(virNetDaemonPtr dmn) } - +#ifndef WIN32 static sig_atomic_t sigErrors; static int sigLastErrno; static int sigWrite = -1; @@ -689,6 +698,7 @@ virNetDaemonSignalSetup(virNetDaemonPtr dmn) return -1; } + int virNetDaemonAddSignalHandler(virNetDaemonPtr dmn, int signum, @@ -731,6 +741,21 @@ virNetDaemonAddSignalHandler(virNetDaemonPtr dmn, return -1; } +#else /* WIN32 */ + +int +virNetDaemonAddSignalHandler(virNetDaemonPtr dmn G_GNUC_UNUSED, + int signum G_GNUC_UNUSED, + virNetDaemonSignalFunc func G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Signal handling not available on this platform")); + return -1; +} + +#endif /* WIN32 */ + static void virNetDaemonAutoShutdownTimer(int timerid G_GNUC_UNUSED, diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h index 5a9842bee6..c2c7767037 100644 --- a/src/rpc/virnetdaemon.h +++ b/src/rpc/virnetdaemon.h @@ -55,6 +55,10 @@ void virNetDaemonAutoShutdown(virNetDaemonPtr dmn, void virNetDaemonAddShutdownInhibition(virNetDaemonPtr dmn); void virNetDaemonRemoveShutdownInhibition(virNetDaemonPtr dmn); +#ifdef WIN32 +# define siginfo_t void +#endif + typedef void (*virNetDaemonSignalFunc)(virNetDaemonPtr dmn, siginfo_t *info, void *opaque); int virNetDaemonAddSignalHandler(virNetDaemonPtr dmn, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e64e08e5da..1a48695b4e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -56,11 +56,6 @@ #include "vsh-table.h" #include "virenum.h" -/* Gnulib doesn't guarantee SA_SIGINFO support. */ -#ifndef SA_SIGINFO -# define SA_SIGINFO 0 -#endif - #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ @@ -1697,12 +1692,14 @@ virshPrintJobProgress(const char *label, unsigned long long remaining, static volatile sig_atomic_t intCaught; +#ifndef WIN32 static void virshCatchInt(int sig G_GNUC_UNUSED, siginfo_t *siginfo G_GNUC_UNUSED, void *context G_GNUC_UNUSED) { intCaught = 1; } +#endif /* !WIN32 */ typedef struct _virshBlockJobWaitData virshBlockJobWaitData; @@ -1842,11 +1839,11 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) * the event to the given block job we will wait for the number of retries * before claiming that we entered synchronised phase */ unsigned int retries = 5; - +#ifndef WIN32 struct sigaction sig_action; struct sigaction old_sig_action; sigset_t sigmask, oldsigmask; - +#endif /* !WIN32 */ unsigned long long start = 0; unsigned long long curr = 0; @@ -1861,6 +1858,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->async_abort) abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC; +#ifndef WIN32 sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -1869,6 +1867,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) sig_action.sa_flags = SA_SIGINFO; sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); +#endif /* !WIN32 */ if (data->timeout && virTimeMillisNow(&start) < 0) { vshSaveLibvirtError(); @@ -1878,9 +1877,13 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) last.cur = last.end = 0; while (true) { +#ifndef WIN32 pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask); +#endif /* !WIN32 */ result = virDomainGetBlockJobInfo(data->dom, data->dev, &info, 0); +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); +#endif /* !WIN32 */ if (result < 0) { vshError(data->ctl, _("failed to query job for disk %s"), data->dev); @@ -1944,7 +1947,9 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) virshPrintJobProgress(data->job_name, 0, 1); cleanup: +#ifndef WIN32 sigaction(SIGINT, &old_sig_action, NULL); +#endif /* !WIN32 */ return ret; } @@ -4226,12 +4231,14 @@ doSave(void *opaque) unsigned int flags = 0; const char *xmlfile = NULL; char *xml = NULL; +#ifndef WIN32 sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; +#endif /* !WIN32 */ if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) goto out; @@ -4265,8 +4272,10 @@ doSave(void *opaque) ret = '0'; out: +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: +#endif /* !WIN32 */ virshDomainFree(dom); VIR_FREE(xml); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -4285,8 +4294,11 @@ virshWatchJob(vshControl *ctl, void *opaque, const char *label) { +#ifndef WIN32 struct sigaction sig_action; struct sigaction old_sig_action; + sigset_t sigmask, oldsigmask; +#endif /* !WIN32 */ struct pollfd pollfd[2] = {{.fd = pipe_fd, .events = POLLIN, .revents = 0}, {.fd = STDIN_FILENO, .events = POLLIN, .revents = 0}}; unsigned long long start_us, curr_us; @@ -4294,10 +4306,10 @@ virshWatchJob(vshControl *ctl, int ret = -1; char retchar; bool functionReturn = false; - sigset_t sigmask, oldsigmask; bool jobStarted = false; nfds_t npollfd = 2; +#ifndef WIN32 sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -4306,6 +4318,7 @@ virshWatchJob(vshControl *ctl, sig_action.sa_flags = SA_SIGINFO; sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); +#endif /* !WIN32 */ /* don't poll on STDIN if we are not using a terminal */ if (!vshTTYAvailable(ctl)) @@ -4355,9 +4368,13 @@ virshWatchJob(vshControl *ctl, } if (verbose || !jobStarted) { +#ifndef WIN32 pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask); +#endif /* !WIN32 */ ret = virDomainGetJobInfo(dom, &jobinfo); +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); +#endif /* !WIN32 */ if (ret == 0) { if (verbose && jobinfo.dataTotal > 0) virshPrintJobProgress(label, jobinfo.dataRemaining, @@ -4378,7 +4395,9 @@ virshWatchJob(vshControl *ctl, functionReturn = true; cleanup: +#ifndef WIN32 sigaction(SIGINT, &old_sig_action, NULL); +#endif /* !WIN32 */ vshTTYRestore(ctl); return functionReturn; } @@ -4662,12 +4681,14 @@ doManagedsave(void *opaque) virDomainPtr dom = NULL; const char *name; unsigned int flags = 0; +#ifndef WIN32 sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; +#endif /* !WIN32 */ if (vshCommandOptBool(cmd, "bypass-cache")) flags |= VIR_DOMAIN_SAVE_BYPASS_CACHE; @@ -4686,8 +4707,10 @@ doManagedsave(void *opaque) ret = '0'; out: +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: +#endif /* !WIN32 */ virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); } @@ -5340,17 +5363,19 @@ doDump(void *opaque) vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; virDomainPtr dom = NULL; - sigset_t sigmask, oldsigmask; const char *name = NULL; const char *to = NULL; unsigned int flags = 0; const char *format = NULL; unsigned int dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; +#ifndef WIN32 + sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; +#endif /* !WIN32 */ if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) goto out; @@ -5407,8 +5432,10 @@ doDump(void *opaque) ret = '0'; out: +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: +#endif /* !WIN32 */ if (dom) virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -10601,7 +10628,6 @@ doMigrate(void *opaque) virshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; - sigset_t sigmask, oldsigmask; virTypedParameterPtr params = NULL; int nparams = 0; int maxparams = 0; @@ -10609,11 +10635,14 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; +#ifndef WIN32 + sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; +#endif /* !WIN32 */ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) goto out; @@ -10881,8 +10910,10 @@ doMigrate(void *opaque) } out: +#ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: +#endif /* !WIN32 */ virTypedParamsFree(params, nparams); virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); diff --git a/tools/virsh.c b/tools/virsh.c index 9fb9ed6430..197a90636d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -29,7 +29,6 @@ #include <time.h> #include <sys/stat.h> #include <inttypes.h> -#include <signal.h> #if WITH_READLINE # include <readline/readline.h> @@ -62,11 +61,6 @@ #include "virsh-snapshot.h" #include "virsh-volume.h" -/* Gnulib doesn't guarantee SA_SIGINFO support. */ -#ifndef SA_SIGINFO -# define SA_SIGINFO 0 -#endif - static char *progname; static const vshCmdGrp cmdGroups[]; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index c71ebb1012..32edfe5757 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -40,11 +40,6 @@ #include "vsh-table.h" #include "virenum.h" -/* Gnulib doesn't guarantee SA_SIGINFO support. */ -#ifndef SA_SIGINFO -# define SA_SIGINFO 0 -#endif - #define VIRT_ADMIN_PROMPT "virt-admin # " /* we don't need precision to milliseconds in this module */ diff --git a/tools/vsh.c b/tools/vsh.c index 949c8dad7b..9c58e40d4f 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -46,11 +46,6 @@ #include "virtypedparam.h" #include "virstring.h" -/* Gnulib doesn't guarantee SA_SIGINFO support. */ -#ifndef SA_SIGINFO -# define SA_SIGINFO 0 -#endif - #ifdef WITH_READLINE /* For autocompletion */ vshControl *autoCompleteOpaque; @@ -2013,6 +2008,7 @@ vshEventLoop(void *opaque) /* We want to use SIGINT to cancel a wait; but as signal handlers * don't have an opaque argument, we have to use static storage. */ +#ifndef WIN32 static int vshEventFd = -1; static struct sigaction vshEventOldAction; @@ -2027,6 +2023,7 @@ vshEventInt(int sig G_GNUC_UNUSED, if (vshEventFd >= 0) ignore_value(safewrite(vshEventFd, &reason, 1)); } +#endif /* !WIN32 */ /* Event loop handler used to limit length of waiting for any other event. */ @@ -2057,10 +2054,13 @@ vshEventTimeout(int timer G_GNUC_UNUSED, int vshEventStart(vshControl *ctl, int timeout_ms) { +#ifndef WIN32 struct sigaction action; + assert(vshEventFd == -1); +#endif /* !WIN32 */ assert(ctl->eventPipe[0] == -1 && ctl->eventPipe[1] == -1 && - vshEventFd == -1 && ctl->eventTimerId >= 0); + ctl->eventTimerId >= 0); if (pipe2(ctl->eventPipe, O_CLOEXEC) < 0) { char ebuf[1024]; @@ -2068,12 +2068,15 @@ vshEventStart(vshControl *ctl, int timeout_ms) virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } + +#ifndef WIN32 vshEventFd = ctl->eventPipe[1]; action.sa_sigaction = vshEventInt; action.sa_flags = SA_SIGINFO; sigemptyset(&action.sa_mask); sigaction(SIGINT, &action, &vshEventOldAction); +#endif /* !WIN32 */ if (timeout_ms) virEventUpdateTimeout(ctl->eventTimerId, timeout_ms); @@ -2140,10 +2143,12 @@ vshEventWait(vshControl *ctl) void vshEventCleanup(vshControl *ctl) { +#ifndef WIN32 if (vshEventFd >= 0) { sigaction(SIGINT, &vshEventOldAction, NULL); vshEventFd = -1; } +#endif /* !WIN32 */ VIR_FORCE_CLOSE(ctl->eventPipe[0]); VIR_FORCE_CLOSE(ctl->eventPipe[1]); virEventUpdateTimeout(ctl->eventTimerId, -1); -- 2.24.1

The sys/uio.h header is only needed when building logging code with journald support enabled. Conditionally include it so that we avoid break on platforms which lack this header. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index ddc3ac1edb..8c17d666de 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <sys/uio.h> #if HAVE_SYSLOG_H # include <syslog.h> #endif @@ -52,6 +51,7 @@ * htole64. */ #if HAVE_SYSLOG_H && defined(__linux__) && HAVE_DECL_HTOLE64 # define USE_JOURNALD 1 +# include <sys/uio.h> #endif #define VIR_FROM_THIS VIR_FROM_NONE -- 2.24.1

g_mkdir() provides portability to Windows platforms. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virfile.c | 2 +- tests/virlockspacetest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 51a0d40b50..d0e0062aa7 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3029,7 +3029,7 @@ virFileMakePathHelper(char *path, mode_t mode) *p = '/'; } - if (mkdir(path, mode) < 0 && errno != EEXIST) + if (g_mkdir(path, mode) < 0 && errno != EEXIST) return -1; return 0; diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 57deb288a9..40395e8c72 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -300,7 +300,7 @@ static int testLockSpaceResourceLockPath(const void *args G_GNUC_UNUSED) if (!(lockspace = virLockSpaceNew(NULL))) goto cleanup; - if (mkdir(LOCKSPACE_DIR, 0700) < 0) + if (g_mkdir(LOCKSPACE_DIR, 0700) < 0) goto cleanup; if (virLockSpaceCreateResource(lockspace, LOCKSPACE_DIR "/foo") < 0) -- 2.24.1

polkit is only useful on Linux systems Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- m4/virt-polkit.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4 index 16889e1639..06da9e4ba6 100644 --- a/m4/virt-polkit.m4 +++ b/m4/virt-polkit.m4 @@ -25,6 +25,10 @@ AC_DEFUN([LIBVIRT_ARG_POLKIT], [ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [ AC_REQUIRE([LIBVIRT_CHECK_DBUS]) + if test "x$with_win" = "xyes"; then + with_polkit=no + fi + if test "x$with_polkit" = "xcheck"; then dnl For --with-polkit=check, also require the pkcheck binary, even dnl though we talk to polkit directly over D-Bus. -- 2.24.1

A large part of the virCommand code is still built on WIN32, despite the fact that the core fork() & execve() functions are not available. So despite succesfully building most of the code, at runtime the APIs are none the less unusuable. With the elimination of GNULIB many of the APIs being used in this code no longer have portability wrappers/shims for Windows. Rather than try to add portability wrappers, or do tests for each individual function, it is clearer to conditionalize nearly all of the code using #ifdef WIN32. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/vircommand.c | 165 ++++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 62 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index dd37b0b8dc..26b3488d6b 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -21,11 +21,15 @@ #include <config.h> -#include <poll.h> +#ifndef WIN32 +# include <poll.h> +#endif #include <signal.h> #include <stdarg.h> #include <sys/stat.h> -#include <sys/wait.h> +#ifndef WIN32 +# include <sys/wait.h> +#endif #include <fcntl.h> #include <unistd.h> @@ -153,7 +157,9 @@ struct _virCommand { static virBufferPtr dryRunBuffer; static virCommandDryRunCallback dryRunCallback; static void *dryRunOpaque; +#ifndef WIN32 static int dryRunStatus; +#endif /* !WIN32 */ /* * virCommandFDIsSet: @@ -538,6 +544,7 @@ virCommandMassClose(virCommandPtr cmd, return 0; } + /* * virExec: * @cmd virCommandPtr containing all information about the program to @@ -805,6 +812,7 @@ virExec(virCommandPtr cmd) return -1; } + /** * virRun: * @argv NULL terminated argv to run @@ -842,18 +850,6 @@ virRun(const char *const *argv G_GNUC_UNUSED, return -1; } -static int -virExec(virCommandPtr cmd G_GNUC_UNUSED) -{ - /* XXX: Some day we can implement pieces of virCommand/virExec on - * top of _spawn() or CreateProcess(), but we can't implement - * everything, since mingw completely lacks fork(), so we cannot - * run our own code in the child process. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virExec is not implemented for WIN32")); - return -1; -} - pid_t virFork(void) { @@ -1682,6 +1678,7 @@ virCommandFreeSendBuffers(virCommandPtr cmd) } +#ifndef WIN32 /** * virCommandSetSendBuffer * @cmd: the command to modify @@ -1690,7 +1687,6 @@ virCommandFreeSendBuffers(virCommandPtr cmd) * given file descriptor. The buffer will be freed automatically * and the file descriptor closed. */ -#if defined(F_SETFL) int virCommandSetSendBuffer(virCommandPtr cmd, int fd, @@ -1724,23 +1720,6 @@ virCommandSetSendBuffer(virCommandPtr cmd, return 0; } -#else /* !defined(F_SETFL) */ - -int -virCommandSetSendBuffer(virCommandPtr cmd, - int fd G_GNUC_UNUSED, - unsigned char *buffer G_GNUC_UNUSED, - size_t buflen G_GNUC_UNUSED) -{ - if (!cmd || cmd->has_error) - return -1; - - cmd->has_error = ENOTSUP; - - return -1; -} - -#endif static int virCommandSendBuffersFillPollfd(virCommandPtr cmd, @@ -1797,6 +1776,9 @@ virCommandSendBuffersHandlePoll(virCommandPtr cmd, return 0; } +#endif /* !WIN32 */ + + /** * virCommandSetInputBuffer: * @cmd: the command to modify @@ -2105,6 +2087,7 @@ virCommandToString(virCommandPtr cmd, bool linebreaks) } +#ifndef WIN32 /* * Manage input and output to the child process. */ @@ -2276,7 +2259,6 @@ virCommandProcessIO(virCommandPtr cmd) * Returns -1 on any error executing the command. * Will not return on success. */ -#ifndef WIN32 int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) { if (!cmd ||cmd->has_error == ENOMEM) { @@ -2299,19 +2281,7 @@ int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) cmd->args[0]); return -1; } -#else -int virCommandExec(virCommandPtr cmd G_GNUC_UNUSED, gid_t *groups G_GNUC_UNUSED, - int ngroups G_GNUC_UNUSED) -{ - /* Mingw execve() has a broken signature. Disable this - * function until gnulib fixes the signature, since we - * don't really need this on Win32 anyway. - */ - virReportSystemError(ENOSYS, "%s", - _("Executing new processes is not supported on Win32 platform")); - return -1; -} -#endif + /** * virCommandRun: @@ -2516,7 +2486,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) } cmd->infd = infd[0]; cmd->inpipe = infd[1]; -#if defined (F_SETFL) + if (fcntl(cmd->inpipe, F_SETFL, O_NONBLOCK) < 0) { virReportSystemError(errno, "%s", _("fcntl failed to set O_NONBLOCK")); @@ -2524,11 +2494,6 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) ret = -1; goto cleanup; } -#else /* !defined(F_SETFL) */ - cmd->has_error = ENOTSUP; - ret = -1; - goto cleanup; -#endif } else if ((cmd->inbuf && cmd->infd == -1) || (cmd->outbuf && cmd->outfdptr != &cmd->outfd) || (cmd->errbuf && cmd->errfdptr != &cmd->errfd)) { @@ -2719,7 +2684,6 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) } -#ifndef WIN32 /** * virCommandAbort: * @cmd: command to abort @@ -2738,15 +2702,6 @@ virCommandAbort(virCommandPtr cmd) cmd->pid = -1; cmd->reap = false; } -#else /* WIN32 */ -void -virCommandAbort(virCommandPtr cmd G_GNUC_UNUSED) -{ - /* Mingw lacks WNOHANG and kill(). But since we haven't ported - * virExec to mingw yet, there's no process to be killed, - * making this implementation trivially correct for now :) */ -} -#endif /** @@ -2891,6 +2846,92 @@ int virCommandHandshakeNotify(virCommandPtr cmd) VIR_FORCE_CLOSE(cmd->handshakeNotify[1]); return 0; } +#else /* WIN32 */ +int +virCommandSetSendBuffer(virCommandPtr cmd, + int fd G_GNUC_UNUSED, + unsigned char *buffer G_GNUC_UNUSED, + size_t buflen G_GNUC_UNUSED) +{ + if (!cmd || cmd->has_error) + return -1; + + cmd->has_error = ENOTSUP; + + return -1; +} + + +int +virCommandExec(virCommandPtr cmd G_GNUC_UNUSED, gid_t *groups G_GNUC_UNUSED, + int ngroups G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} + + +int +virCommandRun(virCommandPtr cmd G_GNUC_UNUSED, int *exitstatus G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} + + +int +virCommandRunAsync(virCommandPtr cmd G_GNUC_UNUSED, pid_t *pid G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} + + +int +virCommandWait(virCommandPtr cmd G_GNUC_UNUSED, int *exitstatus G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} + + +void +virCommandAbort(virCommandPtr cmd G_GNUC_UNUSED) +{ + /* Mingw lacks WNOHANG and kill(). But since we haven't ported + * virExec to mingw yet, there's no process to be killed, + * making this implementation trivially correct for now :) */ +} + + +void virCommandRequireHandshake(virCommandPtr cmd) +{ + if (!cmd || cmd->has_error) + return; + + cmd->has_error = ENOSYS; +} + + +int virCommandHandshakeWait(virCommandPtr cmd G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} + + +int virCommandHandshakeNotify(virCommandPtr cmd G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} +#endif /* WIN32 */ /** -- 2.24.1

Cygwin is not a supported build platform for libvirt and has no testing coverage in our CI systems. Stop pretending the code is usable and remove it so there is less to port to Meson. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- configure.ac | 11 ++--------- m4/virt-compile-pie.m4 | 2 +- m4/virt-win-common.m4 | 8 +++----- m4/virt-win-cygwin.m4 | 32 -------------------------------- m4/virt-win-symbols.m4 | 4 ++-- m4/virt-win-windres.m4 | 4 ++-- m4/virt-xdr.m4 | 9 +++------ src/Makefile.am | 8 +++----- src/admin/Makefile.inc.am | 1 - src/locking/Makefile.inc.am | 1 - src/logging/Makefile.inc.am | 1 - src/rpc/Makefile.inc.am | 3 --- src/rpc/genprotocol.pl | 2 +- src/util/virsocketaddr.h | 10 ---------- src/util/virxdrdefs.h | 12 +----------- 15 files changed, 18 insertions(+), 90 deletions(-) delete mode 100644 m4/virt-win-cygwin.m4 diff --git a/configure.ac b/configure.ac index f0d79b95d4..855654c75d 100644 --- a/configure.ac +++ b/configure.ac @@ -181,8 +181,6 @@ case "$host" in # mingw's ld has the --version-script parameter, but it requires a .def file # instead to work properly, therefore clear --version-script here and use # -Wl, to pass the .def file to the linker - # cygwin's ld has the --version-script parameter too, but for some reason - # it's working there as expected VERSION_SCRIPT_FLAGS="-Wl," ;; * ) @@ -204,13 +202,12 @@ dnl are also linux specific. The "network" and storage_fs drivers are known dnl to not work on macOS presently, so we also make a note if compiling dnl for that -with_linux=no with_macos=no with_freebsd=no with_win=no with_cygwin=no +with_linux=no with_macos=no with_freebsd=no with_win=no case $host in *-*-linux*) with_linux=yes ;; *-*-darwin*) with_macos=yes ;; *-*-freebsd*) with_freebsd=yes ;; *-*-mingw* | *-*-msvc* ) with_win=yes ;; - *-*-cygwin*) with_cygwin=yes ;; esac if test $with_linux = no; then @@ -227,9 +224,6 @@ if test $with_freebsd = yes; then with_firewalld=no fi -if test $with_cygwin = yes; then - with_vbox=no -fi AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) @@ -778,9 +772,8 @@ if test "$enable_test_coverage" = yes; then WARN_CFLAGS=$save_WARN_CFLAGS fi -dnl Cygwin, MinGW and MSVC checks +dnl MinGW checks LIBVIRT_WIN_CHECK_COMMON -LIBVIRT_WIN_CHECK_CYGWIN LIBVIRT_WIN_CHECK_MINGW LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES diff --git a/m4/virt-compile-pie.m4 b/m4/virt-compile-pie.m4 index a2df38ea72..da5cdf57b7 100644 --- a/m4/virt-compile-pie.m4 +++ b/m4/virt-compile-pie.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_COMPILE_PIE],[ PIE_CFLAGS= PIE_LDFLAGS= case "$host" in - *-*-mingw* | *-*-msvc* | *-*-cygwin* ) + *-*-mingw* ) ;; dnl All code is position independent on Win32 target *) gl_COMPILER_OPTION_IF([-fPIE -DPIE -pie], [ diff --git a/m4/virt-win-common.m4 b/m4/virt-win-common.m4 index b639866e64..ebc9d0836e 100644 --- a/m4/virt-win-common.m4 +++ b/m4/virt-win-common.m4 @@ -1,4 +1,4 @@ -dnl The Cygwin, MinGW and MSVC common checks +dnl The MinGW common checks dnl dnl Copyright (C) 2016 Red Hat, Inc. dnl @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_COMMON], [ WIN32_EXTRA_LIBS= case "$host" in - *-*-mingw* | *-*-cygwin* | *-*-msvc* ) + *-*-mingw* ) WIN32_EXTRA_LIBS="-lole32 -loleaut32" # If the host is Windows, and shared libraries are disabled, we # need to add -DLIBVIRT_STATIC to the CFLAGS for proper linking @@ -38,7 +38,5 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_COMMON], [ AC_DEFUN([LIBVIRT_WIN_RESULT_COMMON], [ details="CFLAGS='$WIN32_EXTRA_CFLAGS' LIBS='$WIN32_EXTRA_LIBS'" - LIBVIRT_RESULT([Cygwin], [$with_cygwin], [$details]) - LIBVIRT_RESULT([MinGW], [$with_cygwin], [$details]) - LIBVIRT_RESULT([MSVC], [$with_cygwin], [$details]) + LIBVIRT_RESULT([MinGW], [$with_win], [$details]) ]) diff --git a/m4/virt-win-cygwin.m4 b/m4/virt-win-cygwin.m4 deleted file mode 100644 index 211b3c2b7b..0000000000 --- a/m4/virt-win-cygwin.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The Cygwin check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_WIN_CHECK_CYGWIN], [ - CYGWIN_EXTRA_LDFLAGS= - CYGWIN_EXTRA_LIBADD= - case "$host" in - *-*-cygwin*) - CYGWIN_EXTRA_LDFLAGS="-no-undefined" - CYGWIN_EXTRA_LIBADD="${INTLLIBS}" - ;; - esac - - AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) - AC_SUBST([CYGWIN_EXTRA_LIBADD]) -]) diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index 66dd3b7b1c..eba5596e4b 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -1,4 +1,4 @@ -dnl The Cygwin, MinGW and MSVC symbols checks +dnl The MinGW symbols checks dnl dnl Copyright (C) 2016 Red Hat, Inc. dnl @@ -23,7 +23,7 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_LXC_SYMBOL_FILE='$(srcdir)/libvirt_lxc.syms' LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms' case "$host" in - *-*-mingw* | *-*-msvc* ) + *-*-mingw* ) # Also set the symbol file to .def, so src/Makefile generates libvirt.def # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the # linker diff --git a/m4/virt-win-windres.m4 b/m4/virt-win-windres.m4 index af27f231b4..e913eb48b8 100644 --- a/m4/virt-win-windres.m4 +++ b/m4/virt-win-windres.m4 @@ -1,4 +1,4 @@ -dnl The Cygwin, MinGW and MSVC windres checks +dnl The MinGW windres checks dnl dnl Copyright (C) 2016 Red Hat, Inc. dnl @@ -21,7 +21,7 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_WINDRES], [ dnl Look for windres to build a Windows icon resource. with_windres=no case "$host" in - *-*-mingw* | *-*-cygwin* | *-*-msvc* ) + *-*-mingw* ) AC_CHECK_TOOL([WINDRES], [windres], []) if test "x$WINDRES" != "x"; then with_windres=yes diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 index a65407d955..83754157d9 100644 --- a/m4/virt-xdr.m4 +++ b/m4/virt-xdr.m4 @@ -22,18 +22,15 @@ AC_DEFUN([LIBVIRT_CHECK_XDR], [ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. - dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW), -lnsl (Solaris) + dnl Otherwise try -lxdr (some MinGW) dnl -ltirpc (glibc 2.13.90 or newer) or none (most Unix) AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl tirpc],[], + AC_SEARCH_LIBS([xdrmem_create],[xdr tirpc],[], [AC_MSG_ERROR([Cannot find a XDR library])]) ]) with_xdr="yes" - dnl check for cygwin's variation in xdr function names - AC_CHECK_FUNCS([xdr_u_int64_t],[],[],[#include <rpc/xdr.h>]) - - dnl Cygwin/recent glibc requires -I/usr/include/tirpc for <rpc/rpc.h> + dnl Recent glibc requires -I/usr/include/tirpc for <rpc/rpc.h> old_CFLAGS=$CFLAGS AC_CACHE_CHECK([where to find <rpc/rpc.h>], [lv_cv_xdr_cflags], [ for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do diff --git a/src/Makefile.am b/src/Makefile.am index d4042cf7ba..58355c5337 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,6 @@ AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ - $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) AM_LDFLAGS_MOD = \ @@ -450,8 +449,7 @@ endif WITH_MACOS libvirt_la_LDFLAGS += $(NULL) libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += \ - $(DRIVER_MODULES_LIBS) \ - $(CYGWIN_EXTRA_LIBADD) + $(DRIVER_MODULES_LIBS) libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we # lose automake's automatic dependencies on an appropriate subset of @@ -518,7 +516,7 @@ libvirt_qemu_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(NULL) libvirt_qemu_la_CFLAGS = $(AM_CFLAGS) -libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) +libvirt_qemu_la_LIBADD = libvirt.la libvirt_lxc_la_SOURCES = libvirt-lxc.c libvirt_lxc_la_LDFLAGS = \ @@ -528,7 +526,7 @@ libvirt_lxc_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(NULL) libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) -libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) +libvirt_lxc_la_LIBADD = libvirt.la EXTRA_DIST += \ $(SYSCONF_FILES) \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 7ceccafa8e..b4e2f1f2d3 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -73,7 +73,6 @@ libvirt_admin_la_LDFLAGS = \ libvirt_admin_la_LIBADD = \ libvirt.la \ - $(CYGWIN_EXTRA_LIBADD) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(DEVMAPPER_LIBS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 65b46ad5f3..d49383d9d7 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -162,7 +162,6 @@ virtlockd_LDADD = \ libvirt_driver_admin.la \ $(GLIB_LIBS) \ ../gnulib/lib/libgnu.la \ - $(CYGWIN_EXTRA_LIBADD) \ $(NULL) if WITH_DTRACE_PROBES virtlockd_LDADD += libvirt_probes.lo diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 0f7ffa73b3..e8240fa5c4 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -99,7 +99,6 @@ virtlogd_LDADD = \ libvirt.la \ $(GLIB_LIBS) \ ../gnulib/lib/libgnu.la \ - $(CYGWIN_EXTRA_LIBADD) \ $(NULL) if WITH_DTRACE_PROBES virtlogd_LDADD += libvirt_probes.lo diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 11920b3270..0e154d9c69 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -97,7 +97,6 @@ libvirt_net_rpc_la_LDFLAGS = \ $(SECDRIVER_LIBS) \ $(AM_LDFLAGS) \ $(NULL) -libvirt_net_rpc_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) libvirt_net_rpc_server_la_SOURCES = \ rpc/virnetserverprogram.h \ @@ -122,7 +121,6 @@ libvirt_net_rpc_server_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(DBUS_LIBS) \ $(NULL) -libvirt_net_rpc_server_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) libvirt_net_rpc_client_la_SOURCES = \ rpc/virnetclientprogram.h \ @@ -138,7 +136,6 @@ libvirt_net_rpc_client_la_CFLAGS = \ $(XDR_CFLAGS) \ $(NULL) libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_net_rpc_client_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) if WITH_SASL libvirt_net_rpc_client_la_CFLAGS += \ diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 6baa4f22d5..f567260588 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -47,7 +47,7 @@ open RPCGEN, "-|", "$rpcgen $mode $xdrdef" open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd" || $^O eq "freebsd" || $^O eq "darwin"; +my $fixup = $^O eq "linux" || $^O eq "gnukfreebsd" || $^O eq "freebsd" || $^O eq "darwin"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 1180864f06..66aee2abcd 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -26,16 +26,6 @@ #include "internal.h" -/* On architectures which lack these limits, define them (ie. Cygwin). - * Note that the libvirt code should be robust enough to handle the - * case where actual value is longer than these limits (eg. by setting - * length correctly in second argument to gethostname and by always - * using strncpy instead of strcpy). - */ -#ifndef INET_ADDRSTRLEN -# define INET_ADDRSTRLEN 16 -#endif - #define VIR_LOOPBACK_IPV4_ADDR "127.0.0.1" typedef struct { diff --git a/src/util/virxdrdefs.h b/src/util/virxdrdefs.h index 264d02e7cd..b6f6ad5a4d 100644 --- a/src/util/virxdrdefs.h +++ b/src/util/virxdrdefs.h @@ -20,18 +20,8 @@ #pragma once -/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t - * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 +/* The portablexdr implementation lacks IXDR_PUT_U_INT32 and IXDR_GET_U_INT32 */ -#ifdef HAVE_XDR_U_INT64_T -# define xdr_uint64_t xdr_u_int64_t -#endif -#ifndef IXDR_PUT_INT32 -# define IXDR_PUT_INT32 IXDR_PUT_LONG -#endif -#ifndef IXDR_GET_INT32 -# define IXDR_GET_INT32 IXDR_GET_LONG -#endif #ifndef IXDR_PUT_U_INT32 # define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG #endif -- 2.24.1

Many of the virProcess APIs are relying on GNULIB providing POSIX API stubs. Even with these stubs the APIs don't do anything useful once compiled. We can thus conditionalize the code so that we don't compile anything at all. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virprocess.c | 98 +++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 22 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d8ee3142da..60419538e2 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -24,7 +24,9 @@ #include <fcntl.h> #include <signal.h> -#include <sys/wait.h> +#ifndef WIN32 +# include <sys/wait.h> +#endif #include <unistd.h> #if HAVE_SYS_MOUNT_H # include <sys/mount.h> @@ -121,6 +123,8 @@ VIR_ENUM_IMPL(virProcessSchedPolicy, "rr", ); + +#ifndef WIN32 /** * virProcessTranslateStatus: * @status: child exit status to translate @@ -146,7 +150,6 @@ virProcessTranslateStatus(int status) } -#ifndef WIN32 /** * virProcessAbort: * @pid: child process to kill @@ -206,14 +209,6 @@ virProcessAbort(pid_t pid) cleanup: errno = saved_errno; } -#else -void -virProcessAbort(pid_t pid) -{ - /* Not yet ported to mingw. Any volunteers? */ - VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid); -} -#endif /** @@ -282,6 +277,33 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) return -1; } +#else /* WIN32 */ + +char * +virProcessTranslateStatus(int status) +{ + return g_strdup_printf(_("invalid value %d"), status); +} + + +void +virProcessAbort(pid_t pid) +{ + /* Not yet ported to mingw. Any volunteers? */ + VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid); +} + + +int +virProcessWait(pid_t pid, int *exitstatus G_GNUC_UNUSED, bool raw G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, _("unable to wait for process %lld"), + (long long) pid); + return -1; +} + +#endif /* WIN32 */ + /* send signal to a single process */ int virProcessKill(pid_t pid, int sig) @@ -1036,6 +1058,7 @@ int virProcessGetStartTime(pid_t pid, #endif +#ifdef __linux__ typedef struct _virProcessNamespaceHelperData virProcessNamespaceHelperData; struct _virProcessNamespaceHelperData { pid_t pid; @@ -1088,7 +1111,22 @@ virProcessRunInMountNamespace(pid_t pid, return virProcessRunInFork(virProcessNamespaceHelper, &data); } +#else /* ! __linux__ */ +int +virProcessRunInMountNamespace(pid_t pid G_GNUC_UNUSED, + virProcessNamespaceCallback cb G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Namespaces are not supported on this platform")); + return -1; +} + +#endif /* ! __linux__ */ + + +#ifndef WIN32 static int virProcessRunInForkHelper(int errfd, pid_t ppid, @@ -1174,8 +1212,21 @@ virProcessRunInFork(virProcessForkCallback cb, return ret; } +#else /* WIN32 */ + +int +virProcessRunInFork(virProcessForkCallback cb G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Process spawning is not supported on this platform")); + return -1; +} + +#endif /* WIN32 */ -#if defined(HAVE_SYS_MOUNT_H) && defined(HAVE_UNSHARE) + +#if defined(__linux__) int virProcessSetupPrivateMountNS(void) { @@ -1194,24 +1245,14 @@ virProcessSetupPrivateMountNS(void) return 0; } -#else /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */ - -int -virProcessSetupPrivateMountNS(void) -{ - virReportSystemError(ENOSYS, "%s", - _("Namespaces are not supported on this platform.")); - return -1; -} -#endif /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */ -#if defined(__linux__) G_GNUC_NORETURN static int virProcessDummyChild(void *argv G_GNUC_UNUSED) { _exit(0); } + /** * virProcessNamespaceAvailable: * @ns: what namespaces to check (bitwise-OR of virProcessNamespaceFlags) @@ -1269,6 +1310,14 @@ virProcessNamespaceAvailable(unsigned int ns) #else /* !defined(__linux__) */ +int +virProcessSetupPrivateMountNS(void) +{ + virReportSystemError(ENOSYS, "%s", + _("Namespaces are not supported on this platform.")); + return -1; +} + int virProcessNamespaceAvailable(unsigned int ns G_GNUC_UNUSED) { @@ -1276,6 +1325,7 @@ virProcessNamespaceAvailable(unsigned int ns G_GNUC_UNUSED) _("Namespaces are not supported on this platform.")); return -1; } + #endif /* !defined(__linux__) */ /** @@ -1296,6 +1346,7 @@ virProcessExitWithStatus(int status) { int value = EXIT_CANNOT_INVOKE; +#ifndef WIN32 if (WIFEXITED(status)) { value = WEXITSTATUS(status); } else if (WIFSIGNALED(status)) { @@ -1312,6 +1363,9 @@ virProcessExitWithStatus(int status) raise(WTERMSIG(status)); value = 128 + WTERMSIG(status); } +#else /* WIN32 */ + (void)status; +#endif /* WIN32 */ exit(value); } -- 2.24.1

The net/if.h is not portable so we must check for its existance and avoid using it when missing. Some use of net/if.h was redundant and could be removed. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- build-aux/syntax-check.mk | 2 +- configure.ac | 1 + src/util/virnetdev.c | 1 - src/util/virnetdev.h | 4 +++- src/util/virnetdevbridge.c | 4 +++- src/util/virnetdevip.c | 4 +++- src/util/virnetdevtap.c | 4 +++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 86519b444d..376dc7c30d 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2338,4 +2338,4 @@ exclude_file_name_regexp--sc_prohibit_backslash_alignment = \ ^build-aux/syntax-check\.mk$$ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ - ^src/util/virfile\.c$$ + ^src/util/(virfile|virnetdev|virnetdevip)\.[c,h]|$$ diff --git a/configure.ac b/configure.ac index 855654c75d..75df326795 100644 --- a/configure.ac +++ b/configure.ac @@ -381,6 +381,7 @@ AC_CHECK_HEADERS([\ mntent.h \ net/ethernet.h \ netinet/tcp.h \ + net/if.h \ pty.h \ pwd.h \ stdarg.h \ diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b896a7507e..094d1ac09b 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -34,7 +34,6 @@ #ifndef WIN32 # include <sys/ioctl.h> #endif -#include <net/if.h> #include <fcntl.h> #ifdef __linux__ diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 24b41498ed..78e1aa656a 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -18,7 +18,9 @@ #pragma once -#include <net/if.h> +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif #include "virbitmap.h" #include "virsocketaddr.h" diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 5bb533f1f0..5a0fb5f42f 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -31,7 +31,9 @@ # include <sys/ioctl.h> #endif #include <sys/socket.h> -#include <net/if.h> +#ifdef HAVE_NET_IF +# include <net/if.h> +#endif #include <netinet/in.h> #ifdef __linux__ diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 5897c4aa76..bfb93cf258 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -36,7 +36,9 @@ #ifndef WIN32 # include <sys/ioctl.h> #endif -#include <net/if.h> +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif #include <fcntl.h> #ifdef __linux__ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 8656e267cb..84d91428e7 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -36,7 +36,9 @@ #ifndef WIN32 # include <sys/ioctl.h> #endif -#include <net/if.h> +#ifdef HAVE_NET_IF +# include <net/if.h> +#endif #include <fcntl.h> #ifdef __linux__ # include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */ -- 2.24.1

Most code now uses the virProcess / virCommand APIs, so the need for sys/wait.h is quite limited. Removing this include removes the dependency on GNULIB providing a dummy sys/wait.h for Windows. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/libvirt.c | 1 - src/lxc/lxc_container.c | 1 - src/network/bridge_driver.c | 1 - src/openvz/openvz_conf.c | 1 - src/openvz/openvz_driver.c | 1 - src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_conf.c | 1 - src/qemu/qemu_driver.c | 1 - src/remote/remote_daemon.c | 1 - src/rpc/virnetsocket.c | 1 - src/storage/storage_backend_iscsi.c | 1 - src/storage/storage_backend_logical.c | 1 - src/storage/storage_util.c | 1 - src/util/virfdstream.c | 1 - src/util/virfile.c | 1 - src/util/virhook.c | 1 - src/util/viriptables.c | 1 - src/util/virnetdevveth.c | 2 -- src/util/virsysinfo.c | 1 - src/vz/vz_driver.c | 1 - tests/commandtest.c | 4 +++- tests/testutils.c | 1 - 22 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2d02808a89..a30eaa7590 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -24,7 +24,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include <sys/wait.h> #include <time.h> #include <gio/gnetworking.h> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b44cc68e67..46f3e06f14 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -25,7 +25,6 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <sys/mount.h> -#include <sys/wait.h> #include <sys/stat.h> #include <unistd.h> #include <mntent.h> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b66135f2d9..8db1040b62 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -30,7 +30,6 @@ #include <fcntl.h> #include <signal.h> #include <pwd.h> -#include <sys/wait.h> #include <sys/ioctl.h> #include <net/if.h> #ifdef HAVE_SYSCTLBYNAME diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 1ec42c1d93..a3ae567fdf 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -29,7 +29,6 @@ #include <dirent.h> #include <time.h> #include <sys/stat.h> -#include <sys/wait.h> #include "virerror.h" #include "openvz_conf.h" diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 62644f3129..997b5acdab 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -30,7 +30,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <pwd.h> -#include <sys/wait.h> #include "virerror.h" #include "datatypes.h" diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5ff232608c..9bb4461793 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -51,7 +51,6 @@ #include <fcntl.h> #include <sys/stat.h> #include <unistd.h> -#include <sys/wait.h> #include <stdarg.h> #include <sys/utsname.h> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e5051027fc..119965dd80 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -25,7 +25,6 @@ #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> -#include <sys/wait.h> #include "virerror.h" #include "qemu_conf.h" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 55159365e3..cebedf1fa3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -30,7 +30,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <signal.h> -#include <sys/wait.h> #include <sys/ioctl.h> #include "qemu_driver.h" diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 33697988b6..524ee2cab9 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -23,7 +23,6 @@ #include <unistd.h> #include <fcntl.h> -#include <sys/wait.h> #include <sys/stat.h> #include <getopt.h> #include <grp.h> diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e1af68450f..07733cee48 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -23,7 +23,6 @@ #include <sys/stat.h> #include <unistd.h> -#include <sys/wait.h> #include <signal.h> #include <fcntl.h> #ifdef HAVE_IFADDRS_H diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index c02fbb5eaa..45a80b5f2a 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -22,7 +22,6 @@ #include <config.h> #include <dirent.h> -#include <sys/wait.h> #include <fcntl.h> #include <unistd.h> #include <sys/stat.h> diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 42dec05ba0..d26ca9c58e 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -21,7 +21,6 @@ #include <config.h> -#include <sys/wait.h> #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index b6ea0a2760..73ec3b6167 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -19,7 +19,6 @@ #include <config.h> #include <sys/types.h> -#include <sys/wait.h> #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 05ac63c281..1354d2ee52 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -26,7 +26,6 @@ #include <fcntl.h> #include <unistd.h> #ifndef WIN32 -# include <sys/wait.h> # include <termios.h> #endif diff --git a/src/util/virfile.c b/src/util/virfile.c index 97c82c1161..96778c61bd 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -42,7 +42,6 @@ # include <libutil.h> #endif /* !HAVE_LIBUTIL_H */ #include <sys/stat.h> -#include <sys/wait.h> #if defined(HAVE_SYS_MOUNT_H) # include <sys/mount.h> #endif diff --git a/src/util/virhook.c b/src/util/virhook.c index a687629fc2..5bdacdd79f 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -22,7 +22,6 @@ #include <config.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/stat.h> #include <unistd.h> diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 6b3a025880..e6a1ded8d5 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -25,7 +25,6 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/wait.h> #include "internal.h" #include "viriptables.h" diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 387017f2a8..b9a27951fb 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -19,8 +19,6 @@ #include <config.h> -#include <sys/wait.h> - #include "virnetdevveth.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 4cc4523be0..41f4d1cff9 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -22,7 +22,6 @@ #include <config.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/stat.h> #include <unistd.h> diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 284c9c1bf6..cfa086caf9 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -30,7 +30,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <pwd.h> -#include <sys/wait.h> #include <sys/time.h> #include <sys/statvfs.h> diff --git a/tests/commandtest.c b/tests/commandtest.c index e19ce62207..7df3ae0171 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -23,7 +23,9 @@ #include <unistd.h> #include <signal.h> #include <sys/stat.h> -#include <sys/wait.h> +#ifndef WIN32 +# include <sys/wait.h> +#endif #include <fcntl.h> #include "testutils.h" diff --git a/tests/testutils.c b/tests/testutils.c index 248f9ee8be..579b6fce1a 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -24,7 +24,6 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/wait.h> #include <unistd.h> #include <fcntl.h> #include "testutils.h" -- 2.24.1

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index b1f75fa751..0964ab8d51 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,9 @@ fi gl_EARLY gl_INIT +dnl get 64-int interfaces on 32-bit platforms +AC_SYS_LARGEFILE + AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) -- 2.24.1

The build still succeeds with the workaround removed, so whatever was causing the problem no longer exists. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- examples/c/domain/domtop.c | 15 --------------- examples/c/domain/suspend.c | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/examples/c/domain/domtop.c b/examples/c/domain/domtop.c index e463e2873f..15611c586d 100644 --- a/examples/c/domain/domtop.c +++ b/examples/c/domain/domtop.c @@ -34,21 +34,6 @@ static bool debug; static bool run_top; -/* On mingw, there's a header file that poisons the well: - * - * - * CC domtop.o - *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] - * #define ERROR(...) \ - * ^ - *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, - * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, - * from ../../gnulib/lib/unistd.h:48, - * from domtop.c:35: - * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition - * #define ERROR 0 - */ -#undef ERROR #define ERROR(...) \ do { \ fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c index 322f0d60df..980c4584c7 100644 --- a/examples/c/domain/suspend.c +++ b/examples/c/domain/suspend.c @@ -30,20 +30,6 @@ static int debug; -/* On mingw, there's a header file that poisons the well: - * - * - * CC domtop.o - *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] - * #define ERROR(...) \ - * ^ - *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, - * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, - * from ../../gnulib/lib/unistd.h:48, - * from domtop.c:35: - * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition - * #define ERROR 0 - */ #undef ERROR #define ERROR(...) \ do { \ -- 2.24.1

This hides the differences between Windows and UNIX, and adds standard error reporting. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- configure.ac | 1 + src/libvirt_private.syms | 3 ++ src/util/virutil.c | 64 ++++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 34 +++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/configure.ac b/configure.ac index 0964ab8d51..005753e8a1 100644 --- a/configure.ac +++ b/configure.ac @@ -369,6 +369,7 @@ AC_CHECK_FUNCS_ONCE([\ newlocale \ posix_fallocate \ posix_memalign \ + pipe2 \ prlimit \ sched_getaffinity \ sched_setscheduler \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 674f553403..56981541c5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3394,6 +3394,9 @@ virMemoryLimitTruncate; virMemoryMaxValue; virParseOwnershipIds; virParseVersionString; +virPipe; +virPipeNonBlock; +virPipeQuiet; virScaleInteger; virSetBlocking; virSetCloseExec; diff --git a/src/util/virutil.c b/src/util/virutil.c index fa6b56fd79..d5f3e72ba9 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1769,3 +1769,67 @@ char *virGetPassword(void) return g_strdup(getpass("")); #endif /* ! WIN32 */ } + + +static int +virPipeImpl(int fds[2], bool nonblock, bool errreport) +{ +#ifdef HAVE_PIPE2 + int flags = O_CLOEXEC; + if (nonblock) + flags |= O_NONBLOCK; + int rv = pipe2(fds, flags); +#else /* !HAVE_PIPE2 */ +# ifdef WIN32 + int rv = _pipe(fds, 4096, _O_BINARY); +# else /* !WIN32 */ + int rv = pipe(fds); +# endif /* !WIN32 */ +#endif /* !HAVE_PIPE2 */ + + if (rv < 0) { + if (errreport) + virReportSystemError(errno, "%s", + _("Unable to create pipes")); + return rv; + } + +#ifndef HAVE_PIPE2 + if (nonblock) { + if (virSetNonBlock(fds[0]) < 0 || + virSetNonBlock(fds[1]) < 0) { + if (errreport) + virReportSystemError(errno, "%s", + _("Unable to set pipes to non-blocking")); + virReportSystemError(errno, "%s", + _("Unable to create pipes")); + VIR_FORCE_CLOSE(fds[0]); + VIR_FORCE_CLOSE(fds[1]); + return -1; + } + } +#endif /* !HAVE_PIPE2 */ + + return 0; +} + + +int +virPipe(int fds[2]) +{ + return virPipeImpl(fds, false, true); +} + + +int +virPipeQuiet(int fds[2]) +{ + return virPipeImpl(fds, false, false); +} + + +int +virPipeNonBlock(int fds[2]) +{ + return virPipeImpl(fds, true, true); +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 62a53f34cb..7377c8c8da 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -161,3 +161,37 @@ char *virHostGetDRMRenderNode(void) G_GNUC_NO_INLINE; (((lvalue) = (rvalue)) != (rvalue)) char *virGetPassword(void); + +/* + * virPipe: + * + * Open a pair of FDs which can be used to communicate + * with each other. The FDs will have O_CLOEXEC set. + * This will report a libvirt error on failure. + * + * Returns: -1 on error, 0 on success + */ +int virPipe(int fds[2]); + +/* + * virPipeQuiet: + * + * Open a pair of FDs which can be used to communicate + * with each other. The FDs will have O_CLOEXEC set. + * This will set errno on failure. + * + * Returns: -1 on error, 0 on success + */ +int virPipeQuiet(int fds[2]); + +/* + * virPipe: + * + * Open a pair of FDs which can be used to communicate + * with each other. The FDs will have O_CLOEXEC and + * O_NONBLOCK set. + * This will report a libvirt error on failure. + * + * Returns: -1 on error, 0 on success + */ +int virPipeNonBlock(int fds[2]); -- 2.24.1

This addreses portability to Windows and standardizes error reporting. This fixes a number of places which failed to set O_CLOEXEC or failed to report errors. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/libxl/libxl_migration.c | 6 ++---- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/logging/log_handler.c | 6 ++---- src/lxc/lxc_process.c | 5 +---- src/qemu/qemu_migration.c | 25 +++++++++---------------- src/qemu/qemu_tpm.c | 5 +---- src/remote/remote_daemon.c | 2 +- src/rpc/virnetdaemon.c | 5 +---- src/rpc/virnetsocket.c | 5 +---- src/util/vircommand.c | 18 +++++------------- src/util/virfdstream.c | 5 +---- src/util/virfile.c | 5 +---- src/util/virpolkit.c | 2 +- src/util/virprocess.c | 5 +---- tests/commandtest.c | 4 ++-- tests/eventtest.c | 2 +- tests/testutils.c | 2 +- tools/virsh-domain.c | 8 ++++---- tools/vsh.c | 8 +++----- 20 files changed, 40 insertions(+), 82 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 404c437a22..873b2b3e01 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -584,7 +584,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, * The data flow of tunnel3 migration in the dest side: * stream -> pipe -> recvfd of libxlDomainStartRestore */ - if (pipe(dataFD) < 0) + if (virPipe(dataFD) < 0) goto endjob; /* Stream data will be written to pipeIn */ @@ -916,10 +916,8 @@ libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, tc->dataFD[0] = -1; tc->dataFD[1] = -1; - if (pipe(tc->dataFD) < 0) { - virReportError(errno, "%s", _("Unable to make pipes")); + if (virPipe(tc->dataFD) < 0) goto out; - } arg = &tc->tmThread; /* Read from pipe */ diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 65c38139c4..9c72db93fd 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -356,7 +356,7 @@ static int virLockDaemonForkIntoBackground(const char *argv0) { int statuspipe[2]; - if (pipe(statuspipe) < 0) + if (virPipeQuiet(statuspipe) < 0) return -1; pid_t pid = fork(); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 488f3b459d..2ce6eb7447 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -298,7 +298,7 @@ static int virLogDaemonForkIntoBackground(const char *argv0) { int statuspipe[2]; - if (pipe(statuspipe) < 0) + if (virPipeQuiet(statuspipe) < 0) return -1; pid_t pid = fork(); diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 030c9d66e3..26ccfb4470 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -385,11 +385,9 @@ virLogHandlerDomainOpenLogFile(virLogHandlerPtr handler, } } - if (pipe(pipefd) < 0) { - virReportSystemError(errno, "%s", - _("Cannot open fifo pipe")); + if (virPipe(pipefd) < 0) goto error; - } + if (VIR_ALLOC(file) < 0) goto error; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index af8593d6a5..32a237fadd 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1364,11 +1364,8 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } - if (pipe(handshakefds) < 0) { - virReportSystemError(errno, "%s", - _("Unable to create pipe")); + if (virPipe(handshakefds) < 0) goto cleanup; - } if (!(cmd = virLXCProcessBuildControllerCmd(driver, vm, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 76dcd36266..2323008699 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2488,11 +2488,8 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, goto done; if (tunnel && - (pipe(dataFD) < 0 || virSetCloseExec(dataFD[1]) < 0)) { - virReportSystemError(errno, "%s", - _("cannot create pipe for tunnelled migration")); + virPipe(dataFD) < 0) goto stopjob; - } startFlags = VIR_QEMU_PROCESS_START_AUTODESTROY; @@ -3245,11 +3242,8 @@ qemuMigrationSrcStartTunnel(virStreamPtr st, qemuMigrationIOThreadPtr io = NULL; int wakeupFD[2] = { -1, -1 }; - if (pipe2(wakeupFD, O_CLOEXEC) < 0) { - virReportSystemError(errno, "%s", - _("Unable to make pipe")); + if (virPipe(wakeupFD) < 0) goto error; - } if (VIR_ALLOC(io) < 0) goto error; @@ -3863,10 +3857,12 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, spec.dest.fd.qemu = -1; spec.dest.fd.local = -1; - if (pipe2(fds, O_CLOEXEC) == 0) { - spec.dest.fd.qemu = fds[1]; - spec.dest.fd.local = fds[0]; - } + if (virPipe(fds) < 0) + goto cleanup; + + spec.dest.fd.qemu = fds[1]; + spec.dest.fd.local = fds[0]; + if (spec.dest.fd.qemu == -1 || qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, spec.dest.fd.qemu) < 0) { @@ -5228,11 +5224,8 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, return -1; } - if (compressor && pipe(pipeFD) < 0) { - virReportSystemError(errno, "%s", - _("Failed to create pipe for migration")); + if (compressor && virPipe(pipeFD) < 0) return -1; - } /* All right! We can use fd migration, which means that qemu * doesn't have to open() the file, so while we still have to diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 6741373583..17b800db1c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -374,11 +374,8 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, &secret, &secret_len) < 0) goto error; - if (pipe(pipefd) == -1) { - virReportSystemError(errno, "%s", - _("Unable to create pipe")); + if (virPipe(pipefd) < 0) goto error; - } if (virCommandSetSendBuffer(cmd, pipefd[1], secret, secret_len) < 0) goto error; diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 524ee2cab9..f833cc1024 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -113,7 +113,7 @@ VIR_ENUM_IMPL(virDaemonErr, static int daemonForkIntoBackground(const char *argv0) { int statuspipe[2]; - if (pipe(statuspipe) < 0) + if (virPipeQuiet(statuspipe) < 0) return -1; pid_t pid = fork(); diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index aa77e984ab..7f2226b086 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -671,11 +671,8 @@ virNetDaemonSignalSetup(virNetDaemonPtr dmn) if (dmn->sigwrite != -1) return 0; - if (pipe2(fds, O_CLOEXEC|O_NONBLOCK) < 0) { - virReportSystemError(errno, "%s", - _("Unable to create signal pipe")); + if (virPipeNonBlock(fds) < 0) return -1; - } if ((dmn->sigwatch = virEventAddHandle(fds[0], VIR_EVENT_HANDLE_READABLE, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 07733cee48..494b548948 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -794,11 +794,8 @@ int virNetSocketNewConnectCommand(virCommandPtr cmd, goto error; } - if (pipe(errfd) < 0) { - virReportSystemError(errno, "%s", - _("unable to create socket pair")); + if (virPipe(errfd) < 0) goto error; - } virCommandSetInputFD(cmd, sv[1]); virCommandSetOutputFD(cmd, &sv[1]); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 26b3488d6b..33028aa963 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -585,11 +585,8 @@ virExec(virCommandPtr cmd) if (cmd->outfdptr != NULL) { if (*cmd->outfdptr == -1) { - if (pipe2(pipeout, O_CLOEXEC) < 0) { - virReportSystemError(errno, - "%s", _("cannot create pipe")); + if (virPipe(pipeout) < 0) goto cleanup; - } if ((cmd->flags & VIR_EXEC_NONBLOCK) && virSetNonBlock(pipeout[0]) == -1) { @@ -612,11 +609,8 @@ virExec(virCommandPtr cmd) if (cmd->errfdptr == cmd->outfdptr) { childerr = childout; } else if (*cmd->errfdptr == -1) { - if (pipe2(pipeerr, O_CLOEXEC) < 0) { - virReportSystemError(errno, - "%s", _("Failed to create pipe")); + if (virPipe(pipeerr) < 0) goto cleanup; - } if ((cmd->flags & VIR_EXEC_NONBLOCK) && virSetNonBlock(pipeerr[0]) == -1) { @@ -2478,9 +2472,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) * virCommandDoAsyncIO. */ if (cmd->inbuf && cmd->infd == -1 && (synchronous || cmd->flags & VIR_EXEC_ASYNC_IO)) { - if (pipe2(infd, O_CLOEXEC) < 0) { - virReportSystemError(errno, "%s", - _("unable to open pipe")); + if (virPipe(infd) < 0) { cmd->has_error = -1; return -1; } @@ -2724,11 +2716,11 @@ void virCommandRequireHandshake(virCommandPtr cmd) return; } - if (pipe2(cmd->handshakeWait, O_CLOEXEC) < 0) { + if (virPipeQuiet(cmd->handshakeWait) < 0) { cmd->has_error = errno; return; } - if (pipe2(cmd->handshakeNotify, O_CLOEXEC) < 0) { + if (virPipeQuiet(cmd->handshakeNotify) < 0) { VIR_FORCE_CLOSE(cmd->handshakeWait[0]); VIR_FORCE_CLOSE(cmd->handshakeWait[1]); cmd->has_error = errno; diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 1354d2ee52..3337fc2060 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -1274,11 +1274,8 @@ virFDStreamOpenFileInternal(virStreamPtr st, goto error; } - if (pipe(pipefds) < 0) { - virReportSystemError(errno, "%s", - _("Unable to create pipe")); + if (virPipe(pipefds) < 0) goto error; - } if (VIR_ALLOC(threadData) < 0) goto error; diff --git a/src/util/virfile.c b/src/util/virfile.c index 96778c61bd..2ab4ccb1d5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -275,11 +275,8 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) goto error; } - if (pipe2(pipefd, O_CLOEXEC) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to create pipe for %s"), name); + if (virPipe(pipefd) < 0) goto error; - } if (!(iohelper_path = virFileFindResource("libvirt_iohelper", abs_top_builddir "/src", diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 0db7bf0747..5c2d0d4bd4 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -171,7 +171,7 @@ virPolkitAgentCreate(void) if (!isatty(STDIN_FILENO)) goto error; - if (pipe2(pipe_fd, 0) < 0) + if (virPipe(pipe_fd) < 0) goto error; if (VIR_ALLOC(agent) < 0) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 60419538e2..e33f5bdc7e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1175,11 +1175,8 @@ virProcessRunInFork(virProcessForkCallback cb, pid_t parent = getpid(); int errfd[2] = { -1, -1 }; - if (pipe2(errfd, O_CLOEXEC) < 0) { - virReportSystemError(errno, "%s", - _("Cannot create pipe for child")); + if (virPipe(errfd) < 0) return -1; - } if ((child = virFork()) < 0) goto cleanup; diff --git a/tests/commandtest.c b/tests/commandtest.c index 7df3ae0171..ae2598d5fd 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1019,7 +1019,7 @@ static int test25(const void *unused G_GNUC_UNUSED) int ngroups; virCommandPtr cmd = virCommandNew("some/nonexistent/binary"); - if (pipe(pipeFD) < 0) { + if (virPipeQuiet(pipeFD) < 0) { fprintf(stderr, "Unable to create pipe\n"); goto cleanup; } @@ -1187,7 +1187,7 @@ static int test27(const void *unused G_GNUC_UNUSED) errexpect = g_strdup_printf(TEST27_ERREXPECT_TEMP, buffer0, buffer1, buffer2); - if (pipe(pipe1) < 0 || pipe(pipe2) < 0) { + if (virPipeQuiet(pipe1) < 0 || virPipeQuiet(pipe2) < 0) { printf("Could not create pipe: %s\n", g_strerror(errno)); goto cleanup; } diff --git a/tests/eventtest.c b/tests/eventtest.c index 1bda5efe6d..9855b578fb 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -321,7 +321,7 @@ mymain(void) char one = '1'; for (i = 0; i < NUM_FDS; i++) { - if (pipe(handles[i].pipeFD) < 0) { + if (virPipeQuiet(handles[i].pipeFD) < 0) { fprintf(stderr, "Cannot create pipe: %d", errno); return EXIT_FAILURE; } diff --git a/tests/testutils.c b/tests/testutils.c index 579b6fce1a..7b9a5ea05b 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -377,7 +377,7 @@ virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen) int pipefd[2]; int len; - if (pipe(pipefd) < 0) + if (virPipeQuiet(pipefd) < 0) return -1; pid_t pid = fork(); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 04ba44d4f2..a1e2409303 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4422,7 +4422,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "verbose")) verbose = true; - if (pipe(p) < 0) + if (virPipeQuiet(p) < 0) goto cleanup; data.ctl = ctl; @@ -4731,7 +4731,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "verbose")) verbose = true; - if (pipe(p) < 0) + if (virPipeQuiet(p) < 0) goto cleanup; data.ctl = ctl; @@ -5461,7 +5461,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "verbose")) verbose = true; - if (pipe(p) < 0) + if (virPipeQuiet(p) < 0) goto cleanup; data.ctl = ctl; @@ -11032,7 +11032,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (pipe(p) < 0) + if (virPipeQuiet(p) < 0) goto cleanup; data.ctl = ctl; diff --git a/tools/vsh.c b/tools/vsh.c index 9c58e40d4f..2cf3dab054 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2061,11 +2061,9 @@ vshEventStart(vshControl *ctl, int timeout_ms) assert(ctl->eventPipe[0] == -1 && ctl->eventPipe[1] == -1 && ctl->eventTimerId >= 0); - if (pipe2(ctl->eventPipe, O_CLOEXEC) < 0) { - char ebuf[1024]; - - vshError(ctl, _("failed to create pipe: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); + if (virPipe(ctl->eventPipe) < 0) { + vshSaveLibvirtError(); + vshReportError(ctl); return -1; } -- 2.24.1

The O_SYNC flag is not defined on Windows platforms. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tools/vsh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 2cf3dab054..cd473ef1d6 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2152,7 +2152,11 @@ vshEventCleanup(vshControl *ctl) virEventUpdateTimeout(ctl->eventTimerId, -1); } -#define LOGFILE_FLAGS (O_WRONLY | O_APPEND | O_CREAT | O_SYNC) +#ifdef O_SYNC +# define LOGFILE_FLAGS (O_WRONLY | O_APPEND | O_CREAT | O_SYNC) +#else +# define LOGFILE_FLAGS (O_WRONLY | O_APPEND | O_CREAT) +#endif /** * vshOpenLogFile: -- 2.24.1

When we get rid of GNULIB, we need to check for -lpthread support. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- m4/virt-pthread.m4 | 26 ++++++++++++++------------ src/Makefile.am | 2 -- tests/Makefile.am | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/m4/virt-pthread.m4 b/m4/virt-pthread.m4 index 5b3750e8e9..0b52b40bb8 100644 --- a/m4/virt-pthread.m4 +++ b/m4/virt-pthread.m4 @@ -18,20 +18,24 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_DEFUN([LIBVIRT_CHECK_PTHREAD], [ - old_LIBS="$LIBS" + dnl Availability of pthread functions - dnl Availability of pthread functions. Because of $LIB_PTHREAD, we - dnl cannot use AC_CHECK_FUNCS_ONCE. LIB_PTHREAD and LIBMULTITHREAD - dnl were set during gl_INIT by gnulib. - LIBS="$LIBS $LIB_PTHREAD $LIBMULTITHREAD" - pthread_found=yes - AC_CHECK_FUNCS([pthread_mutexattr_init]) - AC_CHECK_HEADER([pthread.h],,[pthread_found=no]) + AC_SEARCH_LIBS([pthread_mutexattr_init],[pthread ""]) - if test "$ac_cv_func_pthread_mutexattr_init:$pthread_found" != "yes:yes" + if test "$ac_cv_func_pthread_mutexattr_init" = "no" then - AC_MSG_ERROR([A pthreads impl is required for building libvirt]) + AC_MSG_ERROR([libpthread is required for building libvirt]) fi + THREAD_LIBS="" + if test "x$ac_cv_func_pthread_mutexattr_init" != "x" + then + THREAD_LIBS="-l$ac_cv_func_pthread_mutexattr_init" + fi + AC_SUBST([THREAD_LIBS]) + + AC_CHECK_HEADER([pthread.h],,[ + AC_MSG_ERROR([pthread.h is required for building libvirt]) + ]) dnl At least mingw64-winpthreads #defines pthread_sigmask to 0, dnl which in turn causes compilation to complain about unused variables. @@ -51,6 +55,4 @@ AC_DEFUN([LIBVIRT_CHECK_PTHREAD], [ AC_DEFINE([FUNC_PTHREAD_SIGMASK_BROKEN], [1], [Define to 1 if pthread_sigmask is not a real function]) fi - - LIBS="$old_LIBS" ]) diff --git a/src/Makefile.am b/src/Makefile.am index 58355c5337..87322521c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -130,8 +130,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am -THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) - SECDRIVER_CFLAGS = SECDRIVER_LIBS = if WITH_SECDRIVER_SELINUX diff --git a/tests/Makefile.am b/tests/Makefile.am index 19705c6b76..54b128833b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1511,7 +1511,7 @@ libshunload_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) shunloadtest_SOURCES = \ shunloadtest.c -shunloadtest_LDADD = $(LIB_PTHREAD) $(DLOPEN_LIBS) +shunloadtest_LDADD = $(THREAD_LIBS) $(DLOPEN_LIBS) shunloadtest_DEPENDENCIES = libshunload.la sysinfotest_SOURCES = \ -- 2.24.1

All our supported Linux distros now have this header. It has never existed on FreeBSD / macOS / Mingw. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/conf/domain_audit.c | 4 +--- src/lxc/lxc_controller.c | 4 +--- src/lxc/lxc_driver.c | 4 +--- src/qemu/qemu_domain.c | 4 +--- src/util/vircgroup.c | 8 +------- src/util/virdevmapper.c | 4 +--- src/util/virutil.c | 4 +--- tests/vircgroupmock.c | 8 +------- 8 files changed, 8 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 138f270129..1b0abb21a0 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -23,9 +23,7 @@ #include <sys/stat.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 558a964fca..c0a9f33c18 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -24,9 +24,7 @@ #include <sys/epoll.h> #include <sys/wait.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index bc86f35f52..f7376188f0 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -25,9 +25,7 @@ #include <sched.h> #include <sys/utsname.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b0c0e1a19b..a544a514a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -63,9 +63,7 @@ #include "virdomaincheckpointobjlist.h" #include "backup_conf.h" -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif #include <sys/time.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 526ce9da03..0680ff7c24 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -25,13 +25,7 @@ # include <sys/mount.h> # include <fcntl.h> # include <sys/stat.h> - -# ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -# elif MAJOR_IN_SYSMACROS -# include <sys/sysmacros.h> -# endif - +# include <sys/sysmacros.h> # include <sys/types.h> # include <signal.h> # include <dirent.h> diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index cc6a099faa..feb5982315 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -20,9 +20,7 @@ #include <config.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/util/virutil.c b/src/util/virutil.c index d5f3e72ba9..bdb79c7f1b 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -31,9 +31,7 @@ # include <conio.h> #endif /* WIN32 */ -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 9ec3b576d2..66b8c01852 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -23,13 +23,7 @@ # include <unistd.h> # include <fcntl.h> # include <sys/stat.h> - -# ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -# elif MAJOR_IN_SYSMACROS -# include <sys/sysmacros.h> -# endif - +# include <sys/sysmacros.h> # include <stdarg.h> # include "testutilslxc.h" # include "virstring.h" -- 2.24.1

MinGW lacks ENOMSG until version 6.0.0 (Fedora 31). Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/internal.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/internal.h b/src/internal.h index 8c9322ec1e..96a43113cb 100644 --- a/src/internal.h +++ b/src/internal.h @@ -482,3 +482,9 @@ enum { #ifndef ENODATA # define ENODATA EIO #endif + +#ifdef WIN32 +# ifndef ENOMSG +# define ENOMSG 122 +# endif +#endif -- 2.24.1

On macOS some definitions are in xlocale.h, instead of in locale.h. GNULIB hides this difference by making the latter include the former. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- configure.ac | 1 + src/util/virgettext.c | 3 +++ src/util/virstring.c | 3 +++ tests/vshtabletest.c | 3 +++ 4 files changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 005753e8a1..8692c40e86 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,7 @@ AC_CHECK_HEADERS([\ sys/syscall.h \ sys/sysctl.h \ sys/ucred.h \ + xlocale.h \ ]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/util/virgettext.c b/src/util/virgettext.c index 7c12a5c142..8de8edb239 100644 --- a/src/util/virgettext.c +++ b/src/util/virgettext.c @@ -21,6 +21,9 @@ #include <config.h> #include <locale.h> +#ifdef HAVE_XLOCALE_H +# include <xlocale.h> +#endif #include "configmake.h" #include "internal.h" diff --git a/src/util/virstring.c b/src/util/virstring.c index fe5c026d2c..e9e792f3bf 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -20,6 +20,9 @@ #include <glib/gprintf.h> #include <locale.h> +#ifdef HAVE_XLOCALE_H +# include <xlocale.h> +#endif #include "virstring.h" #include "virthread.h" diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 0feda90b52..55b795f99c 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -19,6 +19,9 @@ #include <config.h> #include <locale.h> +#ifdef HAVE_XLOCALE_H +# include <xlocale.h> +#endif #include <wchar.h> #include <wctype.h> -- 2.24.1

The printf/fprintf function impls provided on Windows do not follow the normal syntax for format specifiers as the UNIX hosts. Currently we use GNULIB to provide a portability fix for this. GLib has also imported the GNULIB impl for this same reason, and thus we can rely on the g_printf / g_fprintf functions. This identified a couple of places not explicitly linking to glib. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/internal.h | 14 ++++++++++++++ src/locking/Makefile.inc.am | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/internal.h b/src/internal.h index 96a43113cb..e181218067 100644 --- a/src/internal.h +++ b/src/internal.h @@ -488,3 +488,17 @@ enum { # define ENOMSG 122 # endif #endif + +/* Ideally callers would use the g_*printf + * functions directly but there are alot to + * convert, so until then... + */ +#ifndef VIR_NO_GLIB_STDIO + +# undef printf +# define printf(...) g_printf(__VA_ARGS__) + +# undef fprintf +# define fprintf(fh, ...) g_fprintf(fh, __VA_ARGS__) + +#endif /* VIR_NO_GLIB_STDIO */ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index d49383d9d7..9fd2b7f282 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -208,7 +208,10 @@ libvirt_sanlock_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ $(NULL) -libvirt_sanlock_helper_LDADD = libvirt.la +libvirt_sanlock_helper_LDADD = \ + libvirt.la \ + $(GLIB_LIBS) \ + $(NULL) endif WITH_SANLOCK conf_DATA += locking/virtlockd.conf -- 2.24.1

The virFilePrintf function was a wrapper for fprintf() to provide Windows portability, since gnulib's fprintf() replacement was license restricted. This is no longer needed now we have the g_fprintf function available. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/libvirt_private.syms | 1 - src/util/virfile.c | 31 ----------------------------- src/util/virfile.h | 3 --- tests/commandhelper.c | 3 +-- tests/fdstreamtest.c | 42 ++++++++++++++++++++-------------------- tests/qemusecuritytest.c | 2 +- tests/shunloadtest.c | 2 +- tests/ssh.c | 3 +-- tests/testutils.h | 6 ------ tests/testutilsqemu.c | 4 ++-- tests/virstringtest.c | 34 ++++++++++++++++---------------- 11 files changed, 44 insertions(+), 87 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 56981541c5..59e1399c79 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2007,7 +2007,6 @@ virFileMoveMount; virFileNBDDeviceAssociate; virFileOpenAs; virFileOpenTty; -virFilePrintf; virFileReadAll; virFileReadAllQuiet; virFileReadBufQuiet; diff --git a/src/util/virfile.c b/src/util/virfile.c index 2ab4ccb1d5..0633a1fa8d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3331,37 +3331,6 @@ virFileRemoveLastComponent(char *path) path[0] = '\0'; } -/** - * virFilePrintf: - * - * A replacement for fprintf() which uses g_strdup_vprintf - * to ensure that portable string format placeholders can - * be used, since gnulib's fprintf() replacement is not - * LGPLV2+ compatible - */ -int virFilePrintf(FILE *fp, const char *msg, ...) -{ - va_list vargs; - g_autofree char *str = NULL; - int ret = -1; - - va_start(vargs, msg); - - str = g_strdup_vprintf(msg, vargs); - ret = strlen(str); - - if (fwrite(str, 1, ret, fp) != ret) { - virReportSystemError(errno, "%s", - _("Could not write to stream")); - ret = -1; - } - - va_end(vargs); - - return ret; -} - - #ifdef __linux__ # ifndef NFS_SUPER_MAGIC diff --git a/src/util/virfile.h b/src/util/virfile.h index c805d87b3f..0a520a7522 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -293,9 +293,6 @@ char *virFileFindMountPoint(const char *type); virBuildPathInternal(path, __VA_ARGS__, NULL) int virBuildPathInternal(char **path, ...) G_GNUC_NULL_TERMINATED; -int virFilePrintf(FILE *fp, const char *msg, ...) - G_GNUC_PRINTF(2, 3); - typedef struct _virHugeTLBFS virHugeTLBFS; typedef virHugeTLBFS *virHugeTLBFSPtr; struct _virHugeTLBFS { diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b9677f2caa..3f040be8f2 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -24,8 +24,7 @@ #include <fcntl.h> #include <sys/stat.h> -#include "internal.h" -#define NO_LIBVIRT +#define VIR_NO_GLIB_STDIO /* This file intentionally does not link to libvirt/glib */ #include "testutils.h" #ifndef WIN32 diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 03f5520fa6..7c784a49f1 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -103,16 +103,16 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) g_usleep(20 * 1000); goto reread; } - virFilePrintf(stderr, "Failed to read stream: %s\n", - virGetLastErrorMessage()); + fprintf(stderr, "Failed to read stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } if (got == 0) { /* Expect EOF 1/2 through last pattern */ if (i == 9 && want == (PATTERN_LEN / 2)) break; - virFilePrintf(stderr, "Unexpected EOF block %zu want %zu\n", - i, want); + fprintf(stderr, "Unexpected EOF block %zu want %zu\n", + i, want); goto cleanup; } offset += got; @@ -120,25 +120,25 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) } if (i == 0) { if (memcmp(buf, pattern + (PATTERN_LEN / 2), PATTERN_LEN / 2) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else if (i == 9) { if (memcmp(buf, pattern, PATTERN_LEN / 2) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else { if (memcmp(buf, pattern, PATTERN_LEN) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } } if (st->driver->streamFinish(st) != 0) { - virFilePrintf(stderr, "Failed to finish stream: %s\n", - virGetLastErrorMessage()); + fprintf(stderr, "Failed to finish stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } @@ -226,8 +226,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) if (i == 9 && want == (PATTERN_LEN / 2)) break; - virFilePrintf(stderr, "Failed to write stream: %s\n", - virGetLastErrorMessage()); + fprintf(stderr, "Failed to write stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } offset += got; @@ -236,8 +236,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) } if (st->driver->streamFinish(st) != 0) { - virFilePrintf(stderr, "Failed to finish stream: %s\n", - virGetLastErrorMessage()); + fprintf(stderr, "Failed to finish stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } @@ -252,9 +252,9 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) want = PATTERN_LEN; if ((got = saferead(fd, buf, want)) != want) { - virFilePrintf(stderr, - "Short read from data, i=%zu got=%zu want=%zu\n", - i, got, want); + fprintf(stderr, + "Short read from data, i=%zu got=%zu want=%zu\n", + i, got, want); goto cleanup; } @@ -262,22 +262,22 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) size_t j; for (j = 0; j < (PATTERN_LEN / 2); j++) { if (buf[j] != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } if (memcmp(buf + (PATTERN_LEN / 2), pattern, PATTERN_LEN / 2) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else if (i == 9) { if (memcmp(buf, pattern, PATTERN_LEN / 2) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else { if (memcmp(buf, pattern, PATTERN_LEN) != 0) { - virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); + fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } @@ -320,7 +320,7 @@ mymain(void) int ret = 0; if (!g_mkdtemp(scratchdir)) { - virFilePrintf(stderr, "Cannot create fdstreamdir"); + fprintf(stderr, "Cannot create fdstreamdir"); abort(); } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 4b5bfabeba..a1ef9d8802 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -146,7 +146,7 @@ mymain(void) VIR_SECURITY_MANAGER_PRIVILEGED | VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP, NULL))) { - virFilePrintf(stderr, "Cannot initialize DAC security driver"); + fprintf(stderr, "Cannot initialize DAC security driver"); ret = -1; goto cleanup; } diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index 65c627ed17..b377c07294 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -40,7 +40,7 @@ #include <config.h> -#define NO_LIBVIRT /* This file intentionally does not link to libvirt */ +#define VIR_NO_GLIB_STDIO /* This file intentionally does not link to libvirt/glib */ #include "testutils.h" #ifdef linux diff --git a/tests/ssh.c b/tests/ssh.c index 58148fef77..415dfbdb25 100644 --- a/tests/ssh.c +++ b/tests/ssh.c @@ -18,8 +18,7 @@ #include <config.h> -#include "internal.h" -#define NO_LIBVIRT /* This file intentionally does not link to libvirt */ +#define VIR_NO_GLIB_STDIO /* This file intentionally does not link to libvirt/glib */ #include "testutils.h" #ifndef WIN32 diff --git a/tests/testutils.h b/tests/testutils.h index ad62dfb647..c1b365ab0d 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -30,12 +30,6 @@ #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ #define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */ -/* Work around lack of gnulib support for fprintf %z */ -#ifndef NO_LIBVIRT -# undef fprintf -# define fprintf virFilePrintf -#endif - /* Makefile.am provides these two definitions */ #if !defined(abs_srcdir) || !defined(abs_builddir) # error Fix Makefile.am diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index c25aa1f705..c17e284930 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -405,14 +405,14 @@ int qemuTestDriverInit(virQEMUDriver *driver) driver->config->channelTargetDir = g_strdup("/tmp/channel"); if (!g_mkdtemp(statedir)) { - virFilePrintf(stderr, "Cannot create fake stateDir"); + fprintf(stderr, "Cannot create fake stateDir"); goto error; } driver->config->stateDir = g_strdup(statedir); if (!g_mkdtemp(configdir)) { - virFilePrintf(stderr, "Cannot create fake configDir"); + fprintf(stderr, "Cannot create fake configDir"); goto error; } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 88f50185e5..c87e1b9bec 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -58,16 +58,16 @@ static int testStreq(const void *args) strneq_rv = STRNEQ_NULLABLE(data->a, data->b); if (streq_rv != equal) { - virFilePrintf(stderr, - "STREQ not working correctly. Expected %d got %d", - (int) equal, (int) streq_rv); + fprintf(stderr, + "STREQ not working correctly. Expected %d got %d", + (int) equal, (int) streq_rv); return -1; } if (strneq_rv == equal) { - virFilePrintf(stderr, - "STRNEQ not working correctly. Expected %d got %d", - (int) equal, (int) strneq_rv); + fprintf(stderr, + "STRNEQ not working correctly. Expected %d got %d", + (int) equal, (int) strneq_rv); return -1; } @@ -108,7 +108,7 @@ static int testSplit(const void *args) tmp2 = data->tokens; while (*tmp1 && *tmp2) { if (STRNEQ(*tmp1, *tmp2)) { - virFilePrintf(stderr, "Mismatch '%s' vs '%s'\n", *tmp1, *tmp2); + fprintf(stderr, "Mismatch '%s' vs '%s'\n", *tmp1, *tmp2); goto cleanup; } tmp1++; @@ -116,19 +116,19 @@ static int testSplit(const void *args) exptokens++; } if (*tmp1) { - virFilePrintf(stderr, "Too many pieces returned\n"); + fprintf(stderr, "Too many pieces returned\n"); goto cleanup; } if (*tmp2) { - virFilePrintf(stderr, "Too few pieces returned\n"); + fprintf(stderr, "Too few pieces returned\n"); goto cleanup; } if (ntokens != exptokens) { - virFilePrintf(stderr, - "Returned token count (%zu) doesn't match " - "expected count (%zu)", - ntokens, exptokens); + fprintf(stderr, + "Returned token count (%zu) doesn't match " + "expected count (%zu)", + ntokens, exptokens); goto cleanup; } @@ -151,7 +151,7 @@ static int testJoin(const void *args) return -1; } if (STRNEQ(got, data->string)) { - virFilePrintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); + fprintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); goto cleanup; } @@ -186,7 +186,7 @@ static int testAdd(const void *args) } if (STRNEQ(got, data->string)) { - virFilePrintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); + fprintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); goto cleanup; } @@ -215,13 +215,13 @@ static int testRemove(const void *args) for (i = 0; data->tokens[i]; i++) { virStringListRemove(&list, data->tokens[i]); if (virStringListHasString((const char **) list, data->tokens[i])) { - virFilePrintf(stderr, "Not removed %s", data->tokens[i]); + fprintf(stderr, "Not removed %s", data->tokens[i]); goto cleanup; } } if (list && list[0]) { - virFilePrintf(stderr, "Not removed all tokens: %s", list[0]); + fprintf(stderr, "Not removed all tokens: %s", list[0]); goto cleanup; } -- 2.24.1

This deletes all trace of gnulib from libvirt. We still have the keycodemapdb submodule to deal with. The simple solution taken was to update it when running autogen.sh. Previously gnulib could auto-trigger refresh when running 'make' too. We could figure out a solution for this, but with the pending meson rewrite it isn't worth worrying about, given how infrequently keycodemapdb changes. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .color_coded.in | 2 - .gitignore | 9 +- .gitmodules | 3 - .gnulib | 1 - .ycm_extra_conf.py.in | 2 - Makefile.am | 2 +- README-hacking | 9 +- autogen.sh | 219 +------ bootstrap | 1073 ------------------------------- bootstrap.conf | 100 --- build-aux/syntax-check.mk | 129 +--- ci/build.sh | 4 +- config-post.h | 5 +- configure.ac | 11 +- docs/compiling.html.in | 25 - docs/hacking.html.in | 5 +- gnulib/lib/Makefile.am | 30 - libvirt.spec.in | 2 - m4/virt-compile-warnings.m4 | 18 +- src/Makefile.am | 7 +- src/admin/Makefile.inc.am | 1 - src/bhyve/Makefile.inc.am | 1 - src/interface/Makefile.inc.am | 1 - src/libxl/Makefile.inc.am | 1 - src/locking/Makefile.inc.am | 3 - src/logging/Makefile.inc.am | 1 - src/lxc/Makefile.inc.am | 2 - src/network/Makefile.inc.am | 3 +- src/node_device/Makefile.inc.am | 2 - src/nwfilter/Makefile.inc.am | 1 - src/qemu/Makefile.inc.am | 1 - src/remote/Makefile.inc.am | 1 - src/rpc/virnetsocket.c | 6 - src/secret/Makefile.inc.am | 1 - src/security/Makefile.inc.am | 1 - src/storage/Makefile.inc.am | 16 - src/util/viralloc.h | 3 +- src/util/virbitmap.c | 4 +- src/util/virfile.c | 7 +- src/util/virsocket.h | 15 - src/vbox/Makefile.inc.am | 1 - src/vz/Makefile.inc.am | 1 - tests/Makefile.am | 21 +- tests/virstringtest.c | 3 +- tools/Makefile.am | 9 +- 45 files changed, 62 insertions(+), 1700 deletions(-) delete mode 160000 .gnulib delete mode 100755 bootstrap delete mode 100644 bootstrap.conf delete mode 100644 gnulib/lib/Makefile.am diff --git a/.color_coded.in b/.color_coded.in index 15e1c7cb2e..f39c6860ab 100644 --- a/.color_coded.in +++ b/.color_coded.in @@ -1,7 +1,5 @@ -I@abs_top_builddir@ -I@abs_top_srcdir@ --I@abs_top_builddir@/gnulib/lib --I@abs_top_srcdir@/gnulib/lib -I@abs_top_builddir@/include -I@abs_top_srcdir@/include -I@abs_top_builddir@/src diff --git a/.gitignore b/.gitignore index 949bd3bc5a..6c167e423b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *#*# *.#*# .#* +*~ # autotools related ignores !/m4/virt-*.m4 @@ -28,14 +29,8 @@ /m4/* Makefile.in -# gnulib related ignores -!/gnulib/lib/Makefile.am -*.rej -*~ -/gnulib/lib/* -/gnulib/m4/* - # git related ignores +*.rej *.orig .git-module-status diff --git a/.gitmodules b/.gitmodules index 0fda887528..79b7e19485 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "gnulib"] - path = .gnulib - url = https://git.savannah.gnu.org/git/gnulib.git/ [submodule "keycodemapdb"] path = src/keycodemapdb url = https://gitlab.com/keycodemap/keycodemapdb.git diff --git a/.gnulib b/.gnulib deleted file mode 160000 index 611869be9f..0000000000 --- a/.gnulib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 611869be9f1083e53305446d90a2909fc89914ef diff --git a/.ycm_extra_conf.py.in b/.ycm_extra_conf.py.in index 96c8a4724e..2e24334079 100644 --- a/.ycm_extra_conf.py.in +++ b/.ycm_extra_conf.py.in @@ -1,8 +1,6 @@ flags = [ '-I@abs_top_builddir@', '-I@abs_top_srcdir@', - '-I@abs_top_builddir@/gnulib/lib', - '-I@abs_top_srcdir@/gnulib/lib', '-I@abs_top_builddir@/include', '-I@abs_top_srcdir@/include', '-I@abs_top_builddir@/src', diff --git a/Makefile.am b/Makefile.am index 29501ab40c..5590c88e4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ GENHTML = genhtml # so force it explicitly DISTCHECK_CONFIGURE_FLAGS = --enable-werror -SUBDIRS = . gnulib/lib include/libvirt src tools docs \ +SUBDIRS = . include/libvirt src tools docs \ tests po examples XZ_OPT ?= -v -T0 diff --git a/README-hacking b/README-hacking index 7da940eb13..89fa86be30 100644 --- a/README-hacking +++ b/README-hacking @@ -28,18 +28,11 @@ You can get a copy of the source repository like this: $ git clone https://libvirt.org/git/libvirt.git $ cd libvirt -As an optional step, if you already have a copy of the gnulib git -repository on your hard drive, then you can use it as a reference to -reduce download time and disk space requirements: - - $ export GNULIB_SRCDIR=/path/to/gnulib - We require to have the build directory different than the source directory: $ mkdir build && cd build -The next step is to get all required pieces from gnulib, -to run autoreconf, and to invoke ../autogen.sh: +The next step is to invoke ../autogen.sh: $ ../autogen.sh diff --git a/autogen.sh b/autogen.sh index 47446dc785..671dd63eb6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,208 +1,45 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=$(dirname "$0") +test -n "$srcdir" || srcdir=. -die() -{ - echo "error: $1" >&2 - exit 1 -} - -starting_point=$(pwd) - -srcdir=$(dirname "$0") -test "$srcdir" || srcdir=. +olddir=$(pwd) -cd "$srcdir" || { - die "Failed to cd into $srcdir" -} +cd "$srcdir" -test -f src/libvirt.c || { - die "$0 must live in the top-level libvirt directory" +(test -f src/libvirt.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level libvirt directory" + exit 1 } -dry_run= -no_git= -gnulib_srcdir= -extra_args= -while test "$#" -gt 0; do - case "$1" in - --dry-run) - # This variable will serve both as an indicator of the fact that - # a dry run has been requested, and to store the result of the - # dry run. It will be ultimately used as return code for the - # script: 0 means no action is necessary, 2 means that autogen.sh - # needs to be executed, and 1 is reserved for failures - dry_run=0 - shift - ;; - --no-git) - no_git=" $1" - shift - ;; - --gnulib-srcdir=*) - gnulib_srcdir=" $1" - shift - ;; - --gnulib-srcdir) - gnulib_srcdir=" $1=$2" - shift - shift - ;; - --system) - prefix=/usr - sysconfdir=/etc - localstatedir=/var - if test -d $prefix/lib64; then - libdir=$prefix/lib64 - else - libdir=$prefix/lib - fi - extra_args="--prefix=$prefix --localstatedir=$localstatedir" - extra_args="$extra_args --sysconfdir=$sysconfdir --libdir=$libdir" - shift - ;; - *) - # All remaining arguments will be passed to configure verbatim - break - ;; - esac -done -no_git="$no_git$gnulib_srcdir" - -gnulib_hash() -{ - local no_git=$1 - - if test "$no_git"; then - echo "no-git" - return - fi - - # Compute the hash we'll use to determine whether rerunning bootstrap - # is required. The first is just the SHA1 that selects a gnulib snapshot. - # The second ensures that whenever we change the set of gnulib modules used - # by this package, we rerun bootstrap to pull in the matching set of files. - # The third ensures that whenever we change the set of local gnulib diffs, - # we rerun bootstrap to pull in those diffs. - git submodule status .gnulib | awk '{ print $1 }' - git hash-object bootstrap.conf - git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' -} +git submodule update --init || exit 1 -# Only look into git submodules if we're in a git checkout -if test -d .git || test -f .git; then +aclocal --install || exit 1 +autoreconf --verbose --force --install || exit 1 - # Check for dirty submodules - if test -z "$CLEAN_SUBMODULE"; then - for path in $(git submodule status | awk '{ print $2 }'); do - case "$(git diff "$path")" in - *-dirty*) - echo "error: $path is dirty, please investigate" >&2 - echo "set CLEAN_SUBMODULE to discard submodule changes" >&2 - exit 1 - ;; - esac - done - fi - if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then - if test -z "$dry_run"; then - echo "Cleaning up submodules..." - git submodule foreach 'git clean -dfqx && git reset --hard' || { - die "Cleaning up submodules failed" - } - fi +if test "x$1" = "x--system"; then + shift + prefix=/usr + libdir=$prefix/lib + sysconfdir=/etc + localstatedir=/var + if [ -d /usr/lib64 ]; then + libdir=$prefix/lib64 fi + EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir" +fi - # Update all submodules. If any of the submodules has not been - # initialized yet, it will be initialized now; moreover, any submodule - # with uncommitted changes will be returned to the expected state - echo "Updating submodules..." - git submodule update --init || { - die "Updating submodules failed" - } +cd "$olddir" - # The expected hash, eg. the one computed after the last - # successful bootstrap run, is stored on disk - state_file=.git-module-status - expected_hash=$(cat "$state_file" 2>/dev/null) - actual_hash=$(gnulib_hash "$no_git") +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure $EXTRA_ARGS "$@" || exit 1 - if test "$actual_hash" = "$expected_hash"; then - # The gnulib hash matches our expectations, and all the files - # that can only be generated through bootstrap are present: - # we just need to run autoreconf. Unless we're performing a - # dry run, of course... - if test -z "$dry_run"; then - echo "Running autoreconf..." - autoreconf -v || { - die "autoreconf failed" - } - fi - else - # Whenever the gnulib submodule or any of the related bits - # has been changed in some way (see gnulib_hash) we need to - # run bootstrap again. If we're performing a dry run, we - # change the return code instead to signal our caller - if test "$dry_run"; then - dry_run=2 + if [ "$1" = "--help" ]; then + exit 0 else - echo "Running bootstrap..." - ./bootstrap$no_git || { - die "bootstrap failed" - } - gnulib_hash >"$state_file" + echo "Now type 'make' to compile libvirt" || exit 1 fi - fi -fi - -# When performing a dry run, we can stop here -test "$dry_run" && exit "$dry_run" - -# If asked not to run configure, we can stop here -test "$NOCONFIGURE" && exit 0 - -cd "$starting_point" || { - die "Failed to cd into $starting_point" -} - -if test "$OBJ_DIR"; then - mkdir -p "$OBJ_DIR" || { - die "Failed to create $OBJ_DIR" - } - cd "$OBJ_DIR" || { - die "Failed to cd into $OBJ_DIR" - } -fi - -# Make sure we can find GNU make and tell the user -# the right command to run -MAKE= -for cmd in make gmake; do - if $cmd -v 2>&1 | grep -q "GNU Make"; then - MAKE=$cmd - break - fi -done -test "$MAKE" || { - die "GNU make is required to build libvirt" -} - -if test -z "$*" && test -z "$extra_args" && test -f config.status; then - echo "Running config.status..." - ./config.status --recheck || { - die "config.status failed" - } else - if test -z "$*" && test -z "$extra_args"; then - echo "I am going to run configure with no arguments - if you wish" - echo "to pass any to it, please specify them on the $0 command line." - else - echo "Running configure with $extra_args $@" - fi - "$srcdir/configure" $extra_args "$@" || { - die "configure failed" - } + echo "Skipping configure process." fi - -echo -echo "Now type '$MAKE' to compile libvirt." diff --git a/bootstrap b/bootstrap deleted file mode 100755 index 70fd73cc74..0000000000 --- a/bootstrap +++ /dev/null @@ -1,1073 +0,0 @@ -#! /bin/sh -# Print a version string. -scriptversion=2019-01-04.17; # UTC - -# Bootstrap this package from checked-out sources. - -# Copyright (C) 2003-2020 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -# Originally written by Paul Eggert. The canonical version of this -# script is maintained as build-aux/bootstrap in gnulib, however, to -# be useful to your project, you should place a copy of it under -# version control in the top-level directory of your project. The -# intent is that all customization can be done with a bootstrap.conf -# file also maintained in your version control; gnulib comes with a -# template build-aux/bootstrap.conf to get you started. - -# Please report bugs or propose patches to bug-gnulib@gnu.org. - -nl=' -' - -# Ensure file names are sorted consistently across platforms. -LC_ALL=C -export LC_ALL - -# Ensure that CDPATH is not set. Otherwise, the output from cd -# would cause trouble in at least one use below. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -local_gl_dir=gl - -# Honor $PERL, but work even if there is none. -PERL="${PERL-perl}" - -me=$0 - -default_gnulib_url=git://git.sv.gnu.org/gnulib - -usage() { - cat <<EOF -Usage: $me [OPTION]... -Bootstrap this package from the checked-out sources. - -Options: - --gnulib-srcdir=DIRNAME specify the local directory where gnulib - sources reside. Use this if you already - have gnulib sources on your machine, and - do not want to waste your bandwidth downloading - them again. Defaults to \$GNULIB_SRCDIR - --bootstrap-sync if this bootstrap script is not identical to - the version in the local gnulib sources, - update this script, and then restart it with - /bin/sh or the shell \$CONFIG_SHELL - --no-bootstrap-sync do not check whether bootstrap is out of sync - --copy copy files instead of creating symbolic links - --force attempt to bootstrap even if the sources seem - not to have been checked out - --no-git do not use git to update gnulib. Requires that - --gnulib-srcdir point to a correct gnulib snapshot - --skip-po do not download po files - -If the file $me.conf exists in the same directory as this script, its -contents are read as shell variables to configure the bootstrap. - -For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR -are honored. - -Gnulib sources can be fetched in various ways: - - * If this package is in a git repository with a 'gnulib' submodule - configured, then that submodule is initialized and updated and sources - are fetched from there. If \$GNULIB_SRCDIR is set (directly or via - --gnulib-srcdir) and is a git repository, then it is used as a reference. - - * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir), - then sources are fetched from that local directory. If it is a git - repository and \$GNULIB_REVISION is set, then that revision is checked - out. - - * Otherwise, if this package is in a git repository with a 'gnulib' - submodule configured, then that submodule is initialized and updated and - sources are fetched from there. - - * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are - cloned into that directory using git from \$GNULIB_URL, defaulting to - $default_gnulib_url. - If \$GNULIB_REVISION is set, then that revision is checked out. - - * Otherwise, the existing Gnulib sources in the 'gnulib' directory are - used. If it is a git repository and \$GNULIB_REVISION is set, then that - revision is checked out. - -If you maintain a package and want to pin a particular revision of the -Gnulib sources that has been tested with your package, then there are two -possible approaches: either configure a 'gnulib' submodule with the -appropriate revision, or set \$GNULIB_REVISION (and if necessary -\$GNULIB_URL) in $me.conf. - -Running without arguments will suffice in most cases. -EOF -} - -# warnf_ FORMAT-STRING ARG1... -warnf_ () -{ - warnf_format_=$1 - shift - nl=' -' - case $* in - *$nl*) me_=$(printf "$me"|tr "$nl|" '??') - printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;; - *) printf "$me: $warnf_format_" "$@" ;; - esac >&2 -} - -# warn_ WORD1... -warn_ () -{ - # If IFS does not start with ' ', set it and emit the warning in a subshell. - case $IFS in - ' '*) warnf_ '%s\n' "$*";; - *) (IFS=' '; warn_ "$@");; - esac -} - -# die WORD1... -die() { warn_ "$@"; exit 1; } - -# Configuration. - -# Name of the Makefile.am -gnulib_mk=gnulib.mk - -# List of gnulib modules needed. -gnulib_modules= - -# Any gnulib files needed that are not in modules. -gnulib_files= - -: ${AUTOPOINT=autopoint} -: ${AUTORECONF=autoreconf} - -# A function to be called right after gnulib-tool is run. -# Override it via your own definition in bootstrap.conf. -bootstrap_post_import_hook() { :; } - -# A function to be called after everything else in this script. -# Override it via your own definition in bootstrap.conf. -bootstrap_epilogue() { :; } - -# The command to download all .po files for a specified domain into a -# specified directory. Fill in the first %s with the destination -# directory and the second with the domain name. -po_download_command_format=\ -"wget --mirror --level=1 -nd -nv -A.po -P '%s' \ - https://translationproject.org/latest/%s/" - -# Prefer a non-empty tarname (4th argument of AC_INIT if given), else -# fall back to the package name (1st argument with munging) -extract_package_name=' - /^AC_INIT(\[*/{ - s/// - /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{ - s//\1/ - s/[],)].*// - p - q - } - s/[],)].*// - s/^GNU // - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g - p - } -' -package=$(sed -n "$extract_package_name" configure.ac) \ - || die 'cannot find package name in configure.ac' -gnulib_name=lib$package - -build_aux=build-aux -source_base=lib -m4_base=m4 -doc_base=doc -tests_base=tests -gnulib_extra_files=" - build-aux/install-sh - build-aux/mdate-sh - build-aux/texinfo.tex - build-aux/depcomp - build-aux/config.guess - build-aux/config.sub - doc/INSTALL -" - -# Additional gnulib-tool options to use. Use "\newline" to break lines. -gnulib_tool_option_extras= - -# Other locale categories that need message catalogs. -EXTRA_LOCALE_CATEGORIES= - -# Additional xgettext options to use. Use "\\\newline" to break lines. -XGETTEXT_OPTIONS='\\\ - --flag=_:1:pass-c-format\\\ - --flag=N_:1:pass-c-format\\\ - --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ -' - -# Package bug report address and copyright holder for gettext files -COPYRIGHT_HOLDER='Free Software Foundation, Inc.' -MSGID_BUGS_ADDRESS=bug-$package@gnu.org - -# Files we don't want to import. -excluded_files= - -# File that should exist in the top directory of a checked out hierarchy, -# but not in a distribution tarball. -checkout_only_file=README-hacking - -# Whether to use copies instead of symlinks. -copy=false - -# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want -# those files to be generated in directories like lib/, m4/, and po/. -# Or set it to 'auto' to make this script select which to use based -# on which version control system (if any) is used in the source directory. -vc_ignore=auto - -# Set this to true in bootstrap.conf to enable --bootstrap-sync by -# default. -bootstrap_sync=false - -# Use git to update gnulib sources -use_git=true - -check_exists() { - if test "$1" = "--verbose"; then - ($2 --version </dev/null) >/dev/null 2>&1 - if test $? -ge 126; then - # If not found, run with diagnostics as one may be - # presented with env variables to set to find the right version - ($2 --version </dev/null) - fi - else - ($1 --version </dev/null) >/dev/null 2>&1 - fi - - test $? -lt 126 -} - -# find_tool ENVVAR NAMES... -# ------------------------- -# Search for a required program. Use the value of ENVVAR, if set, -# otherwise find the first of the NAMES that can be run. -# If found, set ENVVAR to the program name, die otherwise. -# -# FIXME: code duplication, see also gnu-web-doc-update. -find_tool () -{ - find_tool_envvar=$1 - shift - find_tool_names=$@ - eval "find_tool_res=\$$find_tool_envvar" - if test x"$find_tool_res" = x; then - for i; do - if check_exists $i; then - find_tool_res=$i - break - fi - done - fi - if test x"$find_tool_res" = x; then - warn_ "one of these is required: $find_tool_names;" - die "alternatively set $find_tool_envvar to a compatible tool" - fi - eval "$find_tool_envvar=\$find_tool_res" - eval "export $find_tool_envvar" -} - -# Override the default configuration, if necessary. -# Make sure that bootstrap.conf is sourced from the current directory -# if we were invoked as "sh bootstrap". -case "$0" in - */*) test -r "$0.conf" && . "$0.conf" ;; - *) test -r "$0.conf" && . ./"$0.conf" ;; -esac - -if test "$vc_ignore" = auto; then - vc_ignore= - test -d .git && vc_ignore=.gitignore - test -d CVS && vc_ignore="$vc_ignore .cvsignore" -fi - -if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then - use_gnulib=false -else - use_gnulib=true -fi - -# Translate configuration into internal form. - -# Parse options. - -for option -do - case $option in - --help) - usage - exit;; - --gnulib-srcdir=*) - GNULIB_SRCDIR=${option#--gnulib-srcdir=};; - --skip-po) - SKIP_PO=t;; - --force) - checkout_only_file=;; - --copy) - copy=true;; - --bootstrap-sync) - bootstrap_sync=true;; - --no-bootstrap-sync) - bootstrap_sync=false;; - --no-git) - use_git=false;; - *) - die "$option: unknown option";; - esac -done - -$use_git || test -d "$GNULIB_SRCDIR" \ - || die "Error: --no-git requires --gnulib-srcdir" - -if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then - die "Bootstrapping from a non-checked-out distribution is risky." -fi - -# Strip blank and comment lines to leave significant entries. -gitignore_entries() { - sed '/^#/d; /^$/d' "$@" -} - -# If $STR is not already on a line by itself in $FILE, insert it at the start. -# Entries are inserted at the start of the ignore list to ensure existing -# entries starting with ! are not overridden. Such entries support -# whitelisting exceptions after a more generic blacklist pattern. -insert_if_absent() { - file=$1 - str=$2 - test -f $file || touch $file - test -r $file || die "Error: failed to read ignore file: $file" - duplicate_entries=$(gitignore_entries $file | sort | uniq -d) - if [ "$duplicate_entries" ] ; then - die "Error: Duplicate entries in $file: " $duplicate_entries - fi - linesold=$(gitignore_entries $file | wc -l) - linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l) - if [ $linesold != $linesnew ] ; then - { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ - || die "insert_if_absent $file $str: failed" - fi -} - -# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with -# insert_if_absent. -insert_vc_ignore() { - vc_ignore_file="$1" - pattern="$2" - case $vc_ignore_file in - *.gitignore) - # A .gitignore entry that does not start with '/' applies - # recursively to subdirectories, so prepend '/' to every - # .gitignore entry. - pattern=$(echo "$pattern" | sed s,^,/,);; - esac - insert_if_absent "$vc_ignore_file" "$pattern" -} - -# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. -found_aux_dir=no -grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ - >/dev/null && found_aux_dir=yes -grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ - >/dev/null && found_aux_dir=yes -test $found_aux_dir = yes \ - || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" - -# If $build_aux doesn't exist, create it now, otherwise some bits -# below will malfunction. If creating it, also mark it as ignored. -if test ! -d $build_aux; then - mkdir $build_aux - for dot_ig in x $vc_ignore; do - test $dot_ig = x && continue - insert_vc_ignore $dot_ig $build_aux - done -fi - -# Note this deviates from the version comparison in automake -# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a -# but this should suffice as we won't be specifying old -# version formats or redundant trailing .0 in bootstrap.conf. -# If we did want full compatibility then we should probably -# use m4_version_compare from autoconf. -sort_ver() { # sort -V is not generally available - ver1="$1" - ver2="$2" - - # split on '.' and compare each component - i=1 - while : ; do - p1=$(echo "$ver1" | cut -d. -f$i) - p2=$(echo "$ver2" | cut -d. -f$i) - if [ ! "$p1" ]; then - echo "$1 $2" - break - elif [ ! "$p2" ]; then - echo "$2 $1" - break - elif [ ! "$p1" = "$p2" ]; then - if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison - echo "$2 $1" - elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison - echo "$1 $2" - else # numeric, then lexicographic comparison - lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1) - if [ "$lp" = "$p2" ]; then - echo "$1 $2" - else - echo "$2 $1" - fi - fi - break - fi - i=$(($i+1)) - done -} - -get_version_sed=' -# Move version to start of line. -s/.*[v ]\([0-9]\)/\1/ - -# Skip lines that do not start with version. -/^[0-9]/!d - -# Remove characters after the version. -s/[^.a-z0-9-].*// - -# The first component must be digits only. -s/^\([0-9]*\)[a-z-].*/\1/ - -#the following essentially does s/5.005/5.5/ -s/\.0*\([1-9]\)/.\1/g -p -q' - -get_version() { - app=$1 - - $app --version >/dev/null 2>&1 || { $app --version; return 1; } - - $app --version 2>&1 | sed -n "$get_version_sed" -} - -check_versions() { - ret=0 - - while read app req_ver; do - # We only need libtoolize from the libtool package. - if test "$app" = libtool; then - app=libtoolize - fi - # Exempt git if --no-git is in effect. - if test "$app" = git; then - $use_git || continue - fi - # Honor $APP variables ($TAR, $AUTOCONF, etc.) - appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_') - test "$appvar" = TAR && appvar=AMTAR - case $appvar in - GZIP) ;; # Do not use $GZIP: it contains gzip options. - PERL::*) ;; # Keep perl modules as-is - *) eval "app=\${$appvar-$app}" ;; - esac - - # Handle the still-experimental Automake-NG programs specially. - # They remain named as the mainstream Automake programs ("automake", - # and "aclocal") to avoid gratuitous incompatibilities with - # pre-existing usages (by, say, autoreconf, or custom autogen.sh - # scripts), but correctly identify themselves (as being part of - # "GNU automake-ng") when asked their version. - case $app in - automake-ng|aclocal-ng) - app=${app%-ng} - ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { - warn_ "Error: '$app' not found or not from Automake-NG" - ret=1 - continue - } ;; - # Another check is for perl modules. These can be written as - # e.g. perl::XML::XPath in case of XML::XPath module, etc. - perl::*) - # Extract module name - app="${app#perl::}" - if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then - warn_ "Error: perl module '$app' not found" - ret=1 - fi - continue - ;; - esac - if [ "$req_ver" = "-" ]; then - # Merely require app to exist; not all prereq apps are well-behaved - # so we have to rely on $? rather than get_version. - if ! check_exists --verbose $app; then - warn_ "Error: '$app' not found" - ret=1 - fi - else - # Require app to produce a new enough version string. - inst_ver=$(get_version $app) - if [ ! "$inst_ver" ]; then - warn_ "Error: '$app' not found" - ret=1 - else - latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) - if [ ! "$latest_ver" = "$inst_ver" ]; then - warnf_ '%s\n' \ - "Error: '$app' version == $inst_ver is too old" \ - " '$app' version >= $req_ver is required" - ret=1 - fi - fi - fi - done - - return $ret -} - -print_versions() { - echo "Program Min_version" - echo "----------------------" - printf %s "$buildreq" - echo "----------------------" - # can't depend on column -t -} - -# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6. -# Also find the compatible sha1 utility on the BSDs -if test x"$SKIP_PO" = x; then - find_tool SHA1SUM sha1sum gsha1sum shasum sha1 -fi - -use_libtool=0 -# We'd like to use grep -E, to see if any of LT_INIT, -# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, -# but that's not portable enough (e.g., for Solaris). -grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ - && use_libtool=1 -grep '^[ ]*LT_INIT' configure.ac >/dev/null \ - && use_libtool=1 -if test $use_libtool = 1; then - find_tool LIBTOOLIZE glibtoolize libtoolize -fi - -# gnulib-tool requires at least automake and autoconf. -# If either is not listed, add it (with minimum version) as a prerequisite. -case $buildreq in - *automake*) ;; - *) buildreq="automake 1.9 -$buildreq" ;; -esac -case $buildreq in - *autoconf*) ;; - *) buildreq="autoconf 2.59 -$buildreq" ;; -esac - -# When we can deduce that gnulib-tool will require patch, -# and when patch is not already listed as a prerequisite, add it, too. -if test -d "$local_gl_dir" \ - && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then - case $buildreq in - *patch*) ;; - *) buildreq="patch - -$buildreq" ;; - esac -fi - -if ! printf "$buildreq" | check_versions; then - echo >&2 - if test -f README-prereq; then - die "See README-prereq for how to get the prerequisite programs" - else - die "Please install the prerequisite programs" - fi -fi - -# Warn the user if autom4te appears to be broken; this causes known -# issues with at least gettext 0.18.3. -probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) -if test "x$probe" != xhi; then - warn_ "WARNING: your autom4te wrapper eats stdin;" - warn_ "if bootstrap fails, consider upgrading your autotools" -fi - -echo "$0: Bootstrapping from checked-out $package sources..." - -# See if we can use gnulib's git-merge-changelog merge driver. -if $use_git && test -d .git && check_exists git; then - if git config merge.merge-changelog.driver >/dev/null ; then - : - elif check_exists git-merge-changelog; then - echo "$0: initializing git-merge-changelog driver" - git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' - git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' - else - echo "$0: consider installing git-merge-changelog from gnulib" - fi -fi - - -cleanup_gnulib() { - status=$? - rm -fr "$gnulib_path" - exit $status -} - -git_modules_config () { - test -f .gitmodules && git config --file .gitmodules "$@" -} - -if $use_gnulib; then - if $use_git; then - gnulib_path=$(git_modules_config submodule.gnulib.path) - test -z "$gnulib_path" && gnulib_path=gnulib - fi - - # Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a - # submodule, for use in the rest of the script. - - case ${GNULIB_SRCDIR--} in - -) - # Note that $use_git is necessarily true in this case. - if git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - git submodule init -- "$gnulib_path" || exit $? - git submodule update -- "$gnulib_path" || exit $? - - elif [ ! -d "$gnulib_path" ]; then - echo "$0: getting gnulib files..." - - trap cleanup_gnulib 1 2 13 15 - - shallow= - if test -z "$GNULIB_REVISION"; then - git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' - fi - git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \ - || cleanup_gnulib - - trap - 1 2 13 15 - fi - GNULIB_SRCDIR=$gnulib_path - ;; - *) - # Use GNULIB_SRCDIR directly or as a reference. - if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ - git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - if git submodule -h|grep -- --reference > /dev/null; then - # Prefer the one-liner available in git 1.6.4 or newer. - git submodule update --init --reference "$GNULIB_SRCDIR" \ - "$gnulib_path" || exit $? - else - # This fallback allows at least git 1.5.5. - if test -f "$gnulib_path"/gnulib-tool; then - # Since file already exists, assume submodule init already complete. - git submodule update -- "$gnulib_path" || exit $? - else - # Older git can't clone into an empty directory. - rmdir "$gnulib_path" 2>/dev/null - git clone --reference "$GNULIB_SRCDIR" \ - "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init -- "$gnulib_path" \ - && git submodule update -- "$gnulib_path" \ - || exit $? - fi - fi - GNULIB_SRCDIR=$gnulib_path - fi - ;; - esac - - if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ - && ! git_modules_config submodule.gnulib.url >/dev/null; then - (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib - fi - - # $GNULIB_SRCDIR now points to the version of gnulib to use, and - # we no longer need to use git or $gnulib_path below here. - - if $bootstrap_sync; then - cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { - echo "$0: updating bootstrap and restarting..." - case $(sh -c 'echo "$1"' -- a) in - a) ignored=--;; - *) ignored=ignored;; - esac - exec sh -c \ - 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ - "$0" "$@" --no-bootstrap-sync - } - fi - - gnulib_tool=$GNULIB_SRCDIR/gnulib-tool - <$gnulib_tool || exit $? -fi - -# Get translations. - -download_po_files() { - subdir=$1 - domain=$2 - echo "$me: getting translations into $subdir for $domain..." - cmd=$(printf "$po_download_command_format" "$subdir" "$domain") - eval "$cmd" -} - -# Mirror .po files to $po_dir/.reference and copy only the new -# or modified ones into $po_dir. Also update $po_dir/LINGUAS. -# Note po files that exist locally only are left in $po_dir but will -# not be included in LINGUAS and hence will not be distributed. -update_po_files() { - # Directory containing primary .po files. - # Overwrite them only when we're sure a .po file is new. - po_dir=$1 - domain=$2 - - # Mirror *.po files into this dir. - # Usually contains *.s1 checksum files. - ref_po_dir="$po_dir/.reference" - - test -d $ref_po_dir || mkdir $ref_po_dir || return - download_po_files $ref_po_dir $domain \ - && ls "$ref_po_dir"/*.po 2>/dev/null | - sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return - - langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') - test "$langs" = '*' && langs=x - for po in $langs; do - case $po in x) continue;; esac - new_po="$ref_po_dir/$po.po" - cksum_file="$ref_po_dir/$po.s1" - if ! test -f "$cksum_file" || - ! test -f "$po_dir/$po.po" || - ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then - echo "$me: updated $po_dir/$po.po..." - cp "$new_po" "$po_dir/$po.po" \ - && $SHA1SUM < "$new_po" > "$cksum_file" || return - fi - done -} - -case $SKIP_PO in -'') - if test -d po; then - update_po_files po $package || exit - fi - - if test -d runtime-po; then - update_po_files runtime-po $package-runtime || exit - fi;; -esac - -symlink_to_dir() -{ - src=$1/$2 - dst=${3-$2} - - test -f "$src" && { - - # If the destination directory doesn't exist, create it. - # This is required at least for "lib/uniwidth/cjk.h". - dst_dir=$(dirname "$dst") - if ! test -d "$dst_dir"; then - mkdir -p "$dst_dir" - - # If we've just created a directory like lib/uniwidth, - # tell version control system(s) it's ignorable. - # FIXME: for now, this does only one level - parent=$(dirname "$dst_dir") - for dot_ig in x $vc_ignore; do - test $dot_ig = x && continue - ig=$parent/$dot_ig - insert_vc_ignore $ig "${dst_dir##*/}" - done - fi - - if $copy; then - { - test ! -h "$dst" || { - echo "$me: rm -f $dst" && - rm -f "$dst" - } - } && - test -f "$dst" && - cmp -s "$src" "$dst" || { - echo "$me: cp -fp $src $dst" && - cp -fp "$src" "$dst" - } - else - # Leave any existing symlink alone, if it already points to the source, - # so that broken build tools that care about symlink times - # aren't confused into doing unnecessary builds. Conversely, if the - # existing symlink's timestamp is older than the source, make it afresh, - # so that broken tools aren't confused into skipping needed builds. See - # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>. - test -h "$dst" && - src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && - dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && - test "$src_i" = "$dst_i" && - both_ls=$(ls -dt "$src" "$dst") && - test "X$both_ls" = "X$dst$nl$src" || { - dot_dots= - case $src in - /*) ;; - *) - case /$dst/ in - *//* | */../* | */./* | /*/*/*/*/*/) - die "invalid symlink calculation: $src -> $dst";; - /*/*/*/*/) dot_dots=../../../;; - /*/*/*/) dot_dots=../../;; - /*/*/) dot_dots=../;; - esac;; - esac - - echo "$me: ln -fs $dot_dots$src $dst" && - ln -fs "$dot_dots$src" "$dst" - } - fi - } -} - -version_controlled_file() { - parent=$1 - file=$2 - if test -d .git; then - git rm -n "$file" > /dev/null 2>&1 - elif test -d .svn; then - svn log -r HEAD "$file" > /dev/null 2>&1 - elif test -d CVS; then - grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | - grep '^/[^/]*/[0-9]' > /dev/null - else - warn_ "no version control for $file?" - false - fi -} - -# NOTE: we have to be careful to run both autopoint and libtoolize -# before gnulib-tool, since gnulib-tool is likely to provide newer -# versions of files "installed" by these two programs. -# Then, *after* gnulib-tool (see below), we have to be careful to -# run autoreconf in such a way that it does not run either of these -# two just-pre-run programs. - -# Import from gettext. -with_gettext=yes -grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ - with_gettext=no - -if test $with_gettext = yes || test $use_libtool = 1; then - - tempbase=.bootstrap$$ - trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15 - - > $tempbase.0 > $tempbase.1 && - find . ! -type d -print | sort > $tempbase.0 || exit - - if test $with_gettext = yes; then - # Released autopoint has the tendency to install macros that have been - # obsoleted in current gnulib, so run this before gnulib-tool. - echo "$0: $AUTOPOINT --force" - $AUTOPOINT --force || exit - fi - - # Autoreconf runs aclocal before libtoolize, which causes spurious - # warnings if the initial aclocal is confused by the libtoolized - # (or worse out-of-date) macro directory. - # libtoolize 1.9b added the --install option; but we support back - # to libtoolize 1.5.22, where the install action was default. - if test $use_libtool = 1; then - install= - case $($LIBTOOLIZE --help) in - *--install*) install=--install ;; - esac - echo "running: $LIBTOOLIZE $install --copy" - $LIBTOOLIZE $install --copy - fi - - find . ! -type d -print | sort >$tempbase.1 - old_IFS=$IFS - IFS=$nl - for file in $(comm -13 $tempbase.0 $tempbase.1); do - IFS=$old_IFS - parent=${file%/*} - version_controlled_file "$parent" "$file" || { - for dot_ig in x $vc_ignore; do - test $dot_ig = x && continue - ig=$parent/$dot_ig - insert_vc_ignore "$ig" "${file##*/}" - done - } - done - IFS=$old_IFS - - rm -f $tempbase.0 $tempbase.1 - trap - 1 2 13 15 -fi - -# Import from gnulib. - -if $use_gnulib; then - gnulib_tool_options="\ - --no-changelog\ - --aux-dir=$build_aux\ - --doc-base=$doc_base\ - --lib=$gnulib_name\ - --m4-base=$m4_base/\ - --source-base=$source_base/\ - --tests-base=$tests_base\ - --local-dir=$local_gl_dir\ - $gnulib_tool_option_extras\ - " - if test $use_libtool = 1; then - case "$gnulib_tool_options " in - *' --libtool '*) ;; - *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; - esac - fi - echo "$0: $gnulib_tool $gnulib_tool_options --import ..." - $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ - || die "gnulib-tool failed" - - for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file \ - || die "failed to symlink $file" - done -fi - -bootstrap_post_import_hook \ - || die "bootstrap_post_import_hook failed" - -# Don't proceed if there are uninitialized submodules. In particular, -# the next step will remove dangling links, which might be links into -# uninitialized submodules. -# -# Uninitialized submodules are listed with an initial dash. -if $use_git && git submodule | grep '^-' >/dev/null; then - die "some git submodules are not initialized. " \ - "Run 'git submodule init' and bootstrap again." -fi - -# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some -# gnulib-populated directories. Such .m4 files would cause aclocal to fail. -# The following requires GNU find 4.2.3 or newer. Considering the usual -# portability constraints of this script, that may seem a very demanding -# requirement, but it should be ok. Ignore any failure, which is fine, -# since this is only a convenience to help developers avoid the relatively -# unusual case in which a symlinked-to .m4 file is git-removed from gnulib -# between successive runs of this script. -find "$m4_base" "$source_base" \ - -depth \( -name '*.m4' -o -name '*.[ch]' \) \ - -type l -xtype l -delete > /dev/null 2>&1 - -# Invoke autoreconf with --force --install to ensure upgrades of tools -# such as ylwrap. -AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" - -# Some systems (RHEL 5) are using ancient autotools, for which the -# --no-recursive option had not been invented. Detect that lack and -# omit the option when it's not supported. FIXME in 2017: remove this -# hack when RHEL 5 autotools are updated, or when they become irrelevant. -case $($AUTORECONF --help) in - *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; -esac - -# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. -echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" -AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ - || die "autoreconf failed" - -# Get some extra files from gnulib, overriding existing files. -for file in $gnulib_extra_files; do - case $file in - */INSTALL) dst=INSTALL;; - build-aux/*) dst=$build_aux/${file#build-aux/};; - *) dst=$file;; - esac - symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ - || die "failed to symlink $file" -done - -if test $with_gettext = yes; then - # Create gettext configuration. - echo "$0: Creating po/Makevars from po/Makevars.template ..." - rm -f po/Makevars - sed ' - /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ - /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/ - /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'| - /^XGETTEXT_OPTIONS *=/{ - s/$/ \\/ - a\ - '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} - } - ' po/Makevars.template >po/Makevars \ - || die 'cannot generate po/Makevars' - - # If the 'gettext' module is in use, grab the latest Makefile.in.in. - # If only the 'gettext-h' module is in use, assume autopoint already - # put the correct version of this file into place. - case $gnulib_modules in - *gettext-h*) ;; - *gettext*) - cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ - || die "cannot create po/Makefile.in.in" - ;; - esac - - if test -d runtime-po; then - # Similarly for runtime-po/Makevars, but not quite the same. - rm -f runtime-po/Makevars - sed ' - /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ - /^subdir *=.*/s/=.*/= runtime-po/ - /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ - /^XGETTEXT_OPTIONS *=/{ - s/$/ \\/ - a\ - '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} - } - ' po/Makevars.template >runtime-po/Makevars \ - || die 'cannot generate runtime-po/Makevars' - - # Copy identical files from po to runtime-po. - (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) - fi -fi - -bootstrap_epilogue - -echo "$0: done. Now you can run './configure'." - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: diff --git a/bootstrap.conf b/bootstrap.conf deleted file mode 100644 index 7e1412093f..0000000000 --- a/bootstrap.conf +++ /dev/null @@ -1,100 +0,0 @@ -# Bootstrap configuration. - -# Copyright (C) 2010-2014 Red Hat, Inc. - -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see -# <http://www.gnu.org/licenses/>. - -# gnulib modules used by this package. - -# NB the GSocket conversion is non-trivial due to the -# different FD vs HANDLE usage in gnulib vs glib. Need -# to find a way to duplicate a socket HANDLE before -# turning it into a FD, since closing an FD also closes -# the original HANDLE. - -# -> Meson -gnulib_modules="$gnulib_modules largefile" -# -> custom configure check -gnulib_modules="$gnulib_modules localeconv" -# -> open code / conditional comp -gnulib_modules="$gnulib_modules pipe-posix" -# -> open code / conditional comp -gnulib_modules="$gnulib_modules pipe2" -# -> GMainLoop -gnulib_modules="$gnulib_modules poll" -# -> GThread -gnulib_modules="$gnulib_modules threadlib" -# -> remove sys/wait.h include from any win32 code paths -gnulib_modules="$gnulib_modules sys_wait" - -SKIP_PO=true - -copy=true - -bootstrap_sync=true - -vc_ignore= - - -# Tell gnulib to: -# require LGPLv2+ -# apply any local diffs in gnulib/local/ dir -# put *.m4 files in m4/ dir -# put *.[ch] files in new gnulib/lib/ dir -# import gnulib tests in new gnulib/tests/ dir -gnulib_name=libgnu -m4_base=m4 -source_base=gnulib/lib -gnulib_tool_option_extras="\ - --lgpl=2\ - --makefile-name=gnulib.mk\ - --avoid=pt_chown\ - --no-vc-files\ -" -local_gl_dir=gnulib/local - -# Build prerequisites -# Note that some of these programs are only required for 'make dist' to -# succeed from a fresh git checkout; not all of these programs are -# required to run 'make dist' on a tarball. -buildreq="\ -autoconf 2.59 -automake 1.9.6 -git 1.5.5 -gzip - -libtool - -patch - -perl 5.5 -pkg-config - -rpcgen - -tar - -xmllint - -xsltproc - -" - -# Override bootstrap's list - we don't use mdate-sh or texinfo.tex. -gnulib_extra_files=" - build-aux/install-sh - build-aux/depcomp - build-aux/config.guess - build-aux/config.sub - doc/INSTALL -" - -bootstrap_epilogue() -{ - echo "$0: done. Now you can run 'mkdir build && cd build && ../configure'." - exit 0 -} diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 4394866963..6406b1c4d3 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -44,10 +44,6 @@ VC = $(GIT) VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) -# You can override this variable in syntax-check.mk if your gnulib submodule lives -# in a different location. -gnulib_dir ?= $(srcdir)/gnulib - # You can override this variable in syntax-check.mk to set your own regexp # matching files to ignore. VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$ @@ -132,8 +128,7 @@ local-check := \ syntax-check: $(local-check) -# We haven't converted all scripts to using gnulib's init.sh yet. -_test_script_regex = \<\(init\|test-lib\)\.sh\> +_test_script_regex = \<test-lib\.sh\> # Most developers don't run 'make distcheck'. We want the official # dist to be secure, but don't want to penalize other developers @@ -420,7 +415,6 @@ sc_prohibit_access_xok: halt='use virFileIsExecutable instead of access(,X_OK)' \ $(_sc_search_regexp) -# Similar to the gnulib syntax-check.mk rule for sc_prohibit_strcmp # Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0. snp_ = strncmp *\(.+\) sc_prohibit_strncmp: @@ -567,8 +561,7 @@ sc_size_of_brackets: $(_sc_search_regexp) # Ensure that no C source file, docs, or rng schema uses TABs for -# indentation. Also match *.h.in files, to get libvirt.h.in. Exclude -# files in gnulib, since they're imported. +# indentation. Also match *.h.in files, to get libvirt.h.in. space_indent_files=(\.(aug(\.in)?|rng|s?[ch](\.in)?|html.in|py|pl|syms)|tools/.*\.in) sc_TAB_in_indentation: @prohibit='^ * ' \ @@ -1660,29 +1653,6 @@ sc_unmarked_diagnostics: halt='found unmarked diagnostic(s)' \ $(_sc_search_regexp) -# List headers for which HAVE_HEADER_H is always true, assuming you are -# using the appropriate gnulib module. CAUTION: for each "unnecessary" -# #if HAVE_HEADER_H that you remove, be sure that your project explicitly -# requires the gnulib module that guarantees the usability of that header. -gl_assured_headers_ = \ - cd $(gnulib_dir)/lib && echo *.in.h|$(SED) 's/\.in\.h//g' - -# Convert the list of names to upper case, and replace each space with "|". -az_ = abcdefghijklmnopqrstuvwxyz -AZ_ = ABCDEFGHIJKLMNOPQRSTUVWXYZ -gl_header_upper_case_or_ = \ - $$($(gl_assured_headers_) \ - | tr $(az_)/.- $(AZ_)___ \ - | tr -s ' ' '|' \ - ) -sc_prohibit_always_true_header_tests: - @or=$(gl_header_upper_case_or_); \ - re="HAVE_($$or)_H"; \ - prohibit='\<'"$$re"'\>' \ - halt=$$(printf '%s\n' \ - 'do not test the above HAVE_<header>_H symbol(s);' \ - ' with the corresponding gnulib module, they are always true') \ - $(_sc_search_regexp) sc_prohibit_defined_have_decl_tests: @prohibit='(#[ ]*ifn?def|\<defined)\>[ (]+HAVE_DECL_' \ @@ -1690,50 +1660,6 @@ sc_prohibit_defined_have_decl_tests: $(_sc_search_regexp) # ================================================================== -gl_other_headers_ ?= \ - openat.h \ - stat-macros.h - -# Perl -lne code to extract "significant" cpp-defined symbols from a -# gnulib header file, eliminating a few common false-positives. -# The exempted names below are defined only conditionally in gnulib, -# and hence sometimes must/may be defined in application code. -gl_extract_significant_defines_ = \ - /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\ - && $$2 !~ /(?:rpl_|_used_without_)/\ - && $$1 !~ /^(?:NSIG|ENODATA)$$/\ - && $$1 !~ /^(?:SA_RESETHAND|SA_RESTART)$$/\ - and print $$1 - -# Create a list of regular expressions matching the names -# of macros that are guaranteed to be defined by parts of gnulib. -define def_sym_regex - gen_h=$(gl_generated_headers_); \ - (cd $(gnulib_dir)/lib; \ - for f in *.in.h $(gl_other_headers_); do \ - test -f $$f \ - && perl -lne '$(gl_extract_significant_defines_)' $$f; \ - done; \ - ) | sort -u \ - | $(SED) 's/^/^ *# *(define|undef) */;s/$$/\\>/' -endef - -# Don't define macros that we already get from gnulib header files. -sc_prohibit_always-defined_macros: - @if test -d $(gnulib_dir); then \ - case $$(echo all: | $(GREP) -l -f - $(abs_top_builddir)/Makefile) in $(abs_top_builddir)/Makefile);; *) \ - echo '$(ME): skipping $@: you lack GNU grep' 1>&2; exit 0;; \ - esac; \ - regex=$$($(def_sym_regex)); export regex; \ - $(VC_LIST_EXCEPT) \ - | xargs sh -c 'echo $$regex | $(GREP) -E -f - "$$@"' \ - dummy /dev/null \ - && { printf '$(ME): define the above' \ - ' via some gnulib .h file\n' 1>&2; \ - exit 1; } \ - || :; \ - fi -# ================================================================== # Prohibit checked in backup files. sc_prohibit_backup_files: @@ -2078,51 +2004,6 @@ sc_vulnerable_makefile_CVE-2012-3386: ' see https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-3386 for details') \ $(_sc_search_regexp) -# We don't use this feature of syntax-check.mk. -prev_version_file = /dev/null - -ifneq ($(_gl-Makefile),) -ifeq (0,$(MAKELEVEL)) - _dry_run_result := $(shell \ - cd '$(srcdir)'; \ - test -d .git || test -f .git || { echo 0; exit; }; \ - $(srcdir)/autogen.sh --dry-run >/dev/null 2>&1; \ - echo $$?; \ - ) - _clean_requested = $(filter %clean,$(MAKECMDGOALS)) - - # A return value of 0 means no action is required - - # A return value of 1 means a genuine error has occurred while - # performing the dry run, and it should be reported so it can - # be investigated - ifeq (1,$(_dry_run_result)) - $(info INFO: autogen.sh error, running again to show details) -syntax-check.mk Makefile: _autogen_error - endif - - # A return value of 2 means that autogen.sh needs to be executed - # in earnest before building, probably because of gnulib updates. - # We don't run autogen.sh if the clean target has been invoked, - # though, as it would be quite pointless - ifeq (2,$(_dry_run_result)$(_clean_requested)) - $(info INFO: running autogen.sh is required, running it now...) - $(shell touch $(srcdir)/AUTHORS) -syntax-check.mk Makefile: _autogen - endif -endif -endif - -# It is necessary to call autogen any time gnulib changes. Autogen -# reruns configure, then we regenerate all Makefiles at once. -.PHONY: _autogen -_autogen: - $(srcdir)/autogen.sh - ./config.status - -.PHONY: _autogen_error -_autogen_error: - $(srcdir)/autogen.sh --dry-run ifneq ($(_gl-Makefile),) syntax-check: spacing-check test-wrap-argv \ @@ -2319,9 +2200,6 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \ ^(build-aux/syntax-check\.mk|src/util/virthread\.c|tests/.*)$$ -exclude_file_name_regexp--sc_prohibit_always-defined_macros = \ - ^tests/virtestmock.c$$ - exclude_file_name_regexp--sc_prohibit_readdir = \ ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$ @@ -2337,8 +2215,5 @@ exclude_file_name_regexp--sc_prohibit_strcmp = \ exclude_file_name_regexp--sc_prohibit_backslash_alignment = \ ^build-aux/syntax-check\.mk$$ -exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ - ^src/util/(virfile|virnetdev|virnetdevip)\.[c,h]|$$ - exclude_file_name_regexp--sc_prohibit_select = \ ^build-aux/syntax-check\.mk|src/util/vireventglibwatch\.c$$ diff --git a/ci/build.sh b/ci/build.sh index 0874c2d1d9..2da84c080a 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -25,9 +25,7 @@ if test $? != 0; then fi find -name test-suite.log -delete -# gl_public_submodule_commit= to disable gnulib's submodule check -# which breaks due to way we clone the submodules -make -j"$CI_SMP" gl_public_submodule_commit= $CI_MAKE_ARGS +make -j"$CI_SMP" $CI_MAKE_ARGS if test $? != 0; then \ LOGS=$(find -name test-suite.log) diff --git a/config-post.h b/config-post.h index de007393da..4a49cd4194 100644 --- a/config-post.h +++ b/config-post.h @@ -22,10 +22,7 @@ /* * Define __GNUC_PREREQ to a sane default if it isn't yet defined. - * This is done here so that it's included as early as possible; gnulib relies - * on this to be defined in features.h, which should be included from ctype.h. - * This doesn't happen on many non-glibc systems. - * When __GNUC_PREREQ is not defined, gnulib defines it to 0, which breaks things. + * This is done here so that it's included as early as possible; */ #ifndef __GNUC_PREREQ # define __GNUC_PREREQ(maj, min) \ diff --git a/configure.ac b/configure.ac index 8692c40e86..e3658b4a13 100644 --- a/configure.ac +++ b/configure.ac @@ -42,11 +42,6 @@ dnl we don't really need the 'u' even in older toolchains. Then there is dnl older libtool, which spelled it AR_FLAGS m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"]) -# Maintainer note - comment this line out if you plan to rerun -# GNULIB_POSIXCHECK testing to see if libvirt should be using more modules. -# Leave it uncommented for normal releases, for faster ./configure. -gl_ASSERT_NO_GNULIB_POSIXCHECK - # Default to using the silent-rules feature when possible. Formatting # chosen to bypass 'grep' checks that cause older automake to warn. # Users (include rpm) can still change the default at configure time. @@ -152,9 +147,6 @@ then fi -gl_EARLY -gl_INIT - dnl get 64-int interfaces on 32-bit platforms AC_SYS_LARGEFILE @@ -747,7 +739,7 @@ AM_CONDITIONAL([WITH_TESTS], [test "$with_test_suite" = "yes"]) LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], [set the default for enabling expensive tests ] - [(gnulib and long timeouts), use VIR_TEST_EXPENSIVE to ] + [(long timeouts), use VIR_TEST_EXPENSIVE to ] [override during make], [check]) case "$enable_expensive_tests" in @@ -926,7 +918,6 @@ AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ - gnulib/lib/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 5869ebb90f..0e12a9218e 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -70,31 +70,6 @@ $ <b>sudo</b> <i>make install</i></pre> will turn on -Werror for builds. This can be disabled with --disable-werror, but this is not recommended. </p> - <p> - Libvirt takes advantage of - the <a href="http://www.gnu.org/software/gnulib/">gnulib</a> - project to provide portability to a number of platforms. This - is normally done dynamically via a git submodule in - the <code>.gnulib</code> subdirectory, which is auto-updated as - needed when you do incremental builds. Setting the environment - variable <code>GNULIB_SRCDIR</code> to a local directory - containing a git checkout of gnulib will let you reduce local - disk space requirements and network download time, regardless of - which actual commit you have in that reference directory. - </p> - <p> - However, if you are developing on a platform where git is not - available, or are behind a firewall that does not allow for git - to easily obtain the gnulib submodule, it is possible to instead - use a static mode of operation where you are then responsible - for updating the git submodule yourself. In this mode, you must - track the exact gnulib commit needed by libvirt (usually not the - latest gnulib.git) via alternative means, such as a shared NFS - drive or manual download, and run this any time libvirt.git - updates the commit stored in the .gnulib submodule:</p> - <pre> -$ GNULIB_SRCDIR=/path/to/gnulib ./autogen.sh --no-git - </pre> <p>To build & install libvirt to your home directory the following commands can be run: diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 74aba5d46b..94c74863b9 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -932,8 +932,7 @@ BAD: type is at least four bytes wide).</li> <li>If a variable has boolean semantics, give it the <code>bool</code> type and use the corresponding <code>true</code> and <code>false</code> macros. - It's ok to include <stdbool.h>, since libvirt's use of gnulib ensures - that it exists and is usable.</li> + </li> <li>In the unusual event that you require a specific width, use a standard type like <code>int32_t</code>, <code>uint32_t</code>, <code>uint64_t</code>, etc.</li> @@ -1549,7 +1548,7 @@ int foo() in the same way, but still make sure they get reviewed if non-trivial. </li> <li>(ir)regular pulls from other repositories or automated updates, such - as the .gnulib submodule updates, pulling in new translations or updating + as the keycodemap submodule updates, pulling in new translations or updating the container images for the CI system </li> </ul> diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am deleted file mode 100644 index 5669551afb..0000000000 --- a/gnulib/lib/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## Makefile for gnulib/lib -*-Makefile-*- - -## Copyright (C) 2011-2013 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -# Initialize variables, so gnulib.mk can append to them -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = -MOSTLYCLEANDIRS = -MOSTLYCLEANFILES = -SUFFIXES = -noinst_LTLIBRARIES = - -include gnulib.mk - -AM_CPPFLAGS = -I$(top_srcdir) diff --git a/libvirt.spec.in b/libvirt.spec.in index bbf9748582..de1ad4293d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -414,8 +414,6 @@ BuildRequires: libtirpc-devel BuildRequires: firewalld-filesystem %endif -Provides: bundled(gnulib) - %description Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index fc0b9bfa55..d3538d59f8 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -37,10 +37,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wconversion" # Too many to deal with dontwarn="$dontwarn -Wsign-conversion" - # GNULIB gettext.h violates - dontwarn="$dontwarn -Wvla" - # Many GNULIB header violations - dontwarn="$dontwarn -Wundef" # Need to allow bad cast for execve() dontwarn="$dontwarn -Wcast-qual" # We need to use long long in many places @@ -51,8 +47,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wstrict-overflow" # Not a problem since we don't use -funsafe-loop-optimizations dontwarn="$dontwarn -Wunsafe-loop-optimizations" - # Gnulib's stat-time.h violates this - dontwarn="$dontwarn -Waggregate-return" # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall dontwarn="$dontwarn -Wenum-compare" # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time @@ -139,7 +133,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ wantwarn="$wantwarn -Wno-unused-function" fi - # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff. + # manywarnings uses '-W' (aka -Wextra) which includes a bunch of stuff. # Unfortunately, this means you can't simply use '-Wsign-compare' # with gl_MANYWARN_COMPLEMENT # So we have -W enabled, and then have to explicitly turn off... @@ -151,16 +145,16 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # so use this CLang-specific arg to keep it quiet wantwarn="$wantwarn -Wno-typedef-redefinition" - # GNULIB expects this to be part of -Wc++-compat, but we turn + # manywarnings expects this to be part of -Wc++-compat, but we turn # that one off, so we need to manually enable this again wantwarn="$wantwarn -Wjump-misses-init" - # GNULIB explicitly filters it out, preferring -Wswitch + # manywarnings explicitly filters it out, preferring -Wswitch # but that doesn't report missing enums if a default: # is present. wantwarn="$wantwarn -Wswitch-enum" - # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, + # manywarnings turns on -Wformat=2 which implies -Wformat-nonliteral, # so we need to manually re-exclude it. wantwarn="$wantwarn -Wno-format-nonliteral" @@ -244,9 +238,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ ;; esac - # Silence certain warnings in gnulib, and use improved glibc headers - AC_DEFINE([lint], [1], - [Define to 1 if the compiler is checking for lint.]) + # Use security checked glibc headers AH_VERBATIM([FORTIFY_SOURCE], [/* Enable compile-time and run-time bounds-checking, and some warnings, without upsetting newer glibc. */ diff --git a/src/Makefile.am b/src/Makefile.am index 87322521c8..d3bf44f8b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,9 +19,7 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. -AM_CPPFLAGS = -I../gnulib/lib \ - -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) \ +AM_CPPFLAGS = -I$(top_srcdir) \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ @@ -445,7 +443,6 @@ if WITH_MACOS libvirt_la_LDFLAGS += -Wl,-flat_namespace endif WITH_MACOS libvirt_la_LDFLAGS += $(NULL) -libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += \ $(DRIVER_MODULES_LIBS) libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) @@ -668,7 +665,7 @@ libvirt_iohelper_LDFLAGS = \ libvirt_iohelper_LDADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la + $(NULL) if WITH_DTRACE_PROBES libvirt_iohelper_LDADD += libvirt_probes.lo endif WITH_DTRACE_PROBES diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index b4e2f1f2d3..0a9717adec 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -32,7 +32,6 @@ libvirt_driver_admin_la_CFLAGS = \ -I$(top_srcdir)/src/util \ -I$(top_builddir)/src/rpc \ $(NULL) -libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) if WITH_SASL diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 2a01a0e5a5..6be2437f23 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -35,7 +35,6 @@ libvirt_driver_bhyve_la_LIBADD = \ libvirt_driver_bhyve_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_bhyve.la libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 3df1d106a7..39157c0770 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -43,7 +43,6 @@ libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_UDEV_SOURCES) endif WITH_UDEV -libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la sbin_PROGRAMS += virtinterfaced diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5d40724c3b..4dc1b9d039 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -35,7 +35,6 @@ libvirt_driver_libxl_la_LIBADD = \ libvirt_driver_libxl_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_libxl.la libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 9fd2b7f282..e663d7146b 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -113,7 +113,6 @@ lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) augeas_DATA += locking/libvirt_lockd.aug if WITH_DTRACE_PROBES @@ -161,7 +160,6 @@ virtlockd_LDADD = \ libvirt.la \ libvirt_driver_admin.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES virtlockd_LDADD += libvirt_probes.lo @@ -182,7 +180,6 @@ sanlock_la_LIBADD = \ -lsanlock_client \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) augeas_DATA += locking/libvirt_sanlock.aug diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index e8240fa5c4..c4fa49106e 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -98,7 +98,6 @@ virtlogd_LDADD = \ libvirt_driver_admin.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES virtlogd_LDADD += libvirt_probes.lo diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 26b20e2e03..f69c1acff5 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -84,7 +84,6 @@ libvirt_driver_lxc_la_LIBADD = \ libvirt_driver_lxc_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_lxc.la libvirt_driver_lxc_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) @@ -213,7 +212,6 @@ libvirt_lxc_LDADD = \ libvirt.la \ $(FUSE_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES libvirt_lxc_LDADD += libvirt_probes.lo diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 3eeab74260..bc05b01987 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -35,7 +35,6 @@ libvirt_driver_network_la_LIBADD = \ libvirt_driver_network_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(LIBNL_LIBS) \ $(DBUS_LIBS) \ $(NULL) @@ -137,7 +136,7 @@ libvirt_leaseshelper_LDFLAGS = \ libvirt_leaseshelper_LDADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la + $(NULL) if WITH_DTRACE_PROBES libvirt_leaseshelper_LDADD += libvirt_probes.lo endif WITH_DTRACE_PROBES diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index c29397464b..0b287189bc 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -67,8 +67,6 @@ libvirt_driver_nodedev_la_LIBADD += \ $(NULL) endif WITH_UDEV -libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la - sbin_PROGRAMS += virtnodedevd nodist_conf_DATA += node_device/virtnodedevd.conf diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index d571d5c713..9a68fd80b6 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -50,7 +50,6 @@ libvirt_driver_nwfilter_impl_la_LIBADD = \ $(LIBNL_LIBS) \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_driver_nwfilter_impl_la_SOURCES = $(NWFILTER_DRIVER_SOURCES) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index d04a87e659..b9c0c6ea9c 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -85,7 +85,6 @@ libvirt_driver_qemu_la_LIBADD = \ libvirt_driver_qemu_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_qemu.la libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index b706e5f92f..958bd18f86 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -79,7 +79,6 @@ endif WITH_DTRACE_PROBES REMOTE_DAEMON_LD_ADD += \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) LOGROTATE_FILES_IN += \ diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 494b548948..a217404fa6 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1384,12 +1384,6 @@ int virNetSocketGetFD(virNetSocketPtr sock) return fd; } -/* Temp hack - we're still pulling in gnulib - * fcntl-h indirectly, but not fcntl */ -#ifdef WIN32 -# undef F_DUPFD_CLOEXEC -#endif - int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec) { int fd; diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 4f0956a7a4..63c8bc6dba 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -26,7 +26,6 @@ libvirt_driver_secret_la_CFLAGS = \ libvirt_driver_secret_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 6fe9d50f29..bd8df677f7 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -74,7 +74,6 @@ virt_aa_helper_LDADD = \ libvirt.la \ libvirt_driver_storage_impl.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES virt_aa_helper_LDADD += libvirt_probes.lo diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 3808079fde..3655b8a53c 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -140,7 +140,6 @@ libvirt_driver_storage_la_LIBADD = \ libvirt_driver_storage_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_storage.la libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) @@ -233,7 +232,6 @@ libvirt_storage_backend_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_fs_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_storage_file_fs_la_SOURCES = $(STORAGE_FILE_FS_SOURCES) @@ -247,7 +245,6 @@ libvirt_storage_file_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_file_fs_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE @@ -263,7 +260,6 @@ libvirt_storage_backend_logical_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_logical_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_LVM @@ -280,7 +276,6 @@ libvirt_storage_backend_iscsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_iscsi_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_ISCSI @@ -299,7 +294,6 @@ libvirt_storage_backend_iscsi_direct_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_iscsi_direct_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(LIBISCSI_LIBS) \ $(NULL) endif WITH_STORAGE_ISCSI_DIRECT @@ -316,7 +310,6 @@ libvirt_storage_backend_scsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_scsi_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_SCSI @@ -326,7 +319,6 @@ libvirt_storage_backend_mpath_la_LIBADD = \ libvirt.la \ $(DEVMAPPER_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_storage_backend_mpath_la_CFLAGS = \ -I$(srcdir)/conf \ @@ -350,7 +342,6 @@ libvirt_storage_backend_disk_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_disk_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_DISK @@ -360,7 +351,6 @@ libvirt_storage_backend_rbd_la_LIBADD = \ libvirt.la \ $(LIBRBD_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_storage_backend_rbd_la_CFLAGS = \ -I$(srcdir)/conf \ @@ -393,7 +383,6 @@ libvirt_storage_backend_sheepdog_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_sheepdog_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_SHEEPDOG @@ -404,7 +393,6 @@ libvirt_storage_backend_gluster_la_LIBADD = \ libvirt.la \ $(GLUSTERFS_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_storage_backend_gluster_la_CFLAGS = \ -I$(srcdir)/conf \ @@ -422,7 +410,6 @@ libvirt_storage_file_gluster_la_LIBADD = \ libvirt.la \ $(GLUSTERFS_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_storage_file_gluster_la_CFLAGS = \ -I$(srcdir)/conf \ @@ -447,7 +434,6 @@ libvirt_storage_backend_zfs_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_zfs_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_ZFS @@ -464,7 +450,6 @@ libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_vstorage_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) endif WITH_STORAGE_VSTORAGE @@ -480,7 +465,6 @@ libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES libvirt_parthelper_LDADD += libvirt_probes.lo diff --git a/src/util/viralloc.h b/src/util/viralloc.h index e6ad9984b7..1d42aeead1 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -382,8 +382,7 @@ void virDisposeString(char **strptr) * @S: size of trailing array elements * * Check to make sure that the requested allocation will not cause - * arithmetic overflow in the allocation size. The check is - * essentially the same as that in gnulib's xalloc_oversized. + * arithmetic overflow in the allocation size. */ #define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 15addee2e9..0679915f70 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -754,7 +754,7 @@ virBitmapNewData(const void *data, if (!bitmap) return NULL; - /* le64toh is not provided by gnulib, so we do the conversion by hand */ + /* le64toh is not available, so we do the conversion by hand */ p = bitmap->map; for (i = j = 0; i < len; i++, j++) { if (j == sizeof(*p)) { @@ -825,7 +825,7 @@ virBitmapToDataBuf(virBitmapPtr bitmap, /* If bitmap and buffer differ in size, only fill to the smaller length */ len = MIN(len, nbytes); - /* htole64 is not provided by gnulib, so we do the conversion by hand */ + /* htole64 is not available, so we do the conversion by hand */ l = bitmap->map; for (i = j = 0; i < len; i++, j++) { if (j == sizeof(*l)) { diff --git a/src/util/virfile.c b/src/util/virfile.c index 0633a1fa8d..5afc1f0251 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1327,9 +1327,7 @@ virBuildPathInternal(char **path, ...) return ret; } -/* Like gnulib's fread_file, but read no more than the specified maximum - number of bytes. If the length of the input is <= max_len, and - upon error while reading that data, it works just like fread_file. */ +/* Read no more than the specified maximum number of bytes. */ static char * saferead_lim(int fd, size_t max_len, size_t *length) { @@ -3214,8 +3212,7 @@ virFileOpenTty(int *ttymaster G_GNUC_UNUSED, char **ttyName G_GNUC_UNUSED, int rawmode G_GNUC_UNUSED) { - /* mingw completely lacks pseudo-terminals, and the gnulib - * replacements are not (yet) license compatible. */ + /* mingw completely lacks pseudo-terminals */ errno = ENOSYS; return -1; } diff --git a/src/util/virsocket.h b/src/util/virsocket.h index 6d323e0a12..419da8b3ae 100644 --- a/src/util/virsocket.h +++ b/src/util/virsocket.h @@ -46,21 +46,6 @@ int vir_setsockopt(int fd, int level, int optname, int vir_socket(int domain, int type, int protocol); -/* Get rid of GNULIB's replacements */ -# undef accept -# undef bind -# undef closesocket -# undef connect -# undef dup -# undef dup2 -# undef getpeername -# undef getsockname -# undef getsockopt -# undef ioctlsocket -# undef listen -# undef setsockopt -# undef socket - /* Provide our own replacements */ # define accept vir_accept # define bind vir_bind diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 57f7987dc8..72a15c6468 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -47,7 +47,6 @@ libvirt_driver_vbox_la_LIBADD = \ libvirt_driver_vbox_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_vbox.la libvirt_driver_vbox_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index e21eab6c92..cabe18a9a1 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -22,7 +22,6 @@ libvirt_driver_vz_la_LIBADD = \ libvirt_driver_vz_impl.la \ libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) mod_LTLIBRARIES += libvirt_driver_vz.la libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) diff --git a/tests/Makefile.am b/tests/Makefile.am index 54b128833b..704f692907 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS = \ -I$(top_builddir) -I$(top_srcdir) \ - -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ @@ -65,19 +64,14 @@ if WITH_DTRACE_PROBES PROBES_O += ../src/libvirt_probes.lo endif WITH_DTRACE_PROBES -GNULIB_LIBS = \ - ../gnulib/lib/libgnu.la - LDADDS = \ $(NO_INDIRECT_LDFLAGS) \ $(PROBES_O) \ - $(GNULIB_LIBS) \ ../src/libvirt.la \ $(GLIB_LIBS) \ $(NULL) MOCKLIBS_LIBS = \ - $(GNULIB_LIBS) \ ../src/libvirt.la EXTRA_DIST = \ @@ -946,8 +940,7 @@ storagepoolxml2xmltest_SOURCES = \ storagepoolxml2xmltest.c \ testutils.c testutils.h storagepoolxml2xmltest_LDADD = $(LDADDS) \ - ../src/libvirt_driver_storage_impl.la \ - $(GNULIB_LIBS) + ../src/libvirt_driver_storage_impl.la storagepoolcapstest_SOURCES = \ storagepoolcapstest.c testutils.h testutils.c @@ -1021,15 +1014,14 @@ commandtest_SOURCES = \ commandtest.c testutils.h testutils.c commandtest_LDADD = $(LDADDS) -# Must not link to any libvirt modules - libc / gnulib only +# Must not link to any libvirt modules - libc only # otherwise external libraries might unexpectedly leak # file descriptors into commandhelper invalidating the # test logic assumptions commandhelper_SOURCES = \ commandhelper.c commandhelper_LDADD = \ - $(NO_INDIRECT_LDFLAGS) \ - $(GNULIB_LIBS) + $(NO_INDIRECT_LDFLAGS) commandhelper_LDFLAGS = -static @@ -1070,16 +1062,16 @@ domaincapstest_LDADD = $(LDADDS) if WITH_QEMU domaincapstest_SOURCES += testutilsqemu.c testutilsqemu.h -domaincapstest_LDADD += libqemutestdriver.la $(GNULIB_LIBS) +domaincapstest_LDADD += libqemutestdriver.la endif WITH_QEMU if WITH_LIBXL domaincapstest_SOURCES += testutilsxen.c testutilsxen.h -domaincapstest_LDADD += libxltestdriver.la $(GNULIB_LIBS) +domaincapstest_LDADD += libxltestdriver.la endif WITH_LIBXL if WITH_BHYVE -domaincapstest_LDADD += ../src/libvirt_driver_bhyve_impl.la $(GNULIB_LIBS) +domaincapstest_LDADD += ../src/libvirt_driver_bhyve_impl.la endif WITH_BHYVE virnetmessagetest_SOURCES = \ @@ -1146,7 +1138,6 @@ virstoragetest_SOURCES = \ virstoragetest_LDADD = $(LDADDS) \ ../src/libvirt.la \ ../src/libvirt_driver_storage_impl.la \ - ../gnulib/lib/libgnu.la \ $(NULL) viridentitytest_SOURCES = \ diff --git a/tests/virstringtest.c b/tests/virstringtest.c index c87e1b9bec..bee49e6cb6 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -417,8 +417,7 @@ struct stringToLongData { /* This test makes assumptions about our compilation platform that are * not guaranteed by POSIX. Good luck to you if you are crazy enough - * to try and port libvirt to a platform with 16-bit int. Gnulib - * already assumes that signed integers are two's complement. */ + * to try and port libvirt to a platform with 16-bit int. */ G_STATIC_ASSERT(sizeof(int) == 4); G_STATIC_ASSERT(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); G_STATIC_ASSERT(sizeof(long long) == 8); diff --git a/tools/Makefile.am b/tools/Makefile.am index 426a6ba661..377f342beb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,14 +17,13 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir) \ $(NULL) -# We do not want to accidentally include stuff from gnulib -# or the main src/ dir or public API dir. Specific files can +# We do not want to accidentally include stuff from src/ +# dir or public API dir. Specific files can # still be included via their path relative to the root if # needed STANDALONE_CPPFLAGS = -I$(top_srcdir) @@ -120,7 +119,6 @@ libvirt_shell_la_LIBADD = \ $(LIBXML_LIBS) \ $(READLINE_LIBS) \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) libvirt_shell_la_SOURCES = \ vsh.c vsh.h \ @@ -166,7 +164,6 @@ virt_host_validate_LDFLAGS = \ virt_host_validate_LDADD = \ ../src/libvirt.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la \ $(NULL) virt_host_validate_CFLAGS = \ @@ -193,7 +190,7 @@ virt_login_shell_helper_LDADD = \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ $(GLIB_LIBS) \ - ../gnulib/lib/libgnu.la + $(NULL) virt_login_shell_helper_CFLAGS = \ $(AM_CFLAGS) \ -- 2.24.1