Having limit set to 100 is in most cases perfect but sometimes there can be a larger series that will have more than 100 patches and it will make the check-dco job fail. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- .gitlab-ci.yml | 2 +- ci/cirrus/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 702198ec8e4..c997dc6df25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - GIT_DEPTH: 100 + GIT_DEPTH: 1000 stages: - sanity_checks diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 893e13d7241..49e90b6d67b 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -14,7 +14,7 @@ build_task: install_script: - @INSTALL_COMMAND@ @PKGS@ clone_script: - - git clone --depth 100 "$CI_REPOSITORY_URL" . + - git clone --depth 1000 "$CI_REPOSITORY_URL" . - git fetch origin "$CI_COMMIT_REF_NAME" - git reset --hard "$CI_COMMIT_SHA" build_script: -- 2.26.2

Coverage functionality is provided directly by meson so there is no need to convert it into meson. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- Makefile.am | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 310a9d90276..fbb3cb09ff1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,9 +16,6 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. -LCOV = lcov -GENHTML = genhtml - # when building from tarball -Werror isn't auto enabled # so force it explicitly DISTCHECK_CONFIGURE_FLAGS = --enable-werror @@ -45,17 +42,6 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) -cov: - $(MKDIR_P) $(top_builddir)/coverage - $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ - -d $(top_builddir)/src \ - -d $(top_builddir)/tests - $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ - -o $(top_builddir)/coverage/libvirt.info - rm $(top_builddir)/coverage/libvirt.info.tmp - $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ - --legend $(top_builddir)/coverage/libvirt.info - dist-hook: gen-AUTHORS .PHONY: gen-AUTHORS -- 2.26.2

Rewrite to meson will eliminate most of the Makefile and all of m4 files so there is no need to check them. We still need to ignore mk files otherwise syntax-check.mk would be considered as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- build-aux/syntax-check.mk | 58 ++------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index bf229c42a74..3d7b644f01f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -785,14 +785,6 @@ sc_spec_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi -# Nested conditionals are easier to understand if we enforce that endifs -# can be paired back to the if -sc_makefile_conditionals: - @prohibit='(else|endif)($$| *#)' \ - in_vc_files='Makefile\.am' \ - halt='match "if FOO" with "endif FOO" in Makefiles' \ - $(_sc_search_regexp) - # Long lines can be harder to diff; too long, and git send-email chokes. # For now, only enforce line length on files where we have intentionally # fixed things and don't want to regress. @@ -801,10 +793,6 @@ sc_prohibit_long_lines: in_vc_files='\.arg[sv]' \ halt='Wrap long lines in expected output files' \ $(_sc_search_regexp) - @prohibit='.{80}' \ - in_vc_files='Makefile(\.inc)?\.am' \ - halt='Wrap long lines in Makefiles' \ - $(_sc_search_regexp) sc_copyright_format: @require='Copyright .*Red 'Hat', Inc\.' \ @@ -1793,40 +1781,6 @@ sc_const_long_option: halt='add "const" to the above declarations' \ $(_sc_search_regexp) -# Ensure that we use only the standard $(VAR) notation, -# not @...@ in Makefile.am, now that we can rely on automake -# to emit a definition for each substituted variable. -# However, there is still one case in which @VAR@ use is not just -# legitimate, but actually required: when augmenting an automake-defined -# variable with a prefix. For example, gettext uses this: -# MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@ -# otherwise, makeinfo would put German or French (current locale) -# navigation hints in the otherwise-English documentation. -# -# Allow the package to add exceptions via a hook in syntax-check.mk; -# for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by -# setting this to ' && !/PRAGMA_SYSTEM_HEADER/'. -_makefile_at_at_check_exceptions ?= -sc_makefile_at_at_check: - @perl -ne '/\@\w+\@/' \ - -e ' && !/(\w+)\s+=.*\@\1\@$$/' \ - -e ''$(_makefile_at_at_check_exceptions) \ - -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}' \ - $$($(VC_LIST_EXCEPT) | $(GREP) -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \ - && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || : - -sc_makefile_TAB_only_indentation: - @prohibit='^ [ ]{8}' \ - in_vc_files='akefile|\.mk$$' \ - halt='found TAB-8-space indentation' \ - $(_sc_search_regexp) - -sc_m4_quote_check: - @prohibit='(AC_DEFINE(_UNQUOTED)?|AC_DEFUN)\([^[]' \ - in_vc_files='(^configure\.ac|\.m4)$$' \ - halt='quote the first arg to AC_DEF*' \ - $(_sc_search_regexp) - gen_source_files: $(MAKE) -C src generated-sources @@ -1839,8 +1793,8 @@ perl_translatable_files_list_ = \ -e 'foreach $$file (@ARGV) {' \ -e ' \# Consider only file extensions with one or two letters' \ -e ' $$file =~ /\...?$$/ or next;' \ - -e ' \# Ignore m4 and mk files' \ - -e ' $$file =~ /\.m[4k]$$/ and next;' \ + -e ' \# Ignore mk files' \ + -e ' $$file =~ /\.mk$$/ and next;' \ -e ' \# Ignore a .c or .h file with a corresponding .l or .y file' \ -e ' $$file =~ /(.+)\.[ch]$$/ && (-e "$${1}.l" || -e "$${1}.y")' \ -e ' and next;' \ @@ -1993,12 +1947,6 @@ exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$|tests/ exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \ ^(build-aux/syntax-check\.mk|include/libvirt/virterror\.h|src/remote/remote_daemon_dispatch\.c|src/util/virerror\.c|docs/internals/oomtesting\.html\.in)$$ -exclude_file_name_regexp--sc_makefile_TAB_only_indentation = \ - ^build-aux/syntax-check\.mk$$ - -exclude_file_name_regexp--sc_makefile_at_at_check = \ - ^build-aux/syntax-check\.mk$$ - exclude_file_name_regexp--sc_prohibit_PATH_MAX = \ ^build-aux/syntax-check\.mk$$ @@ -2076,8 +2024,6 @@ exclude_file_name_regexp--sc_size_of_brackets = build-aux/syntax-check\.mk exclude_file_name_regexp--sc_correct_id_types = \ (^src/locking/lock_protocol.x$$) -exclude_file_name_regexp--sc_m4_quote_check = m4/virt-lib.m4 - exclude_file_name_regexp--sc_prohibit_include_public_headers_quote = \ ^(src/internal\.h$$|tools/wireshark/src/packet-libvirt.c$$) -- 2.26.2

These will not be ported to meson since the function provided by them is available by meson directly. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- m4/virt-arg.m4 | 154 ------------------ m4/virt-lib.m4 | 386 ---------------------------------------------- m4/virt-result.m4 | 42 ----- 3 files changed, 582 deletions(-) delete mode 100644 m4/virt-arg.m4 delete mode 100644 m4/virt-lib.m4 delete mode 100644 m4/virt-result.m4 diff --git a/m4/virt-arg.m4 b/m4/virt-arg.m4 deleted file mode 100644 index d626d72a6c1..00000000000 --- a/m4/virt-arg.m4 +++ /dev/null @@ -1,154 +0,0 @@ -dnl -dnl virt-arg.m4: Helper macros for adding configure arguments -dnl -dnl Copyright (C) 2012-2014 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 - - -dnl -dnl To be used instead of AC_ARG_WITH -dnl -dnl See LIBVIRT_ARG_WITH_FEATURE if the argument you're adding is going to -dnl be used for switching a feature on and off. -dnl -dnl LIBVIRT_ARG_WITH([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_DESC: Description that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl -dnl LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) -dnl LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory], [$(datadir)/doc]) -dnl -AC_DEFUN([LIBVIRT_ARG_WITH], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_desc], [[$2]]) - m4_pushdef([default_action], [$3]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [with-]check_name_dash) - m4_pushdef([with_var], [with_]check_name_lc) - - m4_divert_text([DEFAULTS], [with_var][[=]][default_action]) - AC_ARG_WITH([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])]) - - m4_popdef([with_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([default_action]) - m4_popdef([help_desc]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used instead of AC_ARG_WITH -dnl -dnl The difference between LIBVIRT_ARG_WITH and this macro is that the former -dnl is mostly an enhanced drop-in replacement for AC_ARG_WITH, whereas the -dnl latter is tailored for adding an argument that is going to be used to -dnl switch a feature on and off: as a consequence, it optionally supports -dnl specifying the minimum version for libraries the feature depends on and -dnl automatically builds a suitable description from the feature name. -dnl -dnl LIBVIRT_ARG_WITH_FEATURE([CHECK_NAME], [HELP_NAME], [DEFAULT_ACTION], [MIN_VERSION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_NAME: Name that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl MIN_VERSION: Specify minimal version that will be added to -dnl configure --help (optional) -dnl -dnl LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SeLinux], [check]) -dnl LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1]) -dnl -AC_DEFUN([LIBVIRT_ARG_WITH_FEATURE], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_name], [[$2]]) - m4_pushdef([default_action], [$3]) - m4_pushdef([min_version], [$4]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [with-]check_name_dash) - m4_pushdef([with_var], [with_]check_name_lc) - - m4_pushdef([version_text], m4_ifnblank(min_version, [[ (>= ]]min_version[[)]])) - - m4_divert_text([DEFAULTS], [with_var][[=]][default_action]) - AC_ARG_WITH([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - [with ]]m4_dquote(help_name)m4_dquote(version_text)[[ support @<:@default=]]m4_dquote(default_action)[[@:>@])]) - - m4_popdef([version_text]) - - m4_popdef([with_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([min_version]) - m4_popdef([default_action]) - m4_popdef([help_name]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used instead of AC_ARG_ENABLE -dnl -dnl LIBVIRT_ARG_ENABLE([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_DESC: Description that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl -dnl LIBVIRT_ARG_ENABLE([DEBUG], [enable debugging output], [yes]) -dnl -AC_DEFUN([LIBVIRT_ARG_ENABLE], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_desc], [[$2]]) - m4_pushdef([default_action], [$3]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [enable-]check_name_dash) - m4_pushdef([enable_var], [enable_]check_name_lc) - - m4_divert_text([DEFAULTS], [enable_var][[=]][default_action]) - AC_ARG_ENABLE([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])]) - - m4_popdef([enable_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([default_action]) - m4_popdef([help_desc]) - m4_popdef([check_name]) -]) diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4 deleted file mode 100644 index daa9f801231..00000000000 --- a/m4/virt-lib.m4 +++ /dev/null @@ -1,386 +0,0 @@ -dnl -dnl virt-lib.m4: Helper macros for checking for libraries -dnl -dnl Copyright (C) 2012-2014 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 - - -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_LIB([CHECK_NAME], [LIBRARY_NAME], -dnl [FUNCTION_NAME], [HEADER_NAME], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl -dnl LIBRARY_NAME: base name of library to check for eg libXXX.so -dnl FUNCTION_NAME: function to check for in libXXX.so -dnl HEADER_NAME: header file to check for -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl -dnl e.g. -dnl -dnl LIBVIRT_CHECK_LIB([SELINUX], [selinux], -dnl [getfilecon], [selinux/selinux.h]) -dnl LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], -dnl [sanlock_init], [sanlock.h]) -dnl LIBVIRT_CHECK_LIB([LIBATTR], [attr], -dnl [getxattr], [attr/attr.h]) -dnl -AC_DEFUN([LIBVIRT_CHECK_LIB],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([library_name], [$2]) - m4_pushdef([function_name], [$3]) - m4_pushdef([header_name], [$4]) - m4_pushdef([fail_action], [$5]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - old_LIBS=$LIBS - old_CFLAGS=$CFLAGS - cflags_var= - libs_var= - - fail=0 - if test "x$with_var" != "xno" ; then - if test "x$with_var" != "xyes" && test "x$with_var" != "xcheck" ; then - cflags_var="-I$with_var/include" - libs_var="-L$with_var/lib" - fi - CFLAGS="$CFLAGS $cflags_var" - LIBS="$LIBS $libs_var" - AC_CHECK_LIB(library_name, function_name, [],[ - if test "x$with_var" != "xcheck"; then - fail=1 - fi - with_var=no - ]) - if test "$fail" = "0" && test "x$with_var" != "xno" ; then - AC_CHECK_HEADER(header_name, [ - with_var=yes - ],[ - if test "x$with_var" != "xcheck"; then - fail=1 - fi - with_var=no - ]) - fi - fi - - LIBS=$old_LIBS - CFLAGS=$old_CFLAGS - - if test $fail = 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the lib]library_name[ library & headers to compile libvirt])]) - else - if test "x$with_var" = "xyes" ; then - if test "x$libs_var" = 'x' ; then - libs_var="-l[]library_name" - else - libs_var="$libs_var -l[]library_name" - fi - AC_DEFINE_UNQUOTED(config_var, 1, [whether lib]library_name[ is available]) - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" = "xyes"]) - - AC_SUBST(cflags_var) - AC_SUBST(libs_var) - fi - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([header_name]) - m4_popdef([function_name]) - m4_popdef([library_name]) - m4_popdef([check_name]) -]) - -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_LIB_ALT([CHECK_NAME], [LIBRARY_NAME], -dnl [FUNCTION_NAME], [HEADER_NAME], -dnl [CHECK_NAME_ALT, [LIBRARY_NAME_ALT], -dnl [FUNCTION_NAME_ALT], [HEADER_NAME_ALT], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl -dnl LIBRARY_NAME: base name of library to check for eg libXXX.so -dnl FUNCTION_NAME: function to check for in libXXX.so -dnl HEADER_NAME: header file to check for -dnl -dnl CHECK_NAME_ALT: Suffix/prefix used to set additional -dnl variables if alternative check succeeds -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl NB all vars for CHECK_NAME are also set -dnl LIBRARY_NAME_ALT: alternative library name to check for -dnl FUNCTION_NAME_ALT: alternative function name to check for -dnl HEADER_NAME_ALT: alternative header file to check for -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl e.g. -dnl -dnl LIBVIRT_CHECK_LIB([YAJL], [yajl], -dnl [yajl_parse_complete], [yajl/yajl_common.h], -dnl [YAJL2], [yajl], -dnl [yajl_tree_parse], [yajl/yajl_common.h]) -dnl -AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([library_name], [$2]) - m4_pushdef([function_name], [$3]) - m4_pushdef([header_name], [$4]) - m4_pushdef([check_name_alt], [$5]) - m4_pushdef([library_name_alt], [$6]) - m4_pushdef([function_name_alt], [$7]) - m4_pushdef([header_name_alt], [$8]) - m4_pushdef([fail_action], [$9]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - m4_pushdef([config_var_alt], [WITH_]check_name_alt) - m4_pushdef([make_var_alt], [WITH_]check_name_alt) - - old_LIBS=$LIBS - old_CFLAGS=$CFLAGS - cflags_var= - libs_var= - - fail=0 - alt=0 - if test "x$with_var" != "xno" ; then - if test "x$with_var" != "xyes" && test "x$with_var" != "xcheck" ; then - cflags_var="-I$with_var/include" - libs_var="-L$with_var/lib" - fi - CFLAGS="$CFLAGS $cflags_var" - LIBS="$LIBS $libs_var" - AC_CHECK_LIB(library_name, function_name, [],[ - AC_CHECK_LIB(library_name_alt, function_name_alt, [ - alt=1 - ],[ - if test "x$with_var" != "xcheck"; then - fail=1 - fi - with_var=no - ]) - ]) - if test "$fail" = "0" && test "x$with_var" != "xno" ; then - AC_CHECK_HEADER(header_name, [ - with_var=yes - ],[ - AC_CHECK_HEADER(header_name_alt, [ - with_var=yes - ],[ - if test "x$with_var" != "xcheck"; then - fail=1 - fi - with_var=no - ]) - ]) - fi - fi - - LIBS=$old_LIBS - CFLAGS=$old_CFLAGS - - if test $fail = 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the lib]library_name[ library & headers to compile libvirt])]) - else - if test "x$with_var" = "xyes" ; then - if test "x$libs_var" = 'x' ; then - libs_var="-l[]library_name" - else - libs_var="$libs_var -l[]library_name" - fi - - AC_DEFINE_UNQUOTED(config_var, 1, [whether lib]library_name[ is available]) - if test "$alt" = "1" ; then - AC_DEFINE_UNQUOTED(config_var_alt, 1, [whether lib]library_name[ is available]) - fi - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" = "xyes"]) - AM_CONDITIONAL(make_var_alt, [test "x$with_var" = "xyes" && test "$alt" = "1"]) - - AC_SUBST(cflags_var) - AC_SUBST(libs_var) - fi - - m4_popdef([make_var_alt]) - m4_popdef([config_var_alt]) - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([header_name_alt]) - m4_popdef([function_name_alt]) - m4_popdef([library_name_alt]) - m4_popdef([header_name]) - m4_popdef([function_name]) - m4_popdef([library_name]) - m4_popdef([check_name]) -]) - -dnl -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_PKG([CHECK_NAME], [PC_NAME], [PC_VERSION], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl PC_NAME: Name of the pkg-config module -dnl PC_VERSION: Version of the pkg-config module -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl eg -dnl -dnl LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) -dnl -AC_DEFUN([LIBVIRT_CHECK_PKG],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([pc_name], [$2]) - m4_pushdef([pc_version], [$3]) - m4_pushdef([fail_action], [$4]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - fail=0 - if test "x$with_var" != "xno" ; then - PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [ - with_var=yes - ],[ - if test "x$with_var" != "xcheck"; then - fail=1 - fi - with_var=no - ]) - fi - - if test $fail = 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the ]pc_name[ >= ]pc_version[ pkg-config module to compile libvirt])]) - fi - - if test "x$with_var" = "xyes" ; then - AC_DEFINE_UNQUOTED(config_var, 1, [whether ]pc_name[ >= ]pc_version[ is available]) - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" = "xyes"]) - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([pc_version]) - m4_popdef([pc_name]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used after a call to LIBVIRT_CHECK_LIB, -dnl LIBVIRT_CHECK_LIB_ALT or LIBVIRT_CHECK_PKG -dnl to print the result status -dnl -dnl LIBVIRT_RESULT_LIB([CHECK_NAME]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl -dnl LIBVIRT_RESULT_LIB([SELINUX]) -dnl -AC_DEFUN([LIBVIRT_RESULT_LIB],[ - m4_pushdef([check_name], [$1]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - LIBVIRT_RESULT(check_name_lc, [$with_var], [CFLAGS='$cflags_var' LIBS='$libs_var']) - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([check_name]) -]) diff --git a/m4/virt-result.m4 b/m4/virt-result.m4 deleted file mode 100644 index 36973ba0b54..00000000000 --- a/m4/virt-result.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl -dnl virt-result.m4: Helper macros for checking for libraries -dnl -dnl Copyright (C) 2012-2013 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 - -dnl -dnl To be used to print the results of a conditional test -dnl -dnl LIBVIRT_RESULT(CHECK_NAME, STATUS, DETAILS) -dnl -dnl CHECK_NAME: Name of the item being checked -dnl STATUS: 'yes' or 'no' result of check -dnl DETAILS: Details of result eg compiler flags -dnl -dnl eg -dnl -dnl LIBVIRT_RESULT([yajl], [yes], [-I/opt/yajl/include -lyajl]) -dnl -AC_DEFUN([LIBVIRT_RESULT], [ - if test "$2" = "no" || test -z "$3" ; then - STR=`printf "%20s: %s" "$1" "$2"` - else - STR=`printf "%20s: %s (%s)" "$1" "$2" "$3"` - fi - - AC_MSG_NOTICE([$STR]) -]) -- 2.26.2

With meson we no longer have .libs directory with the actual binary so we have to take a different approach to detect if running from build directory. This is not as robust as for autotools because if you select --prefix in the build directory it will incorrectly enable the override as well but nobody should do that. We have to modify some of the tests to not add current build path into PATH variable and use the full path for virsh instead. Otherwise it would be impossible to figure out that we are running virsh from build directory. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virfile.c | 34 ++++++++++++++++++------- tests/virsh-optparse | 58 +++++++++++++++++++------------------------ tests/virsh-schedinfo | 12 +++------ 3 files changed, 54 insertions(+), 50 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 213acdbcaa2..4542a38278e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1781,21 +1781,37 @@ 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 + * Combine $PWD and @argv0, canonicalize it and check if abs_top_builddir + * matches as prefix in the path. */ void virFileActivateDirOverrideForProg(const char *argv0) { - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') + const char *pwd = g_getenv("PWD"); + g_autofree char *fullPath = NULL; + g_autofree char *canonPath = NULL; + const char *path = NULL; + + if (!pwd) return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { + + if (argv0[0] != '/') { + fullPath = g_strdup_printf("%s/%s", pwd, argv0); + canonPath = virFileCanonicalizePath(fullPath); + + if (!canonPath) { + VIR_DEBUG("Failed to get canonicalized path errno=%d", errno); + return; + } + + path = canonPath; + } else { + path = argv0; + } + + if (STRPREFIX(path, abs_top_builddir)) { useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); + VIR_DEBUG("Activating build dir override for %s", path); } } diff --git a/tests/virsh-optparse b/tests/virsh-optparse index d9c8f3c731b..fed71a8509e 100755 --- a/tests/virsh-optparse +++ b/tests/virsh-optparse @@ -21,17 +21,11 @@ test_expensive -# If $abs_top_builddir/tools is not early in $PATH, put it there, -# so that we can safely invoke "virsh" simply with its name. -case $PATH in - $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;; - $abs_top_builddir/tools:*) ;; - *) PATH=$abs_top_builddir/tools:$PATH; export PATH ;; -esac +VIRSH=$abs_top_builddir/tools/virsh if test "$VERBOSE" = yes; then set -x - virsh --version + $VIRSH --version fi cat <<\EOF > exp-out || framework_failure @@ -63,7 +57,7 @@ for args in \ '--count 2 test' \ '--count=2 test' \ ; do - virsh -k0 -d0 -c $test_url setvcpus $args >out 2>>err || fail=1 + $VIRSH -k0 -d0 -c $test_url setvcpus $args >out 2>>err || fail=1 LC_ALL=C sort out | compare exp-out - || fail=1 done @@ -81,7 +75,7 @@ cat <<\EOF > exp-out || framework_failure </domainsnapshot> EOF -virsh -q -c $test_url snapshot-create-as --print-xml test \ +$VIRSH -q -c $test_url snapshot-create-as --print-xml test \ --diskspec 'vda,file=a&b,,c,snapshot=external' --description '1<2' \ --diskspec vdb --memspec file=d,,e >out 2>>err || fail=1 compare exp-out out || fail=1 @@ -96,7 +90,7 @@ cat <<\EOF > exp-out || framework_failure </domainsnapshot> EOF -virsh -q -c $test_url snapshot-create-as --print-xml test name vda vdb \ +$VIRSH -q -c $test_url snapshot-create-as --print-xml test name vda vdb \

out 2>>err || fail=1 compare exp-out out || fail=1

@@ -120,7 +114,7 @@ for args in \ '--description desc --name name --domain test vda vdb' \ '--description desc --diskspec vda --name name --domain test vdb' \ ; do - virsh -q -c $test_url snapshot-create-as --print-xml $args \ + $VIRSH -q -c $test_url snapshot-create-as --print-xml $args \ >out 2>>err || fail=1 compare exp-out out || fail=1 done @@ -131,7 +125,7 @@ test -s err && fail=1 cat <<\EOF > exp-err || framework_failure error: this function is not supported by the connection driver: virDomainQemuMonitorCommand EOF -virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1 +$VIRSH -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -141,7 +135,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value 'abc' for <start> option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start abc >out 2>err && fail=1 +$VIRSH -q -c $test_url cpu-stats test --start abc >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -149,7 +143,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42WB' for <start> option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start 42WB >out 2>err && fail=1 +$VIRSH -q -c $test_url cpu-stats test --start 42WB >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -158,7 +152,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42MB' for <start> option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start 42MB >out 2>err && fail=1 +$VIRSH -q -c $test_url cpu-stats test --start 42MB >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -166,7 +160,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '2147483648' for <start> option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start 2147483648 >out 2>err && fail=1 +$VIRSH -q -c $test_url cpu-stats test --start 2147483648 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -175,7 +169,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Invalid value for start CPU EOF -virsh -q -c $test_url cpu-stats test --start -1 >out 2>err && fail=1 +$VIRSH -q -c $test_url cpu-stats test --start -1 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -185,7 +179,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Scaled numeric value 'abc' for <size> option is malformed or out of range EOF -virsh -q -c $test_url setmaxmem test abc >out 2>err && fail=1 +$VIRSH -q -c $test_url setmaxmem test abc >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -194,18 +188,18 @@ cat <<\EOF > exp-err || framework_failure error: Scaled numeric value '42WB' for <size> option is malformed or out of range error: invalid argument: unknown suffix 'WB' EOF -virsh -q -c $test_url setmaxmem test 42WB >out 2>err && fail=1 +$VIRSH -q -c $test_url setmaxmem test 42WB >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 # Numeric value with valid suffix -virsh -q -c $test_url setmaxmem test 42MB --config >out 2>err || fail=1 +$VIRSH -q -c $test_url setmaxmem test 42MB --config >out 2>err || fail=1 test -s out && fail=1 test -s err && fail=1 # Numeric value bigger than INT_MAX. No failure here because # scaled numeric values are unsigned long long -virsh -q -c $test_url setmaxmem test 2147483648 --config >out 2>err || fail=1 +$VIRSH -q -c $test_url setmaxmem test 2147483648 --config >out 2>err || fail=1 test -s out && fail=1 test -s err && fail=1 @@ -213,7 +207,7 @@ test -s err && fail=1 cat <<\EOF > exp-err || framework_failure error: Scaled numeric value '-1' for <size> option is malformed or out of range EOF -virsh -q -c $test_url setmaxmem test -1 >out 2>err && fail=1 +$VIRSH -q -c $test_url setmaxmem test -1 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -223,12 +217,12 @@ cat <<\EOF > exp-err || framework_failure error: Unable to change MaxMemorySize error: memory in virDomainSetMaxMemory must not be zero EOF -virsh -q -c $test_url setmaxmem test 0 >out 2>err && fail=1 +$VIRSH -q -c $test_url setmaxmem test 0 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 # Numeric value -virsh -q -c $test_url setmaxmem test 42 --config >out 2>err || fail=1 +$VIRSH -q -c $test_url setmaxmem test 42 --config >out 2>err || fail=1 test -s out && fail=1 test -s err && fail=1 @@ -238,7 +232,7 @@ test -s err && fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value 'abc' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout abc >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout abc >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -247,7 +241,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '2147484' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout 2147484 >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout 2147484 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -255,7 +249,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42WB' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout 42WB >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout 42WB >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -264,7 +258,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42MB' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout 42MB >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout 42MB >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -272,7 +266,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '-1' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout -1 >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout -1 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -281,7 +275,7 @@ compare exp-err err || fail=1 cat <<\EOF > exp-err || framework_failure error: Numeric value '0' for <timeout> option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout 0 >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout 0 >out 2>err && fail=1 test -s out && fail=1 compare exp-err err || fail=1 @@ -291,7 +285,7 @@ cat <<\EOF > exp-out || framework_failure event loop timed out events received: 0 EOF -virsh -q -c $test_url event --all --timeout 1 >out 2>err && fail=1 +$VIRSH -q -c $test_url event --all --timeout 1 >out 2>err && fail=1 test -s err && fail=1 compare exp-out out || fail=1 diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo index d6d9ac2d59e..e4e2509f762 100755 --- a/tests/virsh-schedinfo +++ b/tests/virsh-schedinfo @@ -19,17 +19,11 @@ . "$(dirname $0)/test-lib.sh" -# If $abs_top_builddir/tools is not early in $PATH, put it there, -# so that we can safely invoke "virsh" simply with its name. -case $PATH in - $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;; - $abs_top_builddir/tools:*) ;; - *) PATH=$abs_top_builddir/tools:$PATH; export PATH ;; -esac +VIRSH=$abs_top_builddir/tools/virsh if test "$VERBOSE" = yes; then set -x - virsh --version + $VIRSH --version fi printf 'Scheduler : fair\n\n' > exp-out || framework_failure @@ -39,7 +33,7 @@ fail=0 test_url=test:///default -virsh -c $test_url schedinfo 1 --set j=k >out 2>err && fail=1 +$VIRSH -c $test_url schedinfo 1 --set j=k >out 2>err && fail=1 compare exp-out out || fail=1 compare exp-err err || fail=1 -- 2.26.2

Meson doesn't use .libs directory, everything is placed directly into directories where meson.build file is used. In order to have working tests we need to fix all the paths pointing '.libs' directory. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- docs/logging.html.in | 2 +- examples/systemtap/lock-debug.stp | 2 +- run.in | 2 +- src/driver.c | 2 +- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 2 +- src/locking/lock_manager.c | 2 +- src/storage/storage_backend.c | 2 +- src/util/virstoragefilebackend.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/shunloadtest.c | 4 ++-- tests/testutils.h | 2 +- tests/viridentitytest.c | 2 +- tests/virt-aa-helper-test | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/logging.html.in b/docs/logging.html.in index 3ff0dd3eb67..b4e7d0c3864 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -209,7 +209,7 @@ $ journalctl MESSAGE_ID=8ae2f3fb-2dbe-498e-8fbd-012d40afa361 --output=json "LIBVIRT_QEMU_BINARY" : "/bin/qemu-system-xtensa", "MESSAGE" : "Failed to probe capabilities for /bin/qemu-system-xtensa:" \ "internal error: Child process (LC_ALL=C LD_LIBRARY_PATH=/home/berrange" \ - "/src/virt/libvirt/src/.libs PATH=/usr/lib64/ccache:/usr/local/sbin:" \ + "/src/virt/libvirt/src PATH=/usr/lib64/ccache:/usr/local/sbin:" \ "/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin HOME=/root " \ "USER=root LOGNAME=root /bin/qemu-system-xtensa -help) unexpected " \ "exit status 127: /bin/qemu-system-xtensa: error while loading shared " \ diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp index 0c9cc386924..a68a3855695 100644 --- a/examples/systemtap/lock-debug.stp +++ b/examples/systemtap/lock-debug.stp @@ -12,7 +12,7 @@ # source git directory, it should be only slight modification to the following: # # ./run stap --ldd -c src/libvirtd -d src/libvirtd -# examples/systemtap/lock-debug.stp src/.libs/libvirt.so +# examples/systemtap/lock-debug.stp src/libvirt.so # # Debug RWLock mechanisms as well. # diff --git a/run.in b/run.in index d508e648020..1a0dee4d9ee 100644 --- a/run.in +++ b/run.in @@ -50,7 +50,7 @@ prepend() # Find this script. b=@abs_builddir@ -prepend LD_LIBRARY_PATH "$b/src/.libs" +prepend LD_LIBRARY_PATH "$b/src" export LD_LIBRARY_PATH prepend PKG_CONFIG_PATH "$b/src" diff --git a/src/driver.c b/src/driver.c index e7452106ed9..37bf9de3921 100644 --- a/src/driver.c +++ b/src/driver.c @@ -56,7 +56,7 @@ virDriverLoadModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_driver_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", DEFAULT_DRIVER_DIR, "LIBVIRT_DRIVER_DIR"))) return -1; diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 9243bcf9034..f6d4dd71e7e 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index a4f9e65c03e..b224679d7e3 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index a16e4552105..93a42a457b4 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 07318fb53f0..39e482f11cd 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, if (!(modfile = virFileFindResourceFull(name, NULL, ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", LIBDIR "/libvirt/lock-driver", "LIBVIRT_LOCK_MANAGER_PLUGIN_DIR"))) goto cleanup; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e9f6663e6d1..1f83236f2fc 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_storage_backend_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_BACKEND_MODULE_DIR, "LIBVIRT_STORAGE_BACKEND_DIR"))) return -1; diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c index f362436d9ba..bf452a1dc5d 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_storage_file_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_FILE_MODULE_DIR, "LIBVIRT_STORAGE_FILE_DIR"))) return -1; diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 50b447c1637..2989a668b75 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -374,4 +374,4 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("domaincaps"), - abs_builddir "/.libs/libsecurityselinuxhelper.so") + abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 3f069c2d6be..ae4b08b9d8a 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -339,4 +339,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index b377c07294f..d4ab3cd5acf 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv) fprintf(stderr, " .%*s 1 ", 39, ""); signal(SIGSEGV, sigHandler); - if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) { - fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); + if (!(lib = dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) { + fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror()); return 1; } if (!(startup = dlsym(lib, "shunloadStart"))) { diff --git a/tests/testutils.h b/tests/testutils.h index 3f32aa72002..ff5c98a0785 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -140,7 +140,7 @@ int virTestMain(int argc, return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } -#define VIR_TEST_MOCK(mock) (abs_builddir "/.libs/lib" mock "mock" MOCK_EXT) +#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock" MOCK_EXT) virCapsPtr virTestGenericCapsInit(void); virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq); diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 9a8c8914d36..fd01eeaa80b 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -158,7 +158,7 @@ mymain(void) } #if WITH_SELINUX -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") #else VIR_TEST_MAIN(mymain) #endif diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index 6a6703ecf5c..8dbe82a6b98 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -15,7 +15,7 @@ fi output="/dev/null" use_valgrind="" -ld_library_path="../src/.libs/" +ld_library_path="../src/" if [ ! -z "$1" ] && [ "$1" = "-d" ]; then output="/dev/stdout" shift -- 2.26.2

The PACKAGE* variables are defined by AC_INIT so we have to define explicitly with meson. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- autogen.sh | 53 ------------------ config.h | 1 + configure.ac | 96 --------------------------------- meson.build | 134 ++++++++++++++++++++++++++++++++++++++++++++++ meson_options.txt | 3 ++ 5 files changed, 138 insertions(+), 149 deletions(-) delete mode 100755 autogen.sh create mode 100644 config.h create mode 100644 meson.build create mode 100644 meson_options.txt diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 389f07ef4d2..00000000000 --- a/autogen.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# -# THe following options must come first. All other or subsequent -# arguments are passed to configure: -# --no-git skip `git submodule update --init` - -test -n "$srcdir" || srcdir=$(dirname "$0") -test -n "$srcdir" || srcdir=. - -olddir=$(pwd) - -cd "$srcdir" - -(test -f src/libvirt.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level libvirt directory" - exit 1 -} - -if [ "x$1" = x--no-git ]; then - shift -else - git submodule update --init || exit 1 -fi - -autoreconf --verbose --force --install || exit 1 - -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 - -cd "$olddir" - -if [ "$NOCONFIGURE" = "" ]; then - $srcdir/configure $EXTRA_ARGS "$@" || exit 1 - - if [ "$1" = "--help" ]; then - exit 0 - else - echo "Now type 'make' to compile libvirt" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/config.h b/config.h new file mode 100644 index 00000000000..05cd1507f45 --- /dev/null +++ b/config.h @@ -0,0 +1 @@ +#include <meson-config.h> diff --git a/configure.ac b/configure.ac index 23074d3badd..a91ed590edd 100644 --- a/configure.ac +++ b/configure.ac @@ -16,16 +16,7 @@ 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/>. -AC_INIT([libvirt], [6.6.0], [libvir-list@redhat.com], [], [https://libvirt.org]) - -if test $srcdir = "." -then - AC_MSG_ERROR([Build directory must be different from source directory]) -fi - -AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([config.h]) AH_BOTTOM([#include <config-post.h>]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms @@ -50,61 +41,6 @@ m4_ifndef([AM_SILENT_RULES], AC_CANONICAL_HOST -AC_USE_SYSTEM_EXTENSIONS - -# First extract pieces from the version number string -LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` -LIBVIRT_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` -LIBVIRT_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` -LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX -LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` - -# In libtool terminology we need to figure out: -# -# CURRENT -# The most recent interface number that this library implements. -# -# REVISION -# The implementation number of the CURRENT interface. -# -# AGE -# The difference between the newest and oldest interfaces that this -# library implements. -# -# In other words, the library implements all the interface numbers -# in the range from number `CURRENT - AGE' to `CURRENT'. -# -# Libtool assigns the soname version from `CURRENT - AGE', and we -# don't want that to ever change in libvirt. ie it must always be -# zero, to produce libvirt.so.0. -# -# We would, however, like the libvirt version number reflected -# in the so version'd symlinks, and this is based on AGE.REVISION -# eg libvirt.so.0.AGE.REVISION -# -# Assuming we do ever want to break soname version, this can -# toggled. But seriously, don't ever touch this. -LIBVIRT_SONUM=0 - -# The following examples show what libtool will do -# -# Input: 0.9.14 -> libvirt.so.0.9.14 -# Input: 1.0.0 -> libvirt.so.0.1000.0 -# Input: 2.5.8 -> libvirt.so.0.2005.8 -# -AGE=`expr $LIBVIRT_MAJOR_VERSION '*' 1000 + $LIBVIRT_MINOR_VERSION` -REVISION=$LIBVIRT_MICRO_VERSION -CURRENT=`expr $LIBVIRT_SONUM + $AGE` -LIBVIRT_VERSION_INFO=$CURRENT:$REVISION:$AGE - -AC_SUBST([LIBVIRT_MAJOR_VERSION]) -AC_SUBST([LIBVIRT_MINOR_VERSION]) -AC_SUBST([LIBVIRT_MICRO_VERSION]) -AC_SUBST([LIBVIRT_SONUM]) -AC_SUBST([LIBVIRT_VERSION]) -AC_SUBST([LIBVIRT_VERSION_INFO]) -AC_SUBST([LIBVIRT_VERSION_NUMBER]) - LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no]) if test "x$with_packager" != "xno" @@ -126,27 +62,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP -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. -if test "x$runstatedir" = x; then - AC_SUBST([runstatedir], ['${localstatedir}/run']) -fi - -dnl we introduce --with-runstatedir and then overwrite the -dnl value of $runstatedir so configmake.h is more useful -AC_ARG_WITH( - [runstatedir], - [AS_HELP_STRING( - [--with-runstatedir], - [State directory for temporary sockets, pid files, etc])]) - -if test -n "$with_runstatedir" -then - runstatedir=$with_runstatedir -fi - - dnl get 64-int interfaces on 32-bit platforms AC_SYS_LARGEFILE @@ -450,17 +365,6 @@ dnl LIBVIRT_CHECK_EXTERNAL_PROGRAMS -dnl if --prefix is /usr, don't use /usr/var for localstatedir -dnl or /usr/etc for sysconfdir -dnl as this makes a lot of things break in testing situations - -if test "$prefix" = "/usr" && test "$localstatedir" = '${prefix}/var' ; then - localstatedir='/var' -fi -if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then - sysconfdir='/etc' -fi - dnl dnl Virtualization drivers check dnl diff --git a/meson.build b/meson.build new file mode 100644 index 00000000000..12a6a14ee58 --- /dev/null +++ b/meson.build @@ -0,0 +1,134 @@ +project( + 'libvirt', 'c', + version: '6.6.0', + license: 'LGPLv2+', + meson_version: '>= 0.54.0', + default_options: [ + 'buildtype=debugoptimized', + 'c_std=gnu99', + ], +) + + +# figure out if we are building from git + +git = run_command('test', '-d', '.git').returncode() == 0 + +if git and not get_option('no-git') + run_command('git', 'submodule', 'update', '--init') +endif + + +# prepare build configuration data + +conf = configuration_data() + +conf.set('_GNU_SOURCE', 1) +conf.set_quoted('abs_top_builddir', meson.build_root()) +conf.set_quoted('abs_top_srcdir', meson.source_root()) +conf.set_quoted('PACKAGE', meson.project_name()) +conf.set_quoted('PACKAGE_NAME', meson.project_name()) +conf.set_quoted('PACKAGE_VERSION', meson.project_version()) +conf.set_quoted('VERSION', meson.project_version()) + + +# set various paths + +if get_option('system') + prefix = '/usr' + libdir = prefix / 'lib64' + if run_command('test', '-d', libdir).returncode() != 0 + libdir = prefix / 'lib' + endif + localstatedir = '/var' + sysconfdir = '/etc' +else + prefix = get_option('prefix') + libdir = prefix / get_option('libdir') + localstatedir = prefix / get_option('localstatedir') + sysconfdir = prefix / get_option('sysconfdir') +endif + +# if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for +# sysconfdir as this makes a lot of things break in testing situations +if prefix == '/usr' + if localstatedir == '/usr/var' + localstatedir = '/var' + endif + if sysconfdir == '/usr/etc' + sysconfdir = '/etc' + endif +endif + +runstatedir = get_option('runstatedir') +if runstatedir == '' + runstatedir = localstatedir / 'run' +endif + +bindir = prefix / get_option('bindir') +datadir = prefix / get_option('datadir') +includedir = prefix / get_option('includedir') +infodir = prefix / get_option('infodir') +libexecdir = prefix / get_option('libexecdir') +localedir = prefix / get_option('localedir') +mandir = prefix / get_option('mandir') +sbindir = prefix / get_option('sbindir') +sharedstatedir = prefix / get_option('sharedstatedir') + +confdir = sysconfdir / meson.project_name() +docdir = datadir / 'doc' / meson.project_name() +pkgdatadir = datadir / meson.project_name() + + +# figure out libvirt version strings + +arr_version = meson.project_version().split('.') +libvirt_version_number = 1000000 * arr_version[0].to_int() + 1000 * arr_version[1].to_int() + arr_version[2].to_int() + +conf.set('LIBVIRT_VERSION_NUMBER', libvirt_version_number) + +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt.so.0.AGE.REVISION +# +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt.so.0.9.14 +# Input: 1.0.0 -> libvirt.so.0.1000.0 +# Input: 2.5.8 -> libvirt.so.0.2005.8 +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't ever touch this. + +libvirt_so_version = 0 +libvirt_age = 1000 * arr_version[0].to_int() + arr_version[1].to_int() +libvirt_revision = arr_version[2].to_int() +libvirt_lib_version = '@0@.@1@.@2@'.format(libvirt_so_version, libvirt_age, libvirt_revision) + + +# define top include directory + +top_inc_dir = include_directories('.') + + +# generate meson-config.h file +configure_file(output: 'meson-config.h', configuration: conf) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000000..5338ee89b9a --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,3 @@ +option('no-git', type: 'boolean', value: false, description: 'Disable git submodule update') +option('system', type: 'boolean', value: false, description: 'Set install paths to system ones') +option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 1 - m4/virt-compile-pie.m4 | 35 ----------------------------------- meson.build | 1 + src/Makefile.am | 2 -- src/locking/Makefile.inc.am | 4 ---- src/logging/Makefile.inc.am | 2 -- src/lxc/Makefile.inc.am | 2 -- src/network/Makefile.inc.am | 2 -- src/remote/Makefile.inc.am | 2 -- src/security/Makefile.inc.am | 2 -- src/storage/Makefile.inc.am | 2 -- tools/Makefile.am | 6 ------ 12 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 m4/virt-compile-pie.m4 diff --git a/configure.ac b/configure.ac index a91ed590edd..84e63063e43 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,6 @@ fi # Check for compiler and library settings. LIBVIRT_COMPILE_WARNINGS -LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_LINKER_NO_UNDEFINED diff --git a/m4/virt-compile-pie.m4 b/m4/virt-compile-pie.m4 deleted file mode 100644 index da5cdf57b75..00000000000 --- a/m4/virt-compile-pie.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl -dnl Check for support for position independent executables -dnl -dnl Copyright (C) 2013 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_COMPILE_PIE],[ - PIE_CFLAGS= - PIE_LDFLAGS= - case "$host" in - *-*-mingw* ) - ;; dnl All code is position independent on Win32 target - *) - gl_COMPILER_OPTION_IF([-fPIE -DPIE -pie], [ - PIE_CFLAGS="-fPIE -DPIE" - PIE_LDFLAGS="-pie" - ]) - esac - AC_SUBST([PIE_CFLAGS]) - AC_SUBST([PIE_LDFLAGS]) -]) diff --git a/meson.build b/meson.build index 12a6a14ee58..88a163e2ee6 100644 --- a/meson.build +++ b/meson.build @@ -5,6 +5,7 @@ project( meson_version: '>= 0.54.0', default_options: [ 'buildtype=debugoptimized', + 'b_pie=true', 'c_std=gnu99', ], ) diff --git a/src/Makefile.am b/src/Makefile.am index c2bb7d0083b..6cf23bb0bdf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -603,7 +603,6 @@ libexec_PROGRAMS += libvirt_iohelper libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES) libvirt_iohelper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_iohelper_LDADD = \ libvirt.la \ @@ -615,7 +614,6 @@ endif WITH_DTRACE_PROBES libvirt_iohelper_CFLAGS = \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ab0822dda35..b75588f9fce 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -130,12 +130,10 @@ virtlockd_CFLAGS = \ -I$(builddir)/locking \ -I$(builddir)/rpc \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) virtlockd_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) @@ -182,11 +180,9 @@ libvirt_sanlock_helper_SOURCES = $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) libvirt_sanlock_helper_CFLAGS = \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) libvirt_sanlock_helper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_sanlock_helper_LDADD = \ libvirt.la \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 74987c63845..9aa634b126b 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -76,12 +76,10 @@ virtlogd_CFLAGS = \ -I$(builddir)/logging \ -I$(builddir)/rpc \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) virtlogd_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index c9201110071..031aed14203 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -197,7 +197,6 @@ nodist_libvirt_lxc_SOURCES = \ $(NULL) libvirt_lxc_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(CAPNG_LIBS) \ $(LIBXML_LIBS) \ $(GLIB_LIBS) \ @@ -217,7 +216,6 @@ libvirt_lxc_CFLAGS = \ -I$(builddir)/rpc \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(CAPNG_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 9a1a3717073..5a5d1630a08 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -126,7 +126,6 @@ libexec_PROGRAMS += libvirt_leaseshelper libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) libvirt_leaseshelper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_leaseshelper_LDADD = \ libvirt.la \ @@ -138,7 +137,6 @@ endif WITH_DTRACE_PROBES libvirt_leaseshelper_CFLAGS = \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) INSTALL_DATA_DIRS += network diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 165a7cced60..341f429b773 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -41,7 +41,6 @@ REMOTE_DAEMON_CFLAGS = \ $(XDR_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBNL_CFLAGS) \ - $(PIE_CFLAGS) \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ @@ -52,7 +51,6 @@ REMOTE_DAEMON_CFLAGS = \ REMOTE_DAEMON_LD_FLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 871245a035f..ec24931a80a 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -74,7 +74,6 @@ virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) virt_aa_helper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) virt_aa_helper_LDADD = \ libvirt.la \ @@ -89,7 +88,6 @@ virt_aa_helper_CFLAGS = \ -I$(top_srcdir)/src/hypervisor \ -I$(srcdir)/security \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 43010ee9664..e201b9938d9 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -437,7 +437,6 @@ libexec_PROGRAMS += libvirt_parthelper libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ @@ -451,6 +450,5 @@ endif WITH_DTRACE_PROBES libvirt_parthelper_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) endif WITH_STORAGE_DISK diff --git a/tools/Makefile.am b/tools/Makefile.am index 0530e439a8b..19c3b88777c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,7 +31,6 @@ STANDALONE_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(PIE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(NULL) @@ -92,7 +91,6 @@ libvirt_shell_la_CFLAGS = \ $(NULL) libvirt_shell_la_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) libvirt_shell_la_LIBADD = \ @@ -132,7 +130,6 @@ endif ! WITH_BHYVE virt_host_validate_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) @@ -158,7 +155,6 @@ virt_login_shell_helper_SOURCES = \ virt_login_shell_helper_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) virt_login_shell_helper_LDADD = \ @@ -204,7 +200,6 @@ virsh_SOURCES = \ virsh_LDFLAGS = \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) virsh_LDADD = \ @@ -225,7 +220,6 @@ virt_admin_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(STATIC_BINARIES) \ - $(PIE_LDFLAGS) \ $(NULL) virt_admin_LDADD = \ ../src/libvirt-admin.la \ -- 2.26.2

With meson we generate meson-config.h into the build directory and include it in config.h so there is no need to have separate config-post.h file. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- config-post.h | 58 --------------------------------------------------- config.h | 41 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 - 3 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 config-post.h diff --git a/config-post.h b/config-post.h deleted file mode 100644 index 4a49cd4194d..00000000000 --- a/config-post.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 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/>. - */ - -#ifndef __GNUC__ -# error "Libvirt requires GCC >= 4.8, or CLang" -#endif - -/* - * 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; - */ -#ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -#endif - -#if defined(__clang_major__) && defined(__clang_minor__) -# ifdef __apple_build_version__ -# if __clang_major__ < 5 || (__clang_major__ == 5 && __clang_minor__ < 1) -# error You need at least XCode Clang v5.1 to compile QEMU -# endif -# else -# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 4) -# error You need at least Clang v3.4 to compile QEMU -# endif -# endif -#elif defined(__GNUC__) && defined(__GNUC_MINOR__) -# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) -# error You need at least GCC v4.8 to compile QEMU -# endif -#else -# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 to compile libvirt -#endif - -/* Ask for warnings for anything that was marked deprecated in - * the defined version, or before. It is a candidate for rewrite. - */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 - -/* Ask for warnings if code tries to use function that did not - * exist in the defined version. These risk breaking builds - */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/config.h b/config.h index 05cd1507f45..9c433ad4c0f 100644 --- a/config.h +++ b/config.h @@ -1 +1,42 @@ #include <meson-config.h> + +#ifndef __GNUC__ +# error "Libvirt requires GCC >= 4.8, or CLang" +#endif + +/* + * 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; + */ +#ifndef __GNUC_PREREQ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#endif + +#if defined(__clang_major__) && defined(__clang_minor__) +# ifdef __apple_build_version__ +# if __clang_major__ < 5 || (__clang_major__ == 5 && __clang_minor__ < 1) +# error You need at least XCode Clang v5.1 to compile QEMU +# endif +# else +# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 4) +# error You need at least Clang v3.4 to compile QEMU +# endif +# endif +#elif defined(__GNUC__) && defined(__GNUC_MINOR__) +# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) +# error You need at least GCC v4.8 to compile QEMU +# endif +#else +# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 to compile libvirt +#endif + +/* Ask for warnings for anything that was marked deprecated in + * the defined version, or before. It is a candidate for rewrite. + */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 + +/* Ask for warnings if code tries to use function that did not + * exist in the defined version. These risk breaking builds + */ +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/configure.ac b/configure.ac index 84e63063e43..7294b61bc46 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,6 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. AC_CONFIG_AUX_DIR([build-aux]) -AH_BOTTOM([#include <config-post.h>]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([ -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 ---- meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7294b61bc46..445a44f2e79 100644 --- a/configure.ac +++ b/configure.ac @@ -154,10 +154,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) if test "$with_win" = "yes" ; then # We don't support the daemon yet with_libvirtd=no - - # For AI_ADDRCONFIG - AC_DEFINE([_WIN32_WINNT], [0x0600], [Win Vista / Server 2008]) - AC_DEFINE([WINVER], [0x0600], [Win Vista / Server 2008]) fi # The daemon requires remote support. Likewise, if we are not using diff --git a/meson.build b/meson.build index 88a163e2ee6..3b149e829d3 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,12 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', meson.project_version()) conf.set_quoted('VERSION', meson.project_version()) +if host_machine.system() == 'windows' + # For AI_ADDRCONFIG + conf.set('_WIN32_WINNT', '0x0600') # Win Vista / Server 2008 + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 +endif + # set various paths -- 2.26.2

We don't use all of the defines so copy only the ones actually used. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- Makefile.am | 41 ----------------------------------------- configmake.h.in | 16 ++++++++++++++++ meson.build | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 41 deletions(-) create mode 100644 configmake.h.in diff --git a/Makefile.am b/Makefile.am index fbb3cb09ff1..82ccbac6f91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,44 +63,3 @@ gen-AUTHORS: ci-%: $(MAKE) -C $(srcdir)/ci/ $@ - -# Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+ or 2.70. -# The Automake-defined pkg* macros are appended, in the order -# listed in the Automake 1.10a+ documentation. -configmake.h: Makefile - $(AM_V_GEN)rm -f $@-t && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#if WIN32'; \ - echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \ - echo '#endif'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ - } | sed '/""/d' > $@-t && \ - mv -f $@-t $@ diff --git a/configmake.h.in b/configmake.h.in new file mode 100644 index 00000000000..c9930b60493 --- /dev/null +++ b/configmake.h.in @@ -0,0 +1,16 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +#if WIN32 +# include <winsock2.h> /* avoid mingw pollution on DATADIR */ +#endif +#mesondefine BINDIR +#mesondefine DATADIR +#mesondefine LIBDIR +#mesondefine LIBEXECDIR +#mesondefine LOCALEDIR +#mesondefine LOCALSTATEDIR +#mesondefine MANDIR +#mesondefine PKGDATADIR +#mesondefine PREFIX +#mesondefine RUNSTATEDIR +#mesondefine SBINDIR +#mesondefine SYSCONFDIR diff --git a/meson.build b/meson.build index 3b149e829d3..07dacf92009 100644 --- a/meson.build +++ b/meson.build @@ -87,6 +87,29 @@ docdir = datadir / 'doc' / meson.project_name() pkgdatadir = datadir / meson.project_name() +# generate configmake.h header + +configmake_conf = configuration_data() +configmake_conf.set_quoted('BINDIR', bindir) +configmake_conf.set_quoted('DATADIR', datadir) +configmake_conf.set_quoted('LIBDIR', libdir) +configmake_conf.set_quoted('LIBEXECDIR', libexecdir) +configmake_conf.set_quoted('LOCALEDIR', localedir) +configmake_conf.set_quoted('LOCALSTATEDIR', localstatedir) +configmake_conf.set_quoted('MANDIR', mandir) +configmake_conf.set_quoted('PKGDATADIR', pkgdatadir) +configmake_conf.set_quoted('PREFIX', prefix) +configmake_conf.set_quoted('RUNSTATEDIR', runstatedir) +configmake_conf.set_quoted('SBINDIR', sbindir) +configmake_conf.set_quoted('SYSCONFDIR', sysconfdir) + +configure_file( + input: 'configmake.h.in', + output: 'configmake.h', + configuration: configmake_conf, +) + + # figure out libvirt version strings arr_version = meson.project_version().split('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 13 ------------- meson.build | 14 ++++++++++++++ meson_options.txt | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 445a44f2e79..66fc88bd014 100644 --- a/configure.ac +++ b/configure.ac @@ -40,19 +40,6 @@ m4_ifndef([AM_SILENT_RULES], AC_CANONICAL_HOST -LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) -LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no]) -if test "x$with_packager" != "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"], - [Extra package name]) -fi -if test "x$with_packager_version" != "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"], - [Extra package version]) -fi - dnl Where we look for daemons and admin binaries during configure LIBVIRT_SBIN_PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" diff --git a/meson.build b/meson.build index 07dacf92009..633db2df51a 100644 --- a/meson.build +++ b/meson.build @@ -110,6 +110,20 @@ configure_file( ) +# packager options + +packager = get_option('packager') +packager_version = get_option('packager_version') + +if packager != '' + conf.set_quoted('PACKAGER', packager) +endif + +if packager_version != '' + conf.set_quoted('PACKAGER_VERSION', packager_version) +endif + + # figure out libvirt version strings arr_version = meson.project_version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 5338ee89b9a..2281faec429 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ option('no-git', type: 'boolean', value: false, description: 'Disable git submodule update') +option('packager', type: 'string', value: '', description: 'Extra packager name') +option('packager_version', type: 'string', value: '', description: 'Extra packager version') option('system', type: 'boolean', value: false, description: 'Set install paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc') -- 2.26.2

With autoconf this option controlled if the test suite is compiled by default or not with the fact that it will be compiled later when running `make check`. With meson it is not possible to compile it later when running `ninja test` as it will be always compiled if referenced by `test()` function in meson.build files. Because of that enable the test suite be default. Enabling it only when compiling from git makes the test suite disabled for `ninja dist` command which builds the code from non-git location. Since that command is closest equivalent of `make distcheck` which runs the test suite. The only drawback from the autoconf state is that users compiling libvirt from tarball will compile the test suite as well even though they will not run it in most cases. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 17 ----------------- meson.build | 5 +++++ meson_options.txt | 1 + 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 66fc88bd014..71766f2fe61 100644 --- a/configure.ac +++ b/configure.ac @@ -616,23 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi -LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check]) -case "$with_test_suite" in - yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; -esac - -AC_MSG_CHECKING([Whether to build test suite by default]) -if test "$with_test_suite" = "check" ; then - if test -d $srcdir/.git ; then - with_test_suite=yes - else - with_test_suite=no - fi -fi -AC_MSG_RESULT([$with_test_suite]) -AM_CONDITIONAL([WITH_TESTS], [test "$with_test_suite" = "yes"]) - LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], [set the default for enabling expensive tests ] [(long timeouts), use VIR_TEST_EXPENSIVE to ] diff --git a/meson.build b/meson.build index 633db2df51a..fee75204d27 100644 --- a/meson.build +++ b/meson.build @@ -124,6 +124,11 @@ if packager_version != '' endif +# test options + +use_test_suite = get_option('test_suite') + + # figure out libvirt version strings arr_version = meson.project_version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 2281faec429..6973b9f6587 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,3 +3,4 @@ option('packager', type: 'string', value: '', description: 'Extra packager name' option('packager_version', type: 'string', value: '', description: 'Extra packager version') option('system', type: 'boolean', value: false, description: 'Set install paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc') +option('test_suite', type: 'boolean', value: true, description: 'Whether to enable and build test suite by default') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 21 --------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 71766f2fe61..7b370f4f1be 100644 --- a/configure.ac +++ b/configure.ac @@ -616,27 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi -LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], - [set the default for enabling expensive tests ] - [(long timeouts), use VIR_TEST_EXPENSIVE to ] - [override during make], - [check]) -case "$enable_expensive_tests" in - 0|no) VIR_TEST_EXPENSIVE_DEFAULT=0 ;; - 1|yes) VIR_TEST_EXPENSIVE_DEFAULT=1 ;; - check) ;; - *) AC_MSG_ERROR([bad value ${enable_expensive_tests} for enable-expensive-tests option]) ;; -esac -if test "$enable_expensive_tests" = check; then - if test -d $srcdir/.git ; then - VIR_TEST_EXPENSIVE_DEFAULT=0 - else - VIR_TEST_EXPENSIVE_DEFAULT=1 - fi -fi -AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT]) -AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = 1]) - LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation], [no]) case "$enable_test_coverage" in yes|no) ;; diff --git a/meson.build b/meson.build index fee75204d27..e48525d9d22 100644 --- a/meson.build +++ b/meson.build @@ -128,6 +128,12 @@ endif use_test_suite = get_option('test_suite') +if get_option('expensive_tests').auto() + use_expensive_tests = not git +else + use_expensive_tests = get_option('expensive_tests').enabled() +endif + # figure out libvirt version strings diff --git a/meson_options.txt b/meson_options.txt index 6973b9f6587..f0c4f93ad16 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,3 +4,4 @@ option('packager_version', type: 'string', value: '', description: 'Extra packag option('system', type: 'boolean', value: false, description: 'Set install paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc') option('test_suite', type: 'boolean', value: true, description: 'Whether to enable and build test suite by default') +option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts), use VIR_TEST_EXPENSIVE to override') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 21 --------------------- meson.build | 16 ++++++++++++++++ meson_options.txt | 1 + 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 7b370f4f1be..d76c2d22fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -616,23 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi -LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation], [no]) -case "$enable_test_coverage" in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enable_test_coverga} for test-coverage option]) ;; -esac - -if test "$enable_test_coverage" = yes; then - save_WARN_CFLAGS=$WARN_CFLAGS - WARN_CFLAGS= - gl_WARN_ADD([-fprofile-arcs]) - gl_WARN_ADD([-ftest-coverage]) - COVERAGE_FLAGS=$WARN_CFLAGS - AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS]) - AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS]) - WARN_CFLAGS=$save_WARN_CFLAGS -fi - dnl MinGW checks LIBVIRT_WIN_CHECK_COMMON LIBVIRT_WIN_CHECK_MINGW @@ -878,10 +861,6 @@ AC_MSG_NOTICE([]) LIBVIRT_WIN_RESULT_COMMON LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Test suite]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT([Coverage], [$enable_test_coverage]) -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG diff --git a/meson.build b/meson.build index e48525d9d22..e91d664a77a 100644 --- a/meson.build +++ b/meson.build @@ -134,6 +134,14 @@ else use_expensive_tests = get_option('expensive_tests').enabled() endif +coverage_flags = [] +if get_option('test_coverage') + coverage_flags = [ + '-fprofile-arcs', + '-ftest-coverage', + ] +endif + # figure out libvirt version strings @@ -187,3 +195,11 @@ top_inc_dir = include_directories('.') # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) + + +# print configuration summary + +test_summary = { + 'Coverage': coverage_flags.length() > 0, +} +summary(test_summary, section: 'Test suite', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f0c4f93ad16..0f79f8aea03 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,3 +5,4 @@ option('system', type: 'boolean', value: false, description: 'Set install paths option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc') option('test_suite', type: 'boolean', value: true, description: 'Whether to enable and build test suite by default') option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts), use VIR_TEST_EXPENSIVE to override') +option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 15 --------------- meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index d76c2d22fc2..8f16b364de6 100644 --- a/configure.ac +++ b/configure.ac @@ -722,21 +722,6 @@ if test "$want_ifconfig" = "yes"; then AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) fi -# Detect when running under the clang static analyzer's scan-build driver -# or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. -AC_CACHE_CHECK([whether this build is done by a static analysis tool], - [lv_cv_static_analysis], [ - lv_cv_static_analysis=no - if test -n "${CCC_ANALYZER_ANALYSIS+set}" || \ - test -n "$COVERITY_BUILD_COMMAND$COVERITY_LD_PRELOAD"; then - lv_cv_static_analysis=yes - fi - ]) -t=0 -test "x$lv_cv_static_analysis" = xyes && t=1 -AC_DEFINE_UNQUOTED([STATIC_ANALYSIS], [$t], - [Define to 1 when performing static analysis.]) - GNUmakefile=GNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/meson.build b/meson.build index e91d664a77a..be5e64fc6d2 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,19 @@ if get_option('test_coverage') endif +# Detect when running under the + +rc = run_command( + 'sh', '-c', + 'test -n "${CCC_ANALYZER_HTML}"' + + ' -o -n "${CCC_ANALYZER_ANALYSIS+set}"' + + ' -o -n "$COVERITY_BUILD_COMMAND$COVERITY_LD_PRELOAD"', +) +if rc.returncode() == 0 + conf.set('STATIC_ANALYSIS', 1) +endif + + # figure out libvirt version strings arr_version = meson.project_version().split('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- m4/virt-manywarnings.m4 | 339 ---------------------------------------- meson.build | 192 +++++++++++++++++++++++ 2 files changed, 192 insertions(+), 339 deletions(-) delete mode 100644 m4/virt-manywarnings.m4 diff --git a/m4/virt-manywarnings.m4 b/m4/virt-manywarnings.m4 deleted file mode 100644 index 783620da3ad..00000000000 --- a/m4/virt-manywarnings.m4 +++ /dev/null @@ -1,339 +0,0 @@ -# manywarnings.m4 serial 18 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# gl_MANYWARN_COMPLEMENT(OUTVAR, LISTVAR, REMOVEVAR) -# -------------------------------------------------- -# Copy LISTVAR to OUTVAR except for the entries in REMOVEVAR. -# Elements separated by whitespace. In set logic terms, the function -# does OUTVAR = LISTVAR \ REMOVEVAR. -AC_DEFUN([gl_MANYWARN_COMPLEMENT], -[ - gl_warn_set= - set x $2; shift - for gl_warn_item - do - case " $3 " in - *" $gl_warn_item "*) - ;; - *) - gl_warn_set="$gl_warn_set $gl_warn_item" - ;; - esac - done - $1=$gl_warn_set -]) - -# gl_MANYWARN_ALL_GCC(VARIABLE) -# ----------------------------- -# Add all documented GCC warning parameters to variable VARIABLE. -# Note that you need to test them using gl_WARN_ADD if you want to -# make sure your gcc understands it. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_MANYWARN_ALL_GCC], -[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) - -# Specialization for _AC_LANG = C. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_MANYWARN_ALL_GCC(C)], -[ - AC_LANG_PUSH([C]) - - dnl First, check for some issues that only occur when combining multiple - dnl gcc warning categories. - AC_REQUIRE([AC_PROG_CC]) - if test -n "$GCC"; then - - dnl Check if -W -Werror -Wno-missing-field-initializers is supported - dnl with the current $CC $CFLAGS $CPPFLAGS. - AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported], - [gl_cv_cc_nomfi_supported], - [gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_nomfi_supported=yes], - [gl_cv_cc_nomfi_supported=no]) - CFLAGS="$gl_save_CFLAGS" - ]) - - if test "$gl_cv_cc_nomfi_supported" = yes; then - dnl Now check whether -Wno-missing-field-initializers is needed - dnl for the { 0, } construct. - AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], - [gl_cv_cc_nomfi_needed], - [gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[int f (void) - { - typedef struct { int a; int b; } s_t; - s_t s1 = { 0, }; - return s1.b; - } - ]], - [[]])], - [gl_cv_cc_nomfi_needed=no], - [gl_cv_cc_nomfi_needed=yes]) - CFLAGS="$gl_save_CFLAGS" - ]) - fi - - dnl Next, check if -Werror -Wuninitialized is useful with the - dnl user's choice of $CFLAGS; some versions of gcc warn that it - dnl has no effect if -O is not also used - AC_CACHE_CHECK([whether -Wuninitialized is supported], - [gl_cv_cc_uninitialized_supported], - [gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wuninitialized" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_uninitialized_supported=yes], - [gl_cv_cc_uninitialized_supported=no]) - CFLAGS="$gl_save_CFLAGS" - ]) - - fi - - # List all gcc warning categories. - # To compare this list to your installed GCC's, run this Bash command: - # - # comm -3 \ - # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ - # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \ - # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) - - gl_manywarn_set= - for gl_manywarn_item in -fno-common \ - -W \ - -Wabsolute-value \ - -Waddress \ - -Waddress-of-packed-member \ - -Waggressive-loop-optimizations \ - -Wall \ - -Wattribute-warning \ - -Wattributes \ - -Wbad-function-cast \ - -Wbool-compare \ - -Wbool-operation \ - -Wbuiltin-declaration-mismatch \ - -Wbuiltin-macro-redefined \ - -Wcannot-profile \ - -Wcast-align \ - -Wcast-align=strict \ - -Wcast-function-type \ - -Wchar-subscripts \ - -Wclobbered \ - -Wcomment \ - -Wcomments \ - -Wcoverage-mismatch \ - -Wcpp \ - -Wdangling-else \ - -Wdate-time \ - -Wdeprecated \ - -Wdeprecated-declarations \ - -Wdesignated-init \ - -Wdisabled-optimization \ - -Wdiscarded-array-qualifiers \ - -Wdiscarded-qualifiers \ - -Wdiv-by-zero \ - -Wdouble-promotion \ - -Wduplicated-branches \ - -Wduplicated-cond \ - -Wduplicate-decl-specifier \ - -Wempty-body \ - -Wendif-labels \ - -Wenum-compare \ - -Wexpansion-to-defined \ - -Wextra \ - -Wformat-contains-nul \ - -Wformat-extra-args \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-signedness \ - -Wformat-y2k \ - -Wformat-zero-length \ - -Wframe-address \ - -Wfree-nonheap-object \ - -Whsa \ - -Wif-not-aligned \ - -Wignored-attributes \ - -Wignored-qualifiers \ - -Wimplicit \ - -Wimplicit-function-declaration \ - -Wimplicit-int \ - -Wincompatible-pointer-types \ - -Winit-self \ - -Winline \ - -Wint-conversion \ - -Wint-in-bool-context \ - -Wint-to-pointer-cast \ - -Winvalid-memory-model \ - -Winvalid-pch \ - -Wlogical-not-parentheses \ - -Wlogical-op \ - -Wmain \ - -Wmaybe-uninitialized \ - -Wmemset-elt-size \ - -Wmemset-transposed-args \ - -Wmisleading-indentation \ - -Wmissing-attributes \ - -Wmissing-braces \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-include-dirs \ - -Wmissing-parameter-type \ - -Wmissing-profile \ - -Wmissing-prototypes \ - -Wmultichar \ - -Wmultistatement-macros \ - -Wnarrowing \ - -Wnested-externs \ - -Wnonnull \ - -Wnonnull-compare \ - -Wnull-dereference \ - -Wodr \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wopenmp-simd \ - -Woverflow \ - -Woverlength-strings \ - -Woverride-init \ - -Wpacked \ - -Wpacked-bitfield-compat \ - -Wpacked-not-aligned \ - -Wparentheses \ - -Wpointer-arith \ - -Wpointer-compare \ - -Wpointer-sign \ - -Wpointer-to-int-cast \ - -Wpragmas \ - -Wpsabi \ - -Wrestrict \ - -Wreturn-local-addr \ - -Wreturn-type \ - -Wscalar-storage-order \ - -Wsequence-point \ - -Wshadow \ - -Wshift-count-negative \ - -Wshift-count-overflow \ - -Wshift-negative-value \ - -Wsizeof-array-argument \ - -Wsizeof-pointer-div \ - -Wsizeof-pointer-memaccess \ - -Wstack-protector \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wstrict-prototypes \ - -Wstringop-truncation \ - -Wsuggest-attribute=cold \ - -Wsuggest-attribute=const \ - -Wsuggest-attribute=format \ - -Wsuggest-attribute=malloc \ - -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure \ - -Wsuggest-final-methods \ - -Wsuggest-final-types \ - -Wswitch \ - -Wswitch-bool \ - -Wswitch-unreachable \ - -Wsync-nand \ - -Wsystem-headers \ - -Wtautological-compare \ - -Wtrampolines \ - -Wtrigraphs \ - -Wtype-limits \ - -Wuninitialized \ - -Wunknown-pragmas \ - -Wunsafe-loop-optimizations \ - -Wunused \ - -Wunused-but-set-parameter \ - -Wunused-but-set-variable \ - -Wunused-function \ - -Wunused-label \ - -Wunused-local-typedefs \ - -Wunused-macros \ - -Wunused-parameter \ - -Wunused-result \ - -Wunused-value \ - -Wunused-variable \ - -Wvarargs \ - -Wvariadic-macros \ - -Wvector-operation-performance \ - -Wvla \ - -Wvolatile-register-var \ - -Wwrite-strings \ - \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - - # gcc --help=warnings outputs an unusual form for these options; list - # them here so that the above 'comm' command doesn't report a false match. - # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal. - # Also, AC_COMPUTE_INT requires it to fit in a long; it is 2**63 on - # the only platforms where it does not fit in a long, so make that - # a special case. - AC_MSG_CHECKING([max safe object size]) - AC_COMPUTE_INT([gl_alloc_max], - [LONG_MAX < (PTRDIFF_MAX < (size_t) -1 ? PTRDIFF_MAX : (size_t) -1) - ? -1 - : PTRDIFF_MAX < (size_t) -1 ? (long) PTRDIFF_MAX : (long) (size_t) -1], - [[#include <limits.h> - #include <stddef.h> - #include <stdint.h> - ]], - [gl_alloc_max=2147483647]) - case $gl_alloc_max in - -1) gl_alloc_max=9223372036854775807;; - esac - AC_MSG_RESULT([$gl_alloc_max]) - gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$gl_alloc_max" - gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" - gl_manywarn_set="$gl_manywarn_set -Wattribute-alias=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-truncation=2" - gl_manywarn_set="$gl_manywarn_set -Wimplicit-fallthrough=5" - gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" - gl_manywarn_set="$gl_manywarn_set -Wshift-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wstringop-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wunused-const-variable=2" - gl_manywarn_set="$gl_manywarn_set -Wvla-larger-than=4031" - - # These are needed for older GCC versions. - if test -n "$GCC"; then - case `($CC --version) 2>/dev/null` in - 'gcc (GCC) '[[0-3]].* | \ - 'gcc (GCC) '4.[[0-7]].*) - gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" - gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" - ;; - esac - fi - - # Disable specific options as needed. - if test "$gl_cv_cc_nomfi_needed" = yes; then - gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" - fi - - if test "$gl_cv_cc_uninitialized_supported" = no; then - gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" - fi - - $1=$gl_manywarn_set - - AC_LANG_POP([C]) -]) - -# Specialization for _AC_LANG = C++. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_MANYWARN_ALL_GCC(C++)], -[ - gl_MANYWARN_ALL_GCC_CXX_IMPL([$1]) -]) diff --git a/meson.build b/meson.build index be5e64fc6d2..d9a95e049c0 100644 --- a/meson.build +++ b/meson.build @@ -201,6 +201,198 @@ libvirt_revision = arr_version[2].to_int() libvirt_lib_version = '@0@.@1@.@2@'.format(libvirt_so_version, libvirt_age, libvirt_revision) +# check compile flags + +cc = meson.get_compiler('c') + +cc_flags = [ + '-fno-common', + '-W', + '-Wabsolute-value', + '-Waddress', + '-Waddress-of-packed-member', + '-Waggressive-loop-optimizations', + '-Wall', + '-Wattribute-warning', + '-Wattributes', + '-Wbad-function-cast', + '-Wbool-compare', + '-Wbool-operation', + '-Wbuiltin-declaration-mismatch', + '-Wbuiltin-macro-redefined', + '-Wcannot-profile', + '-Wcast-align', + '-Wcast-align=strict', + '-Wcast-function-type', + '-Wchar-subscripts', + '-Wclobbered', + '-Wcomment', + '-Wcomments', + '-Wcoverage-mismatch', + '-Wcpp', + '-Wdangling-else', + '-Wdate-time', + '-Wdeprecated', + '-Wdeprecated-declarations', + '-Wdesignated-init', + '-Wdisabled-optimization', + '-Wdiscarded-array-qualifiers', + '-Wdiscarded-qualifiers', + '-Wdiv-by-zero', + '-Wdouble-promotion', + '-Wduplicated-branches', + '-Wduplicated-cond', + '-Wduplicate-decl-specifier', + '-Wempty-body', + '-Wendif-labels', + '-Wenum-compare', + '-Wexpansion-to-defined', + '-Wextra', + '-Wformat-contains-nul', + '-Wformat-extra-args', + '-Wformat-nonliteral', + '-Wformat-security', + '-Wformat-signedness', + '-Wformat-y2k', + '-Wformat-zero-length', + '-Wframe-address', + '-Wfree-nonheap-object', + '-Whsa', + '-Wif-not-aligned', + '-Wignored-attributes', + '-Wignored-qualifiers', + '-Wimplicit', + '-Wimplicit-function-declaration', + '-Wimplicit-int', + '-Wincompatible-pointer-types', + '-Winit-self', + '-Winline', + '-Wint-conversion', + '-Wint-in-bool-context', + '-Wint-to-pointer-cast', + '-Winvalid-memory-model', + '-Winvalid-pch', + '-Wlogical-not-parentheses', + '-Wlogical-op', + '-Wmain', + '-Wmaybe-uninitialized', + '-Wmemset-elt-size', + '-Wmemset-transposed-args', + '-Wmisleading-indentation', + '-Wmissing-attributes', + '-Wmissing-braces', + '-Wmissing-declarations', + '-Wmissing-field-initializers', + '-Wmissing-include-dirs', + '-Wmissing-parameter-type', + '-Wmissing-profile', + '-Wmissing-prototypes', + '-Wmultichar', + '-Wmultistatement-macros', + '-Wnarrowing', + '-Wnested-externs', + '-Wnonnull', + '-Wnonnull-compare', + '-Wnull-dereference', + '-Wodr', + '-Wold-style-declaration', + '-Wold-style-definition', + '-Wopenmp-simd', + '-Woverflow', + '-Woverlength-strings', + '-Woverride-init', + '-Wpacked', + '-Wpacked-bitfield-compat', + '-Wpacked-not-aligned', + '-Wparentheses', + '-Wpointer-arith', + '-Wpointer-compare', + '-Wpointer-sign', + '-Wpointer-to-int-cast', + '-Wpragmas', + '-Wpsabi', + '-Wrestrict', + '-Wreturn-local-addr', + '-Wreturn-type', + '-Wscalar-storage-order', + '-Wsequence-point', + '-Wshadow', + '-Wshift-count-negative', + '-Wshift-count-overflow', + '-Wshift-negative-value', + '-Wsizeof-array-argument', + '-Wsizeof-pointer-div', + '-Wsizeof-pointer-memaccess', + '-Wstack-protector', + '-Wstrict-aliasing', + '-Wstrict-overflow', + '-Wstrict-prototypes', + '-Wstringop-truncation', + '-Wsuggest-attribute=cold', + '-Wsuggest-attribute=const', + '-Wsuggest-attribute=format', + '-Wsuggest-attribute=malloc', + '-Wsuggest-attribute=noreturn', + '-Wsuggest-attribute=pure', + '-Wsuggest-final-methods', + '-Wsuggest-final-types', + '-Wswitch', + '-Wswitch-bool', + '-Wswitch-unreachable', + '-Wsync-nand', + '-Wsystem-headers', + '-Wtautological-compare', + '-Wtrampolines', + '-Wtrigraphs', + '-Wtype-limits', + '-Wuninitialized', + '-Wunknown-pragmas', + '-Wunsafe-loop-optimizations', + '-Wunused', + '-Wunused-but-set-parameter', + '-Wunused-but-set-variable', + '-Wunused-function', + '-Wunused-label', + '-Wunused-local-typedefs', + '-Wunused-macros', + '-Wunused-parameter', + '-Wunused-result', + '-Wunused-value', + '-Wunused-variable', + '-Wvarargs', + '-Wvariadic-macros', + '-Wvector-operation-performance', + '-Wvla', + '-Wvolatile-register-var', + '-Wwrite-strings', +] + +# gcc --help=warnings outputs +ptrdiff_max = cc.sizeof('ptrdiff_t', prefix: '#include <stddef.h>') +size_max = cc.sizeof('size_t', prefix: '#include <stdint.h>') +# Compute max safe object size by checking ptrdiff_t and size_t sizes. +# Ideally we would get PTRDIFF_MAX and SIZE_MAX values but it would +# give us (2147483647L) and we would have to remove the () and the suffix +# in order to convert it to numbers to be able to pick the smaller one. +alloc_max = run_command( + 'python3', '-c', + 'print(min(2**@0@ - 1, 2**@1@ - 1))'.format(ptrdiff_max * 8 - 1, size_max * 8), +) +cc_flags += [ + '-Walloc-size-larger-than=@0@'.format(alloc_max.stdout().strip()), + '-Warray-bounds=2', + '-Wattribute-alias=2', + '-Wformat-overflow=2', + '-Wformat-truncation=2', + '-Wimplicit-fallthrough=5', + '-Wnormalized=nfc', + '-Wshift-overflow=2', + '-Wstringop-overflow=2', + '-Wunused-const-variable=2', + '-Wvla-larger-then=4031', +] + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- config.h | 7 + configure.ac | 3 - m4/virt-compile-warnings.m4 | 255 ------------------------------------ m4/virt-warnings.m4 | 115 ---------------- meson.build | 221 ++++++++++++++++++++++++++++--- 5 files changed, 211 insertions(+), 390 deletions(-) delete mode 100644 m4/virt-compile-warnings.m4 delete mode 100644 m4/virt-warnings.m4 diff --git a/config.h b/config.h index 9c433ad4c0f..368688f3d01 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,12 @@ #include <meson-config.h> +/* Enable compile-time and run-time bounds-checking, and some warnings, + * without upsetting newer glibc. */ + +#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ +# define _FORTIFY_SOURCE 2 +#endif + #ifndef __GNUC__ # error "Libvirt requires GCC >= 4.8, or CLang" #endif diff --git a/configure.ac b/configure.ac index 8f16b364de6..56a471fc3ab 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,6 @@ fi # Check for compiler and library settings. -LIBVIRT_COMPILE_WARNINGS LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_LINKER_NO_UNDEFINED @@ -849,8 +848,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG -LIBVIRT_RESULT([Use -Werror], [$enable_werror]) -LIBVIRT_RESULT([Warning Flags], [$WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 deleted file mode 100644 index d3538d59f82..00000000000 --- a/m4/virt-compile-warnings.m4 +++ /dev/null @@ -1,255 +0,0 @@ -dnl -dnl Enable all known GCC compiler warnings, except for those -dnl we can't yet cope with -dnl -AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - LIBVIRT_ARG_ENABLE([WERROR], [Use -Werror (if supported)], [check]) - if test "$enable_werror" = "check"; then - if test -d $srcdir/.git; then - is_git_version=true - enable_werror=yes - else - enable_werror=no - fi - fi - - # List of warnings that are not relevant / wanted - - # Don't care about C++ compiler compat - dontwarn="$dontwarn -Wc++-compat" - dontwarn="$dontwarn -Wabi" - dontwarn="$dontwarn -Wdeprecated" - # Don't care about ancient C standard compat - dontwarn="$dontwarn -Wtraditional" - # Don't care about ancient C standard compat - dontwarn="$dontwarn -Wtraditional-conversion" - # Ignore warnings in /usr/include - dontwarn="$dontwarn -Wsystem-headers" - # Happy for compiler to add struct padding - dontwarn="$dontwarn -Wpadded" - # GCC very confused with -O2 - dontwarn="$dontwarn -Wunreachable-code" - # Too many to deal with - dontwarn="$dontwarn -Wconversion" - # Too many to deal with - dontwarn="$dontwarn -Wsign-conversion" - # Need to allow bad cast for execve() - dontwarn="$dontwarn -Wcast-qual" - # We need to use long long in many places - dontwarn="$dontwarn -Wlong-long" - # We allow manual list of all enum cases without default: - dontwarn="$dontwarn -Wswitch-default" - # Not a problem since we don't use -fstrict-overflow - dontwarn="$dontwarn -Wstrict-overflow" - # Not a problem since we don't use -funsafe-loop-optimizations - dontwarn="$dontwarn -Wunsafe-loop-optimizations" - # 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 - dontwarn="$dontwarn -Wformat-signedness" - # Several conditionals expand the same on both branches - # depending on the particular platform/architecture - dontwarn="$dontwarn -Wduplicated-branches" - # > This warning does not generally indicate that there is anything wrong - # > with your code; it merely indicates that GCC's optimizers are unable - # > to handle the code effectively. - # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html - dontwarn="$dontwarn -Wdisabled-optimization" - # Various valid glib APIs/macros trigger this warning - dontwarn="$dontwarn -Wbad-function-cast" - - # Broken in 6.0 and later - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 - AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op], - [lv_cv_gcc_wlogical_op_equal_expr_broken], [ - save_CFLAGS="$CFLAGS" - CFLAGS="-O2 -Wlogical-op -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define TEST1 1 - #define TEST2 TEST1 - ]], [[ - int test = 0; - return test == TEST1 || test == TEST2;]])], - [lv_cv_gcc_wlogical_op_equal_expr_broken=no], - [lv_cv_gcc_wlogical_op_equal_expr_broken=yes]) - CFLAGS="$save_CFLAGS"]) - - AC_CACHE_CHECK([whether clang gives bogus warnings for -Wdouble-promotion], - [lv_cv_clang_double_promotion_broken], [ - save_CFLAGS="$CFLAGS" - CFLAGS="-O2 -Wdouble-promotion -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <math.h> - ]], [[ - float f = 0.0; - return isnan(f);]])], - [lv_cv_clang_double_promotion_broken=no], - [lv_cv_clang_double_promotion_broken=yes]) - CFLAGS="$save_CFLAGS"]) - - if test "$lv_cv_clang_double_promotion_broken" = "yes"; - then - dontwarn="$dontwarn -Wdouble-promotion" - fi - - # Clang complains about unused static inline functions - # which are common with G_DEFINE_AUTOPTR_CLEANUP_FUNC - AC_CACHE_CHECK([whether clang gives bogus warnings for -Wunused-function], - [lv_cv_clang_unused_function_broken], [ - save_CFLAGS="$CFLAGS" - CFLAGS="-Wunused-function -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - static inline void foo(void) {} - ]], [[ - return 0]])], - [lv_cv_clang_unused_function_broken=no], - [lv_cv_clang_unused_function_broken=yes]) - CFLAGS="$save_CFLAGS"]) - - # We might fundamentally need some of these disabled forever, but - # ideally we'd turn many of them on - dontwarn="$dontwarn -Wfloat-equal" - dontwarn="$dontwarn -Wdeclaration-after-statement" - dontwarn="$dontwarn -Wpacked" - dontwarn="$dontwarn -Wunused-macros" - dontwarn="$dontwarn -Woverlength-strings" - dontwarn="$dontwarn -Wstack-protector" - dontwarn="$dontwarn -Wsuggest-attribute=malloc" - - # Get all possible GCC warnings - gl_MANYWARN_ALL_GCC([maybewarn]) - - # Remove the ones we don't want, blacklisted earlier - gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn]) - - # -Wunused-functin is implied by -Wall we must turn it - # off explicitly. - if test "$lv_cv_clang_unused_function_broken" = "yes"; - then - wantwarn="$wantwarn -Wno-unused-function" - fi - - # 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... - wantwarn="$wantwarn -Wno-sign-compare" - # We do "bad" function casts all the time for event callbacks - wantwarn="$wantwarn -Wno-cast-function-type" - - # CLang incorrectly complains about dup typedefs win gnu99 mode - # so use this CLang-specific arg to keep it quiet - wantwarn="$wantwarn -Wno-typedef-redefinition" - - # 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" - - # manywarnings explicitly filters it out, preferring -Wswitch - # but that doesn't report missing enums if a default: - # is present. - wantwarn="$wantwarn -Wswitch-enum" - - # manywarnings turns on -Wformat=2 which implies -Wformat-nonliteral, - # so we need to manually re-exclude it. - wantwarn="$wantwarn -Wno-format-nonliteral" - - # -Wformat enables this by default, and we should keep it, - # but need to rewrite various areas of code first - wantwarn="$wantwarn -Wno-format-truncation" - - # This should be < 256 really. Currently we're down to 4096, - # but using 1024 bytes sized buffers (mostly for virStrerror) - # stops us from going down further - wantwarn="$wantwarn -Wframe-larger-than=4096" - gl_WARN_ADD([-Wframe-larger-than=262144], [RELAXED_FRAME_LIMIT_CFLAGS]) - - # Extra special flags - dnl -fstack-protector stuff passes gl_WARN_ADD with gcc - dnl on Mingw32, but fails when actually used - case $host in - aarch64-*-*) - dnl "error: -fstack-protector not supported for this target [-Werror]" - ;; - *-*-linux*) - dnl Prefer -fstack-protector-strong if it's available. - dnl There doesn't seem to be great overhead in adding - dnl -fstack-protector-all instead of -fstack-protector. - dnl - dnl We also don't need ssp-buffer-size with -all or -strong, - dnl since functions are protected regardless of buffer size. - dnl wantwarn="$wantwarn --param=ssp-buffer-size=4" - wantwarn="$wantwarn -fstack-protector-strong" - ;; - *-*-freebsd*) - dnl FreeBSD ships old gcc 4.2.1 which doesn't handle - dnl -fstack-protector-all well - wantwarn="$wantwarn -fstack-protector" - - wantwarn="$wantwarn -Wno-unused-command-line-argument" - ;; - esac - wantwarn="$wantwarn -fexceptions" - wantwarn="$wantwarn -fasynchronous-unwind-tables" - - # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure - # fire even without -O. - wantwarn="$wantwarn -fipa-pure-const" - # We should eventually enable this, but right now there are at - # least 75 functions triggering warnings. - wantwarn="$wantwarn -Wno-suggest-attribute=pure" - wantwarn="$wantwarn -Wno-suggest-attribute=const" - - if test "$enable_werror" = "yes" - then - wantwarn="$wantwarn -Werror" - fi - - # Request the gnu99 standard which is the best choice with - # gcc 4.8.0. Not a warning flag, but the probing mechanism - # is convenient - wantwarn="$wantwarn -std=gnu99" - - # Check for $CC support of each warning - for w in $wantwarn; do - gl_WARN_ADD([$w]) - done - - case $host in - *-*-linux*) - dnl Fall back to -fstack-protector-all if -strong is not available - case $WARN_CFLAGS in - *-fstack-protector-strong*) - ;; - *) - gl_WARN_ADD([-fstack-protector-all]) - ;; - esac - ;; - esac - - case $WARN_CFLAGS in - *-Wsuggest-attribute=format*) - AC_DEFINE([HAVE_SUGGEST_ATTRIBUTE_FORMAT], [1], [Whether -Wsuggest-attribute=format works]) - ;; - esac - - # Use security checked glibc headers - AH_VERBATIM([FORTIFY_SOURCE], - [/* Enable compile-time and run-time bounds-checking, and some warnings, - without upsetting newer glibc. */ - #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ - # define _FORTIFY_SOURCE 2 - #endif - ]) - - if test "$gl_cv_warn_c__Wlogical_op" = yes && - test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1, - [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal expr]) - fi -]) diff --git a/m4/virt-warnings.m4 b/m4/virt-warnings.m4 deleted file mode 100644 index d272365f0a1..00000000000 --- a/m4/virt-warnings.m4 +++ /dev/null @@ -1,115 +0,0 @@ -# warnings.m4 serial 14 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# gl_AS_VAR_APPEND(VAR, VALUE) -# ---------------------------- -# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it. -m4_ifdef([AS_VAR_APPEND], -[m4_copy([AS_VAR_APPEND], [gl_AS_VAR_APPEND])], -[m4_define([gl_AS_VAR_APPEND], -[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) - - -# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], -# [PROGRAM = AC_LANG_PROGRAM()]) -# ----------------------------------------------------------------- -# Check if the compiler supports OPTION when compiling PROGRAM. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_COMPILER_OPTION_IF], -[ -dnl FIXME: gl_Warn must be used unquoted until we can assume Autoconf -dnl 2.64 or newer. -AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl -AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl -AS_LITERAL_IF([$1], - [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], - [gl_positive="$1" -case $gl_positive in - -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; -esac -m4_pushdef([gl_Positive], [$gl_positive])])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ - gl_save_compiler_FLAGS="$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), - [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) - AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) - gl_Flags="$gl_save_compiler_FLAGS" -]) -AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) -m4_popdef([gl_Positive])dnl -AS_VAR_POPDEF([gl_Flags])dnl -AS_VAR_POPDEF([gl_Warn])dnl -]) - -# gl_UNKNOWN_WARNINGS_ARE_ERRORS -# ------------------------------ -# Clang doesn't complain about unknown warning options unless one also -# specifies -Wunknown-warning-option -Werror. Detect this. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], -[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) - -# Specialization for _AC_LANG = C. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], -[ - AC_LANG_PUSH([C]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([C]) -]) - -# Specialization for _AC_LANG = C++. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], -[ - AC_LANG_PUSH([C++]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([C++]) -]) - -# Specialization for _AC_LANG = Objective C. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)], -[ - AC_LANG_PUSH([Objective C]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([Objective C]) -]) - -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL], -[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], - [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], - [gl_unknown_warnings_are_errors=])]) - -# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS/WARN_CXXFLAGS], -# [PROGRAM = AC_LANG_PROGRAM()]) -# ----------------------------------------------------------- -# Adds parameter to WARN_CFLAGS/WARN_CXXFLAGS if the compiler supports it -# when compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). -# -# If VARIABLE is a variable name, AC_SUBST it. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_WARN_ADD], -[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS(]_AC_LANG[)]) -gl_COMPILER_OPTION_IF([$1], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_]_AC_LANG_PREFIX[FLAGS]], [[$2]]), [" $1"])], - [], - [$3]) -m4_ifval([$2], - [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], - [AC_SUBST([WARN_]_AC_LANG_PREFIX[FLAGS])])dnl -]) - -# Local Variables: -# mode: autoconf -# End: diff --git a/meson.build b/meson.build index d9a95e049c0..2450a8bdd79 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,7 @@ project( 'buildtype=debugoptimized', 'b_pie=true', 'c_std=gnu99', + 'warning_level=2', ], ) @@ -212,10 +213,8 @@ cc_flags = [ '-Waddress', '-Waddress-of-packed-member', '-Waggressive-loop-optimizations', - '-Wall', '-Wattribute-warning', '-Wattributes', - '-Wbad-function-cast', '-Wbool-compare', '-Wbool-operation', '-Wbuiltin-declaration-mismatch', @@ -232,27 +231,20 @@ cc_flags = [ '-Wcpp', '-Wdangling-else', '-Wdate-time', - '-Wdeprecated', '-Wdeprecated-declarations', '-Wdesignated-init', - '-Wdisabled-optimization', '-Wdiscarded-array-qualifiers', '-Wdiscarded-qualifiers', '-Wdiv-by-zero', - '-Wdouble-promotion', - '-Wduplicated-branches', '-Wduplicated-cond', '-Wduplicate-decl-specifier', '-Wempty-body', '-Wendif-labels', - '-Wenum-compare', '-Wexpansion-to-defined', - '-Wextra', '-Wformat-contains-nul', '-Wformat-extra-args', '-Wformat-nonliteral', '-Wformat-security', - '-Wformat-signedness', '-Wformat-y2k', '-Wformat-zero-length', '-Wframe-address', @@ -299,9 +291,7 @@ cc_flags = [ '-Wold-style-definition', '-Wopenmp-simd', '-Woverflow', - '-Woverlength-strings', '-Woverride-init', - '-Wpacked', '-Wpacked-bitfield-compat', '-Wpacked-not-aligned', '-Wparentheses', @@ -323,15 +313,12 @@ cc_flags = [ '-Wsizeof-array-argument', '-Wsizeof-pointer-div', '-Wsizeof-pointer-memaccess', - '-Wstack-protector', '-Wstrict-aliasing', - '-Wstrict-overflow', '-Wstrict-prototypes', '-Wstringop-truncation', '-Wsuggest-attribute=cold', '-Wsuggest-attribute=const', '-Wsuggest-attribute=format', - '-Wsuggest-attribute=malloc', '-Wsuggest-attribute=noreturn', '-Wsuggest-attribute=pure', '-Wsuggest-final-methods', @@ -340,21 +327,18 @@ cc_flags = [ '-Wswitch-bool', '-Wswitch-unreachable', '-Wsync-nand', - '-Wsystem-headers', '-Wtautological-compare', '-Wtrampolines', '-Wtrigraphs', '-Wtype-limits', '-Wuninitialized', '-Wunknown-pragmas', - '-Wunsafe-loop-optimizations', '-Wunused', '-Wunused-but-set-parameter', '-Wunused-but-set-variable', '-Wunused-function', '-Wunused-label', '-Wunused-local-typedefs', - '-Wunused-macros', '-Wunused-parameter', '-Wunused-result', '-Wunused-value', @@ -392,6 +376,203 @@ cc_flags += [ '-Wvla-larger-then=4031', ] +cc_flags += [ + # So we have -W enabled, and then have to explicitly turn off... + '-Wno-sign-compare', + + # We do "bad" function casts all the time for event callbacks + '-Wno-cast-function-type', + + # CLang incorrectly complains about dup typedefs win gnu99 mode + # so use this CLang-specific arg to keep it quiet + '-Wno-typedef-redefinition', + + # We don't use -Wc++-compat so we have to enable it explicitly + '-Wjump-misses-init', + + # TODO comment + '-Wswitch-enum', + + # -Wformat=2 implies -Wformat-nonliteral so we need to manually exclude it + '-Wno-format-nonliteral', + + # -Wformat enables this by default, and we should keep it, + # but need to rewrite various areas of code first + '-Wno-format-truncation', + + # This should be < 256 really. Currently we're down to 4096, + # but using 1024 bytes sized buffers (mostly for virStrerror) + # stops us from going down further + '-Wframe-larger-than=4096', + + # extra special flags + '-fexceptions', + '-fasynchronous-unwind-tables', + + # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure + # fire even without -O. + '-fipa-pure-const', + + # We should eventually enable this, but right now there are at + # least 75 functions triggering warnings. + '-Wno-suggest-attribute=pure', + '-Wno-suggest-attribute=const', +] + +if git + cc_flags += [ '-Werror' ] +endif + +# on aarch64 error: -fstack-protector not supported for this target +# on mingw32 it is supported but fails when actually used +if host_machine.cpu_family() != 'aarch64' + if host_machine.system() in [ 'linux', 'freebsd' ] + # we prefer -fstack-protector-strong but fallback to -fstack-protector-all + cc_flags += cc.first_supported_argument([ + '-fstack-protector-strong', + '-fstack-protector-all', + ]) + endif +endif + +if cc.has_argument('-Wlogical-op') + # Broken in 6.0 and later + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 + w_logical_op_args = ['-O2', '-Wlogical-op', '-Werror'] + w_logical_op_code = ''' + #define TEST1 1 + #define TEST2 TEST1 + + int main(void) { + int test = 0; + return test == TEST1 || test == TEST2; + } + ''' + if not cc.compiles(w_logical_op_code, args: w_logical_op_args) + conf.set('BROKEN_GCC_WLOGICALOP_EQUAL_EXPR', 1) + endif +endif + +# Check whether clang gives bogus warning for -Wdouble-promotion. +w_double_promotion_args = ['-O2', '-Wdouble-promotion', '-Werror'] +w_double_promotion_code = ''' + #include <math.h> + + int main(void) { + float f = 0.0; + return isnan(f); + } +''' +if cc.compiles(w_double_promotion_code, args: w_double_promotion_args, name: '-Wdouble-promotion') + cc_flags += ['-Wdouble-promotion'] +endif + +# Clang complains about unused static inline functions which are common +# with G_DEFINE_AUTOPTR_CLEANUP_FUNC. +w_unused_function_args = ['-Wunused-function', '-Werror'] +w_unused_function_code = ''' + static inline void foo(void) {} + + int main(void) { return 0; } +''' +# -Wunused-function is implied by -Wall, we must turn it off explicitly. +if not cc.compiles(w_unused_function_code, args: w_unused_function_args) + cc_flags += ['-Wno-unused-function'] +endif + +cc_flags_disabled = [ + # In meson this is specified using 'c_std=gnu99' in project() function. + '-std=gnu99', + + # In meson this is specified using 'warning_level=2' in project() function. + '-Wall', + '-Wextra', + + # don't care about C++ compiler compat + '-Wc++-compat', + '-Wabi', + '-Wdeprecated', + + # Don't care about ancient C standard compat + '-Wtraditional', + '-Wtraditional-conversion', + + # Ignore warnings in /usr/include + '-Wsystem-headers', + + # Happy for compiler to add struct padding + '-Wpadded', + + # GCC very confused with -O2 + '-Wunreachable-code', + + # Too many to deal with + '-Wconversion', + '-Wsign-conversion', + + # Need to allow bad cast for execve() + '-Wcast-qual', + + # We need to use long long in many places + '-Wlong-long', + + # We allow manual list of all enum cases without default + '-Wswitch-default', + + # Not a problem since we don't use -fstrict-overflow + '-Wstrict-overflow', + + # Not a problem since we don't use -funsafe-loop-optimizations + '-Wunsafe-loop-optimizations', + + # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall + '-Wenum-compare', + + # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time + '-Wformat-signedness', + + # Several conditionals expand the same on both branches depending on the + # particular platform/architecture + '-Wduplicated-branches', + + # > This warning does not generally indicate that there is anything wrong + # > with your code; it merely indicates that GCC's optimizers are unable + # > to handle the code effectively. + # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html + '-Wdisabled-optimization', + + # Various valid glib APIs/macros trigger this warning + '-Wbad-function-cast', + + # We might fundamentally need some of these disabled forever, but + # ideally we'd turn many of them on + '-Wfloat-equal', + '-Wdeclaration-after-statement', + '-Wpacked', + '-Wunused-macros', + '-Woverlength-strings', + '-Wstack-protector', + '-Wsuggest-attribute=malloc', +] + +foreach flag : cc_flags_disabled + if cc_flags.contains(flag) + error('@0@ is disabled but listed in cc_flags'.format(flag)) + endif +endforeach + +supported_cc_flags = cc.get_supported_arguments(cc_flags) +add_project_arguments(supported_cc_flags, language: 'c') + +if cc.has_argument('-Wsuggest-attribute=format') + conf.set('HAVE_SUGGEST_ATTRIBUTE_FORMAT', 1) +endif + +# used in tests +cc_flags_relaxed_frame_limit = [ + '-Wframe-larger-than=262144', +] + # define top include directory @@ -408,3 +589,9 @@ test_summary = { 'Coverage': coverage_flags.length() > 0, } summary(test_summary, section: 'Test suite', bool_yn: true) + +misc_summary = { + 'Use -Werror': cc_flags.contains('-Werror'), + 'Warning Flags': supported_cc_flags, +} +summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 41 -------------------------------- m4/virt-linker-no-indirect.m4 | 32 ------------------------- m4/virt-linker-no-undefined.m4 | 32 ------------------------- m4/virt-linker-relro.m4 | 35 --------------------------- meson.build | 43 ++++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 140 deletions(-) delete mode 100644 m4/virt-linker-no-indirect.m4 delete mode 100644 m4/virt-linker-no-undefined.m4 delete mode 100644 m4/virt-linker-relro.m4 diff --git a/configure.ac b/configure.ac index 56a471fc3ab..cb1aed73828 100644 --- a/configure.ac +++ b/configure.ac @@ -64,43 +64,6 @@ m4_ifndef([LT_INIT], [ AM_PROG_CC_C_O AM_PROG_LD -AC_MSG_CHECKING([for how to mark DSO non-deletable at runtime]) -LIBVIRT_NODELETE= -`$LD --help 2>&1 | grep -- "-z nodelete" >/dev/null` && \ - LIBVIRT_NODELETE="-Wl,-z -Wl,nodelete" -AC_MSG_RESULT([$LIBVIRT_NODELETE]) -AC_SUBST([LIBVIRT_NODELETE]) - -AC_MSG_CHECKING([for how to set DSO symbol versions]) -case "$host" in - *-*-mingw* | *-*-msvc* ) - # 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 - VERSION_SCRIPT_FLAGS="-Wl," - ;; - * ) - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," - ;; -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 @@ -161,10 +124,6 @@ fi # Check for compiler and library settings. -LIBVIRT_LINKER_RELRO -LIBVIRT_LINKER_NO_INDIRECT -LIBVIRT_LINKER_NO_UNDEFINED - LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT diff --git a/m4/virt-linker-no-indirect.m4 b/m4/virt-linker-no-indirect.m4 deleted file mode 100644 index b344f708539..00000000000 --- a/m4/virt-linker-no-indirect.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl -dnl Check for --no-copy-dt-needed-entries -dnl -dnl Copyright (C) 2013 Guido Günther <agx@sigxcpu.org> -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_LINKER_NO_INDIRECT],[ - AC_MSG_CHECKING([for how to avoid indirect lib deps]) - - NO_INDIRECT_LDFLAGS= - case `$LD --help 2>&1` in - *"--no-copy-dt-needed-entries"*) - NO_INDIRECT_LDFLAGS="-Wl,--no-copy-dt-needed-entries" ;; - esac - AC_SUBST([NO_INDIRECT_LDFLAGS]) - - AC_MSG_RESULT([$NO_INDIRECT_LDFLAGS]) -]) diff --git a/m4/virt-linker-no-undefined.m4 b/m4/virt-linker-no-undefined.m4 deleted file mode 100644 index 532b0de212c..00000000000 --- a/m4/virt-linker-no-undefined.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl -dnl Check for -z defs linker flag -dnl -dnl Copyright (C) 2013-2018 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_LINKER_NO_UNDEFINED],[ - AC_MSG_CHECKING([for how to stop undefined symbols at link time]) - - NO_UNDEFINED_LDFLAGS= - ld_help=`$LD --help 2>&1` - case $ld_help in - *"-z defs"*) NO_UNDEFINED_LDFLAGS="-Wl,-z -Wl,defs" ;; - esac - AC_SUBST([NO_UNDEFINED_LDFLAGS]) - - AC_MSG_RESULT([$NO_UNDEFINED_LDFLAGS]) -]) diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4 deleted file mode 100644 index 079a095feed..00000000000 --- a/m4/virt-linker-relro.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl -dnl Check for -z now and -z relro linker flags -dnl -dnl Copyright (C) 2013 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_LINKER_RELRO],[ - AC_MSG_CHECKING([for how to force completely read-only GOT table]) - - RELRO_LDFLAGS= - ld_help=`$LD --help 2>&1` - case $ld_help in - *"-z relro"*) RELRO_LDFLAGS="-Wl,-z -Wl,relro" ;; - esac - case $ld_help in - *"-z now"*) RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" ;; - esac - AC_SUBST([RELRO_LDFLAGS]) - - AC_MSG_RESULT([$RELRO_LDFLAGS]) -]) diff --git a/meson.build b/meson.build index 2450a8bdd79..d1237c10875 100644 --- a/meson.build +++ b/meson.build @@ -574,6 +574,49 @@ cc_flags_relaxed_frame_limit = [ ] +# various linker checks + +libvirt_relro = cc.get_supported_link_arguments([ + '-Wl,-z,relro', + '-Wl,-z,now', +]) + +libvirt_nodelete = cc.get_supported_link_arguments([ + '-Wl,-z,nodelete', +]) + +libvirt_no_undefined = cc.get_supported_link_arguments([ + '-Wl,-z,defs', +]) + +libvirt_no_indirect = cc.get_supported_link_arguments([ + '-Wl,--no-copy-dt-needed-entries', +]) + +if host_machine.system() == 'windows' + version_script_flags = '-Wl,' +else + test_file = '@0@/src/libvirt_qemu.syms'.format(meson.source_root()) + if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file)) + version_script_flags = '-Wl,--version-script=' + elif cc.has_link_argument('-Wl,-M,') + version_script_flags = '-Wl,-M,' + else + error('No supported version script link argument found.') + endif +endif + +libvirt_flat_namespace = [] +if host_machine.system() == 'darwin' + libvirt_flat_namespace = '-Wl,-flat_namespace' +endif + +libvirt_export_dynamic = cc.first_supported_link_argument([ + '-Wl,-export-dynamic', + '-Wl,-export_dynamic', +]) + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- Makefile.am | 2 +- configure.ac | 3 +-- include/libvirt/Makefile.am | 26 -------------------------- include/libvirt/meson.build | 36 ++++++++++++++++++++++++++++++++++++ include/meson.build | 3 +++ meson.build | 2 ++ 6 files changed, 43 insertions(+), 29 deletions(-) delete mode 100644 include/libvirt/Makefile.am create mode 100644 include/libvirt/meson.build create mode 100644 include/meson.build diff --git a/Makefile.am b/Makefile.am index 82ccbac6f91..6df2176364a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS = --enable-werror -SUBDIRS = . include/libvirt src tools docs \ +SUBDIRS = . src tools docs \ tests po examples XZ_OPT ?= -v -T0 diff --git a/configure.ac b/configure.ac index cb1aed73828..07b86d8b944 100644 --- a/configure.ac +++ b/configure.ac @@ -689,7 +689,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ + Makefile src/Makefile docs/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ @@ -701,7 +701,6 @@ AC_CONFIG_FILES([\ src/libvirt-lxc.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile \ - include/libvirt/libvirt-common.h \ examples/Makefile \ tests/Makefile \ tools/Makefile]) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am deleted file mode 100644 index e447a5d37da..00000000000 --- a/include/libvirt/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2011, 2013-2016 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/>. - -virincdir = $(includedir)/libvirt - -allheaders = $(wildcard $(srcdir)/*.h) -virinc_HEADERS = $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) -nodist_virinc_HEADERS = libvirt-common.h - -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/include/libvirt/meson.build b/include/libvirt/meson.build new file mode 100644 index 00000000000..4b77a222f03 --- /dev/null +++ b/include/libvirt/meson.build @@ -0,0 +1,36 @@ +libvirt_common_h_in = files('libvirt-common.h.in') + +libvirt_include = files( + 'libvirt-admin.h', + 'libvirt-domain-checkpoint.h', + 'libvirt-domain.h', + 'libvirt-domain-snapshot.h', + 'libvirt-event.h', + 'libvirt.h', + 'libvirt-host.h', + 'libvirt-interface.h', + 'libvirt-lxc.h', + 'libvirt-network.h', + 'libvirt-nodedev.h', + 'libvirt-nwfilter.h', + 'libvirt-qemu.h', + 'libvirt-secret.h', + 'libvirt-storage.h', + 'libvirt-stream.h', + 'virterror.h', +) + +include_conf = configuration_data() +include_conf.merge_from(conf) + +libvirt_common_h = configure_file( + input: libvirt_common_h_in, + output: 'libvirt-common.h', + configuration: include_conf, +) + +install_headers( + libvirt_include, + libvirt_common_h, + install_dir: includedir / 'libvirt', +) diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 00000000000..06658ede6a7 --- /dev/null +++ b/include/meson.build @@ -0,0 +1,3 @@ +libvirt_inc = include_directories('.') + +subdir('libvirt') diff --git a/meson.build b/meson.build index 8c6db66a07f..b5430012a79 100644 --- a/meson.build +++ b/meson.build @@ -626,6 +626,8 @@ top_inc_dir = include_directories('.') subdir('scripts') +subdir('include') + # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 87 ---------------------------------------------------- meson.build | 72 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 87 deletions(-) diff --git a/configure.ac b/configure.ac index 4a40f3fc34e..1ffa4f931ee 100644 --- a/configure.ac +++ b/configure.ac @@ -207,9 +207,6 @@ LIBVIRT_CHECK_YAJL AC_CHECK_SIZEOF([long]) -dnl Check whether endian provides handy macros. -AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) - AC_CHECK_TYPE([struct ifreq], [AC_DEFINE([HAVE_STRUCT_IFREQ],[1], [Defined if struct ifreq exists in net/if.h])], @@ -223,16 +220,6 @@ AC_CHECK_TYPE([struct sockpeercred], [], [[#include <sys/socket.h> ]]) -AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO, - ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES, - ETHTOOL_SCOALESCE, ETHTOOL_GCOALESCE], - [], [], [[#include <linux/ethtool.h> - ]]) - -AC_CHECK_DECLS([SEEK_HOLE], [], [], - [#include <sys/types.h> - #include <unistd.h>]) - AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) @@ -407,27 +394,6 @@ if test $with_storage = yes; then fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) -dnl -dnl check for DEVLINK_CMD_ESWITCH_GET -dnl -dnl Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also -dnl available, as it was introudced in kernel 4.8 -dnl along with the original spelling of this constant -dnl (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt) -dnl -if test "$with_linux" = "yes"; then - AC_CHECK_DECLS([DEVLINK_CMD_ESWITCH_GET], [], [], - [[#include <linux/devlink.h>]]) -fi - -dnl -dnl check for VHOST_VSOCK_SET_GUEST_CID -dnl -if test "$with_linux" = "yes"; then - AC_CHECK_DECLS([VHOST_VSOCK_SET_GUEST_CID], [], [], - [[#include <linux/vhost.h>]]) -fi - dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python3]) if test -z "$PYTHON"; then @@ -478,9 +444,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -dnl GET_VLAN_VID_CMD is required for virNetDevGetVLanID -AC_CHECK_DECLS([GET_VLAN_VID_CMD], [], [], [[#include <linux/if_vlan.h>]]) - # Check for Linux vs. BSD ifreq members AC_CHECK_MEMBERS([struct ifreq.ifr_newname, struct ifreq.ifr_ifindex, @@ -491,41 +454,6 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_newname, #include <net/if.h> ]) -# Check for BSD approach for setting MAC addr -AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ - #include <sys/types.h> - #include <sys/socket.h> - #include <net/if_dl.h> - ]], - [[ - link_addr(0, 0)]])], - [AC_DEFINE([HAVE_DECL_LINK_ADDR], - [1], - [whether link_addr is available])]) - -# Check for BSD approach for bridge management -AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], - [AC_DEFINE([HAVE_BSD_BRIDGE_MGMT], - [1], - [whether BSD style bridge management is available])], - [], - [#include <stdint.h> - #include <net/if.h> - #include <net/ethernet.h> - #include <net/if_bridgevar.h> - ]) - -# Check for BSD CPU affinity availability -AC_CHECK_DECLS([cpuset_getaffinity], - [AC_DEFINE([HAVE_BSD_CPU_AFFINITY], - [1], - [whether BSD CPU affinity management is available])], - [], - [#include <sys/param.h> - #include <sys/cpuset.h> - ]) - # Check for BSD kvm (kernel memory interface) if test $with_freebsd = yes; then AC_CHECK_LIB([kvm], [kvm_getprocs], [], @@ -533,21 +461,6 @@ if test $with_freebsd = yes; then ) fi -AC_CHECK_DECLS([clock_serv_t, host_get_clock_service, clock_get_time], - [AC_DEFINE([HAVE_MACH_CLOCK_ROUTINES], - [1], - [whether Mach clock routines are available])], - [], - [#include <mach/clock.h> - #include <mach/mach.h> - ]) - -# Check if we have new enough kernel to support BPF devices for cgroups v2 -if test "$with_linux" = "yes"; then - AC_CHECK_DECLS([BPF_PROG_QUERY, BPF_CGROUP_DEVICE], - [], [], [#include <linux/bpf.h>]) -fi - # Check if we need to look for ifconfig if test "$want_ifconfig" = "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/meson.build b/meson.build index 62e51230888..c79d557b289 100644 --- a/meson.build +++ b/meson.build @@ -736,6 +736,78 @@ if host_machine.system() == 'linux' endif +# check various symbols + +symbols = [ + # Check whether endian provides handy macros. + [ 'endian.h', 'htole64' ], + + [ 'linux/ethtool.h', 'ETH_FLAG_TXVLAN' ], + [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], + [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], + [ 'linux/ethtool.h', 'ETH_FLAG_LRO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GGSO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GGRO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GFLAGS' ], + [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], + [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], + [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], + + # GET_VLAN_VID_CMD is required for virNetDevGetVLanID + [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], + + [ 'unistd.h', 'SEEK_HOLE' ], + + # GET_VLAN_VID_CMD is required for virNetDevGetVLanID + [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], + + # Check for BSD approach for setting MAC addr + [ 'net/if_dl.h', 'link_addr' ], +] + +if host_machine.system() == 'linux' + symbols += [ + # check for DEVLINK_CMD_ESWITCH_GET + # Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also available, as it was + # introudced in kernel 4.8 along with the original spelling of this + # constant (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt). + [ 'linux/devlink.h', 'DEVLINK_CMD_ESWITCH_GET' ], + + # check for VHOST_VSOCK_SET_GUEST_CID + [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], + + # Check if we have new enough kernel to support BPF devices for cgroups v2 + [ 'linux/bpf.h', 'BPF_PROG_QUERY' ], + [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], + ] +endif + +foreach symbol : symbols + if cc.has_header_symbol(symbol[0], symbol[1]) + conf.set('HAVE_DECL_@0@'.format(symbol[1].to_upper()), 1) + endif +endforeach + +# Check for BSD approach for bridge management +if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD') and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD') and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL')) + conf.set('HAVE_BSD_BRIDGE_MGMT', 1) +endif + +# Check for BSD CPU affinity availability +if cc.has_header_symbol('sys/cpuset.h', 'cpuset_getaffinity') + conf.set('HAVE_BSD_CPU_AFFINITY', 1) +endif + +# whether Mach clock routines are available +if (cc.has_header_symbol('mach/clock.h', 'clock_serv_t') and + cc.has_header_symbol('mach/clock.h', 'host_get_clock_service') and + cc.has_header_symbol('mach/clock.h', 'clock_get_time')) + conf.set('HAVE_MACH_CLOCK_ROUTINES', 1) +endif + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 9 --------- meson.build | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 69067091f09..a426ba2a355 100644 --- a/configure.ac +++ b/configure.ac @@ -429,15 +429,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -# Check for Linux vs. BSD ifreq members -AC_CHECK_MEMBERS([struct ifreq.ifr_newname, - struct ifreq.ifr_ifindex, - struct ifreq.ifr_index, - struct ifreq.ifr_hwaddr], - [], [], - [#include <sys/socket.h> - #include <net/if.h> - ]) # Check for BSD kvm (kernel memory interface) if test $with_freebsd = yes; then diff --git a/meson.build b/meson.build index aa492c9549a..d474745f31e 100644 --- a/meson.build +++ b/meson.build @@ -835,6 +835,25 @@ if host_machine.system() == 'windows' endif +# check various members + +members = [ + # Check for Linux vs. BSD ifreq members + [ 'struct ifreq', 'ifr_newname', '#include <sys/socket.h>\n#include <net/if.h>' ], + [ 'struct ifreq', 'ifr_ifindex', '#include <sys/socket.h>\n#include <net/if.h>' ], + [ 'struct ifreq', 'ifr_index', '#include <sys/socket.h>\n#include <net/if.h>' ], + [ 'struct ifreq', 'ifr_hwaddr', '#include <sys/socket.h>\n#include <net/if.h>' ], +] + +foreach member : members + if cc.has_member(member[0], member[1], prefix: member[2]) + type = member[0].underscorify().to_upper() + member = member[1].underscorify().to_upper() + conf.set('HAVE_@0@_@1@'.format(type, member), 1) + endif +endforeach + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 39 ------------- m4/virt-external-programs.m4 | 106 ----------------------------------- meson.build | 82 +++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 145 deletions(-) delete mode 100644 m4/virt-external-programs.m4 diff --git a/configure.ac b/configure.ac index b85fa9a9a6f..d8ff2ba3900 100644 --- a/configure.ac +++ b/configure.ac @@ -40,9 +40,6 @@ m4_ifndef([AM_SILENT_RULES], AC_CANONICAL_HOST -dnl Where we look for daemons and admin binaries during configure -LIBVIRT_SBIN_PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" - dnl Checks for C compiler. AC_PROG_CC AC_PROG_INSTALL @@ -62,10 +59,6 @@ m4_ifndef([LT_INIT], [ AM_PROG_CC_C_O AM_PROG_LD -dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case -dnl we're working on BSD) -want_ifconfig=no - dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are known @@ -90,7 +83,6 @@ if test $with_linux = no; then fi if test $with_freebsd = yes; then - want_ifconfig=yes with_firewalld=no fi @@ -208,12 +200,6 @@ AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) -dnl -dnl Check for external programs -dnl - -LIBVIRT_CHECK_EXTERNAL_PROGRAMS - dnl dnl Virtualization drivers check dnl @@ -377,17 +363,6 @@ if test $with_storage = yes; then fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) -dnl Allow perl/python overrides -AC_PATH_PROGS([PYTHON], [python3]) -if test -z "$PYTHON"; then - AC_MSG_ERROR(['python3' binary is required to build libvirt]) -fi -AC_DEFINE_UNQUOTED([PYTHON], "$PYTHON", [path to python binary]) -AC_PATH_PROG([FLAKE8], [flake8]) -if test -z "$FLAKE8"; then - AC_MSG_WARN(['flake8' binary is required to check python code style]) -fi - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. @@ -395,11 +370,6 @@ RUNUTF8="LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8" AC_SUBST(RUNUTF8) -AC_PATH_PROG([PERL], [perl]) -if test -z "$PERL"; then - AC_MSG_ERROR(['perl' binary is required to build libvirt]) -fi - dnl MinGW checks LIBVIRT_WIN_CHECK_COMMON LIBVIRT_WIN_CHECK_MINGW @@ -435,15 +405,6 @@ if test $with_freebsd = yes; then ) fi -# Check if we need to look for ifconfig -if test "$want_ifconfig" = "yes"; then - AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) - if test -z "$IFCONFIG_PATH"; then - AC_MSG_ERROR([Failed to find ifconfig.]) - fi - AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) -fi - GNUmakefile=GNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 deleted file mode 100644 index d905beed71d..00000000000 --- a/m4/virt-external-programs.m4 +++ /dev/null @@ -1,106 +0,0 @@ -dnl The External programs 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_CHECK_EXTERNAL_PROGRAMS], [ - dnl Do we have rpcgen? - AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) - AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"]) - - dnl Miscellaneous external programs. - AC_PATH_PROG([XMLLINT], [xmllint], []) - if test -z "$XMLLINT" - then - AC_MSG_ERROR("xmllint is required to build libvirt") - fi - AC_PATH_PROG([XSLTPROC], [xsltproc], []) - if test -z "$XSLTPROC" - then - AC_MSG_ERROR("xsltproc is required to build libvirt") - fi - - dnl Drop the rst2html (aka HTML4) variants once we - dnl stop supporting Ubuntu 16.04 (Xenial) - AC_PATH_PROGS([RST2HTML], [rst2html5 rst2html5.py rst2html5-3 rst2html rst2html.py rst2html-3], []) - if test -z "$RST2HTML" - then - AC_MSG_ERROR("rst2html5/rst2html is required to build libvirt") - fi - AC_PATH_PROGS([RST2MAN], [rst2man rst2man.py rst2man-3], []) - if test -z "$RST2MAN" - then - AC_MSG_ERROR("rst2man is required to build libvirt") - fi - AC_PATH_PROG([AUGPARSE], [augparse], [/usr/bin/augparse]) - AC_PROG_MKDIR_P - AC_PROG_LN_S - - dnl External programs that we can use if they are available. - dnl We will hard-code paths to these programs unless we cannot - dnl detect them, in which case we'll search for the program - dnl along the $PATH at runtime and fail if it's not there. - AC_PATH_PROG([DMIDECODE], [dmidecode], [dmidecode], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([DNSMASQ], [dnsmasq], [dnsmasq], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH]) - 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([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]) - - AC_DEFINE_UNQUOTED([DMIDECODE], ["$DMIDECODE"], - [Location or name of the dmidecode program]) - AC_DEFINE_UNQUOTED([DNSMASQ], ["$DNSMASQ"], - [Location or name of the dnsmasq program]) - AC_DEFINE_UNQUOTED([RADVD], ["$RADVD"], - [Location or name of the radvd program]) - AC_DEFINE_UNQUOTED([TC], ["$TC"], - [Location or name of the tc program (see iproute2)]) - AC_DEFINE_UNQUOTED([MM_CTL], ["$MM_CTL"], - [Location or name of the mm-ctl program]) - 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]) - AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"], - [Location or name of the modprobe program]) - AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"], - [Location or name of the rmmod program]) - AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], - [Location or name of the scrub program (for wiping algorithms)]) - AC_DEFINE_UNQUOTED([ADDR2LINE], ["$ADDR2LINE"], - [Location of addr2line program]) - AC_DEFINE_UNQUOTED([MDEVCTL], ["$MDEVCTL"], - [Location or name of the mdevctl program]) - - AC_PATH_PROG([IP_PATH], [ip], [/sbin/ip], [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([IP_PATH], ["$IP_PATH"], [path to ip binary]) - - AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([IPTABLES_PATH], ["$IPTABLES_PATH"], [path to iptables binary]) - - AC_PATH_PROG([IP6TABLES_PATH], [ip6tables], [/sbin/ip6tables], [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([IP6TABLES_PATH], ["$IP6TABLES_PATH"], [path to ip6tables binary]) - - AC_PATH_PROG([EBTABLES_PATH], [ebtables], [/sbin/ebtables], [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([EBTABLES_PATH], ["$EBTABLES_PATH"], [path to ebtables binary]) -]) diff --git a/meson.build b/meson.build index 121022e5f78..3f86f931de0 100644 --- a/meson.build +++ b/meson.build @@ -859,6 +859,88 @@ endforeach conf.set('SIZEOF_LONG', cc.sizeof('long')) +# Where we look for daemons and admin binaries during configure + +libvirt_sbin_path = [ + '/sbin', + '/usr/sbin', + '/usr/local/sbin', +] + + +# required programs check + +required_programs = [ + 'perl', + 'python3', + 'xmllint', + 'xsltproc', +] + +required_programs_groups = [ + {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']}, + # Drop the rst2html (aka HTML4) variants once we stop supporting Ubuntu 16.04 (Xenial) + {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3', 'rst2html', 'rst2html.py', 'rst2html-3']}, + {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']}, +] + +if host_machine.system() == 'freebsd' + required_programs += 'ifconfig' +endif + +foreach name : required_programs + prog = find_program(name, required: true, dirs: libvirt_sbin_path) + varname = name.underscorify() + conf.set_quoted(varname.to_upper(), prog.path()) + set_variable('@0@_prog'.format(varname), prog) +endforeach + +foreach item : required_programs_groups + prog = find_program(item.get('prog'), required: true, dirs: libvirt_sbin_path) + varname = item.get('name').underscorify() + conf.set_quoted(varname.to_upper(), prog.path()) + set_variable('@0@_prog'.format(varname), prog) +endforeach + + +# optional programs + +optional_programs = [ + 'addr2line', + 'augparse', + 'dmidecode', + 'dnsmasq', + 'ebtables', + 'flake8', + 'ip', + 'ip6tables', + 'iptables', + 'mdevctl', + 'mm-ctl', + 'modprobe', + 'ovs-vsctl', + 'radvd', + 'rmmod', + 'scrub', + 'tc', + 'udevadm', +] + +foreach name : optional_programs + prog = find_program(name, required: false, dirs: libvirt_sbin_path) + varname = name.underscorify() + if prog.found() + prog_path = prog.path() + else + prog_path = name + endif + + conf.set_quoted(varname.to_upper(), prog_path) + conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog_path) + set_variable('@0@_prog'.format(varname), prog) +endforeach + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 2 -- m4/virt-acl.m4 | 37 ------------------------------------- meson.build | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-acl.m4 diff --git a/configure.ac b/configure.ac index d8ff2ba3900..53c87b4e293 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_ACL LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT @@ -480,7 +479,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_ACL LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT diff --git a/m4/virt-acl.m4 b/m4/virt-acl.m4 deleted file mode 100644 index d548729b1dd..00000000000 --- a/m4/virt-acl.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl ACL support -dnl -dnl Copyright (C) 2017 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_CHECK_ACL], [ - - AC_CHECK_HEADERS([sys/acl.h]) - - ACL_CFLAGS="" - ACL_LIBS="" - with_acl=no - if test "x$ac_cv_header_sys_acl_h:x$with_linux" = "xyes:xyes"; then - ACL_LIBS="-lacl" - with_acl=yes - fi - AC_SUBST([ACL_CFLAGS]) - AC_SUBST([ACL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_ACL], [ - LIBVIRT_RESULT_LIB([ACL]) -]) diff --git a/meson.build b/meson.build index d4b3a9e910d..d8ff8e0d658 100644 --- a/meson.build +++ b/meson.build @@ -942,6 +942,16 @@ foreach name : optional_programs endforeach +# generic build dependencies + +if host_machine.system() == 'linux' and cc.has_header('sys/acl.h') + acl_dep = cc.find_library('acl', required: false) + conf.set('HAVE_SYS_ACL_H', 1) +else + acl_dep = dependency('', required: false) +endif + + # define top include directory top_inc_dir = include_directories('.') @@ -960,6 +970,11 @@ configure_file(output: 'meson-config.h', configuration: conf) # print configuration summary +libs_summary = { + 'acl': acl_dep.found(), +} +summary(libs_summary, section: 'Libraries', bool_yn: true) + test_summary = { 'Coverage': coverage_flags.length() > 0, } -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-attr.m4 | 13 ------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 m4/virt-attr.m4 diff --git a/configure.ac b/configure.ac index 5bf4727faa7..6d5fcb4281d 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BLKID @@ -149,7 +148,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BLKID @@ -477,7 +475,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BLKID diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4 deleted file mode 100644 index 478549c17f1..00000000000 --- a/m4/virt-attr.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl The libattr.so library - -AC_DEFUN([LIBVIRT_ARG_ATTR],[ - LIBVIRT_ARG_WITH_FEATURE([ATTR], [attr], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_ATTR],[ - LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_ATTR],[ - LIBVIRT_RESULT_LIB([ATTR]) -]) diff --git a/meson.build b/meson.build index be0bc975116..3d7bd8c4149 100644 --- a/meson.build +++ b/meson.build @@ -958,6 +958,8 @@ if apparmor_dep.found() conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles') endif +attr_dep = cc.find_library('attr', required: get_option('attr')) + # define top include directory @@ -980,6 +982,7 @@ configure_file(output: 'meson-config.h', configuration: conf) libs_summary = { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), + 'attr': attr_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index dc60d569dd2..be7ad8b96f9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,4 @@ option('test_coverage', type: 'boolean', value: false, description: 'turn on cod # build dependencies options option('apparmor', type: 'feature', value: 'auto', description: 'apparmor support') +option('attr', type: 'feature', value: 'auto', description: 'attr support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 -- m4/virt-readline.m4 | 86 --------------------------------------------- meson.build | 64 +++++++++++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 65 insertions(+), 89 deletions(-) delete mode 100644 m4/virt-readline.m4 diff --git a/configure.ac b/configure.ac index 2c9f38f9ba6..b822e862535 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_POLKIT -LIBVIRT_ARG_READLINE LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX @@ -177,7 +176,6 @@ LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_READLINE LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX @@ -502,7 +500,6 @@ LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_READLINE LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 deleted file mode 100644 index cd12110c4e2..00000000000 --- a/m4/virt-readline.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl The readline library -dnl -dnl Copyright (C) 2005-2013 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_ARG_READLINE],[ - LIBVIRT_ARG_WITH_FEATURE([READLINE], [readline], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_READLINE],[ - - # We have to check for readline.pc's presence beforehand because for - # the longest time the library didn't ship a .pc file at all - PKG_CHECK_EXISTS([readline], [use_pkgconfig=1], [use_pkgconfig=0]) - - if test $use_pkgconfig = 1; then - # readline 7.0 is the first version which includes pkg-config support - LIBVIRT_CHECK_PKG([READLINE], [readline], [7.0]) - else - # This function is present in all reasonable (5.0+) readline versions; - # however, the macOS base system contains a library called libedit which - # takes over the readline name despite lacking many of its features. We - # want to make sure we only enable readline support when linking against - # the actual readline library, and the availability of this specific - # functions is as good a witness for that fact as any. - AC_CHECK_DECLS([rl_completion_quote_character], - [], [], - [[#include <stdio.h> - #include <readline/readline.h>]]) - - if test "$ac_cv_have_decl_rl_completion_quote_character" = "no" ; then - if test "$with_readline" = "yes" ; then - AC_MSG_ERROR([readline is missing rl_completion_quote_character]) - else - with_readline=no; - fi - fi - - # The normal library check... - LIBVIRT_CHECK_LIB([READLINE], [readline], [readline], [readline/readline.h]) - fi - - # We need this to avoid compilation issues with modern compilers. - # See 9ea3424a178 for a more detailed explanation - if test "$with_readline" = "yes" ; then - case "$READLINE_CFLAGS" in - *-D_FUNCTION_DEF*) ;; - *) READLINE_CFLAGS="-D_FUNCTION_DEF $READLINE_CFLAGS" ;; - esac - fi - - # Gross kludge for readline include path obtained through pkg-config. - # - # As of 8.0, upstream readline.pc has -I${includedir}/readline among - # its Cflags, which is clearly wrong. This does not affect Linux - # because ${includedir} is already part of the default include path, - # but on other platforms that's not the case and the result is that - # <readline/readline.h> can't be located, causing the build to fail. - # A patch solving this issue has already been posted upstream, so once - # the fix has landed in FreeBSD ports and macOS homebrew we can safely - # drop the kludge and rely on pkg-config alone on those platforms. - # - # [1] http://lists.gnu.org/archive/html/bug-readline/2019-04/msg00007.html - case "$READLINE_CFLAGS" in - *include/readline*) READLINE_CFLAGS=$(echo $READLINE_CFLAGS | sed s,include/readline,include,g) ;; - *) ;; - esac -]) - -AC_DEFUN([LIBVIRT_RESULT_READLINE],[ - LIBVIRT_RESULT_LIB([READLINE]) -]) diff --git a/meson.build b/meson.build index 7aacfc2011c..c30b14c1643 100644 --- a/meson.build +++ b/meson.build @@ -965,6 +965,69 @@ if audit_dep.found() conf.set('WITH_AUDIT', 1) endif +# readline 7.0 is the first version which includes pkg-config support +readline_version = '7.0' +readline_dep = dependency('readline', version: '>=' + readline_version, required: false) +if not readline_dep.found() + readline_dep = cc.find_library('readline', required: get_option('readline')) + + if readline_dep.found() + # This function is present in all reasonable (5.0+) readline versions; + # however, the macOS base system contains a library called libedit which + # takes over the readline name despite lacking many of its features. We + # want to make sure we only enable readline support when linking against + # the actual readline library, and the availability of this specific + # functions is as good a witness for that fact as any. + correct_rl = cc.has_function('rl_completion_quote_character', prefix: '#include <readline/readline.h>') + if not correct_rl and get_option('readline').enabled() + error('readline is missing rl_completion_quote_character') + else + readline_dep = dependency('', required: false) + endif + endif +endif +if readline_dep.found() + # Gross kludge for readline include path obtained through pkg-config. + # + # As of 8.0, upstream readline.pc has -I${includedir}/readline among + # its Cflags, which is clearly wrong. This does not affect Linux + # because ${includedir} is already part of the default include path, + # but on other platforms that's not the case and the result is that + # <readline/readline.h> can't be located, causing the build to fail. + # A patch solving this issue has already been posted upstream, so once + # the fix has landed in FreeBSD ports and macOS homebrew we can safely + # drop the kludge and rely on pkg-config alone on those platforms. + # + # [1] http://lists.gnu.org/archive/html/bug-readline/2019-04/msg00007.html + if readline_dep.type_name() == 'pkgconfig' and host_machine.system() != 'linux' + pkg_config_prog = find_program('pkg-config') + rc = run_command(pkg_config_prog, '--cflags', 'readline', check: true) + cflags = rc.stdout().strip() + if cflags.contains('include/readline') + rc = run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + cflags, 'include/readline', 'include', + ), + check: true, + ) + readline_dep = declare_dependency( + compile_args: rc.stdout().strip().split(), + dependencies: [ readline_dep ], + ) + endif + endif + + # We need this to avoid compilation issues with modern compilers. + # See 9ea3424a178 for a more detailed explanation + readline_dep = declare_dependency( + compile_args: [ '-D_FUNCTION_DEF' ], + dependencies: [ readline_dep ], + ) + + conf.set('WITH_READLINE', 1) +endif + # define top include directory @@ -989,6 +1052,7 @@ libs_summary = { 'apparmor': apparmor_dep.found(), 'attr': attr_dep.found(), 'audit': audit_dep.found(), + 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 16822374180..aafc694533a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,3 +12,4 @@ option('test_coverage', type: 'boolean', value: false, description: 'turn on cod option('apparmor', type: 'feature', value: 'auto', description: 'apparmor support') option('attr', type: 'feature', value: 'auto', description: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit support') +option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-blkid.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-blkid.m4 diff --git a/configure.ac b/configure.ac index a8f838c0ccf..25fb8ca8f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS @@ -145,7 +144,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS @@ -469,7 +467,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4 deleted file mode 100644 index 609d0d58031..00000000000 --- a/m4/virt-blkid.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libblkid.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_BLKID],[ - LIBVIRT_ARG_WITH_FEATURE([BLKID], [blkid], [check], [2.17]) -]) - -AC_DEFUN([LIBVIRT_CHECK_BLKID],[ - LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17]) -]) - -AC_DEFUN([LIBVIRT_RESULT_BLKID],[ - LIBVIRT_RESULT_LIB([BLKID]) -]) diff --git a/meson.build b/meson.build index 5cca3b7d5c2..7988a7b0a13 100644 --- a/meson.build +++ b/meson.build @@ -968,6 +968,12 @@ endif bash_completion_version = '2.0' bash_completion_dep = dependency('bash-completion', version: '>=' + bash_completion_version, required: get_option('bash_completion')) +blkid_version = '2.17' +blkid_dep = dependency('blkid', version: '>=' + blkid_version, required: get_option('blkid')) +if blkid_dep.found() + conf.set('WITH_BLKID', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1082,6 +1088,7 @@ libs_summary = { 'attr': attr_dep.found(), 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), + 'blkid': blkid_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 5313b9bb5fb..73e64f26b0a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,4 +14,5 @@ option('attr', type: 'feature', value: 'auto', description: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit support') option('bash_completion', type: 'feature', value: 'auto', description: 'bash-completion support') option('bash_completion_dir', type: 'string', value: '', description: 'directory containing bash completion scripts') +option('blkid', type: 'feature', value: 'auto', description: 'blkid support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-curl.m4 | 38 -------------------------------------- meson.build | 17 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 m4/virt-curl.m4 diff --git a/configure.ac b/configure.ac index acd326adf71..f89ea566c03 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE @@ -143,7 +142,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN @@ -465,7 +463,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN LIBVIRT_RESULT_FIREWALLD diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4 deleted file mode 100644 index 84fcd69a8e0..00000000000 --- a/m4/virt-curl.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The libcurl.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_CURL],[ - LIBVIRT_ARG_WITH_FEATURE([CURL], [libcurl], [check], [7.18.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CURL],[ - LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0]) - - # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version - # of <curl/curl.h> that #defines several wrapper macros around underlying - # functions to add type safety for gcc only. However, these macros - # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by - # disabling the wrappers; even if it removes some type-check safety. - CURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $CURL_CFLAGS" - AC_SUBST(CURL_CFLAGS) -]) - -AC_DEFUN([LIBVIRT_RESULT_CURL],[ - LIBVIRT_RESULT_LIB([CURL]) -]) diff --git a/meson.build b/meson.build index d504e7720d2..26378134118 100644 --- a/meson.build +++ b/meson.build @@ -979,6 +979,22 @@ if capng_dep.found() conf.set('WITH_CAPNG', 1) endif +curl_version = '7.18.0' +curl_dep = dependency('libcurl', version: '>=' + curl_version, required: get_option('curl')) +if curl_dep.found() + # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version + # of <curl/curl.h> that #defines several wrapper macros around underlying + # functions to add type safety for gcc only. However, these macros + # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by + # disabling the wrappers; even if it removes some type-check safety. + curl_dep = declare_dependency( + compile_args: [ '-DCURL_DISABLE_TYPECHECK' ], + dependencies: [ curl_dep ], + ) + + conf.set('WITH_CURL', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1095,6 +1111,7 @@ libs_summary = { 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), + 'curl': curl_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f53c94c6982..f0d5e05b469 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,4 +16,5 @@ option('bash_completion', type: 'feature', value: 'auto', description: 'bash-com option('bash_completion_dir', type: 'string', value: '', description: 'directory containing bash completion scripts') option('blkid', type: 'feature', value: 'auto', description: 'blkid support') option('capng', type: 'feature', value: 'auto', description: 'cap-ng support') +option('curl', type: 'feature', value: 'auto', description: 'curl support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 1 - m4/virt-devmapper.m4 | 32 -------------------------------- meson.build | 13 +++++++++++++ 3 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-devmapper.m4 diff --git a/configure.ac b/configure.ac index 3499b372036..9bb397d8e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE diff --git a/m4/virt-devmapper.m4 b/m4/virt-devmapper.m4 deleted file mode 100644 index 165caa69685..00000000000 --- a/m4/virt-devmapper.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The devmapper library -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_CHECK_DEVMAPPER], [ - DEVMAPPER_REQUIRED=1.0.0 - - with_devmapper=check - - LIBVIRT_CHECK_PKG([DEVMAPPER], [devmapper], [$DEVMAPPER_REQUIRED], []) - - if test "x$with_devmapper" = "xno"; then - # devmapper is missing pkg-config files in ubuntu, suse, etc - with_devmapper=check - LIBVIRT_CHECK_LIB([DEVMAPPER], [devmapper], [dm_task_run], [libdevmapper.h]) - fi -]) diff --git a/meson.build b/meson.build index 081641c8617..01525c05055 100644 --- a/meson.build +++ b/meson.build @@ -1011,6 +1011,19 @@ if dbus_dep.found() endif endif +devmapper_version = '1.0.0' +devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) +if not devmapper_dep.found() + # devmapper is missing pkg-config files in ubuntu, suse, etc + devmapper_dep = cc.find_library('devmapper', required: false) + if devmapper_dep.found() and not cc.has_function('dm_task_run', dependencies: tmp) + devmapper_dep = dependency('', required: false) + endif +endif +if devmapper_dep.found() + conf.set('WITH_DEVMAPPER', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 7 ------- m4/virt-firewalld.m4 | 43 ------------------------------------------- meson.build | 9 +++++++++ meson_options.txt | 1 + 4 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-firewalld.m4 diff --git a/configure.ac b/configure.ac index 0dc9dc3bcfb..825d14c6384 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,6 @@ if test $with_linux = no; then with_storage_scsi=no fi -if test $with_freebsd = yes; then - with_firewalld=no -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) @@ -114,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER @@ -141,7 +136,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB @@ -459,7 +453,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4 deleted file mode 100644 index 89efa47589b..00000000000 --- a/m4/virt-firewalld.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The firewalld support -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_ARG_FIREWALLD], [ - LIBVIRT_ARG_WITH_FEATURE([FIREWALLD], [firewalld], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [ - AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - - if test "x$with_firewalld" = "xcheck" ; then - with_firewalld=$with_dbus - fi - - if test "x$with_firewalld" = "xyes" ; then - if test "x$with_dbus" != "xyes" ; then - AC_MSG_ERROR([You must have dbus enabled for firewalld support]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD], [1], [whether firewalld support is enabled]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD], [test "x$with_firewalld" != "xno"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD], [ - LIBVIRT_RESULT_LIB([FIREWALLD]) -]) diff --git a/meson.build b/meson.build index 31f4e730ce7..385a959e88b 100644 --- a/meson.build +++ b/meson.build @@ -1122,6 +1122,14 @@ if bash_completion_dep.found() endif endif +if host_machine.system() != 'freebsd' + if not get_option('firewalld').disabled() and dbus_dep.found() + conf.set('WITH_FIREWALLD', 1) + elif get_option('firewalld').enabled() + error('You must have dbus enabled for firewalld support') + endif +endif + # define top include directory @@ -1152,6 +1160,7 @@ libs_summary = { 'curl': curl_dep.found(), 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), + 'firewalld': conf.has('WITH_FIREWALLD'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 957c88a1622..d9e614131cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,4 +18,5 @@ option('blkid', type: 'feature', value: 'auto', description: 'blkid support') option('capng', type: 'feature', value: 'auto', description: 'cap-ng support') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 support') +option('firewalld', type: 'feature', value: 'auto', description: 'firewalld support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-fuse.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-fuse.m4 diff --git a/configure.ac b/configure.ac index 086505d95f6..b136bf6a4cd 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI @@ -135,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS @@ -451,7 +449,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4 deleted file mode 100644 index cc5726fe646..00000000000 --- a/m4/virt-fuse.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libfuse.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_FUSE],[ - LIBVIRT_ARG_WITH_FEATURE([FUSE], [fuse], [check], [2.8.6]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FUSE],[ - LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6]) -]) - -AC_DEFUN([LIBVIRT_RESULT_FUSE],[ - LIBVIRT_RESULT_LIB([FUSE]) -]) diff --git a/meson.build b/meson.build index 573a414b846..7ed5a0218f9 100644 --- a/meson.build +++ b/meson.build @@ -1033,6 +1033,12 @@ if dlopen_dep.found() conf.set('HAVE_DLFCN_H', 1) endif +fuse_version = '2.8.6' +fuse_dep = dependency('fuse', version: '>=' + fuse_version, required: get_option('fuse')) +if fuse_dep.found() + conf.set('WITH_FUSE', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1168,6 +1174,7 @@ libs_summary = { 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), + 'fuse': fuse_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 75417751dd6..9aae950b8ca 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,4 +20,5 @@ option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewalld support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') +option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-gluster.m4 | 32 -------------------------------- meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 m4/virt-gluster.m4 diff --git a/configure.ac b/configure.ac index 0a8a0221206..fa9fecccc73 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP @@ -134,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI @@ -448,7 +446,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4 deleted file mode 100644 index 7edff40047f..00000000000 --- a/m4/virt-gluster.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The gluster libgfapi.so library -dnl -dnl Copyright (C) 2013 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 - -dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier -dnl versions may be possible but only with further testing -AC_DEFUN([LIBVIRT_ARG_GLUSTER],[ - LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[ - LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_RESULT_GLUSTER],[ - LIBVIRT_RESULT_LIB([GLUSTERFS]) -]) diff --git a/meson.build b/meson.build index 132d887be2a..4ee7031b32c 100644 --- a/meson.build +++ b/meson.build @@ -1047,6 +1047,9 @@ glib_dep = declare_dependency( dependencies: [ glib_dep, gobject_dep, gio_dep ], ) +glusterfs_version = '3.4.1' +glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, required: get_option('glusterfs')) + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1184,6 +1187,7 @@ libs_summary = { 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), + 'glusterfs': glusterfs_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 9aae950b8ca..cc3e5bbabab 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,4 +21,5 @@ option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewalld support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') +option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-hal.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-hal.m4 diff --git a/configure.ac b/configure.ac index de31d11e63b..5a37af6f27f 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH @@ -133,7 +132,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED @@ -445,7 +443,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4 deleted file mode 100644 index e37bbf979b4..00000000000 --- a/m4/virt-hal.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libhal.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_HAL],[ - LIBVIRT_ARG_WITH_FEATURE([HAL], [hal], [check], [0.5.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_HAL],[ - LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_HAL],[ - LIBVIRT_RESULT_LIB([HAL]) -]) diff --git a/meson.build b/meson.build index 5a9e9f26db1..ef76c2fad07 100644 --- a/meson.build +++ b/meson.build @@ -1053,6 +1053,12 @@ glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, r gnutls_version = '3.2.0' gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) +hal_version = '0.5.0' +hal_dep = dependency('hal', version: '>=' + hal_version, required: get_option('hal')) +if hal_dep.found() + conf.set('WITH_HAL', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1192,6 +1198,7 @@ libs_summary = { 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), + 'hal': hal_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index cc3e5bbabab..9ba8ad0dd83 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,4 +22,5 @@ option('firewalld', type: 'feature', value: 'auto', description: 'firewalld supp option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') +option('hal', type: 'feature', value: 'auto', description: 'hal support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-libiscsi.m4 | 30 ------------------------------ meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-libiscsi.m4 diff --git a/configure.ac b/configure.ac index 3726854d524..b74cb72db4a 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML @@ -132,7 +131,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP @@ -436,7 +434,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH diff --git a/m4/virt-libiscsi.m4 b/m4/virt-libiscsi.m4 deleted file mode 100644 index 2747f00ec4e..00000000000 --- a/m4/virt-libiscsi.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl Libiscsi library -dnl -dnl Copyright (C) 2018 Clementine Hayat. -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_ARG_LIBISCSI],[ - LIBVIRT_ARG_WITH_FEATURE([LIBISCSI], [libiscsi], [check], [1.18.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBISCSI],[ - LIBVIRT_CHECK_PKG([LIBISCSI], [libiscsi], [1.18.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBISCSI],[ - LIBVIRT_RESULT_LIB(LIBISCSI) -]) diff --git a/meson.build b/meson.build index 62529932518..9d43be1375c 100644 --- a/meson.build +++ b/meson.build @@ -1065,6 +1065,9 @@ if host_machine.system() == 'freebsd' add_project_link_arguments('-lkvm', language: 'c') endif +libiscsi_version = '1.18.0' +libiscsi_dep = dependency('libiscsi', version: '>=' + libiscsi_version, required: get_option('libiscsi')) + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1205,6 +1208,7 @@ libs_summary = { 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), 'hal': hal_dep.found(), + 'libiscsi': libiscsi_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 9ba8ad0dd83..c06e6ee9256 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,4 +23,5 @@ option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether t option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('hal', type: 'feature', value: 'auto', description: 'hal support') +option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 2 -- m4/virt-libnl.m4 | 47 ----------------------------------------------- meson.build | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 m4/virt-libnl.m4 diff --git a/configure.ac b/configure.ac index 456e60e62bc..755fe0073f0 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH @@ -432,7 +431,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL diff --git a/m4/virt-libnl.m4 b/m4/virt-libnl.m4 deleted file mode 100644 index cd780cf90e7..00000000000 --- a/m4/virt-libnl.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libnl library -dnl -dnl Copyright (C) 2012-2013 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_CHECK_LIBNL], [ - AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) - - with_libnl=no - - if test "$with_linux" = "yes"; then - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - with_libnl=yes - AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) - PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0]) - LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE_CFLAGS" - LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE_LIBS" - ], [:]) - fi - if test "$with_libnl" = no; then - if test "$with_macvtap" = "yes"; then - AC_MSG_ERROR([libnl3-devel is required for macvtap support]) - fi - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$with_libnl" = "yes"]) - - AC_SUBST([LIBNL_CFLAGS]) - AC_SUBST([LIBNL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBNL], [ - LIBVIRT_RESULT_LIB([LIBNL]) -]) diff --git a/meson.build b/meson.build index ce3dbca83e0..d096a531bb7 100644 --- a/meson.build +++ b/meson.build @@ -1068,6 +1068,21 @@ endif libiscsi_version = '1.18.0' libiscsi_dep = dependency('libiscsi', version: '>=' + libiscsi_version, required: get_option('libiscsi')) +libnl_version = '3.0' +if host_machine.system() == 'linux' + libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: false) + libnl_route_dep = dependency('libnl-route-3.0', version: '>=' + libnl_version, required: false) + + if libnl_dep.found() and libnl_route_dep.found() + libnl_dep = declare_dependency( + dependencies: [ libnl_dep, libnl_route_dep ], + ) + conf.set('HAVE_LIBNL', 1) + endif +else + libnl_dep = dependency('', required: false) +endif + use_macvtap = false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1190,6 +1205,10 @@ elif get_option('firewalld_zone').enabled() error('You must have firewalld support enabled to enable firewalld_zone') endif +if conf.has('WITH_MACVTAP') and not conf.has('HAVE_LIBNL') + error('libnl3-devel is required for macvtap support') +endif + # define top include directory @@ -1228,6 +1247,7 @@ libs_summary = { 'gnutls': gnutls_dep.found(), 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), + 'libnl': libnl_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-libpcap.m4 | 62 ---------------------------------------------- meson.build | 18 ++++++++++++++ meson_options.txt | 1 + 4 files changed, 19 insertions(+), 65 deletions(-) delete mode 100644 m4/virt-libpcap.m4 diff --git a/configure.ac b/configure.ac index b09a185c053..6d5e4e034fb 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_NETCF @@ -130,7 +129,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_NETCF @@ -430,7 +428,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML diff --git a/m4/virt-libpcap.m4 b/m4/virt-libpcap.m4 deleted file mode 100644 index 605c2fdea71..00000000000 --- a/m4/virt-libpcap.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl The pcap library -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_ARG_LIBPCAP], [ - LIBVIRT_ARG_WITH([LIBPCAP], [libpcap location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBPCAP], [ - LIBPCAP_REQUIRED="1.5.0" - LIBPCAP_CONFIG="pcap-config" - LIBPCAP_CFLAGS="" - LIBPCAP_LIBS="" - - if test "x$with_libpcap" != "xno"; then - case $with_libpcap in - ''|yes|check) LIBPCAP_CONFIG="pcap-config" ;; - *) LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config" ;; - esac - AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [ - AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) - if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then - if test "x$with_libpcap" != "xcheck"; then - AC_MSG_ERROR([You must install libpcap >= $LIBPCAP_REQUIRED to compile libvirt]) - fi - AC_MSG_RESULT(no) - with_libpcap="no" - else - LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" - LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" - with_libpcap="yes" - AC_MSG_RESULT(yes) - fi - ]) - fi - - if test "x$with_libpcap" = "xyes"; then - AC_DEFINE_UNQUOTED([HAVE_LIBPCAP], 1, [whether libpcap can be used]) - fi - - AC_SUBST([LIBPCAP_CFLAGS]) - AC_SUBST([LIBPCAP_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBPCAP], [ - LIBVIRT_RESULT_LIB([LIBPCAP]) -]) diff --git a/meson.build b/meson.build index 38e18f5c750..2346ae31d5a 100644 --- a/meson.build +++ b/meson.build @@ -1094,6 +1094,23 @@ if libparted_dep.found() endif endif +libpcap_version = '1.5.0' +libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false) +if not libpcap_dep.found() + pcap_config_prog = find_program('pcap-config', required: get_option('libpcap')) + if pcap_config_prog.found() + pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split() + pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split() + libpcap_dep = declare_dependency( + compile_args: pcap_args, + link_args: pcap_libs, + ) + endif +endif +if libpcap_dep.found() + conf.set('HAVE_LIBPCAP', 1) +endif + use_macvtap = false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1259,6 +1276,7 @@ libs_summary = { 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libnl': libnl_dep.found(), + 'libpcap': libpcap_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 44e756bdcf3..9e4e3f66429 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,5 +24,6 @@ option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') +option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support') option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 ---- m4/virt-ssh2.m4 | 30 ------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 m4/virt-ssh2.m4 diff --git a/configure.ac b/configure.ac index 1709f56a8b5..c81db75ae33 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,6 @@ fi # RPC, we don't need several libraries. if test "$with_remote" = "no" ; then with_libvirtd=no - with_ssh2=no with_sasl=no fi # Stateful drivers are useful only when building the daemon. @@ -121,7 +120,6 @@ LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX -LIBVIRT_ARG_SSH2 LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK @@ -140,7 +138,6 @@ LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX -LIBVIRT_CHECK_SSH2 LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK @@ -439,7 +436,6 @@ LIBVIRT_RESULT_RBD LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX -LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4 deleted file mode 100644 index f712f81fe2c..00000000000 --- a/m4/virt-ssh2.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libssh2.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_SSH2],[ - LIBVIRT_ARG_WITH_FEATURE([SSH2], [libssh2], [check], [1.3]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SSH2],[ - LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3]) -]) - -AC_DEFUN([LIBVIRT_RESULT_SSH2],[ - LIBVIRT_RESULT_LIB([SSH2]) -]) diff --git a/meson.build b/meson.build index 2ab3aa87dea..6f37862611a 100644 --- a/meson.build +++ b/meson.build @@ -1132,6 +1132,16 @@ else libssh_dep = dependency('', required: false) endif +libssh2_version = '1.3' +if get_option('driver_remote').enabled() + libssh2_dep = dependency('libssh2', version: '>=' + libssh2_version, required: get_option('libssh2')) + if libssh2_dep.found() + conf.set('WITH_SSH2', 1) + endif +else + libssh2_dep = dependency('', required: false) +endif + use_macvtap = false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1299,6 +1309,7 @@ libs_summary = { 'libnl': libnl_dep.found(), 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), + 'libssh2': libssh2_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 9588db5b835..a6e53ca36dc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,5 +26,6 @@ option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support') option('libssh', type: 'feature', value: 'auto', description: 'libssh support') +option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-netcf.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-netcf.m4 diff --git a/configure.ac b/configure.ac index 6710900fa35..798a30bbd3d 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL @@ -124,7 +123,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER @@ -421,7 +419,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 deleted file mode 100644 index ada6b5a7a98..00000000000 --- a/m4/virt-netcf.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libnetcf.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_NETCF],[ - LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NETCF],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NETCF],[ - LIBVIRT_RESULT_LIB([NETCF]) -]) diff --git a/meson.build b/meson.build index 55cf12a951c..025878a0df6 100644 --- a/meson.build +++ b/meson.build @@ -1164,6 +1164,12 @@ if use_macvtap endif endif +netcf_version = '0.1.8' +netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf')) +if netcf_dep.found() + conf.set('WITH_NETCF', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1315,6 +1321,7 @@ libs_summary = { 'libssh2': libssh2_dep.found(), 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), + 'netcf': netcf_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a6e53ca36dc..dc248ee0fe4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,4 +28,5 @@ option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support' option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') +option('netcf', type: 'feature', value: 'auto', description: 'netcf support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-numactl.m4 | 34 ---------------------------------- meson.build | 10 ++++++++++ meson_options.txt | 1 + 4 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 m4/virt-numactl.m4 diff --git a/configure.ac b/configure.ac index 87ba8d059f2..2f3730581ef 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi # Check for compiler and library settings. LIBVIRT_ARG_NSS -LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS @@ -122,7 +121,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS @@ -417,7 +415,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS -LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4 deleted file mode 100644 index f93ffd56dee..00000000000 --- a/m4/virt-numactl.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl The libnuma.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_NUMACTL],[ - LIBVIRT_ARG_WITH_FEATURE([NUMACTL], [numa], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ - LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h]) - AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes]) - if test "$have_numa_bitmask_isbitset" = "yes"; then - AC_DEFINE_UNQUOTED([HAVE_NUMA_BITMASK_ISBITSET], 1, [whether numa_bitmask_isbitset is available]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_NUMACTL],[ - LIBVIRT_RESULT_LIB([NUMACTL]) -]) diff --git a/meson.build b/meson.build index 9a32159472e..cda54c0e862 100644 --- a/meson.build +++ b/meson.build @@ -1208,6 +1208,15 @@ if not get_option('nls').disabled() endif endif +numactl_dep = cc.find_library('numa', required: get_option('numactl')) +if numactl_dep.found() + conf.set('WITH_NUMACTL', 1) + + if cc.has_function('numa_bitmask_isbitset', dependencies: [ numactl_dep ]) + conf.set('HAVE_NUMA_BITMASK_ISBITSET', 1) + endif +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1361,6 +1370,7 @@ libs_summary = { 'macvtap': conf.has('WITH_MACVTAP'), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, + 'numaclt': numactl_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index d906281900d..a29ea23d21a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -30,4 +30,5 @@ option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support' option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') option('netcf', type: 'feature', value: 'auto', description: 'netcf support') option('nls', type: 'feature', value: 'auto', description: 'nls support') +option('numactl', type: 'feature', value: 'auto', description: 'numactl support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- m4/virt-driver-vz.m4 | 4 ---- meson.build | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4 index 9a8bc42efa1..11045e8b393 100644 --- a/m4/virt-driver-vz.m4 +++ b/m4/virt-driver-vz.m4 @@ -22,12 +22,8 @@ AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[ ]) AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ - PARALLELS_SDK_REQUIRED="7.0.22" - if test "$with_vz" = "yes" || test "$with_vz" = "check"; then - PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >= $PARALLELS_SDK_REQUIRED], - [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no]) if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Virtuozzo driver.]) diff --git a/meson.build b/meson.build index 0fc7f3f4bb7..a9ebcd18842 100644 --- a/meson.build +++ b/meson.build @@ -1220,6 +1220,9 @@ endif openwsman_version = '2.2.3' openwsman_dep = dependency('openwsman', version: '>=' + openwsman_version, required: get_option('openwsman')) +parallels_sdk_version = '7.0.22' +parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_version, required: false) + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-polkit.m4 | 62 ----------------------------------------------- meson.build | 13 ++++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 m4/virt-polkit.m4 diff --git a/configure.ac b/configure.ac index 49e6cb6e84e..359bfe4fa54 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX @@ -121,7 +120,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL @@ -412,7 +410,6 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS -LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_RBD LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4 deleted file mode 100644 index 06da9e4ba6f..00000000000 --- a/m4/virt-polkit.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl The polkit library -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_ARG_POLKIT], [ - LIBVIRT_ARG_WITH([POLKIT], [use PolicyKit for UNIX socket access checks], - [check]) -]) - -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. - AC_PATH_PROG([PKCHECK_PATH], [pkcheck], [], [$LIBVIRT_SBIN_PATH]) - if test "x$PKCHECK_PATH" = "x" ; then - with_polkit="no" - fi - fi - - if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then - dnl For --with-polkit=yes, all we need is D-Bus. - if test "x$with_dbus" = "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, - [use PolicyKit for UNIX socket access checks]) - with_polkit="yes" - else - if test "x$with_polkit" = "xcheck" ; then - with_polkit=no - else - AC_MSG_ERROR( - [You must install dbus to compile libvirt with polkit-1]) - fi - fi - fi - - AM_CONDITIONAL([WITH_POLKIT], [test "x$with_polkit" = "xyes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_POLKIT], [ - LIBVIRT_RESULT([polkit], [$with_polkit]) -]) diff --git a/meson.build b/meson.build index 17116af59da..e6dc0aa8717 100644 --- a/meson.build +++ b/meson.build @@ -1226,6 +1226,12 @@ parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_ve pciaccess_version = '0.10.0' pciaccess_dep = dependency('pciaccess', version: '>=' + pciaccess_version, required: get_option('pciaccess')) +if not get_option('polkit').disabled() and host_machine.system() != 'windows' + pkcheck_prog = find_program('pkcheck', required: false, dirs: libvirt_sbin_path) +else + pkcheck_prog = dependency('', required: false) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1333,6 +1339,12 @@ if conf.has('WITH_MACVTAP') and not conf.has('HAVE_LIBNL') error('libnl3-devel is required for macvtap support') endif +if (pkcheck_prog.found() or get_option('polkit').enabled()) and dbus_dep.found() + conf.set('WITH_POLKIT', 1) +elif get_option('polkit').enabled() + error('You must install dbus to compile libvirt with polkit-1') +endif + # define top include directory @@ -1382,6 +1394,7 @@ libs_summary = { 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), + 'polkit': conf.has('WITH_POLKIT'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 991245e0841..3dfe4ca0166 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -33,4 +33,5 @@ option('nls', type: 'feature', value: 'auto', description: 'nls support') option('numactl', type: 'feature', value: 'auto', description: 'numactl support') option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support') option('pciaccess', type: 'feature', value: 'auto', description: 'pciaccess support') +option('polkit', type: 'feature', value: 'auto', description: 'use PolicyKit for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-sanlock.m4 | 47 ---------------------------------------------- meson.build | 13 +++++++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-sanlock.m4 diff --git a/configure.ac b/configure.ac index 359bfe4fa54..97b0f6c4bb8 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX LIBVIRT_ARG_UDEV @@ -121,7 +120,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_UDEV @@ -411,7 +409,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_UDEV diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 deleted file mode 100644 index eb05ab6934b..00000000000 --- a/m4/virt-sanlock.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libsanlock_client.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_SANLOCK],[ - LIBVIRT_ARG_WITH_FEATURE([SANLOCK], [sanlock-client], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ - LIBVIRT_CHECK_PKG([SANLOCK], [libsanlock_client], [3.2.4]) - - if test "x$with_sanlock" = "xyes" ; then - old_cppflags="$CPPFLAGS" - old_libs="$LIBS" - CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS" - LIBS="$LIBS $SANLOCK_LIBS" - - AC_CHECK_LIB([sanlock_client], [sanlock_strerror], - [sanlock_strerror=yes], [sanlock_strerror=no]) - if test "x$sanlock_strerror" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_STRERROR], 1, - [whether sanlock supports sanlock_strerror]) - fi - - CPPFLAGS="$old_cppflags" - LIBS="$old_libs" - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_SANLOCK],[ - LIBVIRT_RESULT_LIB([SANLOCK]) -]) diff --git a/meson.build b/meson.build index d272b5cca05..1bdca816379 100644 --- a/meson.build +++ b/meson.build @@ -1310,6 +1310,18 @@ if readline_dep.found() conf.set('WITH_READLINE', 1) endif +if not get_option('sanlock').disabled() + sanlock_dep = dependency('libsanlock_client', required: false) + + if sanlock_dep.found() + conf.set('WITH_SANLOCK', 1) + # check for sanlock_strerror introduced in sanlock-3.5.0 + if cc.has_function('sanlock_strerror', dependencies: sanlock_dep) + conf.set('HAVE_SANLOCK_STRERROR', 1) + endif + endif +endif + # generic build dependencies checks @@ -1412,6 +1424,7 @@ libs_summary = { 'polkit': conf.has('WITH_POLKIT'), 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), + 'sanlock': conf.has('WITH_SANLOCK'), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 3dfe4ca0166..964fe5e8aea 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -35,3 +35,4 @@ option('openwsman', type: 'feature', value: 'auto', description: 'openwsman supp option('pciaccess', type: 'feature', value: 'auto', description: 'pciaccess support') option('polkit', type: 'feature', value: 'auto', description: 'use PolicyKit for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline support') +option('sanlock', type: 'feature', value: 'auto', description: 'sanlock support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-selinux.m4 | 47 ---------------------------------------------- meson.build | 15 +++++++++++++++ meson_options.txt | 2 ++ 4 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-selinux.m4 diff --git a/configure.ac b/configure.ac index c8d7bbf7a92..0a51a07be0e 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_SELINUX LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK @@ -118,7 +117,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK @@ -406,7 +404,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 deleted file mode 100644 index fb541e207ed..00000000000 --- a/m4/virt-selinux.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libselinux.so library -dnl -dnl Copyright (C) 2012-2014, 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_ARG_SELINUX],[ - LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SELinux], [check]) - LIBVIRT_ARG_WITH([SELINUX_MOUNT], [set SELinux mount point], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ - LIBVIRT_CHECK_LIB([SELINUX], [selinux], - [fgetfilecon_raw], [selinux/selinux.h]) - - if test "$with_selinux" = "yes"; then - 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 - SELINUX_MOUNT=/sys/fs/selinux - else - SELINUX_MOUNT=/selinux - fi - else - SELINUX_MOUNT=$with_selinux_mount - fi - AC_MSG_RESULT([$SELINUX_MOUNT]) - AC_DEFINE_UNQUOTED([SELINUX_MOUNT], ["$SELINUX_MOUNT"], [SELinux mount point]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_SELINUX],[ - LIBVIRT_RESULT_LIB([SELINUX]) -]) diff --git a/meson.build b/meson.build index d7f3fa7a198..fa4dbee3ef3 100644 --- a/meson.build +++ b/meson.build @@ -1332,6 +1332,20 @@ else sasl_dep = dependency('', required: false) endif +selinux_dep = cc.find_library('selinux', required: get_option('selinux')) +if selinux_dep.found() + selinux_mount = get_option('selinux_mount') + if selinux_mount == '' + if run_command('test', '-d', '/sys/fs/selinux').returncode() == 0 + selinux_mount = '/sys/fs/selinux' + else + selinux_mount = '/selinux' + endif + endif + conf.set_quoted('SELINUX_MOUNT', selinux_mount) + conf.set('WITH_SELINUX', 1) +endif + # generic build dependencies checks @@ -1436,6 +1450,7 @@ libs_summary = { 'readline': readline_dep.found(), 'sanlock': conf.has('WITH_SANLOCK'), 'sasl': sasl_dep.found(), + 'selinux': selinux_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a674876713c..40830f9494a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -37,3 +37,5 @@ option('polkit', type: 'feature', value: 'auto', description: 'use PolicyKit for option('readline', type: 'feature', value: 'auto', description: 'readline support') option('sanlock', type: 'feature', value: 'auto', description: 'sanlock support') option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') +option('selinux', type: 'feature', value: 'auto', description: 'selinux support') +option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-udev.m4 | 36 ------------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-udev.m4 diff --git a/configure.ac b/configure.ac index 60cde7c3da7..da4873ea6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -109,14 +109,12 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR @@ -403,7 +401,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 deleted file mode 100644 index 2e0f993e339..00000000000 --- a/m4/virt-udev.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The libudev.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_UDEV],[ - LIBVIRT_ARG_WITH_FEATURE([UDEV], [libudev], [check], [219]) -]) - -AC_DEFUN([LIBVIRT_CHECK_UDEV],[ - AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS]) - LIBVIRT_CHECK_PKG([UDEV], [libudev], [219]) - - if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then - AC_MSG_ERROR([You must install the pciaccess module to build with udev]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_UDEV],[ - AC_REQUIRE([LIBVIRT_RESULT_PCIACCESS]) - LIBVIRT_RESULT_LIB([UDEV]) -]) diff --git a/meson.build b/meson.build index 41c6075985d..453522fd79a 100644 --- a/meson.build +++ b/meson.build @@ -1364,6 +1364,12 @@ if not cc.compiles(pthread_sigmask_code) conf.set('FUNC_PTHREAD_SIGMASK_BROKEN', 1) endif +udev_version = '219' +udev_dep = dependency('libudev', version: '>=' + udev_version, required: get_option('udev')) +if udev_dep.found() + conf.set('WITH_UDEV', 1) +endif + # generic build dependencies checks @@ -1414,6 +1420,10 @@ elif get_option('polkit').enabled() error('You must install dbus to compile libvirt with polkit-1') endif +if udev_dep.found() and not pciaccess_dep.found() + error('You must install the pciaccess module to build with udev') +endif + # define top include directory @@ -1469,6 +1479,7 @@ libs_summary = { 'sanlock': conf.has('WITH_SANLOCK'), 'sasl': sasl_dep.found(), 'selinux': selinux_dep.found(), + 'udev': udev_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 40830f9494a..42b63444ee4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -39,3 +39,4 @@ option('sanlock', type: 'feature', value: 'auto', description: 'sanlock support' option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') option('selinux', type: 'feature', value: 'auto', description: 'selinux support') option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point') +option('udev', type: 'feature', value: 'auto', description: 'udev support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 -- m4/virt-virtualport.m4 | 65 ------------------------------------------ meson.build | 13 +++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 m4/virt-virtualport.m4 diff --git a/configure.ac b/configure.ac index 4d437a54021..86e4b63ddf7 100644 --- a/configure.ac +++ b/configure.ac @@ -109,13 +109,11 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL @@ -399,7 +397,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) diff --git a/m4/virt-virtualport.m4 b/m4/virt-virtualport.m4 deleted file mode 100644 index b758efc3c4a..00000000000 --- a/m4/virt-virtualport.m4 +++ /dev/null @@ -1,65 +0,0 @@ -dnl The virtualport support 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_ARG_VIRTUALPORT], [ - LIBVIRT_ARG_WITH([VIRTUALPORT], [enable virtual port support], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_VIRTUALPORT],[ - AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) - - dnl Warn the user and error out if they requested virtualport support - dnl with configure options, but the required macvtap support isn't available - - if test "$with_virtualport" = "yes"; then - if test "$with_macvtap" = "no"; then - AC_MSG_ERROR([--with-virtualport requires --with-macvtap]) - fi - fi - - dnl virtualport checks - - if test "$with_macvtap" != "yes"; then - with_virtualport=no - fi - if test "$with_virtualport" != "no"; then - AC_MSG_CHECKING([whether to compile with virtual port support]) - AC_TRY_COMPILE([ #include <sys/socket.h> - #include <linux/rtnetlink.h> ], - [ int x = IFLA_PORT_MAX; ], - [ with_virtualport=yes ], - [ if test "$with_virtualport" = "yes" ; then - AC_MSG_ERROR([Installed linux headers don't show support for virtual port support.]) - fi - with_virtualport=no ]) - if test "$with_virtualport" = "yes"; then - val=1 - else - val=0 - fi - AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, - [whether vsi vepa support is enabled]) - AC_MSG_RESULT([$with_virtualport]) - fi - AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_VIRTUALPORT],[ - LIBVIRT_RESULT_LIB([VIRTUALPORT]) -]) diff --git a/meson.build b/meson.build index fa1236e87b8..f5cc0e1d41f 100644 --- a/meson.build +++ b/meson.build @@ -1375,6 +1375,14 @@ if util_dep.found() add_project_link_arguments('-lutil', language: 'c') endif +if not get_option('virtualport').disabled() + if cc.has_header_symbol('linux/if_link.h', 'IFLA_PORT_MAX') + conf.set('WITH_VIRTUALPORT', 1) + elif get_option('virtualport').enabled() + error('Installed linux headers don\'t show support for virtual port support.') + endif +endif + # generic build dependencies checks @@ -1429,6 +1437,10 @@ if udev_dep.found() and not pciaccess_dep.found() error('You must install the pciaccess module to build with udev') endif +if conf.has('WITH_VIRTUALPORT') and not conf.has('WITH_MACVTAP') + error('macvtap is required for virtualport support') +endif + # define top include directory @@ -1485,6 +1497,7 @@ libs_summary = { 'sasl': sasl_dep.found(), 'selinux': selinux_dep.found(), 'udev': udev_dep.found(), + 'virtualport': conf.has('WITH_VIRTUALPORT'), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 42b63444ee4..025cc663027 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -40,3 +40,4 @@ option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') option('selinux', type: 'feature', value: 'auto', description: 'selinux support') option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point') option('udev', type: 'feature', value: 'auto', description: 'udev support') +option('virtualport', type: 'feature', value: 'auto', description: 'enable virtual port support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 6 ---- m4/virt-wireshark.m4 | 71 -------------------------------------------- meson.build | 44 +++++++++++++++++++++++++++ meson_options.txt | 2 ++ 4 files changed, 46 insertions(+), 77 deletions(-) delete mode 100644 m4/virt-wireshark.m4 diff --git a/configure.ac b/configure.ac index 0b02b259c65..5e92466c4aa 100644 --- a/configure.ac +++ b/configure.ac @@ -109,12 +109,10 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL @@ -414,10 +412,6 @@ LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Developer Tools]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_WIRESHARK -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Privileges]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_QEMU_PRIVILEGES diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 deleted file mode 100644 index 2eee8a6ce86..00000000000 --- a/m4/virt-wireshark.m4 +++ /dev/null @@ -1,71 +0,0 @@ -dnl The libvirt.so wireshark plugin -dnl -dnl Copyright (C) 2015 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_ARG_WIRESHARK],[ - LIBVIRT_ARG_WITH_FEATURE([WIRESHARK_DISSECTOR], [wireshark], [check], [2.4.0]) - LIBVIRT_ARG_WITH([WS_PLUGINDIR], - [wireshark plugins directory for use when installing - wireshark plugin], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ - LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [2.4.0]) - - dnl Check for system location of wireshark plugins - if test "x$with_wireshark_dissector" != "xno" ; then - if test "x$with_ws_plugindir" = "xcheck" ; then - ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)" - ws_exec_prefix="$($PKG_CONFIG --variable exec_prefix wireshark)" - ws_modversion="$($PKG_CONFIG --modversion wireshark)" - if test "x$ws_plugindir" = "x" ; then - dnl On some systems the plugindir variable may not be stored within pkg config. - dnl Fall back to older style of constructing the plugin dir path. - ws_plugindir="$libdir/wireshark/plugins/$ws_modversion" - else - if test "x$ws_exec_prefix" = "x" ; then - dnl If wireshark's exec_prefix cannot be retrieved from pkg-config, - dnl this is our best bet - ws_exec_prefix="/usr" - fi - dnl Replace wireshark's exec_prefix with our own. - dnl Note that ${exec_prefix} is kept verbatim at this point in time, - dnl and will only be expanded later, when make is called: this makes - dnl it possible to override such prefix at compilation or installation - dnl time - ws_plugindir='${exec_prefix}'"${ws_plugindir#$ws_exec_prefix}" - fi - - dnl Since wireshark 2.5.0 plugins can't live in top level - dnl plugindir but have to be under one of ["epan", - dnl "wiretap", "codecs"] subdir. The first one looks okay. - ws_plugindir="$ws_plugindir/epan" - - elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then - AC_MSG_ERROR([ws-plugindir must be used only with valid path]) - else - ws_plugindir=$with_ws_plugindir - fi - fi - - AC_SUBST([ws_plugindir]) -]) - -AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ - LIBVIRT_RESULT_LIB([WIRESHARK_DISSECTOR]) -]) diff --git a/meson.build b/meson.build index 3f05a1c0c6b..b710417db2f 100644 --- a/meson.build +++ b/meson.build @@ -1404,6 +1404,45 @@ else win32_link_flags = [] endif +wireshark_version = '2.4.0' +wireshark_dep = dependency('wireshark', version: '>=' + wireshark_version, required: get_option('wireshark_dissector')) +if wireshark_dep.found() + wireshark_plugindir = get_option('wireshark_plugindir') + if wireshark_plugindir == '' + wireshark_plugindir = wireshark_dep.get_pkgconfig_variable('plugindir') + endif + + # On some systems the plugindir variable may not be stored within pkg config. + # Fall back to older style of constructing the plugin dir path. + if wireshark_plugindir == '' + wireshark_modversion = wireshark_dep.version() + wireshark_plugindir = '@0@/wireshark/plugins/@1@'.format( + libdir, wireshark_modversion + ) + else + wireshark_prefix = wireshark_dep.get_pkgconfig_variable('prefix') + if wireshark_prefix == '' + # If wireshark's prefix cannot be retrieved from pkg-config, + # this is our best bet. + wireshark_prefix = '/usr' + endif + # Replace wireshark's prefix with our own. + # There is no replace method in meson so we have to workaround it. + rc = run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + wireshark_plugindir, wireshark_prefix, prefix, + ), + check: true, + ) + wireshark_plugindir = rc.stdout().strip() + endif + + # Since wireshark 2.5.0 plugins can't live in top level plugindir but have + # to be under one of ["epan", "wiretap", "codecs"] subdir. The first one looks okay. + wireshark_plugindir = wireshark_plugindir / 'epan' +endif + # generic build dependencies checks @@ -1537,3 +1576,8 @@ misc_summary = { 'Warning Flags': supported_cc_flags, } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') + +devtools_summary = { + 'wireshark_dissector': wireshark_dep.found(), +} +summary(devtools_summary, section: 'Developer Tools', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 025cc663027..25aa81621f9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -41,3 +41,5 @@ option('selinux', type: 'feature', value: 'auto', description: 'selinux support' option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point') option('udev', type: 'feature', value: 'auto', description: 'udev support') option('virtualport', type: 'feature', value: 'auto', description: 'enable virtual port support') +option('wireshark_dissector', type: 'feature', value: 'auto', description: 'wireshark support') +option('wireshark_plugindir', type: 'string', value: '', description: 'wireshark plugins directory for use when installing wireshark plugin') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-yajl.m4 | 42 ------------------------------------------ meson.build | 25 +++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-yajl.m4 diff --git a/configure.ac b/configure.ac index 1a1a855cba6..7c872bbfe6c 100644 --- a/configure.ac +++ b/configure.ac @@ -109,11 +109,9 @@ fi LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_YAJL @@ -392,7 +390,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4 deleted file mode 100644 index b602abd0a7c..00000000000 --- a/m4/virt-yajl.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl The libyajl.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_YAJL],[ - LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_YAJL],[ - dnl YAJL JSON library http://lloyd.github.com/yajl/ - - PKG_CHECK_EXISTS([yajl], [use_pkgconfig=1], [use_pkgconfig=0]) - - if test $use_pkgconfig = 1; then - dnl 2.0.3 was the version where the pkg-config file was first added - LIBVIRT_CHECK_PKG([YAJL], [yajl], [2.0.3]) - else - dnl SLES 12 and openSUSE Leap 42.3 still use 2.0.1 - dnl TODO: delete this in July 2020 - LIBVIRT_CHECK_LIB([YAJL], [yajl], - [yajl_tree_parse], [yajl/yajl_common.h]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_YAJL],[ - LIBVIRT_RESULT_LIB([YAJL]) -]) diff --git a/meson.build b/meson.build index 948ca4d93ab..13062279c0a 100644 --- a/meson.build +++ b/meson.build @@ -1454,6 +1454,30 @@ else xdr_dep = declare_dependency() endif +yajl_version = '2.0.3' +if not get_option('yajl').disabled() + yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: false) + # 2.0.3 was the version where the pkg-config file was first added + # SLES 12 and openSUSE Leap 42.3 still use 2.0.1 + # TODO: delete this in July 2020 + if not yajl_dep.found() + yajl_dep = cc.find_library('yajl', required: get_option('yajl')) + if yajl_dep.found() + has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_common.h>') + if not has_func and get_option('yajl').enabled() + error('yajl >= @0@ was not found'.format(yajl_version)) + elif not has_func + yajl_dep = dependency('', required: false) + endif + endif + endif +else + yajl_dep = dependency('', required: false) +endif +if yajl_dep.found() + conf.set('WITH_YAJL', 1) +endif + # generic build dependencies checks @@ -1570,6 +1594,7 @@ libs_summary = { 'udev': udev_dep.found(), 'virtualport': conf.has('WITH_VIRTUALPORT'), 'xdr': xdr_dep.found(), + 'yajl': yajl_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 25aa81621f9..a0615fcfdc1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -43,3 +43,4 @@ option('udev', type: 'feature', value: 'auto', description: 'udev support') option('virtualport', type: 'feature', value: 'auto', description: 'enable virtual port support') option('wireshark_dissector', type: 'feature', value: 'auto', description: 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wireshark plugins directory for use when installing wireshark plugin') +option('yajl', type: 'feature', value: 'auto', description: 'yajl support') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 13 ------------- m4/virt-driver-libvirtd.m4 | 33 --------------------------------- meson.build | 23 +++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-libvirtd.m4 diff --git a/configure.ac b/configure.ac index e9a684b1b58..25250fd2c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -87,16 +87,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) -if test "$with_win" = "yes" ; then - # We don't support the daemon yet - with_libvirtd=no -fi - -# The daemon requires remote support. Likewise, if we are not using -# RPC, we don't need several libraries. -if test "$with_remote" = "no" ; then - with_libvirtd=no -fi # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" = "no" ; then with_qemu=no @@ -130,7 +120,6 @@ LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST -LIBVIRT_DRIVER_ARG_LIBVIRTD LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -145,7 +134,6 @@ LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST -LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -353,7 +341,6 @@ LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK -LIBVIRT_DRIVER_RESULT_LIBVIRTD LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) diff --git a/m4/virt-driver-libvirtd.m4 b/m4/virt-driver-libvirtd.m4 deleted file mode 100644 index 090f9532f94..00000000000 --- a/m4/virt-driver-libvirtd.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The libvirtd driver -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_DRIVER_ARG_LIBVIRTD], [ - LIBVIRT_ARG_WITH_FEATURE([LIBVIRTD], [libvirtd], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBVIRTD], [ - if test "$with_libvirtd" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_LIBVIRTD], 1, [whether libvirtd daemon is enabled]) - fi - AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LIBVIRTD], [ - LIBVIRT_RESULT([Libvirtd], [$with_libvirtd]) -]) diff --git a/meson.build b/meson.build index 6c31ae6c848..4aae01f62e5 100644 --- a/meson.build +++ b/meson.build @@ -1549,6 +1549,28 @@ endif remote_default_mode = get_option('remote_default_mode').to_upper() conf.set('REMOTE_DRIVER_MODE_DEFAULT', 'REMOTE_DRIVER_MODE_@0@'.format(remote_default_mode)) +if not get_option('driver_libvirtd').disabled() + use_libvirtd = true + + if host_machine.system() == 'windows' + use_libvirtd = false + if get_option('driver_libvirtd').enabled() + error('libvirtd daemon is not supported on windows') + endif + endif + + if not conf.has('WITH_REMOTE') + use_libvirtd = false + if get_option('driver_libvirtd').enabled() + error('remote driver is required for libvirtd daemon') + endif + endif + + if use_libvirtd + conf.set('WITH_LIBVIRTD', 1) + endif +endif + # define top include directory @@ -1570,6 +1592,7 @@ configure_file(output: 'meson-config.h', configuration: conf) driver_summary = { 'Remote': conf.has('WITH_REMOTE'), + 'Libvirtd': conf.has('WITH_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 4360540bf5a..8731f78defe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,5 +47,6 @@ option('yajl', type: 'feature', value: 'auto', description: 'yajl support') # build driver options +option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-driver-hyperv.m4 | 47 ---------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-driver-hyperv.m4 diff --git a/configure.ac b/configure.ac index a85c52bea14..84cd16f4d95 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -128,7 +127,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -331,7 +329,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC -LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4 deleted file mode 100644 index f276a881f3b..00000000000 --- a/m4/virt-driver-hyperv.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The Hyper-V driver -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_DRIVER_ARG_HYPERV], [ - LIBVIRT_ARG_WITH_FEATURE([HYPERV], [Hyper-V], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [ - AC_REQUIRE([LIBVIRT_CHECK_OPENWSMAN]) - - if test "$with_hyperv" != "no"; then - if test "$with_openwsman" != "yes"; then - if test "$with_hyperv" = "check"; then - with_hyperv=no - else - AC_MSG_ERROR([openwsman is required for the Hyper-V driver]) - fi - else - with_hyperv=yes - fi - fi - - if test "$with_hyperv" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enabled]) - fi - AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_HYPERV], [ - LIBVIRT_RESULT([Hyper-V], [$with_hyperv]) -]) diff --git a/meson.build b/meson.build index 153790c29ec..3c1ccb8f600 100644 --- a/meson.build +++ b/meson.build @@ -1593,6 +1593,12 @@ elif get_option('driver_esx').enabled() error('Curl is required for the ESX driver') endif +if not get_option('driver_hyperv').disabled() and openwsman_dep.found() + conf.set('WITH_HYPERV', 1) +elif get_option('driver_hyperv').enabled() + error('openwsman is required for the Hyper-V driver') +endif + # define top include directory @@ -1614,6 +1620,7 @@ configure_file(output: 'meson-config.h', configuration: conf) driver_summary = { 'ESX': conf.has('WITH_ESX'), + 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), diff --git a/meson_options.txt b/meson_options.txt index 700b7d41287..c64700fcc4e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,6 +49,7 @@ option('yajl', type: 'feature', value: 'auto', description: 'yajl support') # build driver options option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe driver') option('driver_esx', type: 'feature', value: 'enabled', description: 'esx driver') +option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 8 ----- m4/virt-driver-lxc.m4 | 74 ------------------------------------------- meson.build | 34 ++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 35 insertions(+), 82 deletions(-) delete mode 100644 m4/virt-driver-lxc.m4 diff --git a/configure.ac b/configure.ac index 4725050080f..3139b41a36a 100644 --- a/configure.ac +++ b/configure.ac @@ -74,10 +74,6 @@ case $host in esac if test $with_linux = no; then - if test "x$with_lxc" != xyes - then - with_lxc=no - fi with_dtrace=no with_storage_scsi=no fi @@ -90,7 +86,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" = "no" ; then with_qemu=no - with_lxc=no with_vbox=no fi @@ -112,7 +107,6 @@ LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX -LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK @@ -122,7 +116,6 @@ LIBVIRT_DRIVER_CHECK_QEMU LIBVIRT_DRIVER_CHECK_OPENVZ LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX -LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK @@ -324,7 +317,6 @@ LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX -LIBVIRT_DRIVER_RESULT_LXC LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK diff --git a/m4/virt-driver-lxc.m4 b/m4/virt-driver-lxc.m4 deleted file mode 100644 index d2951b596a6..00000000000 --- a/m4/virt-driver-lxc.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl The LXC driver -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_DRIVER_ARG_LXC], [ - LIBVIRT_ARG_WITH_FEATURE([LXC], [Linux Container], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LXC], [ - if test "$with_libvirtd" = "no" ; then - with_lxc=no - fi - - if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include <sched.h> - #include <linux/loop.h> - #include <sys/epoll.h> - ]], [[ - unshare(!(LO_FLAGS_AUTOCLEAR + EPOLL_CLOEXEC)); - ]]) - ], [ - with_lxc=yes - AC_DEFINE([HAVE_DECL_LO_FLAGS_AUTOCLEAR], [1], - [Define to 1 if you have the declaration of `LO_FLAGS_AUTOCLEAR', - and to 0 if you don't.]) - ], [ - if test "$with_lxc" = "check"; then - with_lxc=no - AC_MSG_NOTICE([Required kernel features were not found, disabling LXC]) - else - AC_MSG_ERROR([Required kernel features for LXC were not found]) - fi - ]) - - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include <sched.h> - #include <linux/loop.h> - #include <sys/epoll.h> - ]], [[ - unshare(!(LOOP_CTL_GET_FREE)); - ]]) - ], [ - AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], - [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', - and to 0 if you don't.]) - ]) - fi - if test "$with_lxc" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) - fi - AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LXC], [ - LIBVIRT_RESULT([LXC], [$with_lxc]) -]) diff --git a/meson.build b/meson.build index 813da0ff79e..2ed93e857d0 100644 --- a/meson.build +++ b/meson.build @@ -1650,6 +1650,39 @@ elif get_option('driver_libxl').enabled() error('libvirtd is required for libxenlight') endif +if not get_option('driver_lxc').disabled() and host_machine.system() == 'linux' and conf.has('WITH_LIBVIRTD') + lxc_support_code = ''' +#include <sched.h> +#include <linux/loop.h> +#include <sys/epoll.h> + +void main(void) { + unshare(!(LO_FLAGS_AUTOCLEAR + EPOLL_CLOEXEC)); +} + ''' + if cc.compiles(lxc_support_code, name: 'lxc support', args: '-D_GNU_SOURCE') + conf.set('WITH_LXC', 1) + conf.set('HAVE_DECL_LO_FLAGS_AUTOCLEAR', 1) + elif get_option('driver_lxc').enabled() + error('Required kernel features for LXC were not found') + endif + + lxc_get_free_code = ''' +#include <sched.h> +#include <linux/loop.h> +#include <sys/epoll.h> + +void main(void) { + unshare(!(LOOP_CTL_GET_FREE)); +} + ''' + if cc.compiles(lxc_get_free_code) + conf.set('HAVE_DECL_LOOP_CTL_GET_FREE', 1) + endif +elif get_option('driver_lxc').enabled() + error('linux and remote_driver are required for LXC') +endif + # define top include directory @@ -1671,6 +1704,7 @@ configure_file(output: 'meson-config.h', configuration: conf) driver_summary = { 'libxl': conf.has('WITH_LIBXL'), + 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), diff --git a/meson_options.txt b/meson_options.txt index 5329fd4cd05..ccc0a209378 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,5 +52,6 @@ option('driver_esx', type: 'feature', value: 'enabled', description: 'esx driver option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxenlight driver') +option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux Container driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 8 --- m4/virt-driver-qemu.m4 | 132 ----------------------------------------- meson.build | 127 +++++++++++++++++++++++++++++++++++++++ meson_options.txt | 3 + 4 files changed, 130 insertions(+), 140 deletions(-) delete mode 100644 m4/virt-driver-qemu.m4 diff --git a/configure.ac b/configure.ac index 30b84856d38..d0189c8701a 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" = "no" ; then - with_qemu=no with_vbox=no fi @@ -103,7 +102,6 @@ dnl dnl Virtualization drivers check dnl -LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ @@ -111,7 +109,6 @@ LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE -LIBVIRT_DRIVER_CHECK_QEMU LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ @@ -311,7 +308,6 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ @@ -366,7 +362,3 @@ LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Privileges]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_QEMU_PRIVILEGES -AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4 deleted file mode 100644 index 886261fce5c..00000000000 --- a/m4/virt-driver-qemu.m4 +++ /dev/null @@ -1,132 +0,0 @@ -dnl The QEMU driver -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_DRIVER_ARG_QEMU], [ - LIBVIRT_ARG_WITH_FEATURE([QEMU], [QEMU/KVM], [check]) - LIBVIRT_ARG_WITH([QEMU_USER], [username to run QEMU system instance as], - ['platform dependent']) - LIBVIRT_ARG_WITH([QEMU_GROUP], [groupname to run QEMU system instance as], - ['platform dependent']) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [ - dnl There is no way qemu driver will work without JSON support - AC_REQUIRE([LIBVIRT_CHECK_YAJL]) - if test "$with_qemu:$with_yajl" = "yes:no"; then - AC_MSG_ERROR([YAJL 2 is required to build QEMU driver]) - fi - if test "$with_qemu" = "check"; then - with_qemu=$with_yajl - fi - - if test "$with_qemu" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) - fi - AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) - - if test $with_freebsd = yes || test $with_macos = yes; then - default_qemu_user=root - default_qemu_group=wheel - else - # Try to integrate gracefully with downstream packages by running QEMU - # processes using the same user and group they would - case $(grep ^ID= /etc/os-release 2>/dev/null) in - *arch*) - default_qemu_user=nobody - default_qemu_group=nobody - ;; - *centos*|*fedora*|*gentoo*|*rhel*|*suse*) - default_qemu_user=qemu - default_qemu_group=qemu - ;; - *debian*) - default_qemu_user=libvirt-qemu - default_qemu_group=libvirt-qemu - ;; - *ubuntu*) - default_qemu_user=libvirt-qemu - default_qemu_group=kvm - ;; - *) - default_qemu_user=root - default_qemu_group=root - ;; - esac - # If the expected user and group don't exist, or we haven't hit any - # of the cases above because we're running on an unknown OS, the only - # sensible fallback is root:root - AC_MSG_CHECKING([for QEMU credentials ($default_qemu_user:$default_qemu_group)]) - if getent passwd "$default_qemu_user" >/dev/null 2>&1 && \ - getent group "$default_qemu_group" >/dev/null 2>&1; then - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([not found, using root:root instead]) - default_qemu_user=root - default_qemu_group=root - fi - fi - - if test "x$with_qemu_user" = "xplatform dependent" ; then - QEMU_USER="$default_qemu_user" - else - QEMU_USER="$with_qemu_user" - fi - if test "x$with_qemu_group" = "xplatform dependent" ; then - QEMU_GROUP="$default_qemu_group" - else - QEMU_GROUP="$with_qemu_group" - fi - AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) - AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) - - AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], - [/usr/libexec/qemu-bridge-helper], - [/usr/libexec:/usr/lib/qemu:/usr/lib]) - AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], - [QEMU bridge helper]) - AC_PATH_PROG([QEMU_PR_HELPER], [qemu-pr-helper], - [/usr/bin/qemu-pr-helper], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_PR_HELPER], ["$QEMU_PR_HELPER"], - [QEMU PR helper]) - AC_PATH_PROG([QEMU_SLIRP_HELPER], [slirp-helper], - [/usr/bin/slirp-helper], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_SLIRP_HELPER], ["$QEMU_SLIRP_HELPER"], - [QEMU slirp helper]) - - AC_PATH_PROG([QEMU_DBUS_DAEMON], [dbus-daemon], - [/usr/bin/dbus-daemon], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_DBUS_DAEMON], ["$QEMU_DBUS_DAEMON"], - [QEMU dbus daemon]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_QEMU], [ - LIBVIRT_RESULT([QEMU], [$with_qemu]) -]) - -AC_DEFUN([LIBVIRT_RESULT_QEMU_PRIVILEGES], [ - if test "$QEMU_USER" = "root"; then - LIBVIRT_RESULT([QEMU], [$QEMU_USER:$QEMU_GROUP], - [!!! running QEMU as root is strongly discouraged !!!]) - else - LIBVIRT_RESULT([QEMU], [$QEMU_USER:$QEMU_GROUP]) - fi -]) diff --git a/meson.build b/meson.build index cae9743f5b2..b7710bd0fcb 100644 --- a/meson.build +++ b/meson.build @@ -1689,6 +1689,121 @@ elif get_option('driver_openvz').enabled() error('OpenVZ driver can be enabled on Linux only') endif +if not get_option('driver_qemu').disabled() + use_qemu = true + + if not yajl_dep.found() + use_qemu = false + if get_option('driver_qemu').enabled() + error('YAJL 2 is required to build QEMU driver') + endif + endif + + if not conf.has('WITH_LIBVIRTD') + use_qemu = false + if get_option('driver_qemu').enabled() + error('libvirtd is required to build QEMU driver') + endif + endif + + if use_qemu + conf.set('WITH_QEMU', 1) + + if host_machine.system() in ['freebsd', 'darwin'] + default_qemu_user = 'root' + default_qemu_group = 'wheel' + else + os_release = run_command('grep', '^ID=', '/etc/os-release').stdout() + if os_release.contains('arch') + default_qemu_user = 'nobody' + default_qemu_group = 'nobody' + elif ( os_release.contains('centos') or + os_release.contains('fedora') or + os_release.contains('gentoo') or + os_release.contains('rhel') or + os_release.contains('suse')) + default_qemu_user = 'qemu' + default_qemu_group = 'qemu' + elif os_release.contains('debian') + default_qemu_user = 'libvirt-qemu' + default_qemu_group = 'libvirt-qemu' + elif os_release.contains('ubuntu') + default_qemu_user = 'libvirt-qemu' + default_qemu_group = 'kvm' + else + default_qemu_user = 'root' + default_qemu_group = 'root' + endif + # If the expected user and group don't exist, or we haven't hit any + # of the cases above bacuse we're running on an unknown OS, the only + # sensible fallback is root:root + if ( run_command('getent', 'passwd', default_qemu_user).returncode() != 0 and + run_command('getent', 'group', default_qemu_group).returncode() != 0 ) + default_qemu_user = 'root' + default_qemu_group = 'root' + endif + endif + qemu_user = get_option('qemu_user') + if qemu_user == '' + qemu_user = default_qemu_user + endif + qemu_group = get_option('qemu_group') + if qemu_group == '' + qemu_group = default_qemu_group + endif + conf.set_quoted('QEMU_USER', qemu_user) + conf.set_quoted('QEMU_GROUP', qemu_group) + + qemu_bridge_prog = find_program( + 'qemu-bridge-helper', + dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ], + required: false + ) + if qemu_bridge_prog.found() + qemu_bridge_path = qemu_bridge_prog.path() + else + qemu_bridge_path = '/usr/libexec/qemu-bridge-helper' + endif + conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path) + + qemu_pr_prog = find_program( + 'qemu-pr-helper', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_pr_prog.found() + qemu_pr_path = qemu_pr_prog.path() + else + qemu_pr_path = '/usr/bin/qemu-pr-helper' + endif + conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path) + + qemu_slirp_prog = find_program( + 'slirp-helper', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_slirp_prog.found() + qemu_slirp_path = qemu_slirp_prog.path() + else + qemu_slirp_path = '/usr/bin/slirp-helper' + endif + conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path) + + qemu_dbus_daemon_prog = find_program( + 'dbus-daemon', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_dbus_daemon_prog.found() + qemu_dbus_daemon_path = qemu_dbus_daemon_prog.path() + else + qemu_dbus_daemon_path = '/usr/bin/dbus-daemon' + endif + conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path) + endif +endif + # define top include directory @@ -1709,6 +1824,7 @@ configure_file(output: 'meson-config.h', configuration: conf) # print configuration summary driver_summary = { + 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), @@ -1783,3 +1899,14 @@ devtools_summary = { 'wireshark_dissector': wireshark_dep.found(), } summary(devtools_summary, section: 'Developer Tools', bool_yn: true) + +if conf.has('WITH_QEMU') + qemu_warn = '' + if qemu_user == 'root' + qemu_warn = ' !!! running QEMU as root is strongly discouraged !!!' + endif + priv_summary = { + 'QEMU': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn), + } + summary(priv_summary, section: 'Privileges') +endif diff --git a/meson_options.txt b/meson_options.txt index dbe56561752..4f8cddd0aee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -54,5 +54,8 @@ option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd option('driver_libxl', type: 'feature', value: 'auto', description: 'libxenlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux Container driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'OpenVZ driver') +option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/KVM driver') +option('qemu_user', type: 'string', value: '', description: 'username to run QEMU system instance as') +option('qemu_group', type: 'string', value: '', description: 'groupname to run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 8 -------- m4/virt-driver-vbox.m4 | 44 ------------------------------------------ meson.build | 6 ++++++ meson_options.txt | 2 ++ 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 m4/virt-driver-vbox.m4 diff --git a/configure.ac b/configure.ac index ab1b2145756..c0a6da1f3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,11 +83,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) -# Stateful drivers are useful only when building the daemon. -if test "$with_libvirtd" = "no" ; then - with_vbox=no -fi - # Check for compiler and library settings. LIBVIRT_ARG_NSS @@ -103,13 +98,11 @@ dnl Virtualization drivers check dnl LIBVIRT_DRIVER_ARG_VMWARE -LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE LIBVIRT_DRIVER_CHECK_VMWARE -LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -307,7 +300,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_VMWARE -LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4 deleted file mode 100644 index 589b1c3ed5e..00000000000 --- a/m4/virt-driver-vbox.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl The VirtualBox driver -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_DRIVER_ARG_VBOX], [ - LIBVIRT_ARG_WITH_FEATURE([VBOX], [VirtualBox XPCOMC], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VBOX], [ - vbox_xpcomc_dir= - - if test "x$with_vbox" != "xyes" && test "x$with_vbox" != "xno"; then - # intentionally don't do any further checks here on the provided path - vbox_xpcomc_dir=$with_vbox - with_vbox=yes - fi - - AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], - [Location of directory containing VirtualBox XPCOMC library]) - - if test "x$with_vbox" = "xyes"; then - AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled]) - fi - AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VBOX], [ - LIBVIRT_RESULT([VBox], [$with_vbox]) -]) diff --git a/meson.build b/meson.build index 6a32554bb41..3309032face 100644 --- a/meson.build +++ b/meson.build @@ -1808,6 +1808,11 @@ if get_option('driver_test').enabled() conf.set('WITH_TEST', 1) endif +if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') + conf.set('WITH_VBOX', 1) + conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) +endif + # define top include directory @@ -1830,6 +1835,7 @@ configure_file(output: 'meson-config.h', configuration: conf) driver_summary = { 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), + 'VBox': conf.has('WITH_VBOX'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), diff --git a/meson_options.txt b/meson_options.txt index f9f9e3f79fe..4ea5555a914 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -60,3 +60,5 @@ option('qemu_group', type: 'string', value: '', description: 'groupname to run Q option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') option('driver_test', type: 'feature', value: 'enabled', description: 'test driver') +option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver') +option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-driver-vz.m4 | 43 ------------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-vz.m4 diff --git a/configure.ac b/configure.ac index 531ff24feb8..f2947074e5f 100644 --- a/configure.ac +++ b/configure.ac @@ -97,11 +97,9 @@ dnl dnl Virtualization drivers check dnl -LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE -LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -297,7 +295,6 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4 deleted file mode 100644 index 11045e8b393..00000000000 --- a/m4/virt-driver-vz.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The Virtuozzo driver -dnl -dnl Copyright (C) 2005-2015 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_DRIVER_ARG_VZ],[ - LIBVIRT_ARG_WITH_FEATURE([VZ], [Virtuozzo], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ - if test "$with_vz" = "yes" || - test "$with_vz" = "check"; then - - if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then - AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Virtuozzo driver.]) - fi - - with_vz=$PARALLELS_SDK_FOUND - if test "$with_vz" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_VZ], 1, - [whether vz driver is enabled]) - fi - fi - AM_CONDITIONAL([WITH_VZ], [test "$with_vz" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VZ],[ - LIBVIRT_RESULT([vz], [$with_vz]) -]) diff --git a/meson.build b/meson.build index cd7ec2eaa00..19b51890abb 100644 --- a/meson.build +++ b/meson.build @@ -1818,6 +1818,12 @@ if get_option('driver_vmware').enabled() conf.set('WITH_VMX', 1) endif +if not get_option('driver_vz').disabled() and parallels_sdk_dep.found() + conf.set('WITH_VZ', 1) +elif get_option('driver_vz').enabled() + error('Parallels Virtualization SDK is needed to build the Virtuozzo driver.') +endif + # define top include directory @@ -1846,6 +1852,7 @@ driver_summary = { 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), + 'vz': conf.has('WITH_VZ'), 'Bhyve': conf.has('WITH_BHYVE'), 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), diff --git a/meson_options.txt b/meson_options.txt index b6a49991f19..d6963fabd3c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -63,3 +63,4 @@ option('driver_test', type: 'feature', value: 'enabled', description: 'test driv option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'enabled', description: 'VMware driver') +option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozzo driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-driver-network.m4 | 51 --------------------------------------- meson.build | 11 +++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 m4/virt-driver-network.m4 diff --git a/configure.ac b/configure.ac index fdc7755716c..2100beb582d 100644 --- a/configure.ac +++ b/configure.ac @@ -97,10 +97,8 @@ dnl dnl Virtualization drivers check dnl -LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE -LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -287,7 +285,6 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) diff --git a/m4/virt-driver-network.m4 b/m4/virt-driver-network.m4 deleted file mode 100644 index b98ce07c9cb..00000000000 --- a/m4/virt-driver-network.m4 +++ /dev/null @@ -1,51 +0,0 @@ -dnl The network driver -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_DRIVER_ARG_NETWORK], [ - LIBVIRT_ARG_WITH([NETWORK], [with virtual network driver], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_NETWORK], [ - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LIBVIRTD]) - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_QEMU]) - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LXC]) - - dnl there's no use compiling the network driver without the libvirt - dnl daemon, nor compiling it for macOS, where it breaks the compile - - if test "$with_libvirtd" = "no" || test "$with_macos" = "yes"; then - with_network=no - fi - - if test "$with_network" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_NETWORK], 1, [whether network driver is enabled]) - fi - AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"]) - - with_bridge=no - if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then - with_bridge=yes - AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed]) - fi - AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_NETWORK], [ - LIBVIRT_RESULT([Network], [$with_network]) -]) diff --git a/meson.build b/meson.build index eacfd57ee49..bbc74e32dd5 100644 --- a/meson.build +++ b/meson.build @@ -1683,6 +1683,12 @@ elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif +# there's no use compiling the network driver without the libvirt +# daemon, nor compiling it for macOS, where it breaks the compile +if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') and host_machine.system() != 'darwin' + conf.set('WITH_NETWORK', 1) +endif + if not get_option('driver_openvz').disabled() and host_machine.system() == 'linux' conf.set('WITH_OPENVZ', 1) elif get_option('driver_openvz').enabled() @@ -1836,6 +1842,10 @@ elif get_option('secdriver_selinux').enabled() error('You must install the libselinux development package in order to compile libvirt.') endif +if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or conf.has('WITH_NETWORK') + conf.set('WITH_BRIDGE', 1) +endif + # define top include directory @@ -1868,6 +1878,7 @@ driver_summary = { 'Bhyve': conf.has('WITH_BHYVE'), 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), + 'Network': conf.has('WITH_NETWORK'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index fd370244f56..045c211ca46 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -53,6 +53,7 @@ option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V dr option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxenlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux Container driver') +option('driver_network', type: 'feature', value: 'auto', description: 'virtual network driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'OpenVZ driver') option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/KVM driver') option('qemu_user', type: 'string', value: '', description: 'username to run QEMU system instance as') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 11 ----------- meson.build | 4 ++++ meson_options.txt | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 9a806517594..0ab742c970f 100644 --- a/configure.ac +++ b/configure.ac @@ -132,17 +132,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG -LIBVIRT_ARG_WITH_FEATURE([SECRETS], [local secrets management driver], [yes]) - -if test "$with_libvirtd" = "no"; then - with_secrets=no -fi -if test "$with_secrets" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_SECRETS], 1, [whether local secrets management driver is available]) -fi -AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) - - dnl dnl Storage driver checks dnl diff --git a/meson.build b/meson.build index b25d07fce94..3bd4e0423d2 100644 --- a/meson.build +++ b/meson.build @@ -1816,6 +1816,10 @@ if not get_option('driver_qemu').disabled() endif endif +if not get_option('driver_secrets').disabled() and conf.has('WITH_LIBVIRTD') + conf.set('WITH_SECRETS', 1) +endif + if get_option('driver_test').enabled() conf.set('WITH_TEST', 1) endif diff --git a/meson_options.txt b/meson_options.txt index 3d7272348af..1e40eb214bf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -61,6 +61,7 @@ option('qemu_user', type: 'string', value: '', description: 'username to run QEM option('qemu_group', type: 'string', value: '', description: 'groupname to run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') +option('driver_secrets', type: 'feature', value: 'auto', description: 'local secrets management driver') option('driver_test', type: 'feature', value: 'enabled', description: 'test driver') option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 13 ------------- meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index e4cd6c15e16..49ead1baa8e 100644 --- a/configure.ac +++ b/configure.ac @@ -186,19 +186,6 @@ LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE -with_storage=no -for backend in dir fs lvm iscsi iscsi_direct scsi mpath rbd disk; do - if eval test \$with_storage_$backend = yes; then - with_storage=yes - break - fi -done -if test $with_storage = yes; then - AC_DEFINE([WITH_STORAGE], [1], - [Define to 1 if at least one storage backend is in use]) -fi -AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. diff --git a/meson.build b/meson.build index 6527473ceaf..c865d6c2cbf 100644 --- a/meson.build +++ b/meson.build @@ -1861,6 +1861,15 @@ if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or conf.has('WITH_NETWORK') endif +# check for storage drivers + +use_storage = false + +if use_storage + conf.set('WITH_STORAGE', 1) +endif + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 --- m4/virt-storage-disk.m4 | 58 ----------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 m4/virt-storage-disk.m4 diff --git a/configure.ac b/configure.ac index 1edec551fbe..36bcc8a39a6 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,6 @@ LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH -LIBVIRT_STORAGE_ARG_DISK LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_GLUSTER @@ -156,7 +155,6 @@ if test "$with_libvirtd" = "no"; then with_storage_iscsi_direct=no with_storage_scsi=no with_storage_mpath=no - with_storage_disk=no with_storage_rbd=no with_storage_sheepdog=no with_storage_gluster=no @@ -176,7 +174,6 @@ LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH -LIBVIRT_STORAGE_CHECK_DISK LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER @@ -245,7 +242,6 @@ LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH -LIBVIRT_STORAGE_RESULT_DISK LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_GLUSTER diff --git a/m4/virt-storage-disk.m4 b/m4/virt-storage-disk.m4 deleted file mode 100644 index 7429688f4eb..00000000000 --- a/m4/virt-storage-disk.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The storage disk 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_STORAGE_ARG_DISK], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_DISK], [GPartd Disk backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_DISK], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - AC_REQUIRE([LIBVIRT_CHECK_LIBPARTED]) - - if test "$with_storage_disk" = "yes" || - test "$with_storage_disk" = "check"; then - - if test "$with_storage_disk" = "yes" && - test "$with_libparted" != "yes"; then - AC_MSG_ERROR([Need parted for disk storage driver]) - fi - - if test "$with_storage_disk" = "check"; then - with_storage_disk="$with_libparted" - fi - - if test "$with_storage_disk" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, - [whether Disk backend for storage driver is enabled]) - fi - fi - - if test "x$with_storage_disk" = "xyes"; then - if test "x$with_devmapper" = "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to compile libvirt with disk storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_DISK], [ - LIBVIRT_RESULT([Disk], [$with_storage_disk]) -]) diff --git a/meson.build b/meson.build index 1791e09bfa4..df105176b05 100644 --- a/meson.build +++ b/meson.build @@ -1870,6 +1870,13 @@ if conf.has('WITH_LIBVIRTD') use_storage = true conf.set('WITH_STORAGE_DIR', 1) endif + + if not get_option('storage_disk').disabled() and devmapper_dep.found() and libparted_dep.found() + use_storage = true + conf.set('WITH_STORAGE_DISK', 1) + elif get_option('storage_disk').enabled() + error('You must install libparted and libdevmapper to compile libvirt with disk storage driver') + endif endif if use_storage @@ -1916,6 +1923,7 @@ summary(driver_summary, section: 'Drivers', bool_yn: true) storagedriver_summary = { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'Disk': conf.has('WITH_STORAGE_DISK'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index e840c68b498..9b695cf5ac1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -75,3 +75,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SE # storage driver options option('storage_dir', type: 'feature', value: 'auto', description: 'directory backand for the storage driver') +option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 ---- m4/virt-storage-gluster.m4 | 43 -------------------------------------- meson.build | 8 +++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 m4/virt-storage-gluster.m4 diff --git a/configure.ac b/configure.ac index dc812c73d9a..73c0f85ac74 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG -LIBVIRT_STORAGE_ARG_GLUSTER LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE @@ -155,7 +154,6 @@ if test "$with_libvirtd" = "no"; then with_storage_mpath=no with_storage_rbd=no with_storage_sheepdog=no - with_storage_gluster=no with_storage_zfs=no with_storage_vstorage=no fi @@ -167,7 +165,6 @@ LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG -LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE @@ -234,7 +231,6 @@ LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG -LIBVIRT_STORAGE_RESULT_GLUSTER LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-gluster.m4 b/m4/virt-storage-gluster.m4 deleted file mode 100644 index 0a2406f1fc5..00000000000 --- a/m4/virt-storage-gluster.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The storage Gluster 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_STORAGE_ARG_GLUSTER], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_GLUSTER], [Gluster backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [ - AC_REQUIRE([LIBVIRT_CHECK_GLUSTER]) - - if test "$with_storage_gluster" = "check"; then - with_storage_gluster=$with_glusterfs - fi - if test "$with_storage_gluster" = "yes"; then - if test "$with_glusterfs" = no; then - AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver]) - fi - AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1], - [whether Gluster backend for storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_GLUSTER], [ - LIBVIRT_RESULT([Gluster], [$with_storage_gluster]) -]) diff --git a/meson.build b/meson.build index 68fb89d7dea..5678038c5e8 100644 --- a/meson.build +++ b/meson.build @@ -1920,6 +1920,13 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('SHOWMOUNT', showmount_path) endif endif + + if not get_option('storage_gluster').disabled() and glusterfs_dep.found() + use_storage = true + conf.set('WITH_STORAGE_GLUSTER', 1) + elif get_option('storage_gluster').enabled() + error('Need glusterfs (libgfapi) for gluster storage driver') + endif endif if use_storage @@ -1969,6 +1976,7 @@ storagedriver_summary = { 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), 'Disk': conf.has('WITH_STORAGE_DISK'), + 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index afa93b88418..fe41c2671c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -77,3 +77,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SE option('storage_dir', type: 'feature', value: 'auto', description: 'directory backand for the storage driver') option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver') +option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 --- m4/virt-storage-iscsi-direct.m4 | 44 --------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-storage-iscsi-direct.m4 diff --git a/configure.ac b/configure.ac index ba2b247b926..688425956e1 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl LIBVIRT_STORAGE_ARG_LVM -LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD @@ -147,7 +146,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE if test "$with_libvirtd" = "no"; then with_storage_lvm=no - with_storage_iscsi_direct=no with_storage_scsi=no with_storage_mpath=no with_storage_rbd=no @@ -157,7 +155,6 @@ if test "$with_libvirtd" = "no"; then fi LIBVIRT_STORAGE_CHECK_LVM -LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD @@ -222,7 +219,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_LVM -LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD diff --git a/m4/virt-storage-iscsi-direct.m4 b/m4/virt-storage-iscsi-direct.m4 deleted file mode 100644 index dab44141691..00000000000 --- a/m4/virt-storage-iscsi-direct.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl Iscsi-direct storage -dnl -dnl Copyright (C) 2018 Clementine Hayat. -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_STORAGE_ARG_ISCSI_DIRECT], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI_DIRECT], - [iscsi-direct backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT], [ - AC_REQUIRE([LIBVIRT_CHECK_LIBISCSI]) - if test "$with_storage_iscsi_direct" = "check"; then - with_storage_iscsi_direct=$with_libiscsi - fi - if test "$with_storage_iscsi_direct" = "yes"; then - if test "$with_libiscsi" = "no"; then - AC_MSG_ERROR([Need libiscsi for iscsi-direct storage driver]) - fi - AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI_DIRECT], [1], - [whether iSCSI backend for storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_ISCSI_DIRECT], - [test "$with_storage_iscsi_direct" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT], [ - LIBVIRT_RESULT([iscsi-direct], [$with_storage_iscsi_direct]) -]) diff --git a/meson.build b/meson.build index 2066c537d73..4576f18a6e2 100644 --- a/meson.build +++ b/meson.build @@ -1934,6 +1934,13 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_iscsi').enabled() error('We need iscsiadm for iSCSI storage driver') endif + + if not get_option('storage_iscsi_direct').disabled() and libiscsi_dep.found() + use_storage = true + conf.set('WITH_STORAGE_ISCSI_DIRECT', 1) + elif get_option('storage_iscsi_direct').enabled() + error('Need libiscsi for iscsi-direct storage driver') + endif endif if use_storage @@ -1983,6 +1990,7 @@ storagedriver_summary = { 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), + 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index cff49277ea1..975479e7b8c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -79,3 +79,4 @@ option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver') option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscsi backend for the storage driver') +option('storage_iscsi_direct', type: 'feature', value: 'auto', description: 'iscsi-direct backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 --- m4/virt-storage-mpath.m4 | 53 ---------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 m4/virt-storage-mpath.m4 diff --git a/configure.ac b/configure.ac index acfad8737ee..465d9974ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl LIBVIRT_STORAGE_ARG_SCSI -LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS @@ -145,7 +144,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE if test "$with_libvirtd" = "no"; then with_storage_scsi=no - with_storage_mpath=no with_storage_rbd=no with_storage_sheepdog=no with_storage_zfs=no @@ -153,7 +151,6 @@ if test "$with_libvirtd" = "no"; then fi LIBVIRT_STORAGE_CHECK_SCSI -LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS @@ -216,7 +213,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_SCSI -LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS diff --git a/m4/virt-storage-mpath.m4 b/m4/virt-storage-mpath.m4 deleted file mode 100644 index d4f8ecfb9ea..00000000000 --- a/m4/virt-storage-mpath.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl The storage mpath 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_STORAGE_ARG_MPATH], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_MPATH], [mpath backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_MPATH], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - - if test "$with_storage_mpath" = "check" || test "$with_storage_mpath" = "yes"; then - if test "$with_linux" = "yes"; then - with_storage_mpath=yes - - AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1, - [whether mpath backend for storage driver is enabled]) - else - if test "$with_storage_mpath" = "yes"; then - AC_MSG_ERROR([mpath storage is only supported on Linux]) - fi - with_storage_mpath=no - fi - fi - - if test "x$with_storage_mpath" = "xyes"; then - if test "x$with_devmapper" = "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to compile libvirt with mpath storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_MPATH], [ - LIBVIRT_RESULT([mpath], [$with_storage_mpath]) -]) diff --git a/meson.build b/meson.build index cecc161ed85..c30026bc696 100644 --- a/meson.build +++ b/meson.build @@ -1969,6 +1969,13 @@ if conf.has('WITH_LIBVIRTD') endforeach endif endif + + if not get_option('storage_mpath').disabled() and host_machine.system() == 'linux' and devmapper_dep.found() + use_storage = true + conf.set('WITH_STORAGE_MPATH', 1) + elif get_option('storage_mpath').enabled() + error('mpath storage driver is supported only on Linux and you must install libdevmapper') + endif endif if use_storage @@ -2020,6 +2027,7 @@ storagedriver_summary = { 'LVM': conf.has('WITH_STORAGE_LVM'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), + 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index 66e232f59dc..97e18987860 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -81,3 +81,4 @@ option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscsi backend for the storage driver') option('storage_iscsi_direct', type: 'feature', value: 'auto', description: 'iscsi-direct backend for the storage driver') option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM backend for the storage driver') +option('storage_mpath', type: 'feature', value: 'auto', description: 'mpath backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 6 ------ m4/virt-storage-scsi.m4 | 36 ------------------------------------ meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 m4/virt-storage-scsi.m4 diff --git a/configure.ac b/configure.ac index ad43de7f39e..5f77e47dd10 100644 --- a/configure.ac +++ b/configure.ac @@ -75,10 +75,8 @@ esac if test $with_linux = no; then with_dtrace=no - with_storage_scsi=no fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) @@ -136,19 +134,16 @@ dnl dnl Storage driver checks dnl -LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE if test "$with_libvirtd" = "no"; then - with_storage_scsi=no with_storage_sheepdog=no with_storage_zfs=no with_storage_vstorage=no fi -LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE @@ -209,7 +204,6 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE diff --git a/m4/virt-storage-scsi.m4 b/m4/virt-storage-scsi.m4 deleted file mode 100644 index ea4e47cbda8..00000000000 --- a/m4/virt-storage-scsi.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The storage SCSI 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_STORAGE_ARG_SCSI], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_SCSI], [SCSI backend for the storage driver], [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_SCSI], [ - if test "$with_storage_scsi" = "check" || test "$with_storage_scsi" = "yes"; then - with_storage_scsi=yes - - AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1, - [whether SCSI backend for storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_SCSI], [ - LIBVIRT_RESULT([SCSI], [$with_storage_scsi]) -]) diff --git a/meson.build b/meson.build index b31e77b81a3..1caa824ad40 100644 --- a/meson.build +++ b/meson.build @@ -1983,6 +1983,11 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_rbd').enabled() error('You must install the librbd library & headers to compile libvirt') endif + + if not get_option('storage_scsi').disabled() and host_machine.system() == 'linux' + use_storage = true + conf.set('WITH_STORAGE_SCSI', 1) + endif endif if use_storage @@ -2034,6 +2039,7 @@ storagedriver_summary = { 'LVM': conf.has('WITH_STORAGE_LVM'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), + 'SCSI': conf.has('WITH_STORAGE_SCSI'), 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'RBD': conf.has('WITH_STORAGE_RBD'), diff --git a/meson_options.txt b/meson_options.txt index 0e256fb1004..5cd4a9e28fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,3 +83,4 @@ option('storage_iscsi_direct', type: 'feature', value: 'auto', description: 'isc option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM backend for the storage driver') option('storage_mpath', type: 'feature', value: 'auto', description: 'mpath backend for the storage driver') option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS Block Device backend for the storage driver') +option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 -- m4/virt-storage-vstorage.m4 | 73 ------------------------------------- meson.build | 24 ++++++++++++ meson_options.txt | 1 + 4 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 m4/virt-storage-vstorage.m4 diff --git a/configure.ac b/configure.ac index ba15aa9bb2b..6416986c303 100644 --- a/configure.ac +++ b/configure.ac @@ -135,15 +135,12 @@ dnl Storage driver checks dnl LIBVIRT_STORAGE_ARG_ZFS -LIBVIRT_STORAGE_ARG_VSTORAGE if test "$with_libvirtd" = "no"; then with_storage_zfs=no - with_storage_vstorage=no fi LIBVIRT_STORAGE_CHECK_ZFS -LIBVIRT_STORAGE_CHECK_VSTORAGE dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 @@ -202,7 +199,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_ZFS -LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-vstorage.m4 b/m4/virt-storage-vstorage.m4 deleted file mode 100644 index e3b3bb40f0c..00000000000 --- a/m4/virt-storage-vstorage.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl The storage vstorage check -dnl -dnl Copyright (C) 2016 Parallels IP Holdings GmbH, 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_STORAGE_ARG_VSTORAGE], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_VSTORAGE], - [Virtuozzo Storage backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_VSTORAGE], [ - if test "$with_storage_vstorage" = "yes" || - test "$with_storage_vstorage" = "check"; then - AC_PATH_PROG([VSTORAGE], [vstorage], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VSTORAGE_MOUNT], [vstorage-mount], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([UMOUNT], [umount], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_storage_vstorage" = "yes"; then - if test -z "$VSTORAGE" || test -z "$VSTORAGE_MOUNT"; then - AC_MSG_ERROR([We need vstorage and vstorage-mount tool for Vstorage storage driver]); - fi - if test -z "$UMOUNT" ; then - AC_MSG_ERROR([We need umount for Vstorage storage driver]); - fi - else - if test -z "$VSTORAGE" ; then - with_storage_vstorage=no - fi - if test -z "$VSTORAGE_MOUNT" ; then - with_storage_vstorage=no - fi - if test -z "$UMOUNT" ; then - with_storage_vstorage=no - fi - - if test "$with_storage_vstorage" = "check" ; then - with_storage_vstorage=yes - fi - fi - - if test "$with_storage_vstorage" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_VSTORAGE], 1, - [whether Vstorage backend for storage driver is enabled]) - AC_DEFINE_UNQUOTED([VSTORAGE], ["$VSTORAGE"], - [Location or name of the vstorage client tool]) - AC_DEFINE_UNQUOTED([VSTORAGE_MOUNT], ["$VSTORAGE_MOUNT"], - [Location or name of the vstorage mount tool]) - AC_DEFINE_UNQUOTED([UMOUNT], ["$UMOUNT"], - [Location or name of the umount programm]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_VSTORAGE], [test "$with_storage_vstorage" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_VSTORAGE], [ - LIBVIRT_RESULT([Virtuozzo storage], [$with_storage_vstorage]) -]) diff --git a/meson.build b/meson.build index fcd4bc5e5da..83f7710f93c 100644 --- a/meson.build +++ b/meson.build @@ -1998,6 +1998,29 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('SHEEPDOGCLI', sheepdogcli_prog.path()) endif endif + + if not get_option('storage_vstorage').disabled() + vstorage_enable = true + + foreach name : ['vstorage', 'vstorage-mount', 'umount'] + set_variable( + '@0@_prog'.format(name.underscorify()), + find_program(name, required: get_option('storage_vstorage'), dirs: libvirt_sbin_path) + ) + if not get_variable('@0@_prog'.format(name.underscorify())).found() + vstorage_enable = false + endif + endforeach + + if vstorage_enable + use_storage = true + conf.set('WITH_STORAGE_VSTORAGE', 1) + foreach name : ['vstorage', 'vstorage-mount', 'umount'] + path = get_variable('@0@_prog'.format(name.underscorify())).path() + conf.set_quoted(name.to_upper(), path) + endforeach + endif + endif endif if use_storage @@ -2055,6 +2078,7 @@ storagedriver_summary = { 'RBD': conf.has('WITH_STORAGE_RBD'), 'Sheepdog': conf.has('WITH_STORAGE_SHEEPDOG'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), + 'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index eec89eacfb3..4d8cac9254a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -85,3 +85,4 @@ option('storage_mpath', type: 'feature', value: 'auto', description: 'mpath back option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS Block Device backend for the storage driver') option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI backend for the storage driver') option('storage_sheepdog', type: 'feature', value: 'auto', description: 'Sheepdog backend for the storage driver') +option('storage_vstorage', type: 'feature', value: 'auto', description: 'Virtuozzo storage backend for the storage driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-chrdev-lock-files.m4 | 52 ------------------------------------ meson.build | 12 +++++++++ meson_options.txt | 4 +++ 4 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-chrdev-lock-files.m4 diff --git a/configure.ac b/configure.ac index 030313b7ed5..3a4d98f1dd9 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,6 @@ LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT -LIBVIRT_ARG_CHRDEV_LOCK_FILES LIBVIRT_ARG_DEFAULT_EDITOR LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE @@ -117,7 +116,6 @@ LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT -LIBVIRT_CHECK_CHRDEV_LOCK_FILES LIBVIRT_CHECK_DEFAULT_EDITOR LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE @@ -203,7 +201,6 @@ LIBVIRT_RESULT_DEBUG LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT -LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE diff --git a/m4/virt-chrdev-lock-files.m4 b/m4/virt-chrdev-lock-files.m4 deleted file mode 100644 index 5802136b9f4..00000000000 --- a/m4/virt-chrdev-lock-files.m4 +++ /dev/null @@ -1,52 +0,0 @@ -dnl The locaton of UUCP style lock files -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_ARG_CHRDEV_LOCK_FILES], [ - LIBVIRT_ARG_WITH([CHRDEV_LOCK_FILES], - [location for UUCP style lock files for character devices ] - [(use auto for default paths on some platforms)], - [auto]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CHRDEV_LOCK_FILES], [ - if test "$with_chrdev_lock_files" != "no"; then - case $with_chrdev_lock_files in - yes | auto) - dnl Default locations for platforms, or disable if unknown - if test "$with_linux" = "yes"; then - with_chrdev_lock_files=/var/lock - elif test "$with_chrdev_lock_files" = "auto"; then - with_chrdev_lock_files=no - fi - ;; - esac - if test "$with_chrdev_lock_files" = "yes"; then - AC_MSG_ERROR([You must specify path for the lock files on this platform]) - fi - if test "$with_chrdev_lock_files" != "no"; then - AC_DEFINE_UNQUOTED([VIR_CHRDEV_LOCK_FILE_PATH], "$with_chrdev_lock_files", - [path to directory containing UUCP device lock files]) - fi - fi - AM_CONDITIONAL([VIR_CHRDEV_LOCK_FILE_PATH], [test "$with_chrdev_lock_files" != "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_CHRDEV_LOCK_FILES], [ - LIBVIRT_RESULT([Char device locks], [$with_chrdev_lock_files]) -]) diff --git a/meson.build b/meson.build index 64583b3662a..9d80aec8fd3 100644 --- a/meson.build +++ b/meson.build @@ -2049,6 +2049,17 @@ if use_storage endif +# build feature options + +chrdev_lock_files = get_option('chrdev_lock_files') +if chrdev_lock_files == '' and host_machine.system() == 'linux' + chrdev_lock_files = '/var/lock' +endif +if chrdev_lock_files != '' + conf.set_quoted('VIR_CHRDEV_LOCK_FILE_PATH', chrdev_lock_files) +endif + + # define top include directory top_inc_dir = include_directories('.') @@ -2166,6 +2177,7 @@ summary(test_summary, section: 'Test suite', bool_yn: true) misc_summary = { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'Char device locks': chrdev_lock_files, } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') diff --git a/meson_options.txt b/meson_options.txt index d68712ae2be..1f32533f0f5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -87,3 +87,7 @@ option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI backen option('storage_sheepdog', type: 'feature', value: 'auto', description: 'Sheepdog backend for the storage driver') option('storage_vstorage', type: 'feature', value: 'auto', description: 'Virtuozzo storage backend for the storage driver') option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS backend for the storage driver') + + +# build feature options +option('chrdev_lock_files', type: 'string', value: '', description: 'location for UUCP style lock files for character devices (leave empty for default paths on some platforms)') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-default-editor.m4 | 32 -------------------------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 m4/virt-default-editor.m4 diff --git a/configure.ac b/configure.ac index 2ecdd30d48f..61e830a97eb 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ dnl LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT -LIBVIRT_ARG_DEFAULT_EDITOR LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY @@ -114,7 +113,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT -LIBVIRT_CHECK_DEFAULT_EDITOR LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY @@ -198,7 +196,6 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT -LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY diff --git a/m4/virt-default-editor.m4 b/m4/virt-default-editor.m4 deleted file mode 100644 index 4b4cad4e875..00000000000 --- a/m4/virt-default-editor.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The default editor 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_ARG_DEFAULT_EDITOR], [ - LIBVIRT_ARG_WITH([DEFAULT_EDITOR], - [Editor to use for interactive commands], [vi]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DEFAULT_EDITOR], [ - AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$with_default_editor"], - [Default editor to use]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DEFAULT_EDITOR], [ - LIBVIRT_RESULT([Default Editor], [$with_default_editor]) -]) diff --git a/meson.build b/meson.build index 1a7cc483595..d48912eedc9 100644 --- a/meson.build +++ b/meson.build @@ -2063,6 +2063,8 @@ if get_option('debug_logs') conf.set('ENABLE_DEBUG', 1) endif +conf.set_quoted('DEFAULT_EDITOR', get_option('default_editor')) + # define top include directory @@ -2183,6 +2185,7 @@ misc_summary = { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'Char device locks': chrdev_lock_files, + 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') diff --git a/meson_options.txt b/meson_options.txt index a09dad02875..476ed12a933 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -92,3 +92,4 @@ option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS backend # build feature options option('chrdev_lock_files', type: 'string', value: '', description: 'location for UUCP style lock files for character devices (leave empty for default paths on some platforms)') option('debug_logs', type: 'boolean', value: true, description: 'enable debugging output') +option('default_editor', type: 'string', value: 'vi', description: 'Editor to use for interactive commands') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 7 ------- m4/virt-dtrace.m4 | 45 --------------------------------------------- meson.build | 8 ++++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 m4/virt-dtrace.m4 diff --git a/configure.ac b/configure.ac index d97bc702299..2f486df2e23 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,6 @@ case $host in *-*-mingw* | *-*-msvc* ) with_win=yes ;; esac -if test $with_linux = no; then - with_dtrace=no -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) @@ -101,7 +97,6 @@ dnl dnl Miscellaneous checks dnl -LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL @@ -110,7 +105,6 @@ LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG -LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL @@ -185,7 +179,6 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL diff --git a/m4/virt-dtrace.m4 b/m4/virt-dtrace.m4 deleted file mode 100644 index 3dc20d53436..00000000000 --- a/m4/virt-dtrace.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl The DTrace static probes -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_ARG_DTRACE], [ - LIBVIRT_ARG_WITH([DTRACE], [use dtrace for static probing], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DTRACE], [ - if test "$with_dtrace" != "no" ; then - AC_PATH_PROG([DTRACE], [dtrace], [], [$LIBVIRT_SBIN_PATH]) - if test -z "$DTRACE" ; then - if test "$with_dtrace" = "check"; then - with_dtrace=no - else - AC_MSG_ERROR([You must install the 'dtrace' binary to enable libvirt static probes]) - fi - else - with_dtrace=yes - fi - if test "$with_dtrace" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static probes are available]) - fi - fi - AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" != "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DTRACE], [ - LIBVIRT_RESULT([DTrace], [$with_dtrace]) -]) diff --git a/meson.build b/meson.build index 681874fd447..c7c5cdd3b40 100644 --- a/meson.build +++ b/meson.build @@ -2073,6 +2073,13 @@ if conf.has('WITH_LIBVIRTD') driver_modules_flags = libvirt_export_dynamic endif +if host_machine.system() == 'linux' + dtrace_prog = find_program('dtrace', required: get_option('dtrace'), dirs: libvirt_sbin_path) + if dtrace_prog.found() + conf.set('WITH_DTRACE_PROBES', 1) + endif +endif + # define top include directory @@ -2197,6 +2204,7 @@ misc_summary = { 'Debug': conf.has('ENABLE_DEBUG'), 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), } diff --git a/meson_options.txt b/meson_options.txt index 476ed12a933..b12d0aa3d7b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -93,3 +93,4 @@ option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS backend option('chrdev_lock_files', type: 'string', value: '', description: 'location for UUCP style lock files for character devices (leave empty for default paths on some platforms)') option('debug_logs', type: 'boolean', value: true, description: 'enable debugging output') option('default_editor', type: 'string', value: 'vi', description: 'Editor to use for interactive commands') +option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace for static probing') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 --- m4/virt-init-script.m4 | 61 ------------------------------------------ meson.build | 15 +++++++++++ meson_options.txt | 1 + 4 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 m4/virt-init-script.m4 diff --git a/configure.ac b/configure.ac index eaa7b57380e..e73b3f617ca 100644 --- a/configure.ac +++ b/configure.ac @@ -98,14 +98,12 @@ dnl Miscellaneous checks dnl LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG @@ -178,7 +176,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 deleted file mode 100644 index 676135866f9..00000000000 --- a/m4/virt-init-script.m4 +++ /dev/null @@ -1,61 +0,0 @@ -dnl Init script type -dnl -dnl Copyright (C) 2005-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_ARG_INIT_SCRIPT],[ - LIBVIRT_ARG_WITH([INIT_SCRIPT], - [Style of init script to install: systemd, openrc, check, none], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ - AC_MSG_CHECKING([for init script type]) - - if test "$with_init_script" = check && test "$cross_compiling" = yes; then - with_init_script=none - fi - if test "$with_init_script" = check && type systemctl >/dev/null 2>&1; then - with_init_script=systemd - fi - if test "$with_init_script" = check && type openrc >/dev/null 2>&1; then - with_init_script=openrc - fi - if test "$with_init_script" = check; then - with_init_script=none - fi - - AS_CASE([$with_init_script], - [systemd],[], - [openrc],[], - [none],[], - [*],[ - AC_MSG_ERROR([Unknown initscript flavour $with_init_script]) - ] - ) - - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], - [test "$with_init_script" = "systemd"]) - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_OPENRC], - [test "$with_init_script" = "openrc"]) - - AC_MSG_RESULT($with_init_script) -]) - -AC_DEFUN([LIBVIRT_RESULT_INIT_SCRIPT],[ - LIBVIRT_RESULT([Init script], [$with_init_script]) -]) diff --git a/meson.build b/meson.build index ece7c90e26d..e9186e38cfd 100644 --- a/meson.build +++ b/meson.build @@ -2086,6 +2086,20 @@ elif get_option('host_validate').enabled() error('virt-host-validate is not supported on Windows') endif +if get_option('init_script') == 'check' + if meson.is_cross_build() + init_script = 'none' + elif find_program('systemctl', required: false).found() + init_script = 'systemd' + elif find_program('openrc', required: false).found() + init_script = 'openrc' + else + init_script = 'none' + endif +else + init_script = get_option('init_script') +endif + # define top include directory @@ -2211,6 +2225,7 @@ misc_summary = { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), diff --git a/meson_options.txt b/meson_options.txt index 80a11df4679..0e7b6659e2f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -95,3 +95,4 @@ option('debug_logs', type: 'boolean', value: true, description: 'enable debuggin option('default_editor', type: 'string', value: 'vi', description: 'Editor to use for interactive commands') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace for static probing') option('host_validate', type: 'feature', value: 'auto', description: 'build virt-host-validate') +option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check', 'none'], value: 'check', description: 'Style of init script to install') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 3 -- m4/virt-nss.m4 | 86 ----------------------------------------------- meson.build | 41 ++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 42 insertions(+), 89 deletions(-) delete mode 100644 m4/virt-nss.m4 diff --git a/configure.ac b/configure.ac index cfe0545685f..b1faa47f81c 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) # Check for compiler and library settings. -LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS LIBVIRT_CHECK_NWFILTER @@ -105,7 +104,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG -LIBVIRT_CHECK_NSS dnl Need to test if pkg-config exists @@ -164,7 +162,6 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 deleted file mode 100644 index b519c36e859..00000000000 --- a/m4/virt-nss.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl The libvirt nsswitch plugin -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_ARG_NSS],[ - LIBVIRT_ARG_WITH([NSS_PLUGIN], - [enable Name Service Switch plugin for resolving guest - IP addresses], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NSS],[ - bsd_nss=no - fail=0 - if test "x$with_nss_plugin" != "xno" ; then - if test "x$with_yajl" != "xyes" ; then - if test "x$with_nss_plugin" = "xyes" ; then - AC_MSG_ERROR([Can't build nss plugin without yajl]) - else - with_nss_plugin=no - fi - fi - - if test "x$with_network" != "xyes" ; then - if test "x$with_nss_plugin" = "xyes" ; then - AC_MSG_ERROR([Can't build nss plugin without network]) - else - with_nss_plugin=no - fi - fi - - if test "x$with_nss_plugin" != "xno" ; then - AC_CHECK_HEADERS([nss.h], [ - with_nss_plugin=yes - ],[ - if test "x$with_nss_plugin" = "xyes" ; then - fail = 1 - fi - ]) - - if test $fail = 1 ; then - AC_MSG_ERROR([Can't build nss plugin without nss.h]) - fi - fi - - if test "x$with_nss_plugin" = "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_NSS], 1, [whether nss plugin is enabled]) - - AC_CHECK_TYPE([struct gaih_addrtuple], - [AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1], - [Defined if struct gaih_addrtuple exists in nss.h])], - [], [[#include <nss.h> - ]]) - - AC_CHECK_TYPES([ns_mtab, nss_module_unregister_fn], - [AC_DEFINE([HAVE_BSD_NSS], - [1], - [whether using BSD style NSS]) - bsd_nss=yes - ], - [], - [#include <nsswitch.h>]) - fi - fi - - AM_CONDITIONAL(WITH_NSS, [test "x$with_nss_plugin" = "xyes"]) - AM_CONDITIONAL(WITH_BSD_NSS, [test "x$bsd_nss" = "xyes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NSS],[ - LIBVIRT_RESULT([nss], [$with_nss_plugin]) -]) diff --git a/meson.build b/meson.build index 4c7345c81e3..b1bbd0f4351 100644 --- a/meson.build +++ b/meson.build @@ -2106,6 +2106,46 @@ elif get_option('login_shell').enabled() error('virt-login-shell is supported on Linux only') endif +if not get_option('nss').disabled() + use_nss = true + if not yajl_dep.found() + if get_option('nss').enabled() + error('Can\'t build nss plugin without yajl') + else + use_nss = false + endif + endif + + if use_nss and not conf.has('WITH_NETWORK') + if get_option('nss').enabled() + error('Can\'t build nss plugin without network') + else + use_nss = false + endif + endif + + if use_nss and not cc.has_header('nss.h') + if get_option('nss').enabled() + error('Can\'t build nss plugin without nss.h') + else + use_nss = false + endif + endif + + if use_nss + conf.set('WITH_NSS', 1) + + if cc.has_type('struct gaih_addrtuple', prefix: '#include <nss.h>') + conf.set('HAVE_STRUCT_GAIH_ADDRTUPLE', 1) + endif + + if (cc.has_type('ns_mtab', prefix: '#include <nsswitch.h>') and + cc.has_type('nss_module_unregister_fn', prefix: '#include <nsswitch.h>')) + conf.set('WITH_BSD_NSS', 1) + endif + endif +endif + # define top include directory @@ -2200,6 +2240,7 @@ libs_summary = { 'macvtap': conf.has('WITH_MACVTAP'), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, + 'nss': conf.has('WITH_NSS'), 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index 6a3c98fc697..b7a4fddb8a2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -97,3 +97,4 @@ option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace for st option('host_validate', type: 'feature', value: 'auto', description: 'build virt-host-validate') option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check', 'none'], value: 'check', description: 'Style of init script to install') option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell') +option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses') -- 2.26.2