There is no need to have DRIVER_MODULES_LIBS as it's used only for libvirt.so. The other places are using DLOPEN_LIBS directly and dlopen is required if building with libvirtd. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-driver-modules.m4 | 3 --- src/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 index 8bf8ecf2b1e..54b75e09739 100644 --- a/m4/virt-driver-modules.m4 +++ b/m4/virt-driver-modules.m4 @@ -38,17 +38,14 @@ AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [ fi DRIVER_MODULES_CFLAGS= - DRIVER_MODULES_LIBS= if test "$with_driver_modules" = "yes"; then if test "$with_dlfcn" != "yes" || test "$with_dlopen" != "yes"; then AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules]) fi DRIVER_MODULES_LDFLAGS="-export-dynamic" - DRIVER_MODULES_LIBS="$DLOPEN_LIBS" fi AC_SUBST([DRIVER_MODULES_LDFLAGS]) - AC_SUBST([DRIVER_MODULES_LIBS]) ]) AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [ diff --git a/src/Makefile.am b/src/Makefile.am index 12dd6b80e1e..447cff81659 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -439,7 +439,7 @@ libvirt_la_LDFLAGS += -Wl,-flat_namespace endif WITH_MACOS libvirt_la_LDFLAGS += $(NULL) libvirt_la_LIBADD += \ - $(DRIVER_MODULES_LIBS) + $(DLOPEN_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 -- 2.26.2

FreeBSD 10 is no longer supported by libvirt and the struct member ifi_oqdrops is usable without any define on later FreeBSD versions. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure.ac b/configure.ac index 6c8ac2f04bc..e4c0bea94df 100644 --- a/configure.ac +++ b/configure.ac @@ -857,17 +857,6 @@ if test $with_freebsd = yes; then ) fi -# FreeBSD 10-STABLE requires _IFI_OQDROPS to be defined for if_data.ifi_oqdrops -# field be available -old_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -D_IFI_OQDROPS" - -AC_CHECK_MEMBERS([struct if_data.ifi_oqdrops], - [], - [CFLAGS="$old_CFLAGS"], - [#include <net/if.h> - ]) - AC_CHECK_DECLS([clock_serv_t, host_get_clock_service, clock_get_time], [AC_DEFINE([HAVE_MACH_CLOCK_ROUTINES], [1], -- 2.26.2

Set FLAT_NAMESPACE_FLAGS to -Wl,-flat_namespace in configure only for macOS and use it unconditionally in Makefiles. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 13 +++++++++++++ src/Makefile.am | 10 +++------- tests/Makefile.am | 7 +++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e4c0bea94df..75695252898 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,19 @@ esac AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) AC_SUBST([VERSION_SCRIPT_FLAGS]) +dnl macOS has two-level namespaces by default. +dnl Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES +case "$host" in + *-*-darwin*) + FLAT_NAMESPACE_FLAGS=-Wl,-flat_namespace + ;; + * ) + FLAT_NAMESPACE_FLAGS="" + ;; +esac +AC_MSG_RESULT([$FLAT_NAMESPACE_FLAGS]) +AC_SUBST([FLAT_NAMESPACE_FLAGS]) + dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case dnl we're working on BSD) want_ifconfig=no diff --git a/src/Makefile.am b/src/Makefile.am index 447cff81659..b893f4179e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -431,13 +431,9 @@ libvirt_la_LDFLAGS = \ -version-info $(LIBVIRT_VERSION_INFO) \ $(LIBVIRT_NODELETE) \ $(NO_UNDEFINED_LDFLAGS) \ - $(AM_LDFLAGS) -if WITH_MACOS -# macOS has two-level namespaces by default. -# Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES -libvirt_la_LDFLAGS += -Wl,-flat_namespace -endif WITH_MACOS -libvirt_la_LDFLAGS += $(NULL) + $(FLAT_NAMESPACE_FLAGS) \ + $(AM_LDFLAGS) \ + $(NULL) libvirt_la_LIBADD += \ $(DLOPEN_LIBS) libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 65d1ceeefdf..06d70ab559c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -55,10 +55,9 @@ MOCKLIBS_LDFLAGS = -avoid-version \ DRIVERLIB_LDFLAGS = \ -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation \ - $(MINGW_EXTRA_LDFLAGS) -if WITH_MACOS -DRIVERLIB_LDFLAGS += -Wl,-flat_namespace -endif WITH_MACOS + $(MINGW_EXTRA_LDFLAGS) \ + $(FLAT_NAMESPACE_FLAGS) \ + $(NULL) PROBES_O = if WITH_DTRACE_PROBES -- 2.26.2

Commit <03c532cf9711dd6ad35380455a77141ef7d492ab> removed usage of MAJOR_IN_MKDEV and MAJOR_IN_SYSMACROS from libvirt which makes the AC_HEADER_MAJOR useless. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 75695252898..f8d9038e4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -155,8 +155,6 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL -AC_HEADER_MAJOR - m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL ], [ -- 2.26.2

This was introduced together with clock-time gnulib module by commit <d74e5a4dfc434d3a1d01856d013a7f50d910fa95> and removed from libvirt by commit <86d223a762990c9d529065a2d3b30b6a00ea63dd>. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/util/Makefile.inc.am | 1 - tests/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 5bc60cb5ead..6d732518f40 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -289,7 +289,6 @@ libvirt_util_la_LIBADD = \ $(THREAD_LIBS) \ $(AUDIT_LIBS) \ $(DEVMAPPER_LIBS) \ - $(LIB_CLOCK_GETTIME) \ $(DBUS_LIBS) \ $(WIN32_EXTRA_LIBS) \ $(LIBXML_LIBS) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 06d70ab559c..c87b12d28c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1511,7 +1511,7 @@ endif WITH_LIBVIRTD if WITH_LIBVIRTD eventtest_SOURCES = \ eventtest.c testutils.h testutils.c -eventtest_LDADD = $(LIB_CLOCK_GETTIME) $(LDADDS) +eventtest_LDADD = $(LDADDS) endif WITH_LIBVIRTD libshunload_la_SOURCES = shunloadhelper.c -- 2.26.2

These files are generated by xsltproc as part of html/index.html and html/index-%.html rules. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- docs/Makefile.am | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d8109bb65ca..c33ae8afb13 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -476,13 +476,7 @@ check-html: check-local: check-html -python_generated_files = \ - html/libvirt-libvirt-lxc.html \ - html/libvirt-libvirt-qemu.html \ - html/libvirt-libvirt-admin.html \ - html/libvirt-virterror.html \ - $(api_DATA) \ - $(NULL) +python_generated_files = $(api_DATA) APIBUILD=$(top_srcdir)/scripts/apibuild.py APIBUILD_STAMP=apibuild.py.stamp -- 2.26.2

Commit <d672551816e106f2ce8a6a04658691db96435fb5> removed last usage of this file so drop it as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- docs/Makefile.am | 1 - docs/wrapstring.xsl | 56 --------------------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 docs/wrapstring.xsl diff --git a/docs/Makefile.am b/docs/Makefile.am index c33ae8afb13..07a7d7a369c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -358,7 +358,6 @@ schema_DATA = $(wildcard $(srcdir)/schemas/*.rng) EXTRA_DIST= \ site.xsl subsite.xsl newapi.xsl page.xsl \ - wrapstring.xsl \ $(dot_html_in) $(dot_rst) $(apipng) \ $(fig) $(assets) \ $(javascript) $(logofiles) \ diff --git a/docs/wrapstring.xsl b/docs/wrapstring.xsl deleted file mode 100644 index b468a700f5e..00000000000 --- a/docs/wrapstring.xsl +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - -<!-- based on http://plasmasturm.org/log/xslwordwrap/ --> -<!-- Copyright 2010 Aristotle Pagaltzis; under the MIT licence --> -<!-- http://www.opensource.org/licenses/mit-license.php --> -<xsl:template name="wrap-string"> - <xsl:param name="str" /> - <xsl:param name="wrap-col" /> - <xsl:param name="break-mark" /> - <xsl:param name="pos" select="0" /> - <xsl:choose> - <xsl:when test="contains( $str, ' ' )"> - <xsl:variable name="first-word" select="substring-before( $str, ' ' )" /> - <xsl:variable name="pos-now" select="$pos + 1 + string-length( $first-word )" /> - <xsl:choose> - <xsl:when test="$pos > 0 and $pos-now >= $wrap-col"> - <xsl:copy-of select="$break-mark" /> - <xsl:call-template name="wrap-string"> - <xsl:with-param name="str" select="$str" /> - <xsl:with-param name="wrap-col" select="$wrap-col" /> - <xsl:with-param name="break-mark" select="$break-mark" /> - <xsl:with-param name="pos" select="0" /> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:if test="$pos > 0"> - <xsl:text> </xsl:text> - </xsl:if> - <xsl:value-of select="$first-word" /> - <xsl:call-template name="wrap-string"> - <xsl:with-param name="str" select="substring-after( $str, ' ' )" /> - <xsl:with-param name="wrap-col" select="$wrap-col" /> - <xsl:with-param name="break-mark" select="$break-mark" /> - <xsl:with-param name="pos" select="$pos-now" /> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$pos + string-length( $str ) >= $wrap-col"> - <xsl:copy-of select="$break-mark" /> - </xsl:when> - <xsl:otherwise> - <xsl:if test="$pos > 0"> - <xsl:text> </xsl:text> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - <xsl:value-of select="$str" /> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -</xsl:stylesheet> -- 2.26.2

convert bin is part of ImageMagick package and uses uniconvertor to create png file from fig files. Unfortunately uniconvertor is python2 only and not available in most recent distributions which makes the convert command fail with: sh: uniconvertor: command not found /usr/bin/mv: cannot stat '/tmp/magick-1397138DRT8Pzx4Qmoc.svg': No such file or directory convert: delegate failed `'uniconvertor' '%i' '%o.svg'; /usr/bin/mv '%o.svg' '%o'' @ error/delegate.c/InvokeDelegate/1958. convert: unable to open file `/tmp/magick-1397138S8ARueJXLXkc': No such file or directory @ error/constitute.c/ReadImage/605. convert: no images defined `docs/migration-managed-direct.png' @ error/convert.c/ConvertImageCommand/3226. It looks like that there are plans to somehow port uniconvertor into python3 but as part of different project color-picker but the job is far from complete. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- docs/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 07a7d7a369c..3fd8256e668 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -406,9 +406,6 @@ hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $(api_DATA) \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/hvsupport.py \ $(top_srcdir) $(top_builddir) > $@ || { rm $@ && exit 1; } -%.png: %.fig - convert -rotate 90 $< $@ - manpages/%.html.in: manpages/%.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^:Manual ' < $< | \ -- 2.26.2

On a Thursday in 2020, Pavel Hrdina wrote: This doesn't look right with no changes to the SELinux driver. This means the code relying on HAVE_SELINUX_LXC_CONTEXTS_PATH will no longer be compiled. Jano

All supported OSes have at least libselinux version 2.5 so it's safe to drop this check. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-selinux.m4 | 17 ----------------- tests/securityselinuxhelper.c | 5 ++--- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 64e69808440..fb541e207ed 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -27,23 +27,6 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ [fgetfilecon_raw], [selinux/selinux.h]) if test "$with_selinux" = "yes"; then - # libselinux changed signatures for 2.5 - # TODO: Drop once we don't support Ubuntu 16.04 - AC_CACHE_CHECK([for selinux selabel_open parameter type], - [lv_cv_selabel_open_const], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include <selinux/selinux.h> -#include <selinux/label.h> -struct selabel_handle *selabel_open(unsigned, struct selinux_opt *, unsigned); - ]])], - [lv_cv_selabel_open_const=''], - [lv_cv_selabel_open_const='const'])]) - AC_DEFINE_UNQUOTED([VIR_SELINUX_OPEN_CONST], [$lv_cv_selabel_open_const], - [Define to empty or 'const' depending on how SELinux qualifies its - selabel_open parameter]) - AC_MSG_CHECKING([SELinux mount point]) if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then if test -d /sys/fs/selinux ; then diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index f89224c07a4..0556241fd55 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -53,8 +53,7 @@ static const char *(*real_selinux_lxc_contexts_path)(void); #endif static struct selabel_handle *(*real_selabel_open)(unsigned int backend, - VIR_SELINUX_OPEN_CONST - struct selinux_opt *opts, + const struct selinux_opt *opts, unsigned nopts); static void (*real_selabel_close)(struct selabel_handle *handle); static int (*real_selabel_lookup_raw)(struct selabel_handle *handle, @@ -288,7 +287,7 @@ const char *selinux_lxc_contexts_path(void) struct selabel_handle * selabel_open(unsigned int backend, - VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, + const struct selinux_opt *opts, unsigned nopts) { char *fake_handle; -- 2.26.2

The current code to check XDR support was obsolete and way to complicated. On linux we can use pkg-config to check for libtirpc and have the CFLAGS and LIBS configured by it as well. On MinGW there is portablexdr library which installs header files directly into system include directory. On FreeBSD and macOS XDR functions are part of libc so there is no library needed, we just need to call AM_CONDITIONAL to silence configure which otherwise complains about missing WITH_XDR. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-xdr.m4 | 39 +++++++++++-------------------------- src/Makefile.am | 4 +++- src/admin/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 2 ++ src/logging/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 index 83754157d9a..09d0c2ba2f4 100644 --- a/m4/virt-xdr.m4 +++ b/m4/virt-xdr.m4 @@ -18,37 +18,20 @@ dnl <http://www.gnu.org/licenses/>;. dnl AC_DEFUN([LIBVIRT_CHECK_XDR], [ - with_xdr="no" 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 -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],[xdr tirpc],[], - [AC_MSG_ERROR([Cannot find a XDR library])]) - ]) + dnl On MinGW portablexdr provides XDR functions, on linux they are + dnl provided by libtirpc and on FreeBSD/macOS there is no need to + dnl use extra library as it's provided by libc directly. + with_xdr="yes" - 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 - if test x"$add_CFLAGS" = xmissing; then - lv_cv_xdr_cflags=missing; break - fi - CFLAGS="$old_CFLAGS $add_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <rpc/rpc.h> - ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break]) - done - ]) - CFLAGS=$old_CFLAGS - case $lv_cv_xdr_cflags in - none) XDR_CFLAGS= ;; - missing) AC_MSG_ERROR([Unable to find <rpc/rpc.h>]) ;; - *) XDR_CFLAGS=$lv_cv_xdr_cflags ;; - esac - AC_SUBST([XDR_CFLAGS]) + if test "$with_win" = "yes"; then + LIBVIRT_CHECK_LIB([XDR], [portablexdr], [xdrmem_create], [rpc/rpc.h]) + elif test "$with_linux" = "yes"; then + LIBVIRT_CHECK_PKG([XDR], [libtirpc], [0.1.10]) + else + AM_CONDITIONAL([WITH_XDR], [test "x$with_xdr" = "xyes"]) + fi fi ]) diff --git a/src/Makefile.am b/src/Makefile.am index b893f4179e8..8b0cbb6fc86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -435,7 +435,9 @@ libvirt_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(NULL) libvirt_la_LIBADD += \ - $(DLOPEN_LIBS) + $(DLOPEN_LIBS) \ + $(XDR_LIBS) \ + $(NULL) 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 diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 0a9717adec6..8556a3b8523 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -72,6 +72,7 @@ libvirt_admin_la_LDFLAGS = \ libvirt_admin_la_LIBADD = \ libvirt.la \ + $(XDR_LIBS) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(DEVMAPPER_LIBS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index d1bf49cd3fb..ab01d8e0482 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -120,6 +120,7 @@ lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD = \ libvirt.la \ $(GLIB_LIBS) \ + $(XDR_LIBS) \ $(NULL) augeas_DATA += locking/libvirt_lockd.aug if WITH_DTRACE_PROBES @@ -161,6 +162,7 @@ virtlockd_CFLAGS = \ virtlockd_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlockd_LDADD = \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dc09cfe3fa8..4be33765e9e 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -99,6 +99,7 @@ virtlogd_CFLAGS = \ virtlogd_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlogd_LDADD = \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 1b1be8340df..8a40c96563c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -69,6 +69,7 @@ REMOTE_DAEMON_LD_ADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(XDR_LIBS) \ $(DBUS_LIBS) \ $(LIBNL_LIBS) \ $(NULL) -- 2.26.2

There is no need to provide relative paths to the current directory if we provide search paths using --directory option for xgentext. In addition it will make libvirt.pot file look cleaner as it will not contain relative paths to current directory. It improves the situation for developers which are using different build path as that would change the relative path in libvirt.pot as well. After this patch it will not happen anymore. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- build-aux/syntax-check.mk | 4 +- po/Makefile.am | 6 +- po/POTFILES.in | 726 +++++++++++++++++++------------------- 3 files changed, 369 insertions(+), 367 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d47a92b530f..bf229c42a74 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1869,8 +1869,8 @@ sc_po_check: gen_source_files { $(VC_LIST_EXCEPT); echo $(generated_files); } \ | xargs perl $(perl_translatable_files_list_) \ | xargs $(GREP) -E -l '$(_gl_translatable_string_re)' \ - | $(SED) 's|^$(_dot_escaped_srcdir)|@SRCDIR@|' \ - | $(SED) 's|^$(_dot_escaped_builddir)|@BUILDDIR@|' \ + | $(SED) 's|^$(_dot_escaped_srcdir)/|@SRCDIR@|' \ + | $(SED) 's|^$(_dot_escaped_builddir)/|@BUILDDIR@|' \ | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ diff --git a/po/Makefile.am b/po/Makefile.am index 95294aa12ed..f0698b455ba 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -7,8 +7,8 @@ LANGS := $(shell cat $(srcdir)/LINGUAS) POTFILES_IN = $(srcdir)/POTFILES.in POTFILES: $(POTFILES_IN) $(AM_V_GEN) cat $(POTFILES_IN) | \ - $(SED) 's|[@]SRCDIR[@]|$(top_srcdir)|' | \ - $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@ + $(SED) 's|[@]SRCDIR[@]||' | \ + $(SED) 's|[@]BUILDDIR[@]||' > $@ POTFILE_DEPS = $(shell cat POTFILES) POTFILE := $(DOMAIN).pot POFILES := $(LANGS:%=%.po) @@ -32,6 +32,8 @@ XGETTEXT_ARGS = \ --package-name="$(PACKAGE_NAME)" \ --package-version="$(PACKAGE_VERSION)" \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ + --directory="$(top_srcdir)" \ + --directory="$(top_builddir)" \ --sort-output \ $(NULL) diff --git a/po/POTFILES.in b/po/POTFILES.in index af52054aa4e..b10008ae3d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,363 +1,363 @@ -@BUILDDIR(a)/src/access/viraccessapicheck.c -@BUILDDIR(a)/src/access/viraccessapichecklxc.c -@BUILDDIR(a)/src/access/viraccessapicheckqemu.c -@BUILDDIR(a)/src/admin/admin_client.h -@BUILDDIR(a)/src/admin/admin_server_dispatch_stubs.h -@BUILDDIR(a)/src/remote/remote_client_bodies.h -@BUILDDIR(a)/src/remote/remote_daemon_dispatch_stubs.h -@SRCDIR(a)/src/access/viraccessdriverpolkit.c -@SRCDIR(a)/src/access/viraccessmanager.c -@SRCDIR(a)/src/admin/admin_server.c -@SRCDIR(a)/src/admin/admin_server_dispatch.c -@SRCDIR(a)/src/admin/libvirt-admin.c -@SRCDIR(a)/src/bhyve/bhyve_capabilities.c -@SRCDIR(a)/src/bhyve/bhyve_command.c -@SRCDIR(a)/src/bhyve/bhyve_device.c -@SRCDIR(a)/src/bhyve/bhyve_domain.c -@SRCDIR(a)/src/bhyve/bhyve_driver.c -@SRCDIR(a)/src/bhyve/bhyve_monitor.c -@SRCDIR(a)/src/bhyve/bhyve_parse_command.c -@SRCDIR(a)/src/bhyve/bhyve_process.c -@SRCDIR(a)/src/conf/backup_conf.c -@SRCDIR(a)/src/conf/capabilities.c -@SRCDIR(a)/src/conf/checkpoint_conf.c -@SRCDIR(a)/src/conf/cpu_conf.c -@SRCDIR(a)/src/conf/device_conf.c -@SRCDIR(a)/src/conf/domain_addr.c -@SRCDIR(a)/src/conf/domain_capabilities.c -@SRCDIR(a)/src/conf/domain_conf.c -@SRCDIR(a)/src/conf/domain_event.c -@SRCDIR(a)/src/conf/interface_conf.c -@SRCDIR(a)/src/conf/netdev_bandwidth_conf.c -@SRCDIR(a)/src/conf/netdev_vlan_conf.c -@SRCDIR(a)/src/conf/netdev_vport_profile_conf.c -@SRCDIR(a)/src/conf/network_conf.c -@SRCDIR(a)/src/conf/networkcommon_conf.c -@SRCDIR(a)/src/conf/node_device_conf.c -@SRCDIR(a)/src/conf/node_device_util.c -@SRCDIR(a)/src/conf/numa_conf.c -@SRCDIR(a)/src/conf/nwfilter_conf.c -@SRCDIR(a)/src/conf/nwfilter_params.c -@SRCDIR(a)/src/conf/object_event.c -@SRCDIR(a)/src/conf/secret_conf.c -@SRCDIR(a)/src/conf/snapshot_conf.c -@SRCDIR(a)/src/conf/storage_adapter_conf.c -@SRCDIR(a)/src/conf/storage_conf.c -@SRCDIR(a)/src/conf/virchrdev.c -@SRCDIR(a)/src/conf/virdomainmomentobjlist.c -@SRCDIR(a)/src/conf/virdomainobjlist.c -@SRCDIR(a)/src/conf/virnetworkobj.c -@SRCDIR(a)/src/conf/virnetworkportdef.c -@SRCDIR(a)/src/conf/virnodedeviceobj.c -@SRCDIR(a)/src/conf/virnwfilterbindingdef.c -@SRCDIR(a)/src/conf/virnwfilterbindingobj.c -@SRCDIR(a)/src/conf/virnwfilterbindingobjlist.c -@SRCDIR(a)/src/conf/virnwfilterobj.c -@SRCDIR(a)/src/conf/virsavecookie.c -@SRCDIR(a)/src/conf/virsecretobj.c -@SRCDIR(a)/src/conf/virstorageobj.c -@SRCDIR(a)/src/cpu/cpu.c -@SRCDIR(a)/src/cpu/cpu_arm.c -@SRCDIR(a)/src/cpu/cpu_map.c -@SRCDIR(a)/src/cpu/cpu_ppc64.c -@SRCDIR(a)/src/cpu/cpu_s390.c -@SRCDIR(a)/src/cpu/cpu_x86.c -@SRCDIR(a)/src/datatypes.c -@SRCDIR(a)/src/driver.c -@SRCDIR(a)/src/esx/esx_driver.c -@SRCDIR(a)/src/esx/esx_network_driver.c -@SRCDIR(a)/src/esx/esx_storage_backend_iscsi.c -@SRCDIR(a)/src/esx/esx_storage_backend_vmfs.c -@SRCDIR(a)/src/esx/esx_storage_driver.c -@SRCDIR(a)/src/esx/esx_stream.c -@SRCDIR(a)/src/esx/esx_util.c -@SRCDIR(a)/src/esx/esx_util.h -@SRCDIR(a)/src/esx/esx_vi.c -@SRCDIR(a)/src/esx/esx_vi_methods.c -@SRCDIR(a)/src/esx/esx_vi_types.c -@SRCDIR(a)/src/hyperv/hyperv_driver.c -@SRCDIR(a)/src/hyperv/hyperv_util.c -@SRCDIR(a)/src/hyperv/hyperv_wmi.c -@SRCDIR(a)/src/hypervisor/domain_cgroup.c -@SRCDIR(a)/src/hypervisor/domain_driver.c -@SRCDIR(a)/src/hypervisor/virclosecallbacks.c -@SRCDIR(a)/src/hypervisor/virhostdev.c -@SRCDIR(a)/src/interface/interface_backend_netcf.c -@SRCDIR(a)/src/interface/interface_backend_udev.c -@SRCDIR(a)/src/internal.h -@SRCDIR(a)/src/libvirt-domain-checkpoint.c -@SRCDIR(a)/src/libvirt-domain-snapshot.c -@SRCDIR(a)/src/libvirt-domain.c -@SRCDIR(a)/src/libvirt-host.c -@SRCDIR(a)/src/libvirt-lxc.c -@SRCDIR(a)/src/libvirt-network.c -@SRCDIR(a)/src/libvirt-nodedev.c -@SRCDIR(a)/src/libvirt-nwfilter.c -@SRCDIR(a)/src/libvirt-qemu.c -@SRCDIR(a)/src/libvirt-secret.c -@SRCDIR(a)/src/libvirt-storage.c -@SRCDIR(a)/src/libvirt-stream.c -@SRCDIR(a)/src/libvirt.c -@SRCDIR(a)/src/libxl/libxl_capabilities.c -@SRCDIR(a)/src/libxl/libxl_conf.c -@SRCDIR(a)/src/libxl/libxl_domain.c -@SRCDIR(a)/src/libxl/libxl_driver.c -@SRCDIR(a)/src/libxl/libxl_migration.c -@SRCDIR(a)/src/libxl/xen_common.c -@SRCDIR(a)/src/libxl/xen_xl.c -@SRCDIR(a)/src/libxl/xen_xm.c -@SRCDIR(a)/src/locking/lock_daemon.c -@SRCDIR(a)/src/locking/lock_daemon_dispatch.c -@SRCDIR(a)/src/locking/lock_driver_lockd.c -@SRCDIR(a)/src/locking/lock_driver_sanlock.c -@SRCDIR(a)/src/locking/lock_manager.c -@SRCDIR(a)/src/locking/sanlock_helper.c -@SRCDIR(a)/src/logging/log_daemon.c -@SRCDIR(a)/src/logging/log_daemon_dispatch.c -@SRCDIR(a)/src/logging/log_handler.c -@SRCDIR(a)/src/logging/log_manager.c -@SRCDIR(a)/src/lxc/lxc_cgroup.c -@SRCDIR(a)/src/lxc/lxc_conf.c -@SRCDIR(a)/src/lxc/lxc_container.c -@SRCDIR(a)/src/lxc/lxc_controller.c -@SRCDIR(a)/src/lxc/lxc_domain.c -@SRCDIR(a)/src/lxc/lxc_driver.c -@SRCDIR(a)/src/lxc/lxc_fuse.c -@SRCDIR(a)/src/lxc/lxc_hostdev.c -@SRCDIR(a)/src/lxc/lxc_native.c -@SRCDIR(a)/src/lxc/lxc_process.c -@SRCDIR(a)/src/network/bridge_driver.c -@SRCDIR(a)/src/network/bridge_driver_linux.c -@SRCDIR(a)/src/network/leaseshelper.c -@SRCDIR(a)/src/node_device/node_device_driver.c -@SRCDIR(a)/src/node_device/node_device_hal.c -@SRCDIR(a)/src/node_device/node_device_udev.c -@SRCDIR(a)/src/nwfilter/nwfilter_dhcpsnoop.c -@SRCDIR(a)/src/nwfilter/nwfilter_driver.c -@SRCDIR(a)/src/nwfilter/nwfilter_ebiptables_driver.c -@SRCDIR(a)/src/nwfilter/nwfilter_gentech_driver.c -@SRCDIR(a)/src/nwfilter/nwfilter_learnipaddr.c -@SRCDIR(a)/src/openvz/openvz_conf.c -@SRCDIR(a)/src/openvz/openvz_driver.c -@SRCDIR(a)/src/openvz/openvz_util.c -@SRCDIR(a)/src/qemu/qemu_agent.c -@SRCDIR(a)/src/qemu/qemu_alias.c -@SRCDIR(a)/src/qemu/qemu_backup.c -@SRCDIR(a)/src/qemu/qemu_block.c -@SRCDIR(a)/src/qemu/qemu_blockjob.c -@SRCDIR(a)/src/qemu/qemu_capabilities.c -@SRCDIR(a)/src/qemu/qemu_cgroup.c -@SRCDIR(a)/src/qemu/qemu_checkpoint.c -@SRCDIR(a)/src/qemu/qemu_command.c -@SRCDIR(a)/src/qemu/qemu_conf.c -@SRCDIR(a)/src/qemu/qemu_dbus.c -@SRCDIR(a)/src/qemu/qemu_domain.c -@SRCDIR(a)/src/qemu/qemu_domainjob.c -@SRCDIR(a)/src/qemu/qemu_domain_address.c -@SRCDIR(a)/src/qemu/qemu_driver.c -@SRCDIR(a)/src/qemu/qemu_extdevice.c -@SRCDIR(a)/src/qemu/qemu_firmware.c -@SRCDIR(a)/src/qemu/qemu_hostdev.c -@SRCDIR(a)/src/qemu/qemu_hotplug.c -@SRCDIR(a)/src/qemu/qemu_interface.c -@SRCDIR(a)/src/qemu/qemu_interop_config.c -@SRCDIR(a)/src/qemu/qemu_migration.c -@SRCDIR(a)/src/qemu/qemu_migration_cookie.c -@SRCDIR(a)/src/qemu/qemu_migration_params.c -@SRCDIR(a)/src/qemu/qemu_monitor.c -@SRCDIR(a)/src/qemu/qemu_monitor_json.c -@SRCDIR(a)/src/qemu/qemu_monitor_text.c -@SRCDIR(a)/src/qemu/qemu_process.c -@SRCDIR(a)/src/qemu/qemu_qapi.c -@SRCDIR(a)/src/qemu/qemu_slirp.c -@SRCDIR(a)/src/qemu/qemu_tpm.c -@SRCDIR(a)/src/qemu/qemu_validate.c -@SRCDIR(a)/src/qemu/qemu_vhost_user.c -@SRCDIR(a)/src/qemu/qemu_vhost_user_gpu.c -@SRCDIR(a)/src/qemu/qemu_virtiofs.c -@SRCDIR(a)/src/remote/remote_daemon.c -@SRCDIR(a)/src/remote/remote_daemon_config.c -@SRCDIR(a)/src/remote/remote_daemon_dispatch.c -@SRCDIR(a)/src/remote/remote_daemon_stream.c -@SRCDIR(a)/src/remote/remote_driver.c -@SRCDIR(a)/src/rpc/virkeepalive.c -@SRCDIR(a)/src/rpc/virnetclient.c -@SRCDIR(a)/src/rpc/virnetclientprogram.c -@SRCDIR(a)/src/rpc/virnetclientstream.c -@SRCDIR(a)/src/rpc/virnetdaemon.c -@SRCDIR(a)/src/rpc/virnetlibsshsession.c -@SRCDIR(a)/src/rpc/virnetmessage.c -@SRCDIR(a)/src/rpc/virnetsaslcontext.c -@SRCDIR(a)/src/rpc/virnetserver.c -@SRCDIR(a)/src/rpc/virnetserverclient.c -@SRCDIR(a)/src/rpc/virnetserverprogram.c -@SRCDIR(a)/src/rpc/virnetserverservice.c -@SRCDIR(a)/src/rpc/virnetsocket.c -@SRCDIR(a)/src/rpc/virnetsshsession.c -@SRCDIR(a)/src/rpc/virnettlscontext.c -@SRCDIR(a)/src/secret/secret_driver.c -@SRCDIR(a)/src/security/security_apparmor.c -@SRCDIR(a)/src/security/security_dac.c -@SRCDIR(a)/src/security/security_driver.c -@SRCDIR(a)/src/security/security_manager.c -@SRCDIR(a)/src/security/security_selinux.c -@SRCDIR(a)/src/security/security_util.c -@SRCDIR(a)/src/security/virt-aa-helper.c -@SRCDIR(a)/src/storage/parthelper.c -@SRCDIR(a)/src/storage/storage_backend.c -@SRCDIR(a)/src/storage/storage_backend_disk.c -@SRCDIR(a)/src/storage/storage_backend_fs.c -@SRCDIR(a)/src/storage/storage_backend_gluster.c -@SRCDIR(a)/src/storage/storage_backend_iscsi.c -@SRCDIR(a)/src/storage/storage_backend_iscsi_direct.c -@SRCDIR(a)/src/storage/storage_backend_logical.c -@SRCDIR(a)/src/storage/storage_backend_mpath.c -@SRCDIR(a)/src/storage/storage_backend_rbd.c -@SRCDIR(a)/src/storage/storage_backend_scsi.c -@SRCDIR(a)/src/storage/storage_backend_sheepdog.c -@SRCDIR(a)/src/storage/storage_backend_vstorage.c -@SRCDIR(a)/src/storage/storage_backend_zfs.c -@SRCDIR(a)/src/storage/storage_driver.c -@SRCDIR(a)/src/storage/storage_file_fs.c -@SRCDIR(a)/src/storage/storage_file_gluster.c -@SRCDIR(a)/src/storage/storage_util.c -@SRCDIR(a)/src/test/test_driver.c -@SRCDIR(a)/src/util/iohelper.c -@SRCDIR(a)/src/util/viralloc.c -@SRCDIR(a)/src/util/virarptable.c -@SRCDIR(a)/src/util/viraudit.c -@SRCDIR(a)/src/util/virauth.c -@SRCDIR(a)/src/util/virauthconfig.c -@SRCDIR(a)/src/util/virbitmap.c -@SRCDIR(a)/src/util/vircgroup.c -@SRCDIR(a)/src/util/vircgroupbackend.c -@SRCDIR(a)/src/util/vircgroupbackend.h -@SRCDIR(a)/src/util/vircgroupv1.c -@SRCDIR(a)/src/util/vircgroupv2.c -@SRCDIR(a)/src/util/vircgroupv2devices.c -@SRCDIR(a)/src/util/vircommand.c -@SRCDIR(a)/src/util/virconf.c -@SRCDIR(a)/src/util/vircrypto.c -@SRCDIR(a)/src/util/virdaemon.c -@SRCDIR(a)/src/util/virdbus.c -@SRCDIR(a)/src/util/virdnsmasq.c -@SRCDIR(a)/src/util/virerror.c -@SRCDIR(a)/src/util/virerror.h -@SRCDIR(a)/src/util/virevent.c -@SRCDIR(a)/src/util/vireventthread.c -@SRCDIR(a)/src/util/virfcp.c -@SRCDIR(a)/src/util/virfdstream.c -@SRCDIR(a)/src/util/virfile.c -@SRCDIR(a)/src/util/virfilecache.c -@SRCDIR(a)/src/util/virfirewall.c -@SRCDIR(a)/src/util/virfirewalld.c -@SRCDIR(a)/src/util/virfirmware.c -@SRCDIR(a)/src/util/virhash.c -@SRCDIR(a)/src/util/virhook.c -@SRCDIR(a)/src/util/virhostcpu.c -@SRCDIR(a)/src/util/virhostmem.c -@SRCDIR(a)/src/util/virhostuptime.c -@SRCDIR(a)/src/util/viridentity.c -@SRCDIR(a)/src/util/virinitctl.c -@SRCDIR(a)/src/util/viriptables.c -@SRCDIR(a)/src/util/viriscsi.c -@SRCDIR(a)/src/util/virjson.c -@SRCDIR(a)/src/util/virlease.c -@SRCDIR(a)/src/util/virlockspace.c -@SRCDIR(a)/src/util/virlog.c -@SRCDIR(a)/src/util/virmacmap.c -@SRCDIR(a)/src/util/virmdev.c -@SRCDIR(a)/src/util/virmodule.c -@SRCDIR(a)/src/util/virnetdev.c -@SRCDIR(a)/src/util/virnetdevbandwidth.c -@SRCDIR(a)/src/util/virnetdevbridge.c -@SRCDIR(a)/src/util/virnetdevip.c -@SRCDIR(a)/src/util/virnetdevmacvlan.c -@SRCDIR(a)/src/util/virnetdevmidonet.c -@SRCDIR(a)/src/util/virnetdevopenvswitch.c -@SRCDIR(a)/src/util/virnetdevtap.c -@SRCDIR(a)/src/util/virnetdevveth.c -@SRCDIR(a)/src/util/virnetdevvportprofile.c -@SRCDIR(a)/src/util/virnetlink.c -@SRCDIR(a)/src/util/virnodesuspend.c -@SRCDIR(a)/src/util/virnuma.c -@SRCDIR(a)/src/util/virnvme.c -@SRCDIR(a)/src/util/virobject.c -@SRCDIR(a)/src/util/virpci.c -@SRCDIR(a)/src/util/virperf.c -@SRCDIR(a)/src/util/virpidfile.c -@SRCDIR(a)/src/util/virpolkit.c -@SRCDIR(a)/src/util/virportallocator.c -@SRCDIR(a)/src/util/virprocess.c -@SRCDIR(a)/src/util/virqemu.c -@SRCDIR(a)/src/util/virrandom.c -@SRCDIR(a)/src/util/virresctrl.c -@SRCDIR(a)/src/util/virrotatingfile.c -@SRCDIR(a)/src/util/virscsi.c -@SRCDIR(a)/src/util/virscsihost.c -@SRCDIR(a)/src/util/virscsivhost.c -@SRCDIR(a)/src/util/virsecret.c -@SRCDIR(a)/src/util/virsocketaddr.c -@SRCDIR(a)/src/util/virstorageencryption.c -@SRCDIR(a)/src/util/virstoragefile.c -@SRCDIR(a)/src/util/virstoragefilebackend.c -@SRCDIR(a)/src/util/virstring.c -@SRCDIR(a)/src/util/virsysinfo.c -@SRCDIR(a)/src/util/virsystemd.c -@SRCDIR(a)/src/util/virthreadjob.c -@SRCDIR(a)/src/util/virthreadpool.c -@SRCDIR(a)/src/util/virtime.c -@SRCDIR(a)/src/util/virtpm.c -@SRCDIR(a)/src/util/virtypedparam-public.c -@SRCDIR(a)/src/util/virtypedparam.c -@SRCDIR(a)/src/util/viruri.c -@SRCDIR(a)/src/util/virusb.c -@SRCDIR(a)/src/util/virutil.c -@SRCDIR(a)/src/util/virvhba.c -@SRCDIR(a)/src/util/virvsock.c -@SRCDIR(a)/src/util/virxml.c -@SRCDIR(a)/src/vbox/vbox_XPCOMCGlue.c -@SRCDIR(a)/src/vbox/vbox_common.c -@SRCDIR(a)/src/vbox/vbox_driver.c -@SRCDIR(a)/src/vbox/vbox_network.c -@SRCDIR(a)/src/vbox/vbox_snapshot_conf.c -@SRCDIR(a)/src/vbox/vbox_storage.c -@SRCDIR(a)/src/vbox/vbox_tmpl.c -@SRCDIR(a)/src/vmware/vmware_conf.c -@SRCDIR(a)/src/vmware/vmware_driver.c -@SRCDIR(a)/src/vmx/vmx.c -@SRCDIR(a)/src/vz/vz_driver.c -@SRCDIR(a)/src/vz/vz_sdk.c -@SRCDIR(a)/src/vz/vz_utils.c -@SRCDIR(a)/src/vz/vz_utils.h -@SRCDIR(a)/tests/virpolkittest.c -@SRCDIR(a)/tools/libvirt-guests.sh.in -@SRCDIR(a)/tools/virsh-backup.c -@SRCDIR(a)/tools/virsh-checkpoint.c -@SRCDIR(a)/tools/virsh-completer-host.c -@SRCDIR(a)/tools/virsh-console.c -@SRCDIR(a)/tools/virsh-domain-monitor.c -@SRCDIR(a)/tools/virsh-domain.c -@SRCDIR(a)/tools/virsh-edit.c -@SRCDIR(a)/tools/virsh-host.c -@SRCDIR(a)/tools/virsh-interface.c -@SRCDIR(a)/tools/virsh-network.c -@SRCDIR(a)/tools/virsh-nodedev.c -@SRCDIR(a)/tools/virsh-nwfilter.c -@SRCDIR(a)/tools/virsh-pool.c -@SRCDIR(a)/tools/virsh-secret.c -@SRCDIR(a)/tools/virsh-snapshot.c -@SRCDIR(a)/tools/virsh-util.c -@SRCDIR(a)/tools/virsh-volume.c -@SRCDIR(a)/tools/virsh.c -@SRCDIR(a)/tools/virsh.h -@SRCDIR(a)/tools/virt-admin.c -@SRCDIR(a)/tools/virt-host-validate-bhyve.c -@SRCDIR(a)/tools/virt-host-validate-common.c -@SRCDIR(a)/tools/virt-host-validate-lxc.c -@SRCDIR(a)/tools/virt-host-validate-qemu.c -@SRCDIR(a)/tools/virt-host-validate.c -@SRCDIR(a)/tools/virt-login-shell-helper.c -@SRCDIR(a)/tools/vsh-table.c -@SRCDIR(a)/tools/vsh.c -@SRCDIR(a)/tools/vsh.h +@BUILDDIR(a)src/access/viraccessapicheck.c +@BUILDDIR(a)src/access/viraccessapichecklxc.c +@BUILDDIR(a)src/access/viraccessapicheckqemu.c +@BUILDDIR(a)src/admin/admin_client.h +@BUILDDIR(a)src/admin/admin_server_dispatch_stubs.h +@BUILDDIR(a)src/remote/remote_client_bodies.h +@BUILDDIR(a)src/remote/remote_daemon_dispatch_stubs.h +@SRCDIR(a)src/access/viraccessdriverpolkit.c +@SRCDIR(a)src/access/viraccessmanager.c +@SRCDIR(a)src/admin/admin_server.c +@SRCDIR(a)src/admin/admin_server_dispatch.c +@SRCDIR(a)src/admin/libvirt-admin.c +@SRCDIR(a)src/bhyve/bhyve_capabilities.c +@SRCDIR(a)src/bhyve/bhyve_command.c +@SRCDIR(a)src/bhyve/bhyve_device.c +@SRCDIR(a)src/bhyve/bhyve_domain.c +@SRCDIR(a)src/bhyve/bhyve_driver.c +@SRCDIR(a)src/bhyve/bhyve_monitor.c +@SRCDIR(a)src/bhyve/bhyve_parse_command.c +@SRCDIR(a)src/bhyve/bhyve_process.c +@SRCDIR(a)src/conf/backup_conf.c +@SRCDIR(a)src/conf/capabilities.c +@SRCDIR(a)src/conf/checkpoint_conf.c +@SRCDIR(a)src/conf/cpu_conf.c +@SRCDIR(a)src/conf/device_conf.c +@SRCDIR(a)src/conf/domain_addr.c +@SRCDIR(a)src/conf/domain_capabilities.c +@SRCDIR(a)src/conf/domain_conf.c +@SRCDIR(a)src/conf/domain_event.c +@SRCDIR(a)src/conf/interface_conf.c +@SRCDIR(a)src/conf/netdev_bandwidth_conf.c +@SRCDIR(a)src/conf/netdev_vlan_conf.c +@SRCDIR(a)src/conf/netdev_vport_profile_conf.c +@SRCDIR(a)src/conf/network_conf.c +@SRCDIR(a)src/conf/networkcommon_conf.c +@SRCDIR(a)src/conf/node_device_conf.c +@SRCDIR(a)src/conf/node_device_util.c +@SRCDIR(a)src/conf/numa_conf.c +@SRCDIR(a)src/conf/nwfilter_conf.c +@SRCDIR(a)src/conf/nwfilter_params.c +@SRCDIR(a)src/conf/object_event.c +@SRCDIR(a)src/conf/secret_conf.c +@SRCDIR(a)src/conf/snapshot_conf.c +@SRCDIR(a)src/conf/storage_adapter_conf.c +@SRCDIR(a)src/conf/storage_conf.c +@SRCDIR(a)src/conf/virchrdev.c +@SRCDIR(a)src/conf/virdomainmomentobjlist.c +@SRCDIR(a)src/conf/virdomainobjlist.c +@SRCDIR(a)src/conf/virnetworkobj.c +@SRCDIR(a)src/conf/virnetworkportdef.c +@SRCDIR(a)src/conf/virnodedeviceobj.c +@SRCDIR(a)src/conf/virnwfilterbindingdef.c +@SRCDIR(a)src/conf/virnwfilterbindingobj.c +@SRCDIR(a)src/conf/virnwfilterbindingobjlist.c +@SRCDIR(a)src/conf/virnwfilterobj.c +@SRCDIR(a)src/conf/virsavecookie.c +@SRCDIR(a)src/conf/virsecretobj.c +@SRCDIR(a)src/conf/virstorageobj.c +@SRCDIR(a)src/cpu/cpu.c +@SRCDIR(a)src/cpu/cpu_arm.c +@SRCDIR(a)src/cpu/cpu_map.c +@SRCDIR(a)src/cpu/cpu_ppc64.c +@SRCDIR(a)src/cpu/cpu_s390.c +@SRCDIR(a)src/cpu/cpu_x86.c +@SRCDIR(a)src/datatypes.c +@SRCDIR(a)src/driver.c +@SRCDIR(a)src/esx/esx_driver.c +@SRCDIR(a)src/esx/esx_network_driver.c +@SRCDIR(a)src/esx/esx_storage_backend_iscsi.c +@SRCDIR(a)src/esx/esx_storage_backend_vmfs.c +@SRCDIR(a)src/esx/esx_storage_driver.c +@SRCDIR(a)src/esx/esx_stream.c +@SRCDIR(a)src/esx/esx_util.c +@SRCDIR(a)src/esx/esx_util.h +@SRCDIR(a)src/esx/esx_vi.c +@SRCDIR(a)src/esx/esx_vi_methods.c +@SRCDIR(a)src/esx/esx_vi_types.c +@SRCDIR(a)src/hyperv/hyperv_driver.c +@SRCDIR(a)src/hyperv/hyperv_util.c +@SRCDIR(a)src/hyperv/hyperv_wmi.c +@SRCDIR(a)src/hypervisor/domain_cgroup.c +@SRCDIR(a)src/hypervisor/domain_driver.c +@SRCDIR(a)src/hypervisor/virclosecallbacks.c +@SRCDIR(a)src/hypervisor/virhostdev.c +@SRCDIR(a)src/interface/interface_backend_netcf.c +@SRCDIR(a)src/interface/interface_backend_udev.c +@SRCDIR(a)src/internal.h +@SRCDIR(a)src/libvirt-domain-checkpoint.c +@SRCDIR(a)src/libvirt-domain-snapshot.c +@SRCDIR(a)src/libvirt-domain.c +@SRCDIR(a)src/libvirt-host.c +@SRCDIR(a)src/libvirt-lxc.c +@SRCDIR(a)src/libvirt-network.c +@SRCDIR(a)src/libvirt-nodedev.c +@SRCDIR(a)src/libvirt-nwfilter.c +@SRCDIR(a)src/libvirt-qemu.c +@SRCDIR(a)src/libvirt-secret.c +@SRCDIR(a)src/libvirt-storage.c +@SRCDIR(a)src/libvirt-stream.c +@SRCDIR(a)src/libvirt.c +@SRCDIR(a)src/libxl/libxl_capabilities.c +@SRCDIR(a)src/libxl/libxl_conf.c +@SRCDIR(a)src/libxl/libxl_domain.c +@SRCDIR(a)src/libxl/libxl_driver.c +@SRCDIR(a)src/libxl/libxl_migration.c +@SRCDIR(a)src/libxl/xen_common.c +@SRCDIR(a)src/libxl/xen_xl.c +@SRCDIR(a)src/libxl/xen_xm.c +@SRCDIR(a)src/locking/lock_daemon.c +@SRCDIR(a)src/locking/lock_daemon_dispatch.c +@SRCDIR(a)src/locking/lock_driver_lockd.c +@SRCDIR(a)src/locking/lock_driver_sanlock.c +@SRCDIR(a)src/locking/lock_manager.c +@SRCDIR(a)src/locking/sanlock_helper.c +@SRCDIR(a)src/logging/log_daemon.c +@SRCDIR(a)src/logging/log_daemon_dispatch.c +@SRCDIR(a)src/logging/log_handler.c +@SRCDIR(a)src/logging/log_manager.c +@SRCDIR(a)src/lxc/lxc_cgroup.c +@SRCDIR(a)src/lxc/lxc_conf.c +@SRCDIR(a)src/lxc/lxc_container.c +@SRCDIR(a)src/lxc/lxc_controller.c +@SRCDIR(a)src/lxc/lxc_domain.c +@SRCDIR(a)src/lxc/lxc_driver.c +@SRCDIR(a)src/lxc/lxc_fuse.c +@SRCDIR(a)src/lxc/lxc_hostdev.c +@SRCDIR(a)src/lxc/lxc_native.c +@SRCDIR(a)src/lxc/lxc_process.c +@SRCDIR(a)src/network/bridge_driver.c +@SRCDIR(a)src/network/bridge_driver_linux.c +@SRCDIR(a)src/network/leaseshelper.c +@SRCDIR(a)src/node_device/node_device_driver.c +@SRCDIR(a)src/node_device/node_device_hal.c +@SRCDIR(a)src/node_device/node_device_udev.c +@SRCDIR(a)src/nwfilter/nwfilter_dhcpsnoop.c +@SRCDIR(a)src/nwfilter/nwfilter_driver.c +@SRCDIR(a)src/nwfilter/nwfilter_ebiptables_driver.c +@SRCDIR(a)src/nwfilter/nwfilter_gentech_driver.c +@SRCDIR(a)src/nwfilter/nwfilter_learnipaddr.c +@SRCDIR(a)src/openvz/openvz_conf.c +@SRCDIR(a)src/openvz/openvz_driver.c +@SRCDIR(a)src/openvz/openvz_util.c +@SRCDIR(a)src/qemu/qemu_agent.c +@SRCDIR(a)src/qemu/qemu_alias.c +@SRCDIR(a)src/qemu/qemu_backup.c +@SRCDIR(a)src/qemu/qemu_block.c +@SRCDIR(a)src/qemu/qemu_blockjob.c +@SRCDIR(a)src/qemu/qemu_capabilities.c +@SRCDIR(a)src/qemu/qemu_cgroup.c +@SRCDIR(a)src/qemu/qemu_checkpoint.c +@SRCDIR(a)src/qemu/qemu_command.c +@SRCDIR(a)src/qemu/qemu_conf.c +@SRCDIR(a)src/qemu/qemu_dbus.c +@SRCDIR(a)src/qemu/qemu_domain.c +@SRCDIR(a)src/qemu/qemu_domain_address.c +@SRCDIR(a)src/qemu/qemu_domainjob.c +@SRCDIR(a)src/qemu/qemu_driver.c +@SRCDIR(a)src/qemu/qemu_extdevice.c +@SRCDIR(a)src/qemu/qemu_firmware.c +@SRCDIR(a)src/qemu/qemu_hostdev.c +@SRCDIR(a)src/qemu/qemu_hotplug.c +@SRCDIR(a)src/qemu/qemu_interface.c +@SRCDIR(a)src/qemu/qemu_interop_config.c +@SRCDIR(a)src/qemu/qemu_migration.c +@SRCDIR(a)src/qemu/qemu_migration_cookie.c +@SRCDIR(a)src/qemu/qemu_migration_params.c +@SRCDIR(a)src/qemu/qemu_monitor.c +@SRCDIR(a)src/qemu/qemu_monitor_json.c +@SRCDIR(a)src/qemu/qemu_monitor_text.c +@SRCDIR(a)src/qemu/qemu_process.c +@SRCDIR(a)src/qemu/qemu_qapi.c +@SRCDIR(a)src/qemu/qemu_slirp.c +@SRCDIR(a)src/qemu/qemu_tpm.c +@SRCDIR(a)src/qemu/qemu_validate.c +@SRCDIR(a)src/qemu/qemu_vhost_user.c +@SRCDIR(a)src/qemu/qemu_vhost_user_gpu.c +@SRCDIR(a)src/qemu/qemu_virtiofs.c +@SRCDIR(a)src/remote/remote_daemon.c +@SRCDIR(a)src/remote/remote_daemon_config.c +@SRCDIR(a)src/remote/remote_daemon_dispatch.c +@SRCDIR(a)src/remote/remote_daemon_stream.c +@SRCDIR(a)src/remote/remote_driver.c +@SRCDIR(a)src/rpc/virkeepalive.c +@SRCDIR(a)src/rpc/virnetclient.c +@SRCDIR(a)src/rpc/virnetclientprogram.c +@SRCDIR(a)src/rpc/virnetclientstream.c +@SRCDIR(a)src/rpc/virnetdaemon.c +@SRCDIR(a)src/rpc/virnetlibsshsession.c +@SRCDIR(a)src/rpc/virnetmessage.c +@SRCDIR(a)src/rpc/virnetsaslcontext.c +@SRCDIR(a)src/rpc/virnetserver.c +@SRCDIR(a)src/rpc/virnetserverclient.c +@SRCDIR(a)src/rpc/virnetserverprogram.c +@SRCDIR(a)src/rpc/virnetserverservice.c +@SRCDIR(a)src/rpc/virnetsocket.c +@SRCDIR(a)src/rpc/virnetsshsession.c +@SRCDIR(a)src/rpc/virnettlscontext.c +@SRCDIR(a)src/secret/secret_driver.c +@SRCDIR(a)src/security/security_apparmor.c +@SRCDIR(a)src/security/security_dac.c +@SRCDIR(a)src/security/security_driver.c +@SRCDIR(a)src/security/security_manager.c +@SRCDIR(a)src/security/security_selinux.c +@SRCDIR(a)src/security/security_util.c +@SRCDIR(a)src/security/virt-aa-helper.c +@SRCDIR(a)src/storage/parthelper.c +@SRCDIR(a)src/storage/storage_backend.c +@SRCDIR(a)src/storage/storage_backend_disk.c +@SRCDIR(a)src/storage/storage_backend_fs.c +@SRCDIR(a)src/storage/storage_backend_gluster.c +@SRCDIR(a)src/storage/storage_backend_iscsi.c +@SRCDIR(a)src/storage/storage_backend_iscsi_direct.c +@SRCDIR(a)src/storage/storage_backend_logical.c +@SRCDIR(a)src/storage/storage_backend_mpath.c +@SRCDIR(a)src/storage/storage_backend_rbd.c +@SRCDIR(a)src/storage/storage_backend_scsi.c +@SRCDIR(a)src/storage/storage_backend_sheepdog.c +@SRCDIR(a)src/storage/storage_backend_vstorage.c +@SRCDIR(a)src/storage/storage_backend_zfs.c +@SRCDIR(a)src/storage/storage_driver.c +@SRCDIR(a)src/storage/storage_file_fs.c +@SRCDIR(a)src/storage/storage_file_gluster.c +@SRCDIR(a)src/storage/storage_util.c +@SRCDIR(a)src/test/test_driver.c +@SRCDIR(a)src/util/iohelper.c +@SRCDIR(a)src/util/viralloc.c +@SRCDIR(a)src/util/virarptable.c +@SRCDIR(a)src/util/viraudit.c +@SRCDIR(a)src/util/virauth.c +@SRCDIR(a)src/util/virauthconfig.c +@SRCDIR(a)src/util/virbitmap.c +@SRCDIR(a)src/util/vircgroup.c +@SRCDIR(a)src/util/vircgroupbackend.c +@SRCDIR(a)src/util/vircgroupbackend.h +@SRCDIR(a)src/util/vircgroupv1.c +@SRCDIR(a)src/util/vircgroupv2.c +@SRCDIR(a)src/util/vircgroupv2devices.c +@SRCDIR(a)src/util/vircommand.c +@SRCDIR(a)src/util/virconf.c +@SRCDIR(a)src/util/vircrypto.c +@SRCDIR(a)src/util/virdaemon.c +@SRCDIR(a)src/util/virdbus.c +@SRCDIR(a)src/util/virdnsmasq.c +@SRCDIR(a)src/util/virerror.c +@SRCDIR(a)src/util/virerror.h +@SRCDIR(a)src/util/virevent.c +@SRCDIR(a)src/util/vireventthread.c +@SRCDIR(a)src/util/virfcp.c +@SRCDIR(a)src/util/virfdstream.c +@SRCDIR(a)src/util/virfile.c +@SRCDIR(a)src/util/virfilecache.c +@SRCDIR(a)src/util/virfirewall.c +@SRCDIR(a)src/util/virfirewalld.c +@SRCDIR(a)src/util/virfirmware.c +@SRCDIR(a)src/util/virhash.c +@SRCDIR(a)src/util/virhook.c +@SRCDIR(a)src/util/virhostcpu.c +@SRCDIR(a)src/util/virhostmem.c +@SRCDIR(a)src/util/virhostuptime.c +@SRCDIR(a)src/util/viridentity.c +@SRCDIR(a)src/util/virinitctl.c +@SRCDIR(a)src/util/viriptables.c +@SRCDIR(a)src/util/viriscsi.c +@SRCDIR(a)src/util/virjson.c +@SRCDIR(a)src/util/virlease.c +@SRCDIR(a)src/util/virlockspace.c +@SRCDIR(a)src/util/virlog.c +@SRCDIR(a)src/util/virmacmap.c +@SRCDIR(a)src/util/virmdev.c +@SRCDIR(a)src/util/virmodule.c +@SRCDIR(a)src/util/virnetdev.c +@SRCDIR(a)src/util/virnetdevbandwidth.c +@SRCDIR(a)src/util/virnetdevbridge.c +@SRCDIR(a)src/util/virnetdevip.c +@SRCDIR(a)src/util/virnetdevmacvlan.c +@SRCDIR(a)src/util/virnetdevmidonet.c +@SRCDIR(a)src/util/virnetdevopenvswitch.c +@SRCDIR(a)src/util/virnetdevtap.c +@SRCDIR(a)src/util/virnetdevveth.c +@SRCDIR(a)src/util/virnetdevvportprofile.c +@SRCDIR(a)src/util/virnetlink.c +@SRCDIR(a)src/util/virnodesuspend.c +@SRCDIR(a)src/util/virnuma.c +@SRCDIR(a)src/util/virnvme.c +@SRCDIR(a)src/util/virobject.c +@SRCDIR(a)src/util/virpci.c +@SRCDIR(a)src/util/virperf.c +@SRCDIR(a)src/util/virpidfile.c +@SRCDIR(a)src/util/virpolkit.c +@SRCDIR(a)src/util/virportallocator.c +@SRCDIR(a)src/util/virprocess.c +@SRCDIR(a)src/util/virqemu.c +@SRCDIR(a)src/util/virrandom.c +@SRCDIR(a)src/util/virresctrl.c +@SRCDIR(a)src/util/virrotatingfile.c +@SRCDIR(a)src/util/virscsi.c +@SRCDIR(a)src/util/virscsihost.c +@SRCDIR(a)src/util/virscsivhost.c +@SRCDIR(a)src/util/virsecret.c +@SRCDIR(a)src/util/virsocketaddr.c +@SRCDIR(a)src/util/virstorageencryption.c +@SRCDIR(a)src/util/virstoragefile.c +@SRCDIR(a)src/util/virstoragefilebackend.c +@SRCDIR(a)src/util/virstring.c +@SRCDIR(a)src/util/virsysinfo.c +@SRCDIR(a)src/util/virsystemd.c +@SRCDIR(a)src/util/virthreadjob.c +@SRCDIR(a)src/util/virthreadpool.c +@SRCDIR(a)src/util/virtime.c +@SRCDIR(a)src/util/virtpm.c +@SRCDIR(a)src/util/virtypedparam-public.c +@SRCDIR(a)src/util/virtypedparam.c +@SRCDIR(a)src/util/viruri.c +@SRCDIR(a)src/util/virusb.c +@SRCDIR(a)src/util/virutil.c +@SRCDIR(a)src/util/virvhba.c +@SRCDIR(a)src/util/virvsock.c +@SRCDIR(a)src/util/virxml.c +@SRCDIR(a)src/vbox/vbox_XPCOMCGlue.c +@SRCDIR(a)src/vbox/vbox_common.c +@SRCDIR(a)src/vbox/vbox_driver.c +@SRCDIR(a)src/vbox/vbox_network.c +@SRCDIR(a)src/vbox/vbox_snapshot_conf.c +@SRCDIR(a)src/vbox/vbox_storage.c +@SRCDIR(a)src/vbox/vbox_tmpl.c +@SRCDIR(a)src/vmware/vmware_conf.c +@SRCDIR(a)src/vmware/vmware_driver.c +@SRCDIR(a)src/vmx/vmx.c +@SRCDIR(a)src/vz/vz_driver.c +@SRCDIR(a)src/vz/vz_sdk.c +@SRCDIR(a)src/vz/vz_utils.c +@SRCDIR(a)src/vz/vz_utils.h +@SRCDIR(a)tests/virpolkittest.c +@SRCDIR(a)tools/libvirt-guests.sh.in +@SRCDIR(a)tools/virsh-backup.c +@SRCDIR(a)tools/virsh-checkpoint.c +@SRCDIR(a)tools/virsh-completer-host.c +@SRCDIR(a)tools/virsh-console.c +@SRCDIR(a)tools/virsh-domain-monitor.c +@SRCDIR(a)tools/virsh-domain.c +@SRCDIR(a)tools/virsh-edit.c +@SRCDIR(a)tools/virsh-host.c +@SRCDIR(a)tools/virsh-interface.c +@SRCDIR(a)tools/virsh-network.c +@SRCDIR(a)tools/virsh-nodedev.c +@SRCDIR(a)tools/virsh-nwfilter.c +@SRCDIR(a)tools/virsh-pool.c +@SRCDIR(a)tools/virsh-secret.c +@SRCDIR(a)tools/virsh-snapshot.c +@SRCDIR(a)tools/virsh-util.c +@SRCDIR(a)tools/virsh-volume.c +@SRCDIR(a)tools/virsh.c +@SRCDIR(a)tools/virsh.h +@SRCDIR(a)tools/virt-admin.c +@SRCDIR(a)tools/virt-host-validate-bhyve.c +@SRCDIR(a)tools/virt-host-validate-common.c +@SRCDIR(a)tools/virt-host-validate-lxc.c +@SRCDIR(a)tools/virt-host-validate-qemu.c +@SRCDIR(a)tools/virt-host-validate.c +@SRCDIR(a)tools/virt-login-shell-helper.c +@SRCDIR(a)tools/vsh-table.c +@SRCDIR(a)tools/vsh.c +@SRCDIR(a)tools/vsh.h -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- scripts/check-remote-protocol.py | 5 ++--- src/Makefile.am | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protocol.py index cf9e3f84a1b..e28fb80cdd1 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -32,9 +32,8 @@ import subprocess import sys cc = sys.argv[1] -objext = sys.argv[2] -proto_lo = sys.argv[3] -expected = sys.argv[4] +proto_lo = sys.argv[2] +expected = sys.argv[3] proto_lo = proto_lo.replace("/", "/.libs/") diff --git a/src/Makefile.am b/src/Makefile.am index 8b0cbb6fc86..e1117029ebc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -228,25 +228,25 @@ $(srcdir)/remote_protocol-struct \ $(srcdir)/lxc_protocol-struct: \ $(srcdir)/%-struct: remote/libvirt_driver_remote_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s $(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \ $(srcdir)/%-struct: rpc/libvirt_net_rpc_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s if WITH_LXC $(srcdir)/lxc_monitor_protocol-struct: \ $(srcdir)/%-struct: lxc/libvirt_driver_lxc_impl_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s endif WITH_LXC $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s $(srcdir)/admin_protocol-struct: \ $(srcdir)/%-struct: admin/libvirt_admin_la-%.lo $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" "$(OBJEXT)" $< $(@)s + "$(CC)" $< $(@)s else !WITH_REMOTE # The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be -- 2.26.2

Commit <fd3b8fe7ad491c77c0b3f57110adaf64f743855e> removed objectlocking test but forgot to remove all of the usages of LOCK_CHECKING_CFLAGS. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index e1117029ebc..834e356b68b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,6 @@ AM_CPPFLAGS = -I$(top_srcdir) \ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) -- 2.26.2

Commit <894556ca813ad3c4ebb01083b7971d73b4f53c8b> moved function virSecretGetSecretString out of secret directory but forgot to update CFLAGS in places where the include is no longer needed. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/libxl/Makefile.inc.am | 1 - src/qemu/Makefile.inc.am | 1 - src/storage/Makefile.inc.am | 4 ---- 3 files changed, 6 deletions(-) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 619835a46b6..9037ba61ef3 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -45,7 +45,6 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f83a675ba2f..9e1d6192f5e 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -103,7 +103,6 @@ libvirt_driver_qemu_impl_la_CFLAGS = \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 2f46d244f3a..5e98a7ef5c5 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -123,7 +123,6 @@ libvirt_driver_storage_impl_la_CFLAGS = \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) @@ -269,7 +268,6 @@ if WITH_STORAGE_ISCSI libvirt_storage_backend_iscsi_la_SOURCES = $(STORAGE_DRIVER_ISCSI_SOURCES) libvirt_storage_backend_iscsi_la_CFLAGS = \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) @@ -286,7 +284,6 @@ libvirt_storage_backend_iscsi_direct_la_SOURCES = \ $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) libvirt_storage_backend_iscsi_direct_la_CFLAGS = \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(LIBISCSI_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) @@ -356,7 +353,6 @@ libvirt_storage_backend_rbd_la_LIBADD = \ $(NULL) libvirt_storage_backend_rbd_la_CFLAGS = \ -I$(srcdir)/conf \ - -I$(srcdir)/secret \ $(AM_CFLAGS) \ $(NULL) -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/remote/Makefile.inc.am | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 8a40c96563c..893d6894e2f 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -35,16 +35,13 @@ REMOTE_DAEMON_SOURCES = \ $(NULL) REMOTE_DAEMON_CFLAGS = \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(AM_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(XDR_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ @@ -54,11 +51,9 @@ REMOTE_DAEMON_CFLAGS = \ $(NULL) REMOTE_DAEMON_LD_FLAGS = \ - $(RELRO_LDFLAGS) \ + $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) REMOTE_DAEMON_LD_ADD = \ -- 2.26.2

Commit <0985a9597bb0348d46c0d18dc548a676bf0ad8e2> added unused variable so remove it. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/logging/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 4be33765e9e..873e6029dd5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -30,7 +30,6 @@ LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x EXTRA_DIST += \ $(LOG_PROTOCOL) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ -- 2.26.2

Fixes inconsistency with macro names for external programs. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-external-programs.m4 | 8 ++++---- src/util/virnetdevmidonet.c | 4 ++-- src/util/virnetdevopenvswitch.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index bd3cb1f7576..d905beed71d 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -61,8 +61,8 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ AC_PATH_PROG([UDEVADM], [udevadm], [udevadm], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([MM_CTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([OVS_VSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([SCRUB], [scrub], [scrub], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([ADDR2LINE], [addr2line], [addr2line], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MDEVCTL], [mdevctl], [mdevctl], [$LIBVIRT_SBIN_PATH]) @@ -75,9 +75,9 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC], ["$TC"], [Location or name of the tc program (see iproute2)]) - AC_DEFINE_UNQUOTED([MMCTL], ["$MMCTL"], + AC_DEFINE_UNQUOTED([MM_CTL], ["$MM_CTL"], [Location or name of the mm-ctl program]) - AC_DEFINE_UNQUOTED([OVSVSCTL], ["$OVSVSCTL"], + AC_DEFINE_UNQUOTED([OVS_VSCTL], ["$OVS_VSCTL"], [Location or name of the ovs-vsctl program]) AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 354350ce1b7..be1b6e8a457 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -45,7 +45,7 @@ virNetDevMidonetBindPort(const char *ifname, virUUIDFormat(virtualport->interfaceID, virtportuuid); - cmd = virCommandNew(MMCTL); + cmd = virCommandNew(MM_CTL); virCommandAddArgList(cmd, "--bind-port", virtportuuid, ifname, NULL); @@ -79,7 +79,7 @@ virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport) virUUIDFormat(virtualport->interfaceID, virtportuuid); - cmd = virCommandNew(MMCTL); + cmd = virCommandNew(MM_CTL); virCommandAddArgList(cmd, "--unbind-port", virtportuuid, NULL); if (virCommandRun(cmd, NULL) < 0) { diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index dbb489d174d..89e55650083 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,7 +151,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, ovsport->profileID); } - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); @@ -199,7 +199,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char { g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); @@ -226,7 +226,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) size_t len; g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); @@ -267,7 +267,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) return 0; } - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); @@ -373,7 +373,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json", "--no-headings", "--columns=statistics", "list", @@ -439,7 +439,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) *master = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "iface-to-br", ifname, NULL); virCommandSetOutputBuffer(cmd, master); @@ -498,7 +498,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, return 0; tmpIfname++; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "get", "Interface", tmpIfname, "name", NULL); if (virCommandRun(cmd, &status) < 0 || @@ -525,7 +525,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, { g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "clear", "Port", ifname, "tag", -- 2.26.2

It was introduced by commit <c606671aaad10a9bc87f226bc473a091e00a9629> as a gnulib ldexp module and later removed by commit <09fe607b4de8eb883c966e90aaf5563299a22738>. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/util/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 6d732518f40..5203fa28d48 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -275,7 +275,6 @@ libvirt_util_la_CFLAGS = \ $(AUDIT_CFLAGS) \ $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) \ - $(LDEXP_LIBM) \ $(NUMACTL_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(ACL_CFLAGS) \ -- 2.26.2

Commit <f650e86703847af544762d02f79c70131ff7fbab> added check for openpty function from util library using AC_CHECK_LIB(). However, that macro doesn't define OPENPTY_LIBS, it only defines WITH_LIBUTIL and prepends -lutil into LIBS for the whole project. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/util/Makefile.inc.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 5203fa28d48..eca7e7e0a1e 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -281,7 +281,6 @@ libvirt_util_la_CFLAGS = \ $(NULL) libvirt_util_la_LIBADD = \ -lm \ - $(OPENPTY_LIBS) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(LIBNL_LIBS) \ -- 2.26.2

Commit <5b816e16968ba02def56f067774ecd9a8c8d44d7> removed hard-coded sysconfdir path from *.conf files but missed virtproxyd. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/remote/Makefile.inc.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 893d6894e2f..80f4aad7828 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -276,6 +276,7 @@ remote/virtproxyd.conf: remote/libvirtd.conf.in $(AM_V_GEN)sed \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]runstatedir[@]|@runstatedir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ $< > $@ @@ -301,6 +302,7 @@ remote/virtproxyd.aug: remote/libvirtd.aug.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ $< > $@ @@ -325,6 +327,7 @@ remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \ $(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]runstatedir[@]|@runstatedir@|' \ -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ -- 2.26.2

We have two functions to set that we want to override directory where to look for libvirt files, one checks the binary name and the other one checks env variable. This patch removes the binary name check to simplify code by using only the env variable. This change will be required for Meson introduction where the binary name doesn't have any prefix by default. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/libvirt.c | 2 +- src/libvirt_private.syms | 3 +-- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/qemu/qemu_shim.c | 2 +- src/remote/remote_daemon.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/virfile.c | 25 +------------------------ src/util/virfile.h | 4 +--- tests/Makefile.am | 1 + tests/qemucapsprobe.c | 2 +- tests/testutils.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- 14 files changed, 14 insertions(+), 39 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index b2d0ba3d232..e3d68dc81d5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -221,7 +221,7 @@ virGlobalInit(void) if (virErrorInitialize() < 0) goto error; - virFileActivateDirOverrideForLib(); + virFileActivateDirOverride(); if (getuid() != geteuid() || getgid() != getegid()) { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ae0e253ab9f..f2808945c21 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2041,8 +2041,7 @@ virDirOpenQuiet; virDirRead; virFileAbsPath; virFileAccessibleAs; -virFileActivateDirOverrideForLib; -virFileActivateDirOverrideForProg; +virFileActivateDirOverride; virFileBindMountDevice; virFileBuildPath; virFileCanonicalizePath; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index b0cd89375be..7dc1fcb28f2 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -954,7 +954,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (!(config = virLockDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 028f771f149..8e92543a3a1 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -733,7 +733,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (!(config = virLogDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7e87b8fb962..1e4e2b22ee4 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -167,7 +167,7 @@ int main(int argc, char **argv) } } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (verbose) g_printerr("%s: %lld: preparing event loop thread\n", diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 1aa9bfc0d2f..901af6e934e 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -808,7 +808,7 @@ int main(int argc, char **argv) { virUpdateSelfLastChanged(argv[0]); - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); while (1) { int optidx = 0; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 08eb162b8cd..82d27efa7b3 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1459,7 +1459,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); /* Initialize the log system */ virLogSetFromEnv(); diff --git a/src/util/virfile.c b/src/util/virfile.c index c034df5931e..9e8dee4cb0f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1777,29 +1777,6 @@ virFileFindResource(const char *filename, } -/** - * virFileActivateDirOverrideForProg: - * @argv0: argv[0] of the calling program - * - * Look at @argv0 and try to detect if running from - * a build directory, by looking for a 'lt-' prefix - * on the binary name, or '/.libs/' in the path - */ -void -virFileActivateDirOverrideForProg(const char *argv0) -{ - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') - return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { - useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); - } -} - - /** * virFileActivateDirOverrideForLib: * @@ -1807,7 +1784,7 @@ virFileActivateDirOverrideForProg(const char *argv0) * the build/src tree instead of install tree. */ void -virFileActivateDirOverrideForLib(void) +virFileActivateDirOverride(void) { if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) useDirOverride = true; diff --git a/src/util/virfile.h b/src/util/virfile.h index 7a92364a5c9..fc0f6360506 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -190,9 +190,7 @@ char *virFileFindResourceFull(const char *filename, const char *installdir, const char *envname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); -void virFileActivateDirOverrideForProg(const char *argv0) - ATTRIBUTE_NONNULL(1); -void virFileActivateDirOverrideForLib(void); +void virFileActivateDirOverride(void); off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); diff --git a/tests/Makefile.am b/tests/Makefile.am index c87b12d28c3..f237c134213 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -484,6 +484,7 @@ TESTS_ENVIRONMENT = \ abs_builddir="$(abs_builddir)" \ abs_srcdir="$(abs_srcdir)" \ LIBVIRT_AUTOSTART=0 \ + LIBVIRT_DIR_OVERRIDE=1 \ LC_ALL=C \ VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ $(VG) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 26ea9ff5ed1..f18b7792b02 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -55,7 +55,7 @@ main(int argc, char **argv) VIR_TEST_PRELOAD(mock); - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (argc != 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/testutils.c b/tests/testutils.c index 7f1776b2449..191917b01f0 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -794,7 +794,7 @@ int virTestMain(int argc, g_setenv("VIR_TEST_MOCK_PROGNAME", progname, TRUE); - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (virTestSetEnvPath() < 0) return EXIT_AM_HARDFAIL; diff --git a/tools/virsh.c b/tools/virsh.c index 197a90636d3..4f5e6ed65ef 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -887,7 +887,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index fef0332a0d3..fdb0a130523 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1573,7 +1573,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverrideForProg(argv[0]); + virFileActivateDirOverride(); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); -- 2.26.2

The old code works correctly with make and running directly from shell but it failed with Meson test suite where session ID and process group are the same in both cases. What changes in both cases is parent process ID so use that instead of session ID. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- tests/commandhelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 3f040be8f22..4266e11902f 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -126,7 +126,7 @@ int main(int argc, char **argv) { fprintf(log, "FD:%zu\n", i); } - fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); + fprintf(log, "DAEMON:%s\n", getpgrp() != getppid() ? "yes" : "no"); if (!(cwd = getcwd(NULL, 0))) goto cleanup; if (strlen(cwd) > strlen(".../commanddata") && -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-nss.m4 | 2 +- tests/nssmock.c | 2 +- tests/nsstest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index 951a74e835b..b519c36e859 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -58,7 +58,7 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[ fi if test "x$with_nss_plugin" = "xyes" ; then - AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled]) + AC_DEFINE_UNQUOTED([WITH_NSS], 1, [whether nss plugin is enabled]) AC_CHECK_TYPE([struct gaih_addrtuple], [AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1], diff --git a/tests/nssmock.c b/tests/nssmock.c index 62e8fa372a2..b1c1aba957a 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -18,7 +18,7 @@ #include <config.h> -#ifdef NSS +#ifdef WITH_NSS # include "virmock.h" # include <sys/types.h> # include <dirent.h> diff --git a/tests/nsstest.c b/tests/nsstest.c index 514b4f7195d..135f6b6c939 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -20,7 +20,7 @@ #include "testutils.h" -#ifdef NSS +#ifdef WITH_NSS # include "libvirt_nss.h" # include "virsocket.h" -- 2.26.2

../tools/virsh-secret.c: In function ‘cmdSecretSetValue’: ../tools/virsh-secret.c:262:15: error: pointer targets in assignment from ‘char *’ to ‘unsigned char *’ differ in signedness [-Werror=pointer-sign] 262 | value = g_steal_pointer(&file_buf); | ^ cc1: all warnings being treated as errors Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- tools/virsh-secret.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index be4adc416ec..92801361477 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -259,7 +259,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) } if (plain) { - value = g_steal_pointer(&file_buf); + value = (unsigned char *) g_steal_pointer(&file_buf); value_size = file_len; file_len = 0; } else { -- 2.26.2

On Thu, Jul 02, 2020 at 02:25:29PM +0200, Pavel Hrdina wrote: This looks a bit iffy - what's the rationale for this ? 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 :|

On Thu, Jul 09, 2020 at 05:33:14PM +0200, Pavel Hrdina wrote: Oh, so are you saying it was complaining about unused functions ? We could just use a pragma to squelch the warning flag in this source file. 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 :|

On a Thursday in 2020, Pavel Hrdina wrote: What were the errors? If we don't need these, we can just delete them instead of commenting them out. The rest of the changes look reasonable. Jano