- Devel - libvirt List Archives

[libvirt] [PATCH] remote: fix a memory free error
by Xu Yandong 19 Sep '19

19 Sep '19

In function remoteDeserializeDomainDiskErrors, there is a typo. Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8789c5da00..877250d40c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1943,7 +1943,7 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val, error: for (j = 0; j < i; j++) - VIR_FREE(errors[i].disk); + VIR_FREE(errors[j].disk); return -1; } -- 2.18.1

3 2

[libvirt] [PATCH] cgroup: cleanup eventParams when virTypedParamsAddULLong failed
by Xu Yandong 19 Sep '19

19 Sep '19

Function virTypedParamsAddULLong use realloc to gain memory, and doesn't free it when failed. so we need free eventParams to prevent a memory leak. Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- src/qemu/qemu_cgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ecd96efb0a..bc498e4b10 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -869,8 +869,11 @@ qemuSetupCpuCgroup(virDomainObjPtr vm) if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES, - val) < 0) + val) < 0) { + if (eventParams) + virTypedParamsFree(eventParams, eventNparams); return -1; + } event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); } -- 2.18.1

2 1

[libvirt] [dbus PATCH] build: convert to Meson/Ninja build system
by Pavel Hrdina 19 Sep '19

19 Sep '19

Meson build system is simple and quick compared to Autotools and it's able to fully replace our Autotools usage. There are few drawbacks as it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0, it's still evolving and the user base is not that large and there were some tweaks required to achieve the same functionality. However, there are benefits, the configure and build time is way shorter and build definition files are more readable and easier to maintain. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- .gitignore | 1 + AUTHORS.in | 2 +- HACKING.md | 16 +-- Makefile.am | 51 ------- README.md | 12 +- autogen.sh | 52 ------- configure.ac | 87 ------------ data/Makefile.am | 83 ----------- data/meson.build | 15 ++ data/session/meson.build | 6 + data/system/meson.build | 18 +++ docs/Makefile.am | 21 --- docs/meson.build | 8 ++ libvirt-dbus.spec.in | 8 +- m4/manywarnings.m4 | 276 ------------------------------------ m4/virt-arg.m4 | 154 -------------------- m4/virt-compile-pie.m4 | 35 ----- m4/virt-compile-warnings.m4 | 203 -------------------------- m4/virt-linker-relro.m4 | 35 ----- m4/warnings.m4 | 79 ----------- meson.build | 271 +++++++++++++++++++++++++++++++++++ meson_options.txt | 6 + run.in | 4 +- src/Makefile.am | 66 --------- src/domain.c | 2 +- src/meson.build | 54 +++++++ tests/Makefile.am | 57 -------- tests/meson.build | 49 +++++++ tools/gen-authors.sh | 8 ++ 29 files changed, 454 insertions(+), 1225 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am create mode 100644 data/meson.build create mode 100644 data/session/meson.build create mode 100644 data/system/meson.build delete mode 100644 docs/Makefile.am create mode 100644 docs/meson.build delete mode 100644 m4/manywarnings.m4 delete mode 100644 m4/virt-arg.m4 delete mode 100644 m4/virt-compile-pie.m4 delete mode 100644 m4/virt-compile-warnings.m4 delete mode 100644 m4/virt-linker-relro.m4 delete mode 100644 m4/warnings.m4 create mode 100644 meson.build create mode 100644 meson_options.txt mode change 100644 => 100755 run.in delete mode 100644 src/Makefile.am create mode 100644 src/meson.build delete mode 100644 tests/Makefile.am create mode 100644 tests/meson.build create mode 100755 tools/gen-authors.sh diff --git a/.gitignore b/.gitignore index b4abf66..7ed7554 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ vgcore.* /aclocal.m4 /autom4te.cache/ /build-aux/ +/build/ /config.h /config.h.in /config.log diff --git a/AUTHORS.in b/AUTHORS.in index 52202ea..d5a486e 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -13,4 +13,4 @@ The primary maintainers of libvirt-dbus are: Patches have been received from: -#contributorslist# +@contributorslist@ diff --git a/HACKING.md b/HACKING.md index 8903408..f9b4455 100644 --- a/HACKING.md +++ b/HACKING.md @@ -16,32 +16,26 @@ Alternatively you can use one of the mirrors: Running from git repository --------------------------- - * The first step is to run autoreconf to create configure script: + * The first step is to run meson to create build directory: ``` - ./autogen.sh + meson build ``` Now you can compile libvirt-dbus: ``` - make + ninja -C build ``` * Before posting a patch, you should run tests and perform syntax-checking: ``` - make check + ninja -C build test ``` - The test tool requires python3, python3-pytest and python3-dbus. - - ``` - make syntax-check - ``` - - To run this flake8 package is required. + The test tool requires python3, python3-pytest, python3-dbus and flake8. * To run libvirt-dbus directly from the build dir without installing it diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 0914449..0000000 --- a/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -SUBDIRS = \ - data \ - docs \ - src \ - tests \ - $(NULL) - -ACLOCAL_AMFLAGS = -I m4 - -EXTRA_DIST = \ - $(PACKAGE).spec \ - $(PACKAGE).spec.in \ - AUTHORS.in \ - HACKING.md \ - README.md \ - $(NULL) - -DISTCLEAN_FILES = \ - $(PACKAGE).spec \ - $(NULL) - -rpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) - -dist-hook: gen-AUTHORS - -# Generate the AUTHORS file (with all entries since the switch to git) -# and insert it into the directory we're about to use to create a tarball. -.PHONY: gen-AUTHORS -gen-AUTHORS: - $(AM_V_GEN)\ - if test -d $(srcdir)/.git; then \ - ( \ - cd $(srcdir) && \ - git log --pretty=format:' %aN <%aE>' | sort -u \ - ) > all.list && \ - sort -u $(srcdir)/AUTHORS.in > maint.list && \ - comm -23 all.list maint.list > contrib.list && \ - contrib="`cat contrib.list`" && \ - perl -p -e "s/#contributorslist#// and print '$$contrib'" \ - < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ - mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \ - rm -f all.list maint.list contrib.list; \ - fi - -# E501: (line too long) warning is ignored. -.PHONY: flake8 -flake8: - $(FLAKE8) --show-source --ignore=E501 $(srcdir) - -syntax-check: flake8 diff --git a/README.md b/README.md index 66aa6f6..e365650 100644 --- a/README.md +++ b/README.md @@ -32,21 +32,19 @@ The packages required to build libvirt-dbus are Installation ------------ -libvirt-dbus uses GNU Autotools build system, so the build & install +libvirt-dbus uses Meson build system, so the build & install process is fairly simple. For example, to install as root user: ``` -# ./configure --prefix=/usr --sysconfigdir=/etc --localstatedir=/var -# make -# make install +# meson build --prefix=/usr --sysconfigdir=/etc --localstatedir=/var +# ninja -C build install ``` or to install as unprivileged user: ``` -$ ./configure --prefix=$HOME/usr -$ make -$ make install +$ meson build --prefix=$HOME/usr +$ ninja -C build install ``` diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 6f29899..0000000 --- a/autogen.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -set -e -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -THEDIR=`pwd` -cd $srcdir - -DIE=0 - -for prog in autoreconf automake autoconf libtoolize -do - ($prog --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have $prog installed to compile libvirt-dbus." - DIE=1 - } -done - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no args - if you " - echo "wish to pass any extra arguments to it, please specify them on " - echo "the $0 command line." -fi - -mkdir -p build-aux -autoreconf -if - -cd $THEDIR - -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 - -$srcdir/configure $EXTRA_ARGS "$@" && { - echo - echo "Now type 'make' to compile libvirt-dbus." -} diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 24ebb26..0000000 --- a/configure.ac +++ /dev/null @@ -1,87 +0,0 @@ -AC_INIT([libvirt-dbus], [1.4.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] - -AC_CONFIG_SRCDIR([src/main.c]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -dnl Make automake keep quiet about wildcards & other GNUmake-isms -AM_INIT_AUTOMAKE([foreign -Wno-portability -Wno-obsolete subdir-objects tar-pax no-dist-gzip dist-xz]) -AC_CANONICAL_HOST -AC_USE_SYSTEM_EXTENSIONS - -AM_SILENT_RULES([yes]) - -GLIB2_REQUIRED=2.44.0 -LIBVIRT_REQUIRED=3.0.0 -LIBVIRT_GLIB_REQUIRED=0.0.7 -AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file -AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file -AC_SUBST([LIBVIRT_GLIB_REQUIRED]) dnl used in the .spec file - -LIBVIRT_DBUS_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` -LIBVIRT_DBUS_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` -LIBVIRT_DBUS_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` -LIBVIRT_DBUS_VERSION=$LIBVIRT_DBUS_MAJOR_VERSION.$LIBVIRT_DBUS_MINOR_VERSION.$LIBVIRT_DBUS_MICRO_VERSION$LIBVIRT_DBUS_MICRO_VERSION_SUFFIX -LIBVIRT_DBUS_VERSION_NUMBER=`expr $LIBVIRT_DBUS_MAJOR_VERSION \* 1000000 + $LIBVIRT_dbus_MINOR_VERSION \* 1000 + $LIBVIRT_DBUS_MICRO_VERSION` - -AC_SUBST([LIBVIRT_DBUS_MAJOR_VERSION]) -AC_SUBST([LIBVIRT_DBUS_MINOR_VERSION]) -AC_SUBST([LIBVIRT_DBUS_MICRO_VERSION]) -AC_SUBST([LIBVIRT_DBUS_VERSION]) -AC_SUBST([LIBVIRT_DBUS_VERSION_INFO]) -AC_SUBST([LIBVIRT_DBUS_VERSION_NUMBER]) - -AC_PROG_CC -AC_PROG_MKDIR_P -AM_PROG_CC_C_O -AC_PROG_CC_STDC -AC_PROG_LIBTOOL -AC_PATH_PROGS([FLAKE8], [flake8 flake8-3.6]) - -PKG_CHECK_MODULES([GIO2], [gio-unix-2.0 >= $GLIB2_REQUIRED]) -PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_REQUIRED]) -PKG_CHECK_MODULES([LIBVIRT], [libvirt >= $LIBVIRT_REQUIRED]) -PKG_CHECK_MODULES([LIBVIRT_GLIB], [libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED]) - -LIBVIRT_COMPILE_WARNINGS -LIBVIRT_LINKER_RELRO -LIBVIRT_COMPILE_PIE - -LIBVIRT_ARG_WITH([DBUS_SERVICES], [where D-Bus session services direcotry is], - ['$(datadir)/dbus-1/services']) -DBUS_SERVICES_DIR="$with_dbus_services" -AC_SUBST([DBUS_SERVICES_DIR]) - -LIBVIRT_ARG_WITH([DBUS_SYSTEM_SERVICES], [where D-Bus system services directory is], - ['$(datadir)/dbus-1/system-services']) -DBUS_SYSTEM_SERVICES_DIR="$with_dbus_system_services" -AC_SUBST([DBUS_SYSTEM_SERVICES_DIR]) - -LIBVIRT_ARG_WITH([DBUS_SYSTEM_POLICIES], [where D-Bus system policies directory is], - ['$(datadir)/dbus-1/system.d']) -DBUS_SYSTEM_POLICIES_DIR="$with_dbus_system_policies" -AC_SUBST([DBUS_SYSTEM_POLICIES_DIR]) - -LIBVIRT_ARG_WITH([DBUS_INTERFACES], [where D-Bus interfaces directory is], - ['$(datadir)/dbus-1/interfaces']) -DBUS_INTERFACES_DIR="$with_dbus_interfaces" -AC_SUBST([DBUS_INTERFACES_DIR]) - -LIBVIRT_ARG_WITH([POLKIT_RULES], [directory for polkit rules], - ['$(datadir)/polkit-1/rules.d']) -POLKIT_RULES_DIR="$with_polkit_rules" -AC_SUBST([POLKIT_RULES_DIR]) - -LIBVIRT_ARG_WITH([SYSTEM_USER], [username to run system instance as], - ['libvirtdbus']) -SYSTEM_USER=$with_system_user -AC_SUBST([SYSTEM_USER]) - -AC_CONFIG_FILES([run], - [chmod +x,-w run]) -AC_OUTPUT([Makefile - data/Makefile - docs/Makefile - src/Makefile - tests/Makefile - libvirt-dbus.spec]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index f8311bd..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -service_in_files = \ - session/org.libvirt.service.in \ - $(NULL) -servicedir = $(DBUS_SERVICES_DIR) -service_DATA = \ - $(service_in_files:.service.in=.service) \ - $(NULL) - -system_service_in_files = \ - system/org.libvirt.service.in \ - $(NULL) -system_servicedir = $(DBUS_SYSTEM_SERVICES_DIR) -system_service_DATA = \ - $(system_service_in_files:.service.in=.service) \ - $(NULL) - -system_policy_in_files = \ - system/org.libvirt.conf.in \ - $(NULL) -system_policydir = $(DBUS_SYSTEM_POLICIES_DIR) -system_policy_DATA = \ - $(system_policy_in_files:.conf.in=.conf) \ - $(NULL) - -polkit_in_files = \ - system/libvirt-dbus.rules.in \ - $(NULL) -polkitdir = $(POLKIT_RULES_DIR) -polkit_DATA = \ - $(polkit_in_files:.rules.in=.rules) \ - $(NULL) - -interfaces_files = \ - org.libvirt.Connect.xml \ - org.libvirt.Domain.xml \ - org.libvirt.Interface.xml \ - org.libvirt.Network.xml \ - org.libvirt.NodeDevice.xml \ - org.libvirt.NWFilter.xml \ - org.libvirt.Secret.xml \ - org.libvirt.StoragePool.xml \ - org.libvirt.StorageVol.xml \ - $(NULL) -interfacesdir = $(DBUS_INTERFACES_DIR) -interfaces_DATA = \ - $(interfaces_files) \ - $(NULL) - -EXTRA_DIST = \ - $(service_in_files) \ - $(system_service_in_files) \ - $(system_policy_in_files) \ - $(polkit_in_files) \ - $(interfaces_files) \ - $(NULL) - -CLEANFILES = \ - $(service_DATA) \ - $(system_service_DATA) \ - $(system_policy_DATA) \ - $(polkit_DATA) \ - $(NULL) - -session/org.libvirt.service: session/org.libvirt.service.in - $(AM_V_GEN)$(MKDIR_P) session && \ - sed -e 's|[@]sbindir[@]|$(sbindir)|g' < $< > $@-t && \ - mv $@-t $@ - -system/org.libvirt.service: system/org.libvirt.service.in - $(AM_V_GEN)$(MKDIR_P) system && \ - sed -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ - < $< > $@-t && mv $@-t $@ - -system/org.libvirt.conf: system/org.libvirt.conf.in - $(AM_V_GEN)$(MKDIR_P) system && \ - sed -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ - < $< > $@-t && mv $@-t $@ - -system/libvirt-dbus.rules: system/libvirt-dbus.rules.in - $(AM_V_GEN)$(MKDIR_P) system && \ - sed -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ - < $< > $@-t && mv $@-t $@ diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..42a6799 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,15 @@ +install_data( + 'org.libvirt.Connect.xml', + 'org.libvirt.Domain.xml', + 'org.libvirt.Interface.xml', + 'org.libvirt.Network.xml', + 'org.libvirt.NodeDevice.xml', + 'org.libvirt.NWFilter.xml', + 'org.libvirt.Secret.xml', + 'org.libvirt.StoragePool.xml', + 'org.libvirt.StorageVol.xml', + install_dir: dbus_interfaces_dir, +) + +subdir('session') +subdir('system') diff --git a/data/session/meson.build b/data/session/meson.build new file mode 100644 index 0000000..240fcef --- /dev/null +++ b/data/session/meson.build @@ -0,0 +1,6 @@ +configure_file( + configuration: conf, + input: 'org.libvirt.service.in', + output: 'org.libvirt.service', + install_dir: dbus_services_dir, +) diff --git a/data/system/meson.build b/data/system/meson.build new file mode 100644 index 0000000..74f1949 --- /dev/null +++ b/data/system/meson.build @@ -0,0 +1,18 @@ +configure_file( + configuration: conf, + input: 'org.libvirt.service.in', + output: 'org.libvirt.service', + install_dir: dbus_system_services_dir, +) +configure_file( + configuration: conf, + input: 'org.libvirt.conf.in', + output: 'org.libvirt.conf', + install_dir: dbus_system_policies_dir, +) +configure_file( + configuration: conf, + input: 'libvirt-dbus.rules.in', + output: 'libvirt-dbus.rules', + install_dir: polkit_rules_dir, +) diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index fe8ca1c..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" - -PODFILES = \ - libvirt-dbus.pod \ - $(NULL) - -%.8: %.pod - $(AM_V_GEN)$(POD2MAN) -s 8 $< $@ \ - && if grep 'POD ERROR' $@; then rm $@; exit 1; fi - -man8_MANS = \ - libvirt-dbus.8 \ - $(NULL) - -EXTRA_DIST = \ - $(PODFILES) \ - $(NULL) - -CLEANFILES = \ - $(man8_MANS) \ - $(NULL) diff --git a/docs/meson.build b/docs/meson.build new file mode 100644 index 0000000..e62e71a --- /dev/null +++ b/docs/meson.build @@ -0,0 +1,8 @@ +prog_pod2man = find_program('pod2man') + +configure_file( + command: [prog_pod2man.path(), '-s 8', '@INPUT@', '@OUTPUT@'], + input: 'libvirt-dbus.pod', + output: 'libvirt-dbus.8', + install_dir: join_paths (get_option('mandir'), 'man8'), +) diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 626e2da..50471b8 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -14,7 +14,7 @@ URL: https://libvirt.org/ Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz BuildRequires: gcc -BuildRequires: libtool +BuildRequires: meson BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libvirt-devel >= %{libvirt_version} BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version} @@ -35,11 +35,11 @@ This package provides D-Bus API for libvirt %autosetup %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %pre getent group %{system_user} >/dev/null || groupadd -r %{system_user} diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 deleted file mode 100644 index 0f06ade..0000000 --- a/m4/manywarnings.m4 +++ /dev/null @@ -1,276 +0,0 @@ -# manywarnings.m4 serial 8 -dnl Copyright (C) 2008-2017 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. -AC_DEFUN([gl_MANYWARN_ALL_GCC], -[ - 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_MSG_CHECKING([whether -Wno-missing-field-initializers is supported]) - AC_CACHE_VAL([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"]) - AC_MSG_RESULT([$gl_cv_cc_nomfi_supported]) - - 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_MSG_CHECKING([whether -Wno-missing-field-initializers is needed]) - AC_CACHE_VAL([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" - ]) - AC_MSG_RESULT([$gl_cv_cc_nomfi_needed]) - 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_MSG_CHECKING([whether -Wuninitialized is supported]) - AC_CACHE_VAL([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"]) - AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported]) - - fi - - # List all gcc warning categories. - # To compare this list to your installed GCC's, run this Bash command: - # - # comm -3 \ - # <(sed -n 's/^ *$-[^ ]*$ .*/\1/p' manywarnings.m4 | sort) \ - # <(gcc --help=warnings | sed -n 's/^ $-[^ ]*$ .*/\1/p' | sort | - # grep -v -x -f <( - # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) - - gl_manywarn_set= - for gl_manywarn_item in \ - -fno-common \ - -W \ - -Wabi \ - -Waddress \ - -Waggressive-loop-optimizations \ - -Wall \ - -Wattributes \ - -Wbad-function-cast \ - -Wbool-compare \ - -Wbuiltin-macro-redefined \ - -Wcast-align \ - -Wchar-subscripts \ - -Wchkp \ - -Wclobbered \ - -Wcomment \ - -Wcomments \ - -Wcoverage-mismatch \ - -Wcpp \ - -Wdate-time \ - -Wdeprecated \ - -Wdeprecated-declarations \ - -Wdesignated-init \ - -Wdisabled-optimization \ - -Wdiscarded-array-qualifiers \ - -Wdiscarded-qualifiers \ - -Wdiv-by-zero \ - -Wdouble-promotion \ - -Wduplicated-cond \ - -Wempty-body \ - -Wendif-labels \ - -Wenum-compare \ - -Wextra \ - -Wformat-contains-nul \ - -Wformat-extra-args \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-signedness \ - -Wformat-y2k \ - -Wformat-zero-length \ - -Wframe-address \ - -Wfree-nonheap-object \ - -Whsa \ - -Wignored-attributes \ - -Wignored-qualifiers \ - -Wimplicit \ - -Wimplicit-function-declaration \ - -Wimplicit-int \ - -Wincompatible-pointer-types \ - -Winit-self \ - -Winline \ - -Wint-conversion \ - -Wint-to-pointer-cast \ - -Winvalid-memory-model \ - -Winvalid-pch \ - -Wjump-misses-init \ - -Wlogical-not-parentheses \ - -Wlogical-op \ - -Wmain \ - -Wmaybe-uninitialized \ - -Wmemset-transposed-args \ - -Wmisleading-indentation \ - -Wmissing-braces \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-include-dirs \ - -Wmissing-parameter-type \ - -Wmissing-prototypes \ - -Wmultichar \ - -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 \ - -Wparentheses \ - -Wpointer-arith \ - -Wpointer-sign \ - -Wpointer-to-int-cast \ - -Wpragmas \ - -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-memaccess \ - -Wstack-protector \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wstrict-prototypes \ - -Wsuggest-attribute=const \ - -Wsuggest-attribute=format \ - -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure \ - -Wsuggest-final-methods \ - -Wsuggest-final-types \ - -Wswitch \ - -Wswitch-bool \ - -Wswitch-default \ - -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. - gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" - gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" - gl_manywarn_set="$gl_manywarn_set -Wshift-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wunused-const-variable=2" - - # 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 -]) diff --git a/m4/virt-arg.m4 b/m4/virt-arg.m4 deleted file mode 100644 index d626d72..0000000 --- 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-compile-pie.m4 b/m4/virt-compile-pie.m4 deleted file mode 100644 index a2df38e..0000000 --- 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* | *-*-msvc* | *-*-cygwin* ) - ;; 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/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 deleted file mode 100644 index 6ece136..0000000 --- a/m4/virt-compile-warnings.m4 +++ /dev/null @@ -1,203 +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" - # 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" - # We allow optional default: instead of listing all enum values - dontwarn="$dontwarn -Wswitch-enum" - # 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" - - # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), - # which triggers spurious warnings for our usage - AC_CACHE_CHECK([whether the C compiler's -Wformat allows NULL strings], - [lv_cv_gcc_wformat_null_works], [ - save_CFLAGS=$CFLAGS - CFLAGS='-Wunknown-pragmas -Werror -Wformat' - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stddef.h> - static __attribute__ ((__format__ (__printf__, 1, 2))) int - foo (const char *fmt, ...) { return !fmt; } - ]], [[ - return foo(NULL); - ]])], - [lv_cv_gcc_wformat_null_works=yes], - [lv_cv_gcc_wformat_null_works=no]) - CFLAGS=$save_CFLAGS]) - - 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 - - # 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]) - - # GNULIB 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" - - # -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 - gl_WARN_ADD([-Wframe-larger-than=4096], [STRICT_FRAME_LIMIT_CFLAGS]) - gl_WARN_ADD([-Wframe-larger-than=25600], [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 do "bad" function cast to define glib auto cleanup functions - wantwarn="$wantwarn -Wno-cast-function-type" - - if test "$enable_werror" = "yes" - then - wantwarn="$wantwarn -Werror" - fi - - # 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 - - # Silence certain warnings in gnulib, and use improved 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 - ]) -]) diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4 deleted file mode 100644 index 7669b23..0000000 --- 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/m4/warnings.m4 b/m4/warnings.m4 deleted file mode 100644 index e697174..0000000 --- a/m4/warnings.m4 +++ /dev/null @@ -1,79 +0,0 @@ -# warnings.m4 serial 11 -dnl Copyright (C) 2008-2017 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. -# -# FIXME: gl_Warn must be used unquoted until we can assume Autoconf -# 2.64 or newer. -AC_DEFUN([gl_COMPILER_OPTION_IF], -[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. -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], -[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], -# [PROGRAM = AC_LANG_PROGRAM()]) -# --------------------------------------------- -# Adds parameter to WARN_CFLAGS if the compiler supports it when -# compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). -# -# If VARIABLE is a variable name, AC_SUBST it. -AC_DEFUN([gl_WARN_ADD], -[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS]) -gl_COMPILER_OPTION_IF([$1], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], - [], - [$3]) -m4_ifval([$2], - [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], - [AC_SUBST([WARN_CFLAGS])])dnl -]) - -# Local Variables: -# mode: autoconf -# End: diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..9cc4417 --- /dev/null +++ b/meson.build @@ -0,0 +1,271 @@ +project( + 'libvirt-dbus', 'c', + version:'1.4.0', + license: 'LGPLv2+', + meson_version: '>= 0.49.0', + default_options: [ + 'buildtype=debugoptimized', + 'c_std=gnu99', + ] +) + + +conf = configuration_data() +conf.set('PACKAGE', meson.project_name()) +conf.set('VERSION', meson.project_version()) +conf.set('build_root', meson.build_root()) +conf.set('sbindir', get_option('sbindir')) +conf.set('source_root', meson.source_root()) + +# Dependencies + +glib2_version = '2.44.0' +libvirt_version = '3.0.0' +libvirt_glib_version = '0.0.7' + +dep_gio_unix = dependency('gio-unix-2.0', version: '>=' + glib2_version) +dep_glib = dependency('glib-2.0', version: '>=' + glib2_version) +dep_libvirt = dependency('libvirt', version: '>=' + libvirt_version) +dep_libvirt_glib = dependency('libvirt-glib-1.0', version: '>=' + libvirt_glib_version) + +conf.set('GLIB2_REQUIRED', glib2_version) +conf.set('LIBVIRT_REQUIRED', libvirt_version) +conf.set('LIBVIRT_GLIB_REQUIRED', libvirt_glib_version) + + +# Configure options + +conf.set('SYSTEM_USER', get_option('system_user')) + +opt_dirs = [ + 'dbus_interfaces', + 'dbus_services', + 'dbus_system_services', + 'dbus_system_policies', + 'polkit_rules', +] + +foreach opt_dir : opt_dirs + value = get_option(opt_dir) + varname = opt_dir + '_dir' + if opt_dir.startswith('/') + set_variable(varname, value) + else + set_variable(varname, join_paths(get_option('datadir'), value)) + endif +endforeach + + +# Compile flags + +common_flags = [ + '-DVIRT_DBUS_INTERFACES_DIR="@0@"'.format(dbus_interfaces_dir), +] + +cc_flags = [ + '-W', + '-Waddress', + '-Waggressive-loop-optimizations', + '-Wall', + '-Warray-bounds=2', + '-Wattributes', + '-Wbad-function-cast', + '-Wbool-compare', + '-Wbuiltin-macro-redefined', + '-Wcast-align', + '-Wchar-subscripts', + '-Wclobbered', + '-Wcomment', + '-Wcomments', + '-Wcoverage-mismatch', + '-Wcpp', + '-Wdate-time', + '-Wdeprecated-declarations', + '-Wdesignated-init', + '-Wdiscarded-array-qualifiers', + '-Wdiscarded-qualifiers', + '-Wdiv-by-zero', + '-Wdouble-promotion', + '-Wduplicated-cond', + '-Wempty-body', + '-Wendif-labels', + '-Wextra', + '-Wformat', + '-Wformat-contains-nul', + '-Wformat-extra-args', + '-Wformat-nonliteral', + '-Wformat-security', + '-Wformat-y2k', + '-Wformat-zero-length', + '-Wframe-address', + '-Wframe-larger-then=256', + '-Wfree-nonheap-object', + '-Whsa', + '-Wignored-attributes', + '-Wignored-qualifiers', + '-Wimplicit', + '-Wimplicit-function-declaration', + '-Wimplicit-int', + '-Wincompatible-pointer-types', + '-Winit-self', + '-Winline', + '-Wint-conversion', + '-Wint-to-pointer-cast', + '-Winvalid-memory-model', + '-Winvalid-pch', + '-Wjump-misses-init', + '-Wlogical-not-parentheses', + '-Wlogical-op', + '-Wmain', + '-Wmaybe-uninitialized', + '-Wmemset-transposed-args', + '-Wmisleading-indentation', + '-Wmissing-braces', + '-Wmissing-declarations', + '-Wmissing-field-initializers', + '-Wmissing-include-dirs', + '-Wmissing-parameter-type', + '-Wmissing-prototypes', + '-Wmultichar', + '-Wnarrowing', + '-Wnested-externs', + '-Wno-cast-function-type', + '-Wnonnull', + '-Wnonnull-compare', + '-Wnormalized=nfc', + '-Wnull-dereference', + '-Wodr', + '-Wold-style-declaration', + '-Wold-style-definition', + '-Wopenmp-simd', + '-Woverflow', + '-Woverlength-strings', + '-Woverride-init', + '-Wpacked', + '-Wpacked-bitfield-compat', + '-Wparentheses', + '-Wpointer-arith', + '-Wpointer-sign', + '-Wpointer-to-int-cast', + '-Wpragmas', + '-Wreturn-local-addr', + '-Wreturn-type', + '-Wscalar-storage-order', + '-Wsequence-point', + '-Wshadow', + '-Wshift-count-negative', + '-Wshift-count-overflow', + '-Wshift-negative-value', + '-Wshift-overflow=2', + '-Wsizeof-array-argument', + '-Wsizeof-pointer-memaccess', + '-Wstack-protector', + '-Wstrict-aliasing', + '-Wstrict-prototypes', + '-Wsuggest-attribute=const', + '-Wsuggest-attribute=format', + '-Wsuggest-attribute=noreturn', + '-Wsuggest-attribute=pure', + '-Wsuggest-final-methods', + '-Wsuggest-final-types', + '-Wswitch', + '-Wswitch-bool', + '-Wsync-nand', + '-Wtautological-compare', + '-Wtrampolines', + '-Wtrigraphs', + '-Wtype-limits', + '-Wuninitialized', + '-Wunknown-pragmas', + '-Wunused', + '-Wunused-but-set-parameter', + '-Wunused-but-set-variable', + '-Wunused-const-variable=2', + '-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', + '-fasynchronous-unwind-tables', + '-fexceptions', + '-fipa-pure-const', + '-fno-common', +] +ld_flags = [ + '-Wl,-z,now', + '-Wl,-z,relro', +] + +if host_machine.cpu_family() != 'aarch64' + if host_machine.system() == 'linux' + cc_flags += ['-fstack-protector-strong'] + endif + if host_machine.system() == 'freebsd' + cc_flags += ['-fstack-protector'] + endif +endif + +if host_machine.system() not in ['cygwin', 'windows'] + cc_flags += ['-fPIE', '-DPIE'] + ld_flags += ['-pie'] +endif + +cc = meson.get_compiler('c') +common_flags += cc.get_supported_arguments(cc_flags) +link_flags = cc.get_supported_link_arguments(ld_flags) + +add_project_arguments(common_flags, language: 'c') +add_project_link_arguments(link_flags, language: 'c') + + +# Generate dist files + +configure_file( + input: 'libvirt-dbus.spec.in', + output: 'libvirt-dbus.spec', + configuration: conf, +) + +configure_file( + input: 'run.in', + output: 'run', + configuration: conf, +) + +authors_prog = find_program('tools/gen-authors.sh') + +authors = run_command( + authors_prog, + meson.source_root(), +) + +configure_file( + configuration: { 'contributorslist': authors.stdout() }, + input: 'AUTHORS.in', + output: 'AUTHORS', +) + +foreach file : [ 'libvirt-dbus.spec', 'AUTHORS' ] + meson.add_dist_script( + 'sh', + '-c', + 'cp "' + join_paths(meson.build_root(), file) + '" "$MESON_DIST_ROOT/"', + ) +endforeach + + +# Include sub-directories + +subdir('data') +subdir('docs') +subdir('src') +subdir('tests') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..36e8065 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,6 @@ +option('dbus_services', type: 'string', value: 'dbus-1/services', description: 'D-Bus session services directory') +option('dbus_system_services', type: 'string', value: 'dbus-1/system-services', description: 'D-Bus system services directory') +option('dbus_system_policies', type: 'string', value: 'dbus-1/system.d', description: 'D-Bus system policies directory') +option('dbus_interfaces', type: 'string', value: 'dbus-1/interfaces', description: 'D-Bus interfaces directory') +option('polkit_rules', type: 'string', value: 'polkit-1/rules.d', description: 'polkit rules directory') +option('system_user', type: 'string', value: 'libvirtdbus', description: 'username to run system instance as') diff --git a/run.in b/run.in old mode 100644 new mode 100755 index 0744a80..1b2207e --- a/run.in +++ b/run.in @@ -14,7 +14,7 @@ # ./run gdb --args ./src/libvirt-dbus [args ...] # -export abs_top_builddir="@abs_top_builddir@" -export VIRT_DBUS_INTERFACES_DIR="@abs_top_srcdir@/data" +export abs_top_builddir="@build_root@" +export VIRT_DBUS_INTERFACES_DIR="@source_root@/data" exec "$@" diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 845696e..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -DVIRT_DBUS_INTERFACES_DIR=\"$(DBUS_INTERFACES_DIR)\" \ - $(NULL) -AM_CFLAGS = \ - $(GIO2_CFLAGS) \ - $(GLIB2_CFLAGS) \ - $(LIBVIRT_CFLAGS) \ - $(LIBVIRT_GLIB_CFLAGS) \ - $(WARN_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -AM_LDFLAGS = \ - $(GIO2_LDFLAGS) \ - $(GLIB2_LDFLAGS) \ - $(LIBVIRT_LDFLAGS) \ - $(LIBVIRT_GLIB_LDFLAGS) \ - $(RELRO_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = \ - libutil.la \ - $(NULL) - -libutil_la_SOURCES = \ - util.c \ - util.h \ - $(NULL) - -sbin_PROGRAMS = \ - libvirt-dbus \ - $(NULL) - -libvirt_dbus_SOURCES = \ - connect.c \ - connect.h \ - domain.c \ - domain.h \ - events.c \ - events.h \ - gdbus.c \ - gdbus.h \ - interface.c \ - interface.h \ - main.c \ - network.c \ - network.h \ - nodedev.c \ - nodedev.h \ - nwfilter.c \ - nwfilter.h \ - secret.c \ - secret.h \ - storagepool.c \ - storagepool.h \ - storagevol.c \ - storagevol.h \ - $(NULL) -libvirt_dbus_LDADD = \ - libutil.la \ - $(GIO2_LIBS) \ - $(GLIB2_LIBS) \ - $(LIBVIRT_LIBS) \ - $(LIBVIRT_GLIB_LIBS) \ - $(NULL) diff --git a/src/domain.c b/src/domain.c index e8b1a0e..10fa8de 100644 --- a/src/domain.c +++ b/src/domain.c @@ -136,7 +136,7 @@ virtDBusDomainGVariantToCpumap(GVariantIter *iter, guint cnt = 0; *cpumaplen = VIR_CPU_MAPLEN(cpus); - *cpumap = g_new0(guchar, cpumaplen); + *cpumap = g_new0(guchar, *cpumaplen); while (g_variant_iter_loop(iter, "b", &usable)) { if (usable) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..2c844c6 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,54 @@ +lib_util = static_library( + 'libutil', + [ + 'util.c', + 'util.h', + ], + dependencies: [ + dep_gio_unix, + dep_glib, + dep_libvirt, + dep_libvirt_glib + ], +) + +exe_libvirt_dbus = executable( + 'libvirt-dbus', + [ + 'connect.c', + 'connect.h', + 'domain.c', + 'domain.h', + 'events.c', + 'events.h', + 'gdbus.c', + 'gdbus.h', + 'interface.c', + 'interface.h', + 'main.c', + 'network.c', + 'network.h', + 'nodedev.c', + 'nodedev.h', + 'nwfilter.c', + 'nwfilter.h', + 'secret.c', + 'secret.h', + 'storagepool.c', + 'storagepool.h', + 'storagevol.c', + 'storagevol.h', + ], + dependencies: [ + dep_gio_unix, + dep_glib, + dep_libvirt, + dep_libvirt_glib + ], + link_with: [ + lib_util, + ], + install: true, + install_dir: get_option('sbindir'), +) + diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index cd1fbd7..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - $(NULL) - -test_helpers = \ - xmldata.py \ - libvirttest.py \ - conftest.py \ - $(NULL) - -test_programs = \ - test_connect.py \ - test_domain.py \ - test_interface.py \ - test_network.py \ - test_nodedev.py \ - test_storage.py \ - $(NULL) - -check_PROGRAMS = \ - test_util \ - $(NULL) - -test_util_SOURCES = \ - test_util.c \ - $(NULL) -test_util_CFLAGS = \ - $(GIO2_CFLAGS) \ - $(GLIB2_CFLAGS) \ - $(LIBVIRT_CFLAGS) \ - $(NULL) -test_util_LDFLAGS = \ - $(GIO2_LDFLAGS) \ - $(GLIB2_LDFLAGS) \ - $(LIBVIRT_LDFLAGS) \ - $(NULL) -test_util_LDADD = \ - $(top_builddir)/src/libutil.la \ - $(GIO2_LIBS) \ - $(GLIB2_LIBS) \ - $(LIBVIRT_LIBS) \ - $(NULL) - -EXTRA_DIST = \ - $(test_helpers) \ - $(test_programs) \ - travis-run \ - $(NULL) - -TESTS = \ - $(check_PROGRAMS) \ - $(test_programs) \ - $(NULL) - -AM_TESTS_ENVIRONMENT = \ - export abs_top_builddir="$(abs_top_builddir)"; \ - export VIRT_DBUS_INTERFACES_DIR="$(abs_top_srcdir)/data"; diff --git a/tests/meson.build b/tests/meson.build new file mode 100644 index 0000000..b0fb91a --- /dev/null +++ b/tests/meson.build @@ -0,0 +1,49 @@ +test_exec = executable( + 'test_util', + [ + 'test_util.c', + ], + dependencies: [ + dep_gio_unix, + dep_glib, + dep_libvirt, + dep_libvirt_glib + ], + link_with: [ + lib_util, + ], + include_directories: [ '../src' ], +) + +test('test_util', test_exec) + +python_tests = [ + 'test_connect.py', + 'test_domain.py', + 'test_interface.py', + 'test_network.py', + 'test_nodedev.py', + 'test_storage.py', +] + +python_env = [ + 'abs_top_builddir=' + meson.build_root(), + 'VIRT_DBUS_INTERFACES_DIR=' + meson.source_root() + '/data' +] + +foreach name : python_tests + prog = find_program(name) + test(name, prog, env: python_env) +endforeach + +flake8 = find_program('flake8', 'flake8-3', required: false) +if flake8.found() + test( + 'flake8', flake8, + args: [ + '--show-source', + '--ignore=E501', + meson.source_root(), + ] + ) +endif diff --git a/tools/gen-authors.sh b/tools/gen-authors.sh new file mode 100755 index 0000000..75eb58a --- /dev/null +++ b/tools/gen-authors.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +srcdir=$1 + +if test -d ${srcdir}/.git; then + cd ${srcdir} + git log --pretty=format:' %aN <%aE>' | sort -u +fi -- 2.21.0

5 20

[libvirt] [PATCH] conf: fix memory leak in virNodeDevPCICapSRIOVVirtualParseXML
by Xu Yandong 19 Sep '19

19 Sep '19

In function virNodeDevPCICapSRIOVVirtualParseXML, temp variable addr could leak if VIR_APPEND_ELEMENT fails . Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- src/conf/node_device_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 618ce8e00e..2d8e03e53e 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1519,8 +1519,10 @@ virNodeDevPCICapSRIOVVirtualParseXML(xmlXPathContextPtr ctxt, if (VIR_APPEND_ELEMENT(pci_dev->virtual_functions, pci_dev->num_virtual_functions, - addr) < 0) + addr) < 0) { + VIR_FREE(addr); goto cleanup; + } } pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; -- 2.18.1

3 2

[libvirt] [PATCH] qemu: fix potential memory leak
by Xu Yandong 19 Sep '19

19 Sep '19

function virTypedParamsAddString may return -1 but alloc params, so invoker should free it. Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- src/qemu/qemu_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e041a8bac..62ce7270ca 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5312,6 +5312,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, goto cleanup; event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); + eventParams = NULL; + eventNparams = 0; ret = 0; @@ -5320,6 +5322,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virCgroupFree(&cgroup_vcpu); VIR_FREE(str); virObjectEventStateQueue(driver->domainEventState, event); + if (eventParams) + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5527,6 +5531,8 @@ qemuDomainPinEmulator(virDomainPtr dom, goto endjob; event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + eventParams = NULL; + eventNparams = 0; } if (persistentDef) { @@ -5548,6 +5554,8 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: if (cgroup_emulator) virCgroupFree(&cgroup_emulator); + if (eventParams) + virTypedParamsFree(eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); VIR_FREE(str); virBitmapFree(pcpumap); @@ -6012,6 +6020,8 @@ qemuDomainPinIOThread(virDomainPtr dom, goto endjob; event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + eventParams = NULL; + eventNparams = 0; } if (persistentDef) { @@ -6043,6 +6053,8 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: if (cgroup_iothread) virCgroupFree(&cgroup_iothread); + if (eventParams) + virTypedParamsFree(eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); VIR_FREE(str); virBitmapFree(pcpumap); -- 2.18.1

2 1

[libvirt] [PATCH] qemu: clear vcpupin when unhotplug vcpu
by Xu Yandong 19 Sep '19

19 Sep '19

step1: hotplug vcpus step2: pin vcpus step3: unhotplug vcpus As a result, vcpu pin info still show up in xml. So we need clear it. Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- src/qemu/qemu_hotplug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 62e505b779..df94b54d09 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6105,6 +6105,9 @@ qemuDomainHotplugDelVcpu(virQEMUDriverPtr driver, qemuDomainVcpuPersistOrder(vm->def); + virBitmapFree(vcpuinfo->cpumask); + vcpuinfo->cpumask = NULL; + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; @@ -6390,6 +6393,8 @@ qemuDomainSetVcpusConfig(virDomainDefPtr def, vcpu->online = false; vcpu->hotpluggable = VIR_TRISTATE_BOOL_YES; + virBitmapFree(vcpu->cpumask); + vcpu->cpumask = NULL; if (--curvcpus == nvcpus) break; -- 2.18.1

2 1

[libvirt] [PATCH 0/2] Don't colorize output senselessly
by Peter Krempa 19 Sep '19

19 Sep '19

Basing the colors on the message itself is in many cases wrong. Look into the patches for examples. Peter Krempa (2): Revert "virt-result.m4: Colourize summary printings" Revert "configure: Colorize output" m4/virt-colours.m4 | 62 ---------------------------------------------- m4/virt-result.m4 | 21 +++------------- 2 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 m4/virt-colours.m4 -- 2.21.0

2 4

[libvirt] [PATCH 0/9] conf: Clean up XPath context handling
by Peter Krempa 18 Sep '19

18 Sep '19

Refactor allocation and deallocation of the XPath context to have slightly less messy code. Peter Krempa (9): util: xml: Add wrapper for xmlXPathNewContext conf: network: Use VIR_AUTOPTR in virNetworkDefUpdateSection conf: Refactor resource cleanup in virDomainDeviceDefParse conf: Use automatic pointers for xmlXPathContext conf: Use VIR_AUTOPTR for xmlDoc and xmlXPath objects conf: domain: Register VIR_AUTOPTR function for virDomainDef conf: domain: Refactor cleanup in virDomainDefParseNode conf: secret: Register VIR_AUTOPTR function for virSecretDef conf: secret: Refactor cleanup in secretXMLParseNode src/conf/checkpoint_conf.c | 17 ++-- src/conf/domain_conf.c | 131 ++++++++++++------------------- src/conf/domain_conf.h | 1 + src/conf/interface_conf.c | 16 +--- src/conf/network_conf.c | 52 +++++------- src/conf/node_device_conf.c | 16 +--- src/conf/nwfilter_conf.c | 18 ++--- src/conf/secret_conf.c | 40 ++++------ src/conf/secret_conf.h | 2 + src/conf/snapshot_conf.c | 21 ++--- src/conf/storage_conf.c | 54 ++++--------- src/conf/virnetworkportdef.c | 5 +- src/conf/virnwfilterbindingdef.c | 5 +- src/conf/virnwfilterbindingobj.c | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 +- src/util/virxml.c | 20 ++++- src/util/virxml.h | 3 + src/vbox/vbox_snapshot_conf.c | 17 ++-- src/vz/vz_sdk.c | 6 +- 20 files changed, 166 insertions(+), 268 deletions(-) -- 2.21.0

2 18

[libvirt] [PATCH 0/5] virsh: Allow more use of VIR_AUTO* in virsh
by Peter Krempa 18 Sep '19

18 Sep '19

See patch 1 for impl and description and patch 2 for example. Peter Krempa (5): virsh: Allow using VIR_AUTOPTR for releasing virDomainPtr in virsh virsh: demonstrate use of VIR_AUTOPTR(virshDomain) on 'send-process-signal' virsh: Use virshDomain type in 'inject-nmi' virsh: Use VIR_AUTO machinery in cmdQemuMonitorCommand virsh: Don't open-code virJSONStringReformat in cmdQemuMonitorCommand tools/virsh-domain.c | 51 ++++++++++++++------------------------------ tools/virsh-util.h | 3 +++ 2 files changed, 19 insertions(+), 35 deletions(-) -- 2.21.0

3 11

[libvirt] [PATCH] util: remove some no-op thread functions
by Daniel P. Berrangé 18 Sep '19

18 Sep '19

Neither virThreadInitialize or virThreadOnExit do anything since we dropped the Win32 threads impl, in favour of win-pthreads. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt-admin.c | 3 +-- src/libvirt.c | 6 ++---- src/libvirt_private.syms | 1 - src/locking/lock_daemon.c | 1 - src/logging/log_daemon.c | 1 - src/lxc/lxc_controller.c | 1 - src/network/leaseshelper.c | 1 - src/security/virt-aa-helper.c | 1 - src/util/iohelper.c | 1 - src/util/virthread.c | 10 ---------- src/util/virthread.h | 3 --- tests/commandtest.c | 3 --- tests/eventtest.c | 2 -- tests/qemuagenttest.c | 3 +-- tests/qemucapabilitiestest.c | 3 --- tests/qemucaps2xmltest.c | 3 --- tests/qemucapsprobe.c | 3 +-- tests/qemuhotplugtest.c | 3 +-- tests/qemumigparamstest.c | 3 +-- tests/qemumonitorjsontest.c | 3 +-- tests/seclabeltest.c | 3 --- tests/testutils.c | 3 +-- tests/viratomictest.c | 3 --- 23 files changed, 9 insertions(+), 55 deletions(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 9d5c5b1b7b..091473e698 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -52,8 +52,7 @@ virAdmGlobalInit(void) * virAdmConnectOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) goto error; virLogSetFromEnv(); diff --git a/src/libvirt.c b/src/libvirt.c index 15917cba6f..ca172beb71 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -243,8 +243,7 @@ virGlobalInit(void) * virConnectOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) goto error; virFileActivateDirOverrideForLib(); @@ -369,8 +368,7 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED, break; case DLL_THREAD_DETACH: - /* Release per-thread local data */ - virThreadOnExit(); + /* Nothing todo in libvirt yet */ break; case DLL_PROCESS_DETACH: diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6619dbc2e9..da915876ff 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3173,7 +3173,6 @@ virRWLockWrite; virThreadCancel; virThreadCreateFull; virThreadID; -virThreadInitialize; virThreadIsSelf; virThreadJoin; virThreadSelf; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index edb61d74c0..a5a3a97e99 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1124,7 +1124,6 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 85c58aaa7b..9621702138 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -896,7 +896,6 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c677eb8f6d..37851bf284 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2505,7 +2505,6 @@ int main(int argc, char *argv[]) ns_fd[i] = -1; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 5e04e16171..46482ad3ce 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -104,7 +104,6 @@ main(int argc, char **argv) program_name = argv[0]; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), program_name); exit(EXIT_FAILURE); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 326cfaf52a..ead4eaa236 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1421,7 +1421,6 @@ main(int argc, char **argv) char *include_file = NULL; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/util/iohelper.c b/src/util/iohelper.c index ddc338b7c7..f3d45b9c03 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -196,7 +196,6 @@ main(int argc, char **argv) program_name = argv[0]; if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed"), program_name); exit(EXIT_FAILURE); diff --git a/src/util/virthread.c b/src/util/virthread.c index 05b5572f5f..cdc5cab604 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -33,16 +33,6 @@ #include "virthreadjob.h" -/* Nothing special required for pthreads */ -int virThreadInitialize(void) -{ - return 0; -} - -void virThreadOnExit(void) -{ -} - int virOnce(virOnceControlPtr once, virOnceFunc init) { return pthread_once(&once->once, init); diff --git a/src/util/virthread.h b/src/util/virthread.h index 7870340c47..6bbc09fa13 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -82,9 +82,6 @@ struct virOnceControl { typedef void (*virOnceFunc)(void); -int virThreadInitialize(void) ATTRIBUTE_RETURN_CHECK; -void virThreadOnExit(void); - typedef void (*virThreadFunc)(void *opaque); #define virThreadCreate(thread, joinable, func, opaque) \ diff --git a/tests/commandtest.c b/tests/commandtest.c index a382bb6dd2..c6fd826003 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1292,9 +1292,6 @@ mymain(void) int timer = -1; int virinitret; - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - if (chdir("/tmp") < 0) return EXIT_FAILURE; diff --git a/tests/eventtest.c b/tests/eventtest.c index df7570bac6..f426469d21 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -321,8 +321,6 @@ mymain(void) } } - if (virThreadInitialize() < 0) - return EXIT_FAILURE; char *debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && (virLogSetDefaultPriority(virLogParseDefaultPriority(debugEnv)) < 0)) { diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 91f19644d5..5ae098efa9 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1431,8 +1431,7 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; virEventRegisterDefaultImpl(); diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 67f57a4fdc..1a785d8e39 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -214,9 +214,6 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - virEventRegisterDefaultImpl(); if (testQemuDataInit(&data) < 0) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 3b381251a0..e36ba06eeb 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -203,9 +203,6 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - virEventRegisterDefaultImpl(); if (testQemuDataInit(&data) < 0) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index ae016c47c2..36af01d561 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -54,8 +54,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - if (virThreadInitialize() < 0 || - virInitialize() < 0) { + if (virInitialize() < 0) { fprintf(stderr, "Failed to initialize libvirt"); return EXIT_FAILURE; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3c177c6622..76b131295a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -614,8 +614,7 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; virEventRegisterDefaultImpl(); diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index dcefde2dbc..aacb905639 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -209,8 +209,7 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; virEventRegisterDefaultImpl(); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index af84e0ba04..d0bbb1f674 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3019,8 +3019,7 @@ mymain(void) return EXIT_AM_SKIP; #endif - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; virEventRegisterDefaultImpl(); diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index a0296c787e..42dcb8c97f 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -11,9 +11,6 @@ mymain(void) virSecurityManagerPtr mgr; const char *doi, *model; - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - mgr = virSecurityManagerNew(NULL, "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED); if (mgr == NULL) { fprintf(stderr, "Failed to start security driver"); diff --git a/tests/testutils.c b/tests/testutils.c index 064460b4dc..1b663f9d5d 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -877,8 +877,7 @@ int virTestMain(int argc, } fprintf(stderr, "TEST: %s\n", progname); - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) return EXIT_FAILURE; virLogSetFromEnv(); diff --git a/tests/viratomictest.c b/tests/viratomictest.c index 52f17154e9..a933ab1cbd 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -164,9 +164,6 @@ mymain(void) { int ret = 0; - if (virThreadInitialize() < 0) - return -1; - if (virTestRun("types", testTypes, NULL) < 0) ret = -1; if (virTestRun("threads", testThreads, NULL) < 0) -- 2.21.0

3 2

[libvirt] [PATCHv2] maint: Use flake8 to check python code
by Shi Lei 18 Sep '19

18 Sep '19

Replace 'sc_prohibit_semicolon_at_eol_in_python' with generic 'sc_flake8' rule to check python code style. Now 'sc_flake8' just check the error E703: 'statement ends with a semicolon'. In future, we could use '--select' to introduce more rules. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- v1: https://www.redhat.com/archives/libvir-list/2019-September/msg00501.html since v1: - Use the return-value from flake8 directly for 'sc_flake8'. - Add the option '--show-source' to be more helpful for developers. - Set checking for 'flake8' as a soft requirement. cfg.mk | 17 ++++++++++++----- configure.ac | 4 ++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index 42e1abf0..a7c88383 100644 --- a/cfg.mk +++ b/cfg.mk @@ -812,11 +812,13 @@ sc_require_enum_last_marker: exit 1; } || : # In Python files we don't want to end lines with a semicolon like in C -sc_prohibit_semicolon_at_eol_in_python: - @prohibit='^[^#].*\;$$' \ - in_vc_files='\.py$$' \ - halt='python does not require to end lines with a semicolon' \ - $(_sc_search_regexp) +sc_flake8: + @if [ -n "$(FLAKE8)" ]; then \ + $(VC_LIST_EXCEPT) | $(GREP) '\.py$$' | xargs \ + $(FLAKE8) --select E703 --show-source; \ + else \ + echo '$(ME): skipping test $@: flake8 not installed' 1>&2; \ + fi # mymain() in test files should use return, not exit, for nicer output sc_prohibit_exit_in_tests: @@ -1140,6 +1142,11 @@ syntax-check: spacing-check test-wrap-argv \ echo "*****************************************************" >&2; \ echo "* cppi not installed, some checks have been skipped *" >&2; \ echo "*****************************************************" >&2; \ + fi; \ + if [ -z "$(FLAKE8)" ]; then \ + echo "*****************************************************" >&2; \ + echo "* flake8 not installed, sc_flake8 has been skipped *" >&2; \ + echo "*****************************************************" >&2; \ fi endif diff --git a/configure.ac b/configure.ac index 41d3da3e..286b9f7a 100644 --- a/configure.ac +++ b/configure.ac @@ -704,6 +704,10 @@ AC_PATH_PROGS([PYTHON], [python3 python2 python]) if test -z "$PYTHON"; then AC_MSG_ERROR(['python3', 'python2' or 'python' binary is required to build libvirt]) fi +AC_PATH_PROG([FLAKE8], [flake8]) +if test -z "$FLAKE8"; then + AC_MSG_WARN(['flake8' binary is required to check python code style]) +fi AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) -- 2.17.1

2 1

[libvirt] Call for volunteers: LWN.net articles about KVM Forum talks
by Stefan Hajnoczi 18 Sep '19

18 Sep '19

Hi, LWN.net is a popular open source news site that covers Linux and other open source communities (Python, GNOME, Debian, etc). It has published a few KVM articles in the past too. Let's raise awareness of QEMU, KVM, and libvirt by submitting articles covering KVM Forum. I am looking for ~5 volunteers who are attending KVM Forum to write an article about a talk they find interesting. Please pick a talk you'd like to cover and reply to this email thread. I will then send an email to LWN with a heads-up so they can let us know if they are interested in publishing a KVM Forum special. I will not ask LWN.net for money. KVM Forum schedule: https://events.linuxfoundation.org/events/kvm-forum-2019/program/schedule/ LWN.net guidelines: https://lwn.net/op/AuthorGuide.lwn "Our general guideline is for articles to be around 1500 words in length, though somewhat longer or shorter can work too. The best articles cover a fairly narrow topic completely, without any big omissions or any extra padding." I volunteer to cover Michael Tsirkin's "VirtIO without the Virt - Towards Implementations in Hardware" talk. Thanks, Stefan

5 6

[libvirt] [PATCH 0/2] vz: build fixes for passing qemuCaps down the stack
by Nikolay Shirokovskiy 18 Sep '19

18 Sep '19

Pushed as trivial and build breaker. Nikolay Shirokovskiy (2): vz: build fix for passing qemuCaps to virDomainDeviceDefPostParse vz: build fix for passing qemuCaps to virDomainDefParseNode src/vz/vz_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.8.3.1

1 2

[libvirt] [PATCH v2 0/2] qemu: Enable slirp-helper iff dbus-vmstate present
by Michal Privoznik 17 Sep '19

17 Sep '19

This is technically a v2 of: https://www.redhat.com/archives/libvir-list/2019-September/msg00281.html It implements what Jano suggested - use dbus-vmstate capability to decide if slirp-helper is used. Michal Prívozník (2): qemu: Enable slirp-helper iff dbus-vmstate present Revert "qemu: add socket datagram capability" src/qemu/qemu_capabilities.c | 5 ----- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvtest.c | 2 +- 13 files changed, 4 insertions(+), 17 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH] maint: Use flake8 to check python code
by Shi Lei 17 Sep '19

17 Sep '19

Replace 'sc_prohibit_semicolon_at_eol_in_python' with generic 'sc_flake8' rule to check python code style. Now 'sc_flake8' just check the error E703: 'statement ends with a semicolon'. In future, we could use '--select' to introduce more rules. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- cfg.mk | 8 +++----- configure.ac | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index 42e1abf0..8acc45ac 100644 --- a/cfg.mk +++ b/cfg.mk @@ -812,11 +812,9 @@ sc_require_enum_last_marker: exit 1; } || : # In Python files we don't want to end lines with a semicolon like in C -sc_prohibit_semicolon_at_eol_in_python: - @prohibit='^[^#].*\;$$' \ - in_vc_files='\.py$$' \ - halt='python does not require to end lines with a semicolon' \ - $(_sc_search_regexp) +sc_flake8: + @$(VC_LIST_EXCEPT) | $(GREP) '\.py$$' | xargs $(FLAKE8) --select E703 \ + | $(GREP) . && { exit 1; } || : # mymain() in test files should use return, not exit, for nicer output sc_prohibit_exit_in_tests: diff --git a/configure.ac b/configure.ac index a8f8b051..93212ca7 100644 --- a/configure.ac +++ b/configure.ac @@ -704,6 +704,10 @@ AC_PATH_PROGS([PYTHON], [python3 python2 python]) if test -z "$PYTHON"; then AC_MSG_ERROR(['python3', 'python2' or 'python' binary is required to build libvirt]) fi +AC_PATH_PROG([FLAKE8], [flake8]) +if test -z "$FLAKE8"; then + AC_MSG_ERROR(['flake8' binary is required to check python code style]) +fi AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) -- 2.17.1

