8:53 a.m.
The modues in this series are either obsolete (problems now fixed), or
redundant (fixing problems we never cared about - hello AIX
portability), or trivially replaced.
Daniel P. Berrangé (11):
bhyve: stop using private gnulib _getopt_internal_r func
build: drop the getopt-posix gnulib module
build: drop the inet_pton gnulib module
build: drop the mktempd gnulib module
util: drop the stpcpy gnulib module
Revert "build: use autobuild module to make build logs nicer"
build: drop the usleep gnulib module
build: drop the stdarg gnulib module
build: drop the gitlog-to-changelog gnulib module
build: drop the perror gnulib module
build: drop the pthread gnulib module
Makefile.am | 1 -
bootstrap.conf | 10 ----
configure.ac | 6 ---
po/POTFILES | 1 -
src/bhyve/bhyve_parse_command.c | 88 +++++++++++++++++----------------
src/util/virerror.c | 5 +-
tests/test-lib.sh | 3 +-
7 files changed, 50 insertions(+), 64 deletions(-)
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 01/11] bhyve: stop using private gnulib _getopt_internal_r func
The _getopt_internal_r func is not intended for public use, it is an
internal function shared between the gnulib getopt and argp modules.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/bhyve/bhyve_parse_command.c | 88 +++++++++++++++++----------------
1 file changed, 46 insertions(+), 42 deletions(-)
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index 7d460e9824..0bfe17c08c 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -23,7 +23,6 @@
#include <config.h>
#include <libutil.h>
-#include <getopt_int.h>
#include "bhyve_capabilities.h"
#include "bhyve_command.h"
@@ -633,6 +632,14 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def,
return -1;
}
+#define CONSUME_ARG(var) \
+ if ((opti + 1) == argc) { \
+ virReportError(VIR_ERR_INVALID_ARG, "Missing argument for
'%s'", \
+ argv[opti]); \
+ goto error; \
+ } \
+ var = argv[++opti]
+
/*
* Parse the /usr/sbin/bhyve command line.
*/
@@ -642,28 +649,24 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def,
unsigned caps,
int argc, char **argv)
{
- int c;
- const char optstr[] = "abehuwxACHIPSWYp:g:c:s:m:l:U:";
int vcpus = 1;
size_t memory = 0;
unsigned nahcidisks = 0;
unsigned nvirtiodisks = 0;
- struct _getopt_data *parser;
-
- if (!argv)
- goto error;
+ size_t opti;
+ const char *arg;
- if (VIR_ALLOC(parser) < 0)
- goto error;
+ for (opti = 1; opti < argc; opti++) {
+ if (argv[opti][0] != '-')
+ break;
- while ((c = _getopt_internal_r(argc, argv, optstr,
- NULL, NULL, 0, parser, 0)) != -1) {
- switch (c) {
+ switch (argv[opti][1]) {
case 'A':
def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
break;
case 'c':
- if (virStrToLong_i(parser->optarg, NULL, 10, &vcpus) < 0) {
+ CONSUME_ARG(arg);
+ if (virStrToLong_i(arg, NULL, 10, &vcpus) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Failed to parse number of vCPUs"));
goto error;
@@ -674,20 +677,23 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def,
goto error;
break;
case 'l':
- if (bhyveParseBhyveLPCArg(def, caps, parser->optarg))
+ CONSUME_ARG(arg);
+ if (bhyveParseBhyveLPCArg(def, caps, arg))
goto error;
break;
case 's':
+ CONSUME_ARG(arg);
if (bhyveParseBhyvePCIArg(def,
xmlopt,
caps,
&nahcidisks,
&nvirtiodisks,
- parser->optarg))
+ arg))
goto error;
break;
case 'm':
- if (bhyveParseMemsize(parser->optarg, &memory)) {
+ CONSUME_ARG(arg);
+ if (bhyveParseMemsize(arg, &memory)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Failed to parse memory"));
goto error;
@@ -709,19 +715,23 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def,
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
break;
case 'U':
- if (virUUIDParse(parser->optarg, def->uuid) < 0) {
+ CONSUME_ARG(arg);
+ if (virUUIDParse(arg, def->uuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Cannot parse UUID '%s'"),
parser->optarg);
+ _("Cannot parse UUID '%s'"), arg);
goto error;
}
break;
case 'S':
def->mem.locked = true;
break;
+ case 'p':
+ case 'g':
+ CONSUME_ARG(arg);
}
}
- if (argc != parser->optind) {
+ if (argc != opti) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Failed to parse arguments for bhyve command"));
goto error;
@@ -738,11 +748,9 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def,
goto error;
}
- VIR_FREE(parser);
return 0;
error:
- VIR_FREE(parser);
return -1;
}
@@ -753,42 +761,38 @@ static int
bhyveParseBhyveLoadCommandLine(virDomainDefPtr def,
int argc, char **argv)
{
- int c;
/* bhyveload called with default arguments when only -m and -d are given.
* Store this in a bit field and check if only those two options are given
* later */
unsigned arguments = 0;
size_t memory = 0;
- struct _getopt_data *parser;
size_t i = 0;
int ret = -1;
+ size_t opti;
+ const char *arg;
- const char optstr[] = "CSc:d:e:h:l:m:";
-
- if (!argv)
- goto error;
-
- if (VIR_ALLOC(parser) < 0)
- goto error;
+ for (opti = 1; opti < argc; opti++) {
+ if (argv[opti][0] != '-')
+ break;
- while ((c = _getopt_internal_r(argc, argv, optstr,
- NULL, NULL, 0, parser, 0)) != -1) {
- switch (c) {
+ switch (argv[opti][1]) {
case 'd':
+ CONSUME_ARG(arg);
arguments |= 1;
/* Iterate over the disks of the domain trying to match up the
* source */
for (i = 0; i < def->ndisks; i++) {
if (STREQ(virDomainDiskGetSource(def->disks[i]),
- parser->optarg)) {
+ arg)) {
def->disks[i]->info.bootIndex = i;
break;
}
}
break;
case 'm':
+ CONSUME_ARG(arg);
arguments |= 2;
- if (bhyveParseMemsize(parser->optarg, &memory)) {
+ if (bhyveParseMemsize(arg, &memory)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Failed to parse memory"));
goto error;
@@ -806,6 +810,12 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def,
}
}
+ if (argc != opti) {
+ virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+ _("Failed to parse arguments for bhyve command"));
+ goto error;
+ }
+
if (arguments != 3) {
/* Set os.bootloader since virDomainDefFormatInternal will only format
* the bootloader arguments if os->bootloader is set. */
@@ -815,12 +825,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def,
def->os.bootloaderArgs = virStringListJoin((const char**) &argv[1], "
");
}
- if (argc != parser->optind) {
- virReportError(VIR_ERR_OPERATION_FAILED, "%s",
- _("Failed to parse arguments for bhyveload command"));
- goto error;
- }
-
+ fprintf(stderr, "Ok %s %s %d\n", def->name, argv[argc], argc);
if (def->name == NULL) {
if (VIR_STRDUP(def->name, argv[argc]) < 0)
goto error;
@@ -834,7 +839,6 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def,
ret = 0;
error:
- VIR_FREE(parser);
return ret;
}
--
2.21.0
11:09 a.m.
New subject: [libvirt] [PATCH 01/11] bhyve: stop using private gnulib _getopt_internal_r func
On Thu, Oct 03, 2019 at 02:53:08PM +0100, Daniel P. Berrangé wrote:
src/bhyve/bhyve_parse_command.c:637: virReportError(VIR_ERR_INVALID_ARG,
"Missing argument for '%s'", \
maint.mk: found unmarked diagnostic(s)
Debugging leftovers
if (def->name == NULL) {
if (VIR_STRDUP(def->name, argv[argc]) < 0)
goto error;
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
8:53 a.m.
New subject: [libvirt] [PATCH 02/11] build: drop the getopt-posix gnulib module
The getopt-posix module fixes a problem with optind being incorrectly
set after a failed option parse. This is not something that matters to
libvirt code.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
po/POTFILES | 1 -
2 files changed, 2 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 4f944a9c23..22f6153f3c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -51,7 +51,6 @@ fsync
getaddrinfo
getcwd-lgpl
gethostname
-getopt-posix
getpass
getpeername
getsockname
diff --git a/po/POTFILES b/po/POTFILES
index 35fc26c4b9..9385fc4e15 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,4 @@
gnulib/lib/gai_strerror.c
-gnulib/lib/getopt.c
gnulib/lib/regcomp.c
src/access/viraccessdriverpolkit.c
src/access/viraccessmanager.c
--
2.21.0
10:12 a.m.
New subject: [libvirt] [PATCH 02/11] build: drop the getopt-posix gnulib module
On Thu, Oct 03, 2019 at 02:53:09PM +0100, Daniel P. Berrangé wrote:
This module was introduced by:
commit b436a8ae5ccb04f8cf893d882d52ab5efc713307
gnulib: add getopt module
for the patches implementing command line parsing for the bhyve
driver. So you can also remove the gl_REPLACE_GETOPT_ALWAYS definition
in m4/virt-driver-bhyve.m4 and delete gnulib/lib/getopt.c from
POTFILES.in.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:40 a.m.
New subject: [libvirt] [PATCH 02/11] build: drop the getopt-posix gnulib module
On Thu, Oct 03, 2019 at 05:12:52PM +0200, Ján Tomko wrote:
POTFILES.in was renamed to POTFILES which I've updated here.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
8:53 a.m.
New subject: [libvirt] [PATCH 03/11] build: drop the inet_pton gnulib module
All use of this function was purged a long time ago in favour
of getaddrinfo
commit a8ae7d19f4ace62ff3f364c628cbc16baa9b080c
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Thu Oct 21 11:13:05 2010 +0100
Remove all use of inet_pton and inet_ntop
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 22f6153f3c..1fa0a38389 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -58,7 +58,6 @@ gettimeofday
gitlog-to-changelog
gnumakefile
ignore-value
-inet_pton
intprops
ioctl
isatty
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 04/11] build: drop the mktempd gnulib module
The mktempd module in gnulib provides an equivalent to 'mktemp -d' on
platforms which lack this shell command. All platforms on which libvirt
runs the affected tests have 'mktemp -d' support, so the gnulib module
is not required.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
tests/test-lib.sh | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 1fa0a38389..9964231bb7 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -71,7 +71,6 @@ mgetgroups
mkdtemp
mkostemp
mkostemps
-mktempd
net_if
netdb
nonblocking
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index ef5a47b565..c19005a371 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -256,8 +256,7 @@ fi
# a partition, or to undo any other global state changes.
cleanup_() { :; }
-mktempd="$abs_top_srcdir/build-aux/mktempd"
-t_=$("$SHELL" "$mktempd" "$test_dir_"
lv-$this_test.XXXXXXXXXX) \
+t_=$("mktemp" "-d" "$test_dir_/lv-$this_test.XXXXXXXXXX")
\
|| error_ "failed to create temporary directory in $test_dir_"
# Run each test from within a temporary sub-directory named after the
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 05/11] util: drop the stpcpy gnulib module
stpcpy returns a pointer to the end of the string just copied
which in theory makes it easier to then copy another string
after it. We only use stpcpy in one place though and that
is trivially rewritten to avoid stpcpy with no less in code
clarity or efficiency.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
src/util/virerror.c | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 9964231bb7..9ca1e6ddd7 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -96,7 +96,6 @@ snprintf
socket
stat-time
stdarg
-stpcpy
strchrnul
strdup-posix
strndup
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 77f76a9abf..3bb9d1d32c 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1367,8 +1367,9 @@ void virReportSystemErrorFull(int domcode,
size_t len = strlen(errnoDetail);
if (0 <= n && n + 2 + len < sizeof(msgDetailBuf)) {
- char *p = msgDetailBuf + n;
- stpcpy(stpcpy(p, ": "), errnoDetail);
+ strcpy(msgDetailBuf + n, ": ");
+ n += 2;
+ strcpy(msgDetailBuf + n, errnoDetail);
msgDetail = msgDetailBuf;
}
}
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 06/11] Revert "build: use autobuild module to make build logs nicer"
This reverts commit 83aca30f1e8be524780a60b9dd8a14ec5f9de878.
While the motivation of the original commit is fine, we are intending to
drop autoconf in favour of meson, and similarly wish to drop use of
gnulib. Removing this feature is part of that conversion work.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
configure.ac | 6 ------
2 files changed, 7 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 9ca1e6ddd7..09dcf78007 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,7 +20,6 @@
gnulib_modules='
accept
areadlink
-autobuild
base64
bind
bitrotate
diff --git a/configure.ac b/configure.ac
index af8cbcdfd8..ea4cd89733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,12 +123,6 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_CPP
-dnl Setting AB_VERSION makes the 'autobuild' lines of configure output
-dnl slightly more useful
-if test -d $srcdir/.git && git --version >/dev/null 2>&1 ; then
- AB_VERSION=`cd $srcdir && git describe --match 'v[[0-9]]*'
2>/dev/null`
-fi
-
dnl autoconf 2.70 adds a --runstatedir option so that downstreams
dnl can point to /run instead of the historic /var/run, but
dnl autoconf hasn't had a release since 2012.
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 07/11] build: drop the usleep gnulib module
The usleep function was missing on older mingw versions, but we can rely
on it existing everywhere these days.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 09dcf78007..022f564134 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -112,7 +112,6 @@ ttyname_r
uname
unsetenv
useless-if-before-free
-usleep
vasprintf
verify
vc-list-files
--
2.21.0
10:34 a.m.
New subject: [libvirt] [PATCH 07/11] build: drop the usleep gnulib module
On Thu, Oct 03, 2019 at 02:53:14PM +0100, Daniel P. Berrangé wrote:
Per https://www.gnu.org/software/gnulib/manual/html_node/usleep.html#usleep
usleep only works up to one second on mingw.
However from 'git grep usleep' it seems that the virsh usage is the only
one possibly relevant to Windows.
Is there any benefit of using usleep for values that are multiples of
1000?
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:39 a.m.
New subject: [libvirt] [PATCH 07/11] build: drop the usleep gnulib module
On Thu, Oct 03, 2019 at 05:34:50PM +0200, Ján Tomko wrote:
Doh, I totally misread that note.
Is there any benefit of using usleep for values that are multiples
of
1000?
Just nice to have consistency.
I'll move this patch into my glib series, as I can do a straight
s/usleep/g_usleep/, as that calls to Sleep() on Win32 to avoid
the problem, albeit with only millisecond precision but that's
fine.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
8:53 a.m.
New subject: [libvirt] [PATCH 08/11] build: drop the stdarg gnulib module
gnulib fixes a portability problem on AIX which is a platform we have
never targetted.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 022f564134..257782a7b9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -94,7 +94,6 @@ sigpipe
snprintf
socket
stat-time
-stdarg
strchrnul
strdup-posix
strndup
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 09/11] build: drop the gitlog-to-changelog gnulib module
The use of this script was discontinued when we stopped providing a full
ChangeLog in the dist with:
commit ce97c33a795dec053f1e85c65ecd924b8c6ec4ba
Author: Andrea Bolognani <abologna(a)redhat.com>
Date: Mon Apr 1 17:33:03 2019 +0200
maint: Stop generating ChangeLog from git
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
Makefile.am | 1 -
bootstrap.conf | 1 -
2 files changed, 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 711f365504..2cc4b91f9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ EXTRA_DIST = \
AUTHORS.in \
build-aux/augeas-gentest.pl \
build-aux/check-spacing.pl \
- build-aux/gitlog-to-changelog \
build-aux/header-ifdef.pl \
build-aux/minimize-po.pl \
build-aux/mock-noinline.pl \
diff --git a/bootstrap.conf b/bootstrap.conf
index 257782a7b9..617d9acb76 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -54,7 +54,6 @@ getpass
getpeername
getsockname
gettimeofday
-gitlog-to-changelog
gnumakefile
ignore-value
intprops
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 10/11] build: drop the perror gnulib module
This fixes a problem on mingw where it doesn't know how to report
certain errnos defined by POSIX, but not used on Windows. These are
not a real problem for libvirt.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 617d9acb76..1f1c33f998 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -74,7 +74,6 @@ netdb
nonblocking
openpty
passfd
-perror
physmem
pipe-posix
pipe2
--
2.21.0
8:53 a.m.
New subject: [libvirt] [PATCH 11/11] build: drop the pthread gnulib module
This was fixing a problem with old versions of mingw which had a
pthread.h that polluted the namespace with random symbols. This is no
longer relevant on our mingw platform targets.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
bootstrap.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 1f1c33f998..6120873397 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -79,7 +79,6 @@ pipe-posix
pipe2
poll
posix-shell
-pthread
pthread_sigmask
recv
regex
--
2.21.0
2019
days inactive
2019
days old
24 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Ján Tomko