2 2

[libvirt] [PATCH 0/6] test_driver: implement device attach/detach APIs
by Ilias Stamatis 17 Sep '19

17 Sep '19

Ilias Stamatis (6): test_driver: implement virDomainAttachDeviceFlags test_driver: implement virDomainAttachDevice test_driver: implement virDomainDetachDeviceFlags test_driver: implement virDomainDetachDevice test_driver: implement virDomainDetachDeviceAlias test_driver: implement virDomainUpdateDeviceFlags src/test/test_driver.c | 570 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 570 insertions(+) -- 2.22.0

2 10

[libvirt] [virttools-planet PATCH] README: add instructions for adding a new blog
by Stefan Hajnoczi 17 Sep '19

17 Sep '19

Signed-off-by: Stefan Hajnoczi <stefanha(a)gmail.com> --- README | 22 ++++++++++++++++++++++ updater/virt-tools/basic/index.html.tmpl | 1 + 2 files changed, 23 insertions(+) diff --git a/README b/README index 1013e71..ad388f8 100644 --- a/README +++ b/README @@ -6,6 +6,28 @@ This directory contains content / configuration for managing http(s)://planet.virttools.org http(s)://planet.virt-tools.org +How to add your blog +-------------------- +Add a config.ini section for your blog to updater/virt-tools/config.ini: + + [https://example.org/my/blog/feed/] + name = John Doe + face = jdoe.png + facewidth = 96 + faceheight = 96 + +Where face (logo image filename), facewidth (logo image width in pixels), and +faceheight (logo image height in pixels) are optional attributes that describe +the logo image associated with your blog. Remember to add your image file into +the updater/virt-tools/images/ directory if you wish to use an image. + +Please send a patch email to libvir-list(a)redhat.com: + + $ git commit -as + $ git send-email --to libvir-list(a)redhat.com --cc berrange(a)redhat.com HEAD^.. + +How to run the site +------------------- The site is setup to run under OpenShift Initial load can be done with diff --git a/updater/virt-tools/basic/index.html.tmpl b/updater/virt-tools/basic/index.html.tmpl index d8d239e..d26aba0 100644 --- a/updater/virt-tools/basic/index.html.tmpl +++ b/updater/virt-tools/basic/index.html.tmpl @@ -23,6 +23,7 @@ <TMPL_LOOP Channels> <li><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name></a> <a href="<TMPL_VAR url ESCAPE="HTML">">(feed)</a></li> </TMPL_LOOP> + <li><a href="https://libvirt.org/git/?p=virttools-planet.git;a=blob;f=README">Add your blog!</a></li> </ul> </div> -- 2.21.0

2 1

[libvirt] [RFC] quirks of interface target device name
by Nikolay Shirokovskiy 17 Sep '19

17 Sep '19

Hi, all I recently discovered that <target dev=''/> input is allowed[*] by qemu driver's defineXML for <interface> element. On start it will turn into 'tap<N>'. At the same time empty value is not allowed by schema. This name is generated by kernel on linux. I wonder how to deal with this. 1. Fix schema to allow empty value for dev attribute. Additionally fix migrating to clear out this autogenerated name. This way we have 2 options to autogenerate dev name. First as described above. Second is by ommiting target element. The naming will be 'vnet<N>' in the latter case. Having these 2 options looks redundant. 2. Don't allow to start domains with such configuration. We can not fail definition because disappearing VMs on libvirt update looks too unpleasant. This way we don't have two different set of autogenerated names. This can even go unnoticed given we fail such starts anyway after [1] (which is fixed by [*]). [1] is commited on 2018 Jul 23 and released in 4.6.0. However Centos 7 is based on 4.5.0 and virNetDevTapCreate has logic to copy generated tap name from kernel like since the beginning (I managed to follow the history to 2011). Nikolay [*] at least with recent "virStrncpy: fix to successfully copy empty string" applied [1] 7d70a63b util: Improve virStrncpy() implementation

2 3

[libvirt] [PATCH 0/2] Fix systemd socket activation for systemd < v227
by Michael Chapman 17 Sep '19

17 Sep '19

A couple of bugs were encountered using socket activated libvirtd on CentOS 7: - When resolving a tls_port/tcp_port from the config file (needed even when using socket activation on systemd < v227), the port endianness was incorrect. - The wrong name was used when checking whether libvirtd-tls.socket was passed to libvirtd, leading to this socket not being properly registered. Michael Chapman (2): util: fix byte order of port in virSocketAddrResolveService remote: fix registration of TLS socket src/remote/remote_daemon.c | 2 +- src/util/virsocketaddr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH 1/1] virStrncpy: fix to successfully copy empty string
by Nikolay Shirokovskiy 16 Sep '19

16 Sep '19

After [1] we got failure on attempt to copy empty string. Before the patch empty string was copied successfuly. Restore the original behaviour. [1] 7d70a63b util: Improve virStrncpy() implementation Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/util/virstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 2064944b0b..a4cc7e9c0a 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -786,7 +786,7 @@ virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) if (n == -1) n = src_len; - if (n <= 0 || n > src_len || n > (destbytes - 1)) + if (n > src_len || n > (destbytes - 1)) return -1; memcpy(dest, src, n); -- 2.23.0

2 1

[libvirt] [PATCH 0/2] qemu: Enable -blockdev support (blockdev-add saga)
by Peter Krempa 16 Sep '19

16 Sep '19

To my knowledge, everything in libvirt is now prepared to fully use -blockdev way to configure disks in qemu. There is one known qemu bug though: Internal snapshots don't work with -blockdev: https://bugzilla.redhat.com/show_bug.cgi?id=1658981 Since I can't in good faith ask for merging this patchset yet I'd like to give it some more testing I'm suggesting that we push it and revert it during freeze or add a capability check once qemu is fixed. Any other ideas? Peter Krempa (2): qemu: caps: Add capability for dynamic 'auto-read-only' support for files qemu: enable blockdev support src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + .../caps_4.1.0.x86_64.xml | 2 + .../controller-virtio-scsi.x86_64-latest.args | 35 +++-- .../disk-aio.x86_64-latest.args | 19 ++- ...-backing-chains-noindex.x86_64-latest.args | 145 +++++++++++++++--- .../disk-cache.x86_64-latest.args | 50 ++++-- .../disk-cdrom-network.x86_64-latest.args | 32 ++-- .../disk-cdrom-tray.x86_64-latest.args | 24 ++- .../disk-cdrom.x86_64-latest.args | 21 +-- .../disk-copy_on_read.x86_64-latest.args | 19 ++- .../disk-detect-zeroes.x86_64-latest.args | 17 +- .../disk-error-policy.x86_64-latest.args | 30 ++-- .../disk-floppy-q35-2_11.x86_64-latest.args | 14 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 14 +- .../disk-floppy.x86_64-latest.args | 21 ++- .../disk-network-gluster.x86_64-latest.args | 32 ++-- .../disk-network-iscsi.x86_64-latest.args | 58 ++++--- .../disk-network-nbd.x86_64-latest.args | 41 +++-- .../disk-network-rbd.x86_64-latest.args | 67 +++++--- .../disk-network-sheepdog.x86_64-latest.args | 16 +- ...isk-network-source-auth.x86_64-latest.args | 30 ++-- .../disk-network-tlsx509.x86_64-latest.args | 64 +++++--- .../disk-readonly-disk.x86_64-latest.args | 14 +- .../disk-scsi-device-auto.x86_64-latest.args | 14 +- .../disk-scsi.x86_64-latest.args | 35 +++-- .../disk-shared.x86_64-latest.args | 36 +++-- ...irtio-scsi-reservations.x86_64-latest.args | 20 ++- .../floppy-drive-fat.x86_64-latest.args | 7 +- ...egl-headless-rendernode.x86_64-latest.args | 7 +- .../graphics-egl-headless.x86_64-latest.args | 7 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 25 ++- ...y-hotplug-nvdimm-access.x86_64-latest.args | 7 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 7 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 7 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 7 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 7 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 7 +- ...eo-bochs-display-device.x86_64-latest.args | 10 +- ...virtio-non-transitional.x86_64-latest.args | 7 +- .../virtio-transitional.x86_64-latest.args | 7 +- .../x86_64-pc-graphics.x86_64-latest.args | 8 +- .../x86_64-pc-headless.x86_64-latest.args | 8 +- .../x86_64-q35-graphics.x86_64-latest.args | 8 +- .../x86_64-q35-headless.x86_64-latest.args | 8 +- 45 files changed, 714 insertions(+), 306 deletions(-) -- 2.21.0

4 9

[libvirt] [PATCH v2 00/11] hostdev: handle usb detach/attach on node
by Nikolay Shirokovskiy 16 Sep '19

16 Sep '19

*Notes* Deleting usb device from qemu is synchronous operation (although it is not stated in qemu API). I did not used this knowledge in the series. The last patch is remnant of previus version of the series yet it is useful. Diff to previous[1] version: - don't use dummy device while host usb device is unplugged [1] https://www.redhat.com/archives/libvir-list/2019-August/msg01413.html Nikolay Shirokovskiy (11): qemu: track hostdev delete intention qemu: support host usb device unplug qemu: support usb hostdev plugging back qemu: handle host usb device add/del udev events qemu: handle libvirtd restart after host usb device unplug qemu: handle race on device deletion and usb host device plugging qemu: hotplug: update device list on device deleted event qemu: handle host usb device plug/unplug when libvirtd is down qemu: don't mess with non mandatory hostdevs on reattaching qemu: handle detaching of unplugged hostdev conf: parse hostdev missing flag src/conf/domain_conf.c | 32 +++ src/conf/domain_conf.h | 15 ++ src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 431 ++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 104 ++++++++-- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_process.c | 59 ++++++ src/util/virhostdev.c | 2 + tests/qemuhotplugtest.c | 2 +- 12 files changed, 637 insertions(+), 20 deletions(-) -- 2.23.0

3 31

[libvirt] [PATCH] qemu_blockjob: Remove image metadata on blockcommit
by Michal Privoznik 16 Sep '19

16 Sep '19

When doing a blockcommit, the base and possibly top parent are relabelled in qemuDomainBlockCommit(). However, once the block job is finished, we need to remove the secdriver metadata (XATTRs) created at the beginning. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1741456 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_blockjob.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index a991309ee7..47715f12f6 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -677,6 +677,25 @@ qemuBlockJobEventProcessLegacyCompleted(virQEMUDriverPtr driver, } virObjectUnref(disk->mirror); + } else if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) { + if (qemuSecurityMoveImageMetadata(driver, vm, + job->data.commit.base, NULL) < 0) { + VIR_WARN("Unable to remove disk metadata on " + "vm %s from %s (disk target %s)", + vm->def->name, + NULLSTR(job->data.commit.base->path), + disk->dst); + } + if (job->data.commit.topparent && + job->data.commit.topparent != disk->src && + qemuSecurityMoveImageMetadata(driver, vm, + job->data.commit.topparent, NULL) < 0) { + VIR_WARN("Unable to remove disk metadata on " + "vm %s from %s (disk target %s)", + vm->def->name, + NULLSTR(job->data.commit.topparent->path), + disk->dst); + } } } -- 2.21.0

2 3

[libvirt] [PATCH 0/2] qemu: Fix blockjob assignment collision (blockdev-add saga)
by Peter Krempa 16 Sep '19

16 Sep '19

We leaked a block job object in the tests because two jobs with distinct names referenced the same disk. Fix the test data and add code to prevent this issue. Peter Krempa (2): tests: qemustatusxml2xml: Fix disk target mess qemu: blockjob: Refuse to register blockjob if disk already has one src/qemu/qemu_blockjob.c | 6 ++++++ .../qemustatusxml2xmldata/blockjob-blockdev-in.xml | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) -- 2.21.0

3 6

[libvirt] [PATCH 0/3] qemu: make runtime validation of NetDefs more consistent
by Laine Stump 15 Sep '19

15 Sep '19

There is some validation of NetDefs (<interface>) that can't be done until runtime, due to not knowing the exact configuration until that time. This needs to happen in 3 places: 1) in the qemu commandline when a new guest is started, 2) when an <interface> is hotplugged, and 3) when an <interface> is updated. Until now, there some (but not all) validation copy-pasted between (1) and (2), and none of that was present for (3). These patches move all the validation from (1) (which is the most complete) into a separate function, and then call that function from all three places, so the exact same validation is done in all cases. (These patches are a followup to a patch I sent *long* ago in a naive attempt to fix https://bugzilla.redhat.com/1502754 - my original patch did fix the problem when starting a guest with an invalid <interface> config, but not when hotplugging or updating such an interface.) NB: I noticed that if someone tries to specify <bandwidth> for an interface type that doesn't support it, we only give a warning, not an error, due to a fear that there are existing management apps that add <bandwidth> to all types of interfaces, and we don't want them to suddenly fail to run (I got this info from the BZ associated with the commit that added the warning). This seems to me to be going a bit too far - I think that (at least upstream) we should turn this into an error, and let the regression testing of said management apps catch the behavior change so they can fix their code. (insert Kermit-drinking-coffee meme here) Laine Stump (3): conf: make arg to virDomainNetGetActualVirtPortProfile() a const qemu: move runtime netdev validation into a separate function qemu: call common NetDef validation for hotplug and device update src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 52 +-------------------------- src/qemu/qemu_domain.c | 80 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_hotplug.c | 32 +++++------------ 6 files changed, 95 insertions(+), 77 deletions(-) -- 2.21.0

2 8