- Devel - libvirt List Archives

[libvirt] [python PATCH] Fix RPM deps for centos 7
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-python.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 1e92f3c..33d2775 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -21,8 +21,13 @@ Url: http://libvirt.org License: LGPLv2+ BuildRequires: libvirt-devel == %{version} BuildRequires: python3-devel +%if 0%{?rhel} == 7 +BuildRequires: python36-nose +BuildRequires: python36-lxml +%else BuildRequires: python3-nose BuildRequires: python3-lxml +%endif BuildRequires: gcc # Don't want provides for python shared objects -- 2.23.0

2 1

[libvirt] [jenkins-ci PATCH] lcitool: Add 'install=' to the extra_arg
by Fabiano Fidêncio 04 Dec '19

04 Dec '19

Add "install=" unconditionally to the extra_arg parameter passed to virt-install. It's needed as the virt-install present on CentOS CI host does not use the correct kernel URL argument when installing OpenSUSE. This does not cause issues on other installations as the other distros will just ignore the argument passed. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- I've verified this solution works on a CentOS 7 host. I've verified this solution doesn't cause regressions on a Fedora 31 host. --- guests/lcitool | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 0e27796..c7f949d 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -542,8 +542,13 @@ class Application: # but we need to point anaconda in the right direction through # the 'ks' kernel parameter. We can use 'ks' unconditionally # for simplicity's sake, because distributions that don't use - # kickstart for unattended installation will simply ignore it - extra_arg = "console=ttyS0 ks=file:/{}".format(install_config) + # kickstart for unattended installation will simply ignore it. + # Similarly to how we can use 'ks' unconditionally, we also can + # do the same with 'install' argument, needed to workaround a + # a bug on virt-install as it does not use the correct kernel + # URL argument when installing an OpenSUSE guest. + extra_arg = ("console=ttyS0 ks=file:/{} install={}". + format(install_config, facts["install_url"])) virt_install = distutils.spawn.find_executable("virt-install") if virt_install is None: -- 2.23.0

2 1

[libvirt] [PATCH] build: only support python3 binary
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

python2 will be end of life by the time of the next libvirt release. All our supported build targets, including CentOS7, have a python3 build available. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- configure.ac | 4 ++-- docs/apibuild.py | 4 +--- docs/reformat-news.py | 4 +--- libvirt.spec.in | 10 +--------- scripts/augeas-gentest.py | 4 +--- scripts/check-aclperms.py | 4 +--- scripts/check-aclrules.py | 4 +--- scripts/check-driverimpls.py | 4 +--- scripts/check-drivername.py | 4 +--- scripts/check-symfile.py | 4 +--- scripts/check-symsorting.py | 4 +--- scripts/dtrace2systemtap.py | 4 +--- scripts/genpolkit.py | 4 +--- scripts/gensystemtap.py | 4 +--- scripts/header-ifdef.py | 4 +--- scripts/minimize-po.py | 4 +--- scripts/mock-noinline.py | 4 +--- scripts/prohibit-duplicate-header.py | 4 +--- src/esx/esx_vi_generator.py | 4 +--- src/hyperv/hyperv_wmi_generator.py | 4 +--- tests/cputestdata/cpu-gather.sh | 9 +-------- 21 files changed, 22 insertions(+), 73 deletions(-) diff --git a/configure.ac b/configure.ac index 76d28d2f67..2e5af075ea 100644 --- a/configure.ac +++ b/configure.ac @@ -701,9 +701,9 @@ if test "$with_linux" = "yes"; then fi dnl Allow perl/python overrides -AC_PATH_PROGS([PYTHON], [python3 python2 python]) +AC_PATH_PROGS([PYTHON], [python3]) if test -z "$PYTHON"; then - AC_MSG_ERROR(['python3', 'python2' or 'python' binary is required to build libvirt]) + AC_MSG_ERROR(['python3' binary is required to build libvirt]) fi AC_PATH_PROG([FLAKE8], [flake8]) if test -z "$FLAKE8"; then diff --git a/docs/apibuild.py b/docs/apibuild.py index 5a0224c1c6..2f7314b379 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # This is the API builder, it parses the C sources and build the # API formal description in XML. @@ -8,8 +8,6 @@ # daniel(a)veillard.com # -from __future__ import print_function - import os import sys import glob diff --git a/docs/reformat-news.py b/docs/reformat-news.py index a06f945c02..7bc752d821 100755 --- a/docs/reformat-news.py +++ b/docs/reformat-news.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # reformat-news.py: Reformat the NEWS file properly # @@ -18,8 +18,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import sys COLUMNS = 80 diff --git a/libvirt.spec.in b/libvirt.spec.in index 4c6161a26f..72ed2fd96b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -188,14 +188,6 @@ %define with_bash_completion 0%{!?_without_bash_completion:1} -# Use Python 3 when possible, Python 2 otherwise -%if 0%{?fedora} || 0%{?rhel} > 7 - %define python python3 -%else - %define python python2 -%endif - - %if %{with_qemu} || %{with_lxc} # numad is used to manage the CPU and memory placement dynamically, # it's not available on many non-x86 architectures. @@ -281,7 +273,7 @@ BuildRequires: perl-interpreter %else BuildRequires: perl %endif -BuildRequires: %{python} +BuildRequires: python3 BuildRequires: systemd-units %if %{with_libxl} BuildRequires: xen-devel diff --git a/scripts/augeas-gentest.py b/scripts/augeas-gentest.py index 60e12fb77e..8976785cad 100755 --- a/scripts/augeas-gentest.py +++ b/scripts/augeas-gentest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2012-2019 Red Hat, Inc. # @@ -19,8 +19,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import re import sys diff --git a/scripts/check-aclperms.py b/scripts/check-aclperms.py index b1084a3758..67de0efabd 100755 --- a/scripts/check-aclperms.py +++ b/scripts/check-aclperms.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013-2019 Red Hat, Inc. # @@ -21,8 +21,6 @@ # a lot of auto-generation of code, so when these don't match # problems occur, preventing auth from succeeding at all. -from __future__ import print_function - import re import sys diff --git a/scripts/check-aclrules.py b/scripts/check-aclrules.py index 5a7d275410..a1fa473174 100755 --- a/scripts/check-aclrules.py +++ b/scripts/check-aclrules.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013-2019 Red Hat, Inc. # @@ -32,8 +32,6 @@ # detected EnsureACL call recorded. # -from __future__ import print_function - import re import sys diff --git a/scripts/check-driverimpls.py b/scripts/check-driverimpls.py index bc3f16a816..8289b8051e 100755 --- a/scripts/check-driverimpls.py +++ b/scripts/check-driverimpls.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013-2019 Red Hat, Inc. # @@ -17,8 +17,6 @@ # <http://www.gnu.org/licenses/>. # -from __future__ import print_function - import re import sys diff --git a/scripts/check-drivername.py b/scripts/check-drivername.py index ba77a6d48d..39eff836c7 100644 --- a/scripts/check-drivername.py +++ b/scripts/check-drivername.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013-2019 Red Hat, Inc. # @@ -17,8 +17,6 @@ # <http://www.gnu.org/licenses/>. # -from __future__ import print_function - import re import sys diff --git a/scripts/check-symfile.py b/scripts/check-symfile.py index 7aeb047d89..0f6e780df0 100755 --- a/scripts/check-symfile.py +++ b/scripts/check-symfile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2012-2019 Red Hat, Inc. # @@ -16,8 +16,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import re import subprocess import sys diff --git a/scripts/check-symsorting.py b/scripts/check-symsorting.py index 8e698c0657..fd00449c44 100755 --- a/scripts/check-symsorting.py +++ b/scripts/check-symsorting.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2012-2019 Red Hat, Inc. # @@ -16,8 +16,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import os.path import re import sys diff --git a/scripts/dtrace2systemtap.py b/scripts/dtrace2systemtap.py index d6bf1f8d1f..506db9c503 100755 --- a/scripts/dtrace2systemtap.py +++ b/scripts/dtrace2systemtap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2011-2019 Red Hat, Inc. # @@ -23,8 +23,6 @@ # python dtrace2systemtap.py probes.d > libvirt_probes.stp # -from __future__ import print_function - import re import sys diff --git a/scripts/genpolkit.py b/scripts/genpolkit.py index 230d920f70..8845ea44e0 100755 --- a/scripts/genpolkit.py +++ b/scripts/genpolkit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2012-2019 Red Hat, Inc. # @@ -17,8 +17,6 @@ # <http://www.gnu.org/licenses/>. # -from __future__ import print_function - import re import sys diff --git a/scripts/gensystemtap.py b/scripts/gensystemtap.py index 7b391cc911..ad808e3033 100755 --- a/scripts/gensystemtap.py +++ b/scripts/gensystemtap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2011-2019 Red Hat, Inc. # @@ -22,8 +22,6 @@ # python gensystemtap.py */*.x > libvirt_functions.stp # -from __future__ import print_function - import re import sys diff --git a/scripts/header-ifdef.py b/scripts/header-ifdef.py index d5ec7b45fe..e668875f18 100644 --- a/scripts/header-ifdef.py +++ b/scripts/header-ifdef.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-2019 Red Hat, Inc. # @@ -44,8 +44,6 @@ # ....content.... # #endif /* SYMBOL */ -from __future__ import print_function - import os.path import re import sys diff --git a/scripts/minimize-po.py b/scripts/minimize-po.py index d548b427e9..c305229721 100755 --- a/scripts/minimize-po.py +++ b/scripts/minimize-po.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-2019 Red Hat, Inc. # @@ -16,8 +16,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import re import sys diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py index b338c5f097..4fc60c0be3 100644 --- a/scripts/mock-noinline.py +++ b/scripts/mock-noinline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2017-2019 Red Hat, Inc. # @@ -16,8 +16,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import re import sys diff --git a/scripts/prohibit-duplicate-header.py b/scripts/prohibit-duplicate-header.py index 420311ccef..33a91ddbc5 100644 --- a/scripts/prohibit-duplicate-header.py +++ b/scripts/prohibit-duplicate-header.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2016-2019 Red Hat, Inc. # @@ -16,8 +16,6 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. -from __future__ import print_function - import re import sys diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 2f685c0898..048f5dde9e 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # esx_vi_generator.py: generates most of the SOAP type mapping code @@ -22,8 +22,6 @@ # <http://www.gnu.org/licenses/>. # -from __future__ import print_function - import sys import os import os.path diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 3001f222f7..736eabd598 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # hyperv_wmi_generator.py: generates most of the WMI type mapping code @@ -20,8 +20,6 @@ # <http://www.gnu.org/licenses/>. # -from __future__ import print_function - import sys import os import os.path diff --git a/tests/cputestdata/cpu-gather.sh b/tests/cputestdata/cpu-gather.sh index cefd1b0d0d..79e3fddf22 100755 --- a/tests/cputestdata/cpu-gather.sh +++ b/tests/cputestdata/cpu-gather.sh @@ -9,9 +9,7 @@ grep 'model name' /proc/cpuinfo | head -n1 cpuid -1r echo -for python in python3 python2; do - $python <<EOF -from __future__ import print_function +python3 <<EOF from struct import pack, unpack from fcntl import ioctl import sys, errno @@ -51,11 +49,6 @@ except IOError as e: pass EOF - if [[ $? -eq 0 ]]; then - break - fi -done - qemu=qemu-system-x86_64 for cmd in /usr/bin/$qemu /usr/bin/qemu-kvm /usr/libexec/qemu-kvm; do if [[ -x $cmd ]]; then -- 2.21.0

3 3

[libvirt] [jenkins-ci PATCH] Drop support for python 2
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

CentOS7 now has support for python 3 out of the box Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/playbooks/update/tasks/bootstrap.yml | 6 ------ guests/vars/mappings.yml | 24 --------------------- guests/vars/projects/base.yml | 1 - guests/vars/projects/libvirt-python.yml | 4 ---- 5 files changed, 37 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index 94e29af..d730aa2 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -16,5 +16,3 @@ package_format: 'rpm' package_manager: 'yum' os_name: 'CentOS' os_version: '7' - -ansible_python_interpreter: /usr/bin/python2 diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml index 2e1dc42..c77d3a1 100644 --- a/guests/playbooks/update/tasks/bootstrap.yml +++ b/guests/playbooks/update/tasks/bootstrap.yml @@ -7,11 +7,5 @@ - set_fact: python: python3 -- set_fact: - python: python2 - when: - - os_name == 'CentOS' - - os_version == '7' - - name: Bootstrap Ansible raw: '{{ package_manager }} install -y {{ python }}' diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 9c339f2..ce1294c 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -804,30 +804,6 @@ mappings: CentOS7: python36-docutils FreeBSD: py36-docutils - python2: - default: python - Fedora: python2 - FreeBSD: python2 - - python2-devel: - deb: python-dev - pkg: python2 - rpm: python2-devel - cross-policy-deb: foreign - - python2-lxml: - default: python-lxml - Fedora: python2-lxml - FreeBSD: py27-lxml - - python2-nose: - default: python-nose - Fedora: python2-nose - FreeBSD: py27-nose - - python2-setuptools: - CentOS7: python2-setuptools - python3: default: python3 diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index 275211c..29c10b4 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -25,7 +25,6 @@ packages: - patch - perl - pkg-config - - python2-setuptools - python3 - python3-pip - python3-setuptools diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects/libvirt-python.yml index 86b5aab..71a0717 100644 --- a/guests/vars/projects/libvirt-python.yml +++ b/guests/vars/projects/libvirt-python.yml @@ -1,9 +1,5 @@ --- packages: - - python2 - - python2-devel - - python2-lxml - - python2-nose - python3-devel - python3-lxml - python3-nose -- 2.23.0

3 2

[libvirt] [jenkins-ci PATCH] lcitool: Decouple Python interpreters for Ansible and builds
by Andrea Bolognani 04 Dec '19

04 Dec '19

We need to keep using Python 2 for Ansible, because Python 3 is only supported by the dnf module and on CentOS 7 we have to use the yum module instead; at the same time, all libvirt projects have now dropped Python 2 support so we need to make sure we use Python 3 for building them. Decouple the Python versions used for the two purposes so that we can keep everything working. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/tasks/paths.yml | 2 ++ guests/playbooks/update/templates/bashrc.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/playbooks/update/tasks/paths.yml b/guests/playbooks/update/tasks/paths.yml index aada1f3..c204462 100644 --- a/guests/playbooks/update/tasks/paths.yml +++ b/guests/playbooks/update/tasks/paths.yml @@ -14,6 +14,7 @@ - make - ninja - ninja-build + - python3 - su - name: 'Look for files' @@ -39,6 +40,7 @@ bash: '{{ commands["bash"] }}' ccache: '{{ commands["ccache"] }}' java: '{{ commands["java"] }}' + python: '{{ commands["python3"] }}' su: '{{ commands["su"] }}' sudoers: '{{ files["sudoers"] }}' diff --git a/guests/playbooks/update/templates/bashrc.j2 b/guests/playbooks/update/templates/bashrc.j2 index d3fc652..9cea90c 100644 --- a/guests/playbooks/update/templates/bashrc.j2 +++ b/guests/playbooks/update/templates/bashrc.j2 @@ -2,7 +2,7 @@ export PS1="[\u@\h \w]\$ " export MAKE="{{ make }}" export NINJA="{{ ninja }}" -export PYTHON="{{ ansible_python_interpreter }}" +export PYTHON="{{ python }}" export MAKEFLAGS="-j{{ install_vcpus|int + 1 }}" -- 2.23.0

2 1

[libvirt] [PATCH] tests: Make check-file-access.pl accept files through argv
by Michal Privoznik 04 Dec '19

04 Dec '19

The script needs two files to open: $(builddir)/test_file_access.txt, and $(srcdir)/file_access_whitelist.txt. However, the script is opening the files from the $CWD which won't work for a VPATH build. Make the script accept paths to the files through @ARGV and tune the Makefile.am to pass them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 4 +++- tests/check-file-access.pl | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index cbe8e86224..4c2856bf97 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -454,7 +454,9 @@ EXTRA_DIST += $(test_scripts) if WITH_LINUX check-access: file-access-clean VIR_TEST_FILE_ACCESS=1 $(MAKE) $(AM_MAKEFLAGS) check - $(PERL) check-file-access.pl | sort -u + $(PERL) $(abs_srcdir)/check-file-access.pl \ + $(abs_builddir)/test_file_access.txt \ + $(abs_srcdir)/file_access_whitelist.txt | sort -u file-access-clean: > test_file_access.txt diff --git a/tests/check-file-access.pl b/tests/check-file-access.pl index ea0b7a18a2..2926126b14 100755 --- a/tests/check-file-access.pl +++ b/tests/check-file-access.pl @@ -24,8 +24,12 @@ use strict; use warnings; -my $access_file = "test_file_access.txt"; -my $whitelist_file = "file_access_whitelist.txt"; +sub usage { + die "$0 access_file file_access_whitelist\n"; +} + +my $access_file = shift or usage(); +my $whitelist_file = shift or usage(); my @known_actions = ("open", "fopen", "access", "stat", "lstat", "connect"); -- 2.23.0

2 1

[libvirt] [PATCH v5 00/23] scripts: convert most perl scripts to python
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

This series is an effort to reduce the number of different languages we use by eliminating most use of perl in favour of python. This aligns with fact that the likely future build system we'll use (meson) is written in python, and that python is much more commonly used/understood by developers these days than perl. With this applied we use perl in a handful of places only: - src/rpc/gendispatch.pl - this is a horrendously large script and very hard to understand/follow. A straight syntax conversion to Python would still leave a hgue and hard to understand/follow script. It really needs a clean room rewrite from scratch, with better structure. - src/rpc/genprotocol.pl - fairly easy to convert, but might be obsolete depending on approach for rewriting gendispatch.pl, so ignored for now - tests/oomtrace.pl - will be purge by the patches that drop OOM handling anyway - tools/wireshark/util/genxdrstub.pl - a very large script, which I haven't got the courage to tackle yet. - cfg.mk/maint.mk - many syntax rules involve regexes which are fed to perl. Decision on what to do with syntax-check rules punted to another time. - build-aux/gitlog-to-changelog - build-aux/useless-if-before-free - Both pulled in from gnulib. Could be rewritten quite easily if desired, but given that we aren't maintainers of them right now, they're ignored as they don't really impact our developers. Note that the check-spacing.py script is significantly slower in Python than in Perl. After researching this it appears there is nothing that can be done. The Perl regex engine is simply much better optimized than the Python one. As previously discussed we need to loook at uncrustify or clang-format or some other tool to validate whitespace formatting. This is ongoing. We can either accept the slow down in the short term or keep the Perl version in the short term. In v5: - Rebased to cope with changes to require VPATH build - Merged the already-ACKd scripts In v4: - Moved all scripts into the scripts/ directory instead of having them scattered around source tree - Use re.search instead of re.match - Don't bother re-compiling regexes In v3: - All scripts comply with all flake8 style rules with exception of E129 visually indented line with same indent as next logical line In v2: - Pulled in patch to hacking file - Converted many more scripts - Forced UTF-8 character set to avoid ascii codec on py3 < 3.7 Daniel P. Berrangé (23): build-aux: rewrite duplicate header checker in Python build-aux: rewrite whitespace checker in Python build-aux: rewrite mock inline checker in Python build-aux: rewrite header ifdef checker in Python src: rewrite ACL permissions checker in Python src: rewrite symfile sorting checker in Python src: rewrite symfile library checker in Python src: rewrite systemtap probe generator in Python src: rewrite systemtap function generator in Python src: rewrite driver name checker in Python src: rewrite driver impl checker in Python src: rewrite ACL rule checker in Python src: rewrite polkit ACL generator in Python src: rewrite remote protocol checker in Python tests: rewrite test argv line wrapper in Python tests: rewrite qemu capability grouper in Python tests: rewrite file access checker in Python docs: rewrite hvsupport.html page generator in python docs: rewrite polkit docs generator in Python docs: move apibuild.py to the scripts/ directory docs: move reformat-news.py to the scripts/ directory docs: move esx_vi_generator.py to the scripts/ directory docs: move hyperv_wmi_generator.py to the scripts/ directory Makefile.am | 33 +- build-aux/check-spacing.pl | 198 ------- build-aux/header-ifdef.pl | 182 ------- build-aux/mock-noinline.pl | 75 --- build-aux/prohibit-duplicate-header.pl | 26 - build-aux/syntax-check.mk | 32 +- docs/Makefile.am | 16 +- docs/genaclperms.pl | 125 ----- docs/hvsupport.pl | 459 ---------------- {docs => scripts}/apibuild.py | 0 scripts/check-aclperms.py | 75 +++ scripts/check-aclrules.py | 263 +++++++++ scripts/check-driverimpls.py | 102 ++++ scripts/check-drivername.py | 114 ++++ scripts/check-file-access.py | 123 +++++ scripts/check-remote-protocol.py | 136 +++++ scripts/check-spacing.py | 229 ++++++++ scripts/check-symfile.py | 80 +++ scripts/check-symsorting.py | 117 ++++ scripts/dtrace2systemtap.py | 143 +++++ {src/esx => scripts}/esx_vi_generator.py | 0 scripts/genaclperms.py | 123 +++++ scripts/genpolkit.py | 122 +++++ scripts/gensystemtap.py | 184 +++++++ scripts/group-qemu-caps.py | 123 +++++ scripts/header-ifdef.py | 231 ++++++++ scripts/hvsupport.py | 504 ++++++++++++++++++ .../hyperv_wmi_generator.py | 0 scripts/mock-noinline.py | 85 +++ scripts/prohibit-duplicate-header.py | 56 ++ {docs => scripts}/reformat-news.py | 0 scripts/test-wrap-argv.py | 170 ++++++ src/Makefile.am | 146 ++--- src/access/Makefile.inc.am | 6 +- src/access/genpolkit.pl | 119 ----- src/admin/Makefile.inc.am | 6 +- src/check-aclperms.pl | 73 --- src/check-aclrules.pl | 252 --------- src/check-driverimpls.pl | 80 --- src/check-drivername.pl | 83 --- src/check-symfile.pl | 70 --- src/check-symsorting.pl | 106 ---- src/dtrace2systemtap.pl | 130 ----- src/esx/Makefile.inc.am | 6 +- src/hyperv/Makefile.inc.am | 5 +- src/rpc/Makefile.inc.am | 1 - src/rpc/gensystemtap.pl | 193 ------- tests/Makefile.am | 3 +- tests/check-file-access.pl | 126 ----- tests/file_access_whitelist.txt | 2 +- tests/group-qemu-caps.pl | 124 ----- tests/test-wrap-argv.pl | 174 ------ tests/testutils.c | 16 +- 53 files changed, 3092 insertions(+), 2755 deletions(-) delete mode 100755 build-aux/check-spacing.pl delete mode 100644 build-aux/header-ifdef.pl delete mode 100644 build-aux/mock-noinline.pl delete mode 100644 build-aux/prohibit-duplicate-header.pl delete mode 100755 docs/genaclperms.pl delete mode 100755 docs/hvsupport.pl rename {docs => scripts}/apibuild.py (100%) create mode 100755 scripts/check-aclperms.py create mode 100755 scripts/check-aclrules.py create mode 100755 scripts/check-driverimpls.py create mode 100644 scripts/check-drivername.py create mode 100755 scripts/check-file-access.py create mode 100644 scripts/check-remote-protocol.py create mode 100755 scripts/check-spacing.py create mode 100755 scripts/check-symfile.py create mode 100755 scripts/check-symsorting.py create mode 100755 scripts/dtrace2systemtap.py rename {src/esx => scripts}/esx_vi_generator.py (100%) create mode 100755 scripts/genaclperms.py create mode 100755 scripts/genpolkit.py create mode 100755 scripts/gensystemtap.py create mode 100755 scripts/group-qemu-caps.py create mode 100644 scripts/header-ifdef.py create mode 100755 scripts/hvsupport.py rename {src/hyperv => scripts}/hyperv_wmi_generator.py (100%) create mode 100644 scripts/mock-noinline.py create mode 100644 scripts/prohibit-duplicate-header.py rename {docs => scripts}/reformat-news.py (100%) create mode 100755 scripts/test-wrap-argv.py delete mode 100755 src/access/genpolkit.pl delete mode 100755 src/check-aclperms.pl delete mode 100755 src/check-aclrules.pl delete mode 100755 src/check-driverimpls.pl delete mode 100755 src/check-drivername.pl delete mode 100755 src/check-symfile.pl delete mode 100755 src/check-symsorting.pl delete mode 100755 src/dtrace2systemtap.pl delete mode 100755 src/rpc/gensystemtap.pl delete mode 100755 tests/check-file-access.pl delete mode 100755 tests/group-qemu-caps.pl delete mode 100755 tests/test-wrap-argv.pl -- 2.21.0

4 65

[libvirt] [PATCH v3 0/3] Update valid range of scsi unit
by Han Han 04 Dec '19

04 Dec '19

Fix spelling typo. Separate virtio serial port and ccid slot from driveUnit. v2: https://www.redhat.com/archives/libvir-list/2019-December/msg00004.html Han Han (3): conf: fix logic error for scsi units rng: Separate virtio serial port and ccid slot from driveUnit rng: Extend the range of driveUnit docs/schemas/domaincommon.rng | 16 +++++++++++++--- src/conf/domain_conf.c | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) -- 2.24.0.rc1

2 4

[libvirt] [PATCH v2 00/15] docs: some refactoring and new docs about RPM deployment
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

This refactors existing docs related to the remote driver/daemon and URIs. It then also adds a kbase page about RPM package options. This introduces the use of RST for docs as a replacement for HTML. The intent is that all new docs should use RST from this point. The POD man pages will also be converted to RST. I'll post this as a different series. Note this series only touches the main HTML content, not the styling / templating using XSL. Tackling that is a separate job I've not attempted. My guess is that we'd use either Sphinx or Pelican to do the templating. Existing HTML docs are candidates for conversion to RST, however, people should *NOT* attempt todo this manually. In this series I've converted docs/kbase/ files, using the pandoc tool. This does a pretty good job in general but does need some manual cleanups. First I post-processed its output to change the heading highlighting to follow the documented style $ cat convert.pl my @in = <>; my @out; for (my $i ; $i <= $#in; $i++) { my $line = $in[$i]; if ($line =~ /^=+$/) { my @newout = splice @out, 0, $i - 1; push @newout, $line; push @newout, $out[$i-1]; push @newout, $out[$i]; push @newout, $line; push @newout, "\n"; push @newout, ".. contents::\n"; @out = @newout; } elsif ($line =~ /^(-|~|^|')+$/) { $line =~ s/-/=/g; $line =~ s/~/-/g; $line =~ s/\^/~/g; $line =~ s/'/^/g; push @out, $line; } else { push @out, $line; } } print @out; So I'm converting with pandoc -f html -t rst < foo.html.in | perl convert.pl > foo.rst $EDITOR foot.rst git rm -f foot.html.in git add foo.rst After pandoc & the headings convert, there's usually manual fixes needed to deal with a few oddities pandoc gets wrong, or looks ugly. This is still way simpler than converting the doc to rst manually. Changed in v2: - Added a style guide for RST docs - Probe for rst2html's different names - Added make rules for building rst - Fixed permalinks in generated docs - Misc CSS fixes - Auto-converted all of kbase/ directory Daniel P. Berrangé (15): docs: split TLS certificate setup into its own file docs: move docs about remote driver URIs into URI docs docs: introduce rst2html as a mandatory tool for building docs docs: adapt filling of <head> section for rst2html output docs: generate permalinks correctly for rst2html output docs: relax CSS context match for pretty tables docs: add styling for <tt> element docs: add a minimal style guide for writing RST docs docs: convert kbase/domainstatecapture.html.in to RST docs: convert kbase/launch_security_sev.html.in to RST docs: convert kbase/secureusage.html.in to RST docs: convert kbase/locking.html.in to RST docs: convert kbase/locking-lockd.html.in to RST docs: convert kbase/locking-sanlock.html.in to RST docs: add a kbase page about RPM packaging options docs/Makefile.am | 33 +- docs/aclpolkit.html.in | 20 +- docs/docs.html.in | 6 + docs/genaclperms.pl | 2 +- docs/generic.css | 4 +- docs/kbase.html.in | 4 + docs/kbase/domainstatecapture.html.in | 303 ----------- docs/kbase/domainstatecapture.rst | 255 +++++++++ docs/kbase/launch_security_sev.html.in | 533 ------------------- docs/kbase/launch_security_sev.rst | 529 +++++++++++++++++++ docs/kbase/locking-lockd.html.in | 160 ------ docs/kbase/locking-lockd.rst | 121 +++++ docs/kbase/locking-sanlock.html.in | 247 --------- docs/kbase/locking-sanlock.rst | 193 +++++++ docs/kbase/locking.html.in | 48 -- docs/kbase/locking.rst | 33 ++ docs/kbase/rpm-deployment.rst | 410 +++++++++++++++ docs/kbase/secureusage.html.in | 171 ------- docs/kbase/secureusage.rst | 131 +++++ docs/libvirt.css | 76 +-- docs/migration.html.in | 2 +- docs/newapi.xsl | 4 +- docs/page.xsl | 9 +- docs/remote.html.in | 684 +------------------------ docs/styleguide.rst | 66 +++ docs/tlscerts.html.in | 413 +++++++++++++++ docs/uri.html.in | 263 ++++++++-- libvirt.spec.in | 2 + m4/virt-external-programs.m4 | 5 + mingw-libvirt.spec.in | 1 + 30 files changed, 2478 insertions(+), 2250 deletions(-) delete mode 100644 docs/kbase/domainstatecapture.html.in create mode 100644 docs/kbase/domainstatecapture.rst delete mode 100644 docs/kbase/launch_security_sev.html.in create mode 100644 docs/kbase/launch_security_sev.rst delete mode 100644 docs/kbase/locking-lockd.html.in create mode 100644 docs/kbase/locking-lockd.rst delete mode 100644 docs/kbase/locking-sanlock.html.in create mode 100644 docs/kbase/locking-sanlock.rst delete mode 100644 docs/kbase/locking.html.in create mode 100644 docs/kbase/locking.rst create mode 100644 docs/kbase/rpm-deployment.rst delete mode 100644 docs/kbase/secureusage.html.in create mode 100644 docs/kbase/secureusage.rst create mode 100644 docs/styleguide.rst create mode 100644 docs/tlscerts.html.in -- 2.23.0

2 17

[libvirt] [PATCH] tests: stop static linking to libvirt code in tests
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

If we static link to libvirt_util.la then we can't override functions in this file by simply implementing them in the test code. Any tests should dynamic link to the main libvirt.la and ensure symbols are exported. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt_private.syms | 2 ++ tests/Makefile.am | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9365..0864de030b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -915,6 +915,8 @@ virDomainSnapshotDefFormat; virDomainSnapshotDefIsExternal; virDomainSnapshotDefNew; virDomainSnapshotDefParseString; +virDomainSnapshotDiskDefFree; +virDomainSnapshotDiskDefParseXML; virDomainSnapshotFormatConvertXMLFlags; virDomainSnapshotIsExternal; virDomainSnapshotLocationTypeFromString; diff --git a/tests/Makefile.am b/tests/Makefile.am index e009de830c..af8fd69842 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -662,8 +662,7 @@ qemublocktest_SOURCES = \ $(NULL) qemublocktest_LDADD = \ libqemumonitortestutils.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(qemu_LDADDS) \ $(NULL) @@ -939,8 +938,7 @@ storagevolxml2argvtest_SOURCES = \ storagevolxml2argvtest_LDADD = \ $(LIBXML_LIBS) \ ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(LDADDS) storagepoolxml2argvtest_SOURCES = \ @@ -949,8 +947,7 @@ storagepoolxml2argvtest_SOURCES = \ storagepoolxml2argvtest_LDADD = \ $(LIBXML_LIBS) \ ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(LDADDS) storagepoolxml2xmltest_SOURCES = \ @@ -1150,8 +1147,6 @@ virstoragetest_SOURCES = \ virstoragetest.c testutils.h testutils.c virstoragetest_LDADD = $(LDADDS) \ ../src/libvirt.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ ../src/libvirt_driver_storage_impl.la \ ../gnulib/lib/libgnu.la \ $(NULL) -- 2.23.0

2 1

[libvirt] [PATCH] scripts: fix list indexing when printing mis-ordered symbols
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

The python array slice syntax expects the first and last indexes, not the first length and element count. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/check-symsorting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/check-symsorting.py b/scripts/check-symsorting.py index 8e698c0657..006c42f1b3 100755 --- a/scripts/check-symsorting.py +++ b/scripts/check-symsorting.py @@ -59,8 +59,8 @@ def check_sorting(group, symfile, line, groupfile, lastgroup): issorted = False if not issorted: - actual = group[first:(last - first + 1)] - expect = sortedgroup[first:(last - first + 1)] + actual = group[first:last] + expect = sortedgroup[first:last] print("Symbol block at %s:%s: symbols not sorted" % (symfile, line), file=sys.stderr) for g in actual: -- 2.23.0

2 1

[libvirt] [python PATCH] Drop support for python 2
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/consolecallback.py | 2 +- examples/dhcpleases.py | 2 +- examples/dominfo.py | 2 +- examples/domipaddrs.py | 2 +- examples/domrestore.py | 2 +- examples/domsave.py | 2 +- examples/domstart.py | 2 +- examples/esxlist.py | 2 +- examples/event-test.py | 2 +- examples/guest-vcpus/guest-vcpu-daemon.py | 2 +- examples/guest-vcpus/guest-vcpu.py | 2 +- examples/nodestats.py | 2 +- examples/sparsestream.py | 2 +- examples/topology.py | 2 +- generator.py | 2 +- libvirt-lxc-override.c | 51 ++------- libvirt-override.c | 51 ++------- libvirt-python.spec.in | 96 +--------------- libvirt-qemu-override.c | 51 ++------- libvirt-utils.c | 17 +-- libvirt-utils.h | 6 +- sanitytest.py | 2 +- setup.py | 9 +- typewrappers.c | 133 +++------------------- typewrappers.h | 5 - 25 files changed, 71 insertions(+), 380 deletions(-) diff --git a/examples/consolecallback.py b/examples/consolecallback.py index c539a92..1347384 100644 --- a/examples/consolecallback.py +++ b/examples/consolecallback.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # consolecallback - provide a persistent console that survives guest reboots import sys, os, logging, libvirt, tty, termios, atexit diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py index da51f52..f394541 100755 --- a/examples/dhcpleases.py +++ b/examples/dhcpleases.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # netdhcpleases - print leases info for given virtual network import libvirt diff --git a/examples/dominfo.py b/examples/dominfo.py index d3049cd..0a39f4c 100755 --- a/examples/dominfo.py +++ b/examples/dominfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # dominfo - print some information about a domain import libvirt diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py index d6d5cac..bda308c 100755 --- a/examples/domipaddrs.py +++ b/examples/domipaddrs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domipaddrs - print domain interfaces along with their MAC and IP addresses import libvirt diff --git a/examples/domrestore.py b/examples/domrestore.py index 06fdfbc..96f4955 100755 --- a/examples/domrestore.py +++ b/examples/domrestore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/domsave.py b/examples/domsave.py index 727217c..4940cce 100755 --- a/examples/domsave.py +++ b/examples/domsave.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/domstart.py b/examples/domstart.py index ce1b60c..7ff6cb9 100755 --- a/examples/domstart.py +++ b/examples/domstart.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/esxlist.py b/examples/esxlist.py index 0d47b00..d86e064 100755 --- a/examples/esxlist.py +++ b/examples/esxlist.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # esxlist - list active domains of an ESX host and print some info. # also demonstrates how to use the libvirt.openAuth() method diff --git a/examples/event-test.py b/examples/event-test.py index 4458e22..fddef64 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # # diff --git a/examples/guest-vcpus/guest-vcpu-daemon.py b/examples/guest-vcpus/guest-vcpu-daemon.py index c7c08a8..30fcb9c 100755 --- a/examples/guest-vcpus/guest-vcpu-daemon.py +++ b/examples/guest-vcpus/guest-vcpu-daemon.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import libvirt import threading diff --git a/examples/guest-vcpus/guest-vcpu.py b/examples/guest-vcpus/guest-vcpu.py index 8faba87..479ec40 100755 --- a/examples/guest-vcpus/guest-vcpu.py +++ b/examples/guest-vcpus/guest-vcpu.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import libvirt import sys diff --git a/examples/nodestats.py b/examples/nodestats.py index c01dead..ae2a442 100755 --- a/examples/nodestats.py +++ b/examples/nodestats.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Print some host NUMA node statistics # # Authors: diff --git a/examples/sparsestream.py b/examples/sparsestream.py index e960c40..d7c09b7 100755 --- a/examples/sparsestream.py +++ b/examples/sparsestream.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Example of sparse streams usage # # Authors: diff --git a/examples/topology.py b/examples/topology.py index 191669c..197c87a 100755 --- a/examples/topology.py +++ b/examples/topology.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Parse topology information from the capabilities XML and use # them to calculate host topology # diff --git a/generator.py b/generator.py index 3352521..cba9d47 100755 --- a/generator.py +++ b/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # generate python wrappers from the XML API description # diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index d7af154..138ba5b 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -21,18 +21,10 @@ #include "libvirt-utils.h" #include "build/libvirt-lxc.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod_lxc(void); -# else -extern PyObject *PyInit_cygvirtmod_lxc(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod_lxc(void); -# else -extern void initcygvirtmod_lxc(void); -# endif +extern PyObject *PyInit_cygvirtmod_lxc(void); #endif #if 0 @@ -107,14 +99,13 @@ static PyMethodDef libvirtLxcMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod_lxc", -# else +#else "cygvirtmod_lxc", -# endif +#endif NULL, -1, libvirtLxcMethods, @@ -125,11 +116,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod_lxc -# else +#else PyInit_cygvirtmod_lxc -# endif +#endif (void) { PyObject *module; @@ -141,25 +132,3 @@ PyInit_cygvirtmod_lxc return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod_lxc -# else -initcygvirtmod_lxc -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod_lxc", -# else - "cygvirtmod_lxc", -# endif - libvirtLxcMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-override.c b/libvirt-override.c index 2e24d27..4e4c00a 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007-2015 Red Hat, Inc. + * Copyright (C) 2005-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -25,18 +25,10 @@ #include "build/libvirt.h" #include "libvirt-utils.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod(void); -# else -extern PyObject *PyInit_cygvirtmod(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod(void); -# else -extern void initcygvirtmod(void); -# endif +extern PyObject *PyInit_cygvirtmod(void); #endif #if 0 @@ -10553,14 +10545,13 @@ static PyMethodDef libvirtMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod", -# else +#else "cygvirtmod", -# endif +#endif NULL, -1, libvirtMethods, @@ -10571,11 +10562,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod -# else +#else PyInit_cygvirtmod -# endif +#endif (void) { PyObject *module; @@ -10587,25 +10578,3 @@ PyInit_cygvirtmod return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod -# else -initcygvirtmod -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod", -# else - "cygvirtmod", -# endif - libvirtMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 8506840..1e92f3c 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -12,26 +12,7 @@ %define supported_platform 0 %endif -%define _with_python2 1 -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 -%define _with_python2 0 -%endif - -%define _with_python3 0 -%if 0%{?fedora} || 0%{?rhel} > 7 -%define _with_python3 1 -%endif - -# Whether py2 packages are assumed to have python2- name prefix -%define py2_versioned_deps 0 -%if 0%{?fedora} || 0%{?rhel} > 7 -%define py2_versioned_deps 1 -%endif - -%{!?with_python2: %define with_python2 %{_with_python2}} -%{!?with_python3: %define with_python3 %{_with_python3}} - -Summary: The libvirt virtualization API python2 binding +Summary: The libvirt virtualization API python3 binding Name: libvirt-python Version: @PY_VERSION@ Release: 1%{?dist} @@ -39,31 +20,13 @@ Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ BuildRequires: libvirt-devel == %{version} -%if %{with_python2} -%if %{py2_versioned_deps} -BuildRequires: python2-devel -BuildRequires: python2-nose -BuildRequires: python2-lxml -%else -BuildRequires: python-devel -BuildRequires: python-nose -BuildRequires: python-lxml -%endif -%endif -%if %{with_python3} BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-lxml -%endif BuildRequires: gcc # Don't want provides for python shared objects -%if %{with_python2} -%{?filter_provides_in: %filter_provides_in %{python2_sitearch}/.*\.so} -%endif -%if %{with_python3} %{?filter_provides_in: %filter_provides_in %{python3_sitearch}/.*\.so} -%endif %{?filter_setup} %description @@ -72,23 +35,6 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%if %{with_python2} -%package -n python2-libvirt -Summary: The libvirt virtualization API python2 binding -Url: http://libvirt.org -License: LGPLv2+ -%{?python_provide:%python_provide python2-libvirt} -Provides: libvirt-python = %{version}-%{release} -Obsoletes: libvirt-python <= 3.6.0-1%{?dist} - -%description -n python2-libvirt -The python2-libvirt package contains a module that permits applications -written in the Python programming language to use the interface -supplied by the libvirt library to use the virtualization capabilities -of recent versions of Linux (and other OSes). -%endif - -%if %{with_python3} %package -n python3-libvirt Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -99,16 +45,15 @@ Obsoletes: libvirt-python3 <= 3.6.0-1%{?dist} %description -n python3-libvirt The python3-libvirt package contains a module that permits applications -written in the Python programming language to use the interface +written in the Python 3.x programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%endif %prep %setup -q # Unset execute bit for example scripts; it can introduce spurious -# RPM dependencies, like /usr/bin/python which can pull in python2 +# RPM dependencies, like /usr/bin/python3 # for the -python3 package find examples -type f -exec chmod 0644 \{\} \; @@ -118,56 +63,22 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" exit 1 %endif -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_build -%else -CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_build %else CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %endif -%endif %install -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_install -%else -%{__python2} setup.py install --skip-build --root=%{buildroot} -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_install %else %{__python3} setup.py install --skip-build --root=%{buildroot} %endif -%endif %check -%if %{with_python2} -%{__python2} setup.py test -%endif -%if %{with_python3} %{__python3} setup.py test -%endif -%if %{with_python2} -%files -n python2-libvirt -%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{python2_sitearch}/libvirt.py* -%{python2_sitearch}/libvirt_qemu.py* -%{python2_sitearch}/libvirt_lxc.py* -%{python2_sitearch}/libvirtmod* -%{python2_sitearch}/*egg-info -%endif - -%if %{with_python3} %files -n python3-libvirt %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{python3_sitearch}/libvirt.py* @@ -180,6 +91,5 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{python3_sitearch}/__pycache__/libvirtaio.cpython-*.py* %{python3_sitearch}/libvirtmod* %{python3_sitearch}/*egg-info -%endif %changelog diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index f166f6e..6ae95b4 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2011-2014 Red Hat, Inc. + * Copyright (C) 2011-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -21,18 +21,10 @@ #include "libvirt-utils.h" #include "build/libvirt-qemu.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod_qemu(void); -# else -extern PyObject *PyInit_cygvirtmod_qemu(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod_qemu(void); -# else -extern void initcygvirtmod_qemu(void); -# endif +extern PyObject *PyInit_cygvirtmod_qemu(void); #endif #if 0 @@ -351,14 +343,13 @@ static PyMethodDef libvirtQemuMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod_qemu", -# else +#else "cygvirtmod_qemu", -# endif +#endif NULL, -1, libvirtQemuMethods, @@ -369,11 +360,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod_qemu -# else +#else PyInit_cygvirtmod_qemu -# endif +#endif (void) { PyObject *module; @@ -385,25 +376,3 @@ PyInit_cygvirtmod_qemu return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod_qemu -# else -initcygvirtmod_qemu -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod_qemu", -# else - "cygvirtmod_qemu", -# endif - libvirtQemuMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-utils.c b/libvirt-utils.c index 78b94ca..d8ff11d 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -1,7 +1,7 @@ /* * libvirt-utils.c: misc helper APIs for python binding * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013-2019 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -274,11 +274,7 @@ setPyVirTypedParameter(PyObject *info, int nparams) { PyObject *key, *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else Py_ssize_t pos = 0; -#endif virTypedParameterPtr temp = NULL, ret = NULL; Py_ssize_t size; ssize_t i; @@ -416,13 +412,6 @@ virPyDictToTypedParamOne(virTypedParameterPtr *params, type = VIR_TYPED_PARAM_LLONG; else type = VIR_TYPED_PARAM_ULLONG; -#if PY_MAJOR_VERSION < 3 - } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#endif } else if (PyFloat_Check(value)) { type = VIR_TYPED_PARAM_DOUBLE; } @@ -520,11 +509,7 @@ virPyDictToTypedParams(PyObject *dict, { PyObject *key; PyObject *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else Py_ssize_t pos = 0; -#endif virTypedParameterPtr params = NULL; int n = 0; int max = 0; diff --git a/libvirt-utils.h b/libvirt-utils.h index cc3d278..82f0af8 100644 --- a/libvirt-utils.h +++ b/libvirt-utils.h @@ -139,11 +139,7 @@ int virReallocN(void *ptrptr, size_t size, size_t count) void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); -# if PY_MAJOR_VERSION > 2 -# define libvirt_PyString_Check PyUnicode_Check -# else -# define libvirt_PyString_Check PyString_Check -# endif +# define libvirt_PyString_Check PyUnicode_Check #define VIR_N_ELEMENTS(array) (sizeof(array) / sizeof(*(array))) diff --git a/sanitytest.py b/sanitytest.py index 0b415fd..1bedd55 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import lxml diff --git a/setup.py b/setup.py index 117f6ff..ea25dc0 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from distutils.core import setup, Extension, Command from distutils.command.build import build @@ -17,6 +17,10 @@ import re import shutil import time +if sys.version_info[0] != 3: + print("libvirt-python requires Python 3.x to build") + sys.exit(1) + MIN_LIBVIRT = "0.9.11" MIN_LIBVIRT_LXC = "1.0.2" @@ -341,7 +345,7 @@ setup(name = 'libvirt-python', description = 'The libvirt virtualization API python binding', long_description = '''The libvirt-python package provides a module that permits applications -written in the Python programming language to call the interface +written in the Python 3.x programming language to call the interface supplied by the libvirt library, to manage the virtualization capabilities of recent versions of Linux (and other OSes).''', license = 'LGPLv2+', @@ -362,7 +366,6 @@ of recent versions of Linux (and other OSes).''', "Intended Audience :: Developers", "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", "Programming Language :: Python", - "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", ] ) diff --git a/typewrappers.c b/typewrappers.c index 2507859..3b1df87 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -2,141 +2,88 @@ * types.c: converter functions between the internal representation * and the Python objects * - * Copyright (C) 2005, 2007, 2012 Red Hat, Inc. + * Copyright (C) 2005-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - * via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, - * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ + * via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, + * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H #include "typewrappers.h" #include "libvirt-utils.h" -#ifndef Py_CAPSULE_H -typedef void(*PyCapsule_Destructor)(void *, void *); -#endif - static PyObject * libvirt_buildPyObject(void *cobj, const char *name, PyCapsule_Destructor destr) { - PyObject *ret; - -#ifdef Py_CAPSULE_H - ret = PyCapsule_New(cobj, name, destr); -#else - ret = PyCObject_FromVoidPtrAndDesc(cobj, (void *) name, destr); -#endif /* _TEST_CAPSULE */ - - return ret; + return PyCapsule_New(cobj, name, destr); } PyObject * libvirt_intWrap(int val) { - PyObject *ret; -#if PY_MAJOR_VERSION > 2 - ret = PyLong_FromLong((long) val); -#else - ret = PyInt_FromLong((long) val); -#endif - return ret; + return PyLong_FromLong((long) val); } PyObject * libvirt_uintWrap(uint val) { - PyObject *ret; -#if PY_MAJOR_VERSION > 2 - ret = PyLong_FromLong((long) val); -#else - ret = PyInt_FromLong((long) val); -#endif - return ret; + return PyLong_FromLong((long) val); } PyObject * libvirt_longWrap(long val) { - PyObject *ret; - ret = PyLong_FromLong(val); - return ret; + return PyLong_FromLong(val); } PyObject * libvirt_ulongWrap(unsigned long val) { - PyObject *ret; - ret = PyLong_FromLong(val); - return ret; + return PyLong_FromLong(val); } PyObject * libvirt_longlongWrap(long long val) { - PyObject *ret; - ret = PyLong_FromLongLong(val); - return ret; + return PyLong_FromLongLong(val); } PyObject * libvirt_ulonglongWrap(unsigned long long val) { - PyObject *ret; - ret = PyLong_FromUnsignedLongLong(val); - return ret; + return PyLong_FromUnsignedLongLong(val); } PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyBytes_FromStringAndSize(str, size); -#else - ret = PyString_FromStringAndSize(str, size); -#endif - return ret; + return PyBytes_FromStringAndSize(str, size); } PyObject * libvirt_charPtrWrap(char *str) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyUnicode_FromString(str); -#else - ret = PyString_FromString(str); -#endif - return ret; + return PyUnicode_FromString(str); } PyObject * libvirt_constcharPtrWrap(const char *str) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyUnicode_FromString(str); -#else - ret = PyString_FromString(str); -#endif - return ret; + return PyUnicode_FromString(str); } PyObject * @@ -163,11 +110,7 @@ libvirt_intUnwrap(PyObject *obj, * to C long type directly. If it is of PyLong_Type, PyInt_AsLong * will call PyLong_AsLong() to deal with it automatically. */ -#if PY_MAJOR_VERSION > 2 long_val = PyLong_AsLong(obj); -#else - long_val = PyInt_AsLong(obj); -#endif if ((long_val == -1) && PyErr_Occurred()) return -1; @@ -196,11 +139,7 @@ libvirt_uintUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 long_val = PyLong_AsLong(obj); -#else - long_val = PyInt_AsLong(obj); -#endif if ((long_val == -1) && PyErr_Occurred()) return -1; @@ -269,14 +208,7 @@ libvirt_longlongUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION == 2 - /* If obj is of PyInt_Type, PyLong_AsLongLong - * will call PyInt_AsLong() to handle it automatically. - */ - if (PyInt_Check(obj) || PyLong_Check(obj)) -#else if (PyLong_Check(obj)) -#endif llong_val = PyLong_AsLongLong(obj); else PyErr_SetString(PyExc_TypeError, "an integer is required"); @@ -299,21 +231,7 @@ libvirt_ulonglongUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION == 2 - /* The PyLong_AsUnsignedLongLong doesn't check the type of - * obj, only accept argument of PyLong_Type, so we check it instead. - */ - if (PyInt_Check(obj)) { - long long llong_val = PyInt_AsLong(obj); - if (llong_val < 0) - PyErr_SetString(PyExc_OverflowError, - "negative Python int cannot be converted to C unsigned long long"); - else - ullong_val = llong_val; - } else if (PyLong_Check(obj)) { -#else if (PyLong_Check(obj)) { -#endif ullong_val = PyLong_AsUnsignedLongLong(obj); } else { PyErr_SetString(PyExc_TypeError, "an integer is required"); @@ -367,9 +285,7 @@ int libvirt_charPtrUnwrap(PyObject *obj, char **str) { -#if PY_MAJOR_VERSION > 2 PyObject *bytes; -#endif const char *ret; *str = NULL; if (!obj) { @@ -377,21 +293,15 @@ libvirt_charPtrUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 if (!(bytes = PyUnicode_AsUTF8String(obj))) return -1; ret = PyBytes_AsString(bytes); -#else - ret = PyString_AsString(obj); -#endif if (ret) { *str = strdup(ret); if (!*str) PyErr_NoMemory(); } -#if PY_MAJOR_VERSION > 2 Py_DECREF(bytes); -#endif return ret && *str ? 0 : -1; } @@ -400,10 +310,6 @@ libvirt_charPtrSizeUnwrap(PyObject *obj, char **str, Py_ssize_t *size) { - int ret; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int isize; -#endif *str = NULL; *size = 0; if (!obj) { @@ -411,18 +317,7 @@ libvirt_charPtrSizeUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 - ret = PyBytes_AsStringAndSize(obj, str, size); -#else -# if PY_MINOR_VERSION <= 4 - ret = PyString_AsStringAndSize(obj, str, &isize); - *size = isize; -# else - ret = PyString_AsStringAndSize(obj, str, size); -# endif -#endif - - return ret; + return PyBytes_AsStringAndSize(obj, str, size); } PyObject * diff --git a/typewrappers.h b/typewrappers.h index 486017a..fc923bf 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -22,11 +22,6 @@ # define ATTRIBUTE_UNUSED #endif -/* Work around really old python. */ -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5 -typedef ssize_t Py_ssize_t; -#endif - #if !LIBVIR_CHECK_VERSION(4, 5, 0) typedef struct _virNWFilterBinding *virNWFilterBindingPtr; #endif -- 2.21.0

2 1

[libvirt] [PATCH] tests: stop linking virt tests to secondary drivers
by Daniel P. Berrangé 03 Dec '19

03 Dec '19

The hard dependancy between the virt drivers and the network or storage drivers was removed quite a while back now, so the tests no longer need to link to these drivers. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/Makefile.am | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index e009de830c..ac4c0e1a3a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -500,11 +500,10 @@ sockettest_SOURCES = \ sockettest_LDADD = $(LDADDS) if WITH_LIBXL -libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la -if WITH_NETWORK -libxl_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -libxl_LDADDS += $(LDADDS) +libxl_LDADDS = \ + ../src/libvirt_driver_libxl_impl.la \ + $(LDADDS) \ + $(NULL) libxltestdriver_la_SOURCES = libxltestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS) @@ -547,12 +546,6 @@ if WITH_QEMU libqemumonitortestutils_la_SOURCES = $(QEMUMONITORTESTUTILS_SOURCES) qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la -if WITH_NETWORK -qemu_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -if WITH_STORAGE -qemu_LDADDS += ../src/libvirt_driver_storage_impl.la -endif WITH_STORAGE if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES @@ -733,11 +726,10 @@ endif ! WITH_QEMU if WITH_LXC -lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la -if WITH_NETWORK -lxc_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -lxc_LDADDS += $(LDADDS) +lxc_LDADDS = \ + ../src/libvirt_driver_lxc_impl.la \ + $(LDADDS) \ + $(NULL) lxcxml2xmltest_SOURCES = \ lxcxml2xmltest.c testutilslxc.c testutilslxc.h \ @@ -818,11 +810,10 @@ libbhyveargv2xmlmock_la_SOURCES = \ libbhyveargv2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libbhyveargv2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) -bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la -if WITH_STORAGE -bhyve_LDADDS += ../src/libvirt_driver_storage_impl.la -endif WITH_STORAGE -bhyve_LDADDS += $(LDADDS) +bhyve_LDADDS = \ + ../src/libvirt_driver_bhyve_impl.la \ + $(LDADDS) \ + $(NULL) bhyvexml2argvtest_SOURCES = \ bhyvexml2argvtest.c \ testutils.c testutils.h -- 2.21.0

2 1

[libvirt] [PATCH] spec: mingw: add deps for genprotocol.pl usage
by Cole Robinson 03 Dec '19

03 Dec '19

As of 0985a9597bb03 we no longer distribute generated files. mingw needs to call genprotocol.pl itself, which means it needs rpcgen and cpp installed. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- mingw-libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index c29f3eeed2..fd9b729591 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -89,6 +89,10 @@ BuildRequires: mingw64-libssh2 BuildRequires: mingw32-curl BuildRequires: mingw64-curl %endif +BuildRequires: cpp +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: rpcgen +%endif BuildArch: noarch -- 2.23.0

2 1

[libvirt] [PATCH v2] driver: Include source as a flag to virDomainGetHostname
by Julio Faracco 03 Dec '19

03 Dec '19

There is a lots of possibilities to retrieve hostname information from domain. Libvirt could use lease information from dnsmasq to get current hostname too. QEMU supports QEMU-agent but it can use lease source. See 'domifaddr' as an example. This commit still adds lease options for QEMU. It will get the first hostname available from domain networks. This case, every driver has a default section inside switch to keep compatibility. So, if someone call 'domhostname' without specifying source, it will get the default option. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- include/libvirt/libvirt-domain.h | 5 +++ src/lxc/lxc_driver.c | 71 ++++++++++++++++++++++++++++++++ src/openvz/openvz_driver.c | 30 ++++++++++---- src/qemu/qemu_driver.c | 69 ++++++++++++++++++++++++++----- tools/virsh-domain.c | 25 ++++++++++- 5 files changed, 178 insertions(+), 22 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index a2f007568c..b37f33d5d0 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4790,6 +4790,11 @@ typedef struct _virTypedParameter virMemoryParameter; */ typedef virMemoryParameter *virMemoryParameterPtr; +typedef enum { + VIR_DOMAIN_HOSTNAME_SRC_LEASE = (1 << 0), /* Parse DHCP lease file */ + VIR_DOMAIN_HOSTNAME_SRC_AGENT = (1 << 1), /* Query qemu guest agent */ +} virDomainHostnameSource; + typedef enum { VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */ VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 826bf074e3..3221b06261 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5321,6 +5321,76 @@ lxcDomainGetCPUStats(virDomainPtr dom, return ret; } +static char * +lxcDomainGetHostname(virDomainPtr dom, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virNetwork) network = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; + char *hostname = NULL; + + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); + + if (!(vm = lxcDomObjFromDomain(dom))) + return NULL; + + if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + switch (flags) { + default: + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + virObjectUnref(network); + network = virNetworkLookupByName(dom->conn, + vm->def->nets[i]->data.network.name); + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto cleanup; + } + } + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + } + break; + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown hostname data source %d"), + flags); + break; + } + + cleanup: + virDomainObjEndAPI(&vm); + return hostname; +} static int lxcNodeGetFreePages(virConnectPtr conn, @@ -5467,6 +5537,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainSetMetadata = lxcDomainSetMetadata, /* 1.1.3 */ .domainGetMetadata = lxcDomainGetMetadata, /* 1.1.3 */ .domainGetCPUStats = lxcDomainGetCPUStats, /* 1.2.2 */ + .domainGetHostname = lxcDomainGetHostname, /* 5.9.0 */ .nodeGetMemoryParameters = lxcNodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = lxcNodeSetMemoryParameters, /* 0.10.2 */ .domainSendProcessSignal = lxcDomainSendProcessSignal, /* 1.0.1 */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e07b3b302d..c9f8255f19 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -301,19 +301,31 @@ openvzDomainGetHostname(virDomainPtr dom, unsigned int flags) struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); + if (!(vm = openvzDomObjFromDomain(driver, dom->uuid))) return NULL; - hostname = openvzVEGetStringParam(dom, "hostname"); - if (hostname == NULL) - goto cleanup; + switch (flags) { + default: + hostname = openvzVEGetStringParam(dom, "hostname"); + if (hostname == NULL) + goto cleanup; - /* vzlist prints an unset hostname as '-' */ - if (STREQ(hostname, "-")) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hostname of '%s' is unset"), vm->def->name); - VIR_FREE(hostname); + /* vzlist prints an unset hostname as '-' */ + if (STREQ(hostname, "-")) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Hostname of '%s' is unset"), vm->def->name); + VIR_FREE(hostname); + } + break; + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown hostname data source %d"), + flags); + break; } cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b5300241a8..928f75cafe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20090,9 +20090,15 @@ qemuDomainGetHostname(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuAgentPtr agent; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virNetwork) network = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; char *hostname = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); if (!(vm = qemuDomainObjFromDomain(dom))) return NULL; @@ -20100,21 +20106,62 @@ qemuDomainGetHostname(virDomainPtr dom, if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) - goto cleanup; - if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!qemuDomainAgentAvailable(vm, true)) - goto endjob; + switch (flags) { + default: + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) + goto cleanup; - agent = qemuDomainObjEnterAgent(vm); - ignore_value(qemuAgentGetHostname(agent, &hostname)); - qemuDomainObjExitAgent(vm, agent); + if (!qemuDomainAgentAvailable(vm, true)) + goto endjob; - endjob: - qemuDomainObjEndAgentJob(vm); + agent = qemuDomainObjEnterAgent(vm); + ignore_value(qemuAgentGetHostname(agent, &hostname)); + qemuDomainObjExitAgent(vm, agent); + + endjob: + qemuDomainObjEndAgentJob(vm); + break; + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + virObjectUnref(network); + network = virNetworkLookupByName(dom->conn, + vm->def->nets[i]->data.network.name); + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto cleanup; + } + } + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + } + break; + } cleanup: virDomainObjEndAPI(&vm); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6be9780836..01de6b633a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11669,6 +11669,10 @@ static const vshCmdInfo info_domhostname[] = { static const vshCmdOptDef opts_domhostname[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + {.name = "source", + .type = VSH_OT_STRING, + .flags = VSH_OFLAG_NONE, + .help = N_("address source: 'lease' or 'agent'")}, {.name = NULL} }; @@ -11678,21 +11682,38 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) char *hostname; virDomainPtr dom; bool ret = false; + const char *sourcestr = NULL; + int flags = 0; /* Use default value. Drivers can have its own default. */ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - hostname = virDomainGetHostname(dom, 0); + if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) + goto error; + + if (sourcestr) { + if (STREQ(sourcestr, "lease")) { + flags |= VIR_DOMAIN_HOSTNAME_SRC_LEASE; + } else if (STREQ(sourcestr, "agent")) { + flags |= VIR_DOMAIN_HOSTNAME_SRC_AGENT; + } else { + vshError(ctl, _("Unknown data source '%s'"), sourcestr); + goto error; + } + } + + hostname = virDomainGetHostname(dom, flags); if (hostname == NULL) { vshError(ctl, "%s", _("failed to get hostname")); goto error; } vshPrint(ctl, "%s\n", hostname); + + VIR_FREE(hostname); ret = true; error: - VIR_FREE(hostname); virshDomainFree(dom); return ret; } -- 2.20.1

2 1

[libvirt] [PATCH RFC V2] guests: Add support for openSUSE
by Jim Fehlig 03 Dec '19

03 Dec '19

This change adds support for the latest openSUSE Leap and openSUSE Tumbleweed guests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- This version of the patch overcomes the 'lci build' issues noted in V1 and works well for openSUSE Leap 15.1 and Tumbleweed. I'm still of the opinion of only supporting the latest Leap since there is only a six month support overlap between versions. Version x-1 is only supported six months after x is released. 'lci update ... libvirt' fails in task "Configure hostname": fatal: [libvirt-opensuse-tumbleweed]: FAILED! => {"changed": false, "msg": "hostname module cannot be used on platform Linux (Opensuse-tumbleweed)"} Not sure why that is the case. But more importantly, even though it doesn't fail, the "Update installed packages" task doesn't install any of the packages required to build libvirt. I suppose that agrees with guests/REAMDME, but how then are the packages required to build $project installed? How/when is the list of packages required to build $project conveyed to $package_manager? 'lcitool build libvirt-opensuse-tumbleweed libvirt' fails in the "Gathering Facts" task: fatal: [libvirt-opensuse-tumbleweed]: UNREACHABLE! => {"changed": false, "msg": "Invalid/incorrect password: ", "unreachable": true} Passing --debug to the command didn't help with determining what needed the password. ssh? I can't find where the "Gathering Facts" task is defined. The $root_password_file passed to /usr/bin/ansible-playbook contains the correct password for the root user. /me needs to figure out how to better debug this stuff :-). guests/configs/autoinst.xml | 75 +++++++++++++++++++ .../host_vars/libvirt-opensuse-15/docker.yml | 2 + .../host_vars/libvirt-opensuse-15/install.yml | 2 + guests/host_vars/libvirt-opensuse-15/main.yml | 22 ++++++ .../libvirt-opensuse-tumbleweed/docker.yml | 2 + .../libvirt-opensuse-tumbleweed/install.yml | 2 + .../libvirt-opensuse-tumbleweed/main.yml | 22 ++++++ guests/inventory | 2 + guests/lcitool | 2 + guests/playbooks/update/tasks/base.yml | 15 ++++ guests/vars/mappings.yml | 41 +++++++++- 11 files changed, 185 insertions(+), 2 deletions(-) diff --git a/guests/configs/autoinst.xml b/guests/configs/autoinst.xml new file mode 100644 index 0000000..42c42f8 --- /dev/null +++ b/guests/configs/autoinst.xml @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile + xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <general> + <mode> + <confirm config:type="boolean">false</confirm> + </mode> + </general> + <partitioning config:type="list"> + <drive> + <device>/dev/vda</device> + <use>all</use> + <partitions config:type="list"> + <partition> + <filesystem config:type="symbol">swap</filesystem> + <size>256M</size> + <mount>swap</mount> + </partition> + <partition> + <filesystem config:type="symbol">ext4</filesystem> + <mount>/</mount> + <size>max</size> + </partition> + </partitions> + </drive> + </partitioning> + <bootloader> + <global> + <terminal>console serial</terminal> + </global> + </bootloader> + <timezone> + <hwclock>UTC</hwclock> + <timezone>UTC</timezone> + </timezone> + <software> + <install_recommended config:type="boolean">false</install_recommended> + <products config:type="list"> + <product>openSUSE</product> + </products> + <patterns config:type="list"> + <pattern>base</pattern> + <pattern>minimal_base</pattern> + <pattern>yast2_basis</pattern> + </patterns> + <packages config:type="list"> + <package>openssh</package> + </packages> + </software> + <networking> + <keep_install_network config:type="boolean">true</keep_install_network> + </networking> + <users config:type="list"> + <user> + <username>root</username> + <user_password>root</user_password> + <encrypted config:type="boolean">false</encrypted> + <uid>0</uid> + <gid>0</gid> + <home>/root</home> + <shell>/bin/bash</shell> + </user> + </users> + <services-manager> + <default_target>multi-user</default_target> + <services config:type="list"> + <service> + <service_name>sshd</service_name> + <service_status>enable</service_status> + </service> + </services> + </services-manager> +</profile> diff --git a/guests/host_vars/libvirt-opensuse-15/docker.yml b/guests/host_vars/libvirt-opensuse-15/docker.yml new file mode 100644 index 0000000..8f32d06 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-15/docker.yml @@ -0,0 +1,2 @@ +--- +docker_base: opensuse/leap:15 diff --git a/guests/host_vars/libvirt-opensuse-15/install.yml b/guests/host_vars/libvirt-opensuse-15/install.yml new file mode 100644 index 0000000..d0fdbe5 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-15/install.yml @@ -0,0 +1,2 @@ +--- +install_url: http://download.opensuse.org/distribution/leap/15.1/repo/oss/ diff --git a/guests/host_vars/libvirt-opensuse-15/main.yml b/guests/host_vars/libvirt-opensuse-15/main.yml new file mode 100644 index 0000000..abd83c5 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-15/main.yml @@ -0,0 +1,22 @@ +--- +projects: + - libosinfo + - libvirt + - libvirt-cim + - libvirt-dbus + - libvirt-glib + - libvirt-perl + - libvirt-python + - libvirt-sandbox + - libvirt-tck + - osinfo-db + - osinfo-db-tools + - virt-manager + - virt-viewer + +package_format: 'rpm' +package_manager: 'zypper' +os_name: 'OpenSUSE' +os_version: '15' + +ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/host_vars/libvirt-opensuse-tumbleweed/docker.yml b/guests/host_vars/libvirt-opensuse-tumbleweed/docker.yml new file mode 100644 index 0000000..cc79a22 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-tumbleweed/docker.yml @@ -0,0 +1,2 @@ +--- +docker_base: opensuse/tumbleweed diff --git a/guests/host_vars/libvirt-opensuse-tumbleweed/install.yml b/guests/host_vars/libvirt-opensuse-tumbleweed/install.yml new file mode 100644 index 0000000..36cea68 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-tumbleweed/install.yml @@ -0,0 +1,2 @@ +--- +install_url: http://download.opensuse.org/tumbleweed/repo/oss/ diff --git a/guests/host_vars/libvirt-opensuse-tumbleweed/main.yml b/guests/host_vars/libvirt-opensuse-tumbleweed/main.yml new file mode 100644 index 0000000..828df81 --- /dev/null +++ b/guests/host_vars/libvirt-opensuse-tumbleweed/main.yml @@ -0,0 +1,22 @@ +--- +projects: + - libosinfo + - libvirt + - libvirt-cim + - libvirt-dbus + - libvirt-glib + - libvirt-perl + - libvirt-python + - libvirt-sandbox + - libvirt-tck + - osinfo-db + - osinfo-db-tools + - virt-manager + - virt-viewer + +package_format: 'rpm' +package_manager: 'zypper' +os_name: 'OpenSUSE' +os_version: 'Tumbleweed' + +ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/inventory b/guests/inventory index 3b15513..71d3c91 100644 --- a/guests/inventory +++ b/guests/inventory @@ -8,5 +8,7 @@ libvirt-fedora-rawhide libvirt-freebsd-11 libvirt-freebsd-12 libvirt-freebsd-current +libvirt-opensuse-15 +libvirt-opensuse-tumbleweed libvirt-ubuntu-16 libvirt-ubuntu-18 diff --git a/guests/lcitool b/guests/lcitool index a630971..7f26731 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -531,6 +531,8 @@ class Application: install_config = "preseed.cfg" elif facts["os_name"] in ["CentOS", "Fedora"]: install_config = "kickstart.cfg" + elif facts["os_name"] == "OpenSUSE": + install_config = "autoinst.xml" else: raise Exception( "Host {} doesn't support installation".format(host) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 3d83e78..b6a2cd2 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -65,12 +65,27 @@ when: - package_format == 'pkg' +- name: Update installed packages + command: '{{ package_manager }} update -y -l --force-resolution --no-recommends' + args: + warn: no + when: + - os_name == 'OpenSUSE' + - name: Clean up packages after update shell: '{{ package_manager }} clean packages -y && {{ package_manager }} autoremove -y' args: warn: no when: - package_format == 'rpm' + - not os_name == "OpenSUSE" + +- name: Clean up packages after update + shell: '{{ package_manager }} clean' + args: + warn: no + when: + - os_name == "OpenSUSE" - name: Clean up packages after update apt: diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index bd9b161..8359ce2 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -19,10 +19,10 @@ # - deb, pkg, rpm # # Valid OS names are: -# - CentOS, Debian, Fedora, FreeBSD, Ubuntu +# - CentOS, Debian, Fedora, FreeBSD, OpenSUSE, Ubuntu # # Valid OS versions are: -# - CentOS7, Debian9, FedoraRawhide, Ubuntu18 and so on +# - CentOS7, Debian9, FedoraRawhide, OpenSUSE15, Ubuntu18 and so on # # The arch specific rules use a prefix "$ARCH-" where $ARCH # is a libvirt arch name. @@ -70,6 +70,7 @@ mappings: apparmor: deb: libapparmor-dev + OpenSUSE: libapparmor-devel cross-policy-deb: foreign augeas: @@ -117,6 +118,7 @@ mappings: cppi: Fedora: cppi FreeBSD: cppi + OpenSUSE: cppi cyrus-sasl: deb: libsasl2-dev @@ -127,6 +129,7 @@ mappings: dbus-daemon: default: dbus Fedora: dbus-daemon + OpenSUSE: dbus-1 device-mapper: deb: libdevmapper-dev @@ -196,6 +199,7 @@ mappings: deb: libglusterfs-dev rpm: glusterfs-api-devel Debian9: glusterfs-common + OpenSUSE: glusterfs-devel Ubuntu16: glusterfs-common Ubuntu18: glusterfs-common cross-policy-deb: foreign @@ -204,6 +208,7 @@ mappings: deb: libgnutls28-dev pkg: gnutls rpm: gnutls-devel + OpenSUSE: libgnutls-devel cross-policy-deb: foreign go: @@ -228,6 +233,7 @@ mappings: gtk-update-icon-cache: default: gtk-update-icon-cache + OpenSUSE: gtk3-tools Ubuntu16: libgtk2.0-bin gtk-vnc2: @@ -248,14 +254,17 @@ mappings: ip: deb: iproute2 rpm: iproute + OpenSUSE: iproute2 iscsiadm: deb: open-iscsi rpm: iscsi-initiator-utils + OpenSUSE: open-iscsi isoinfo: default: genisoimage FreeBSD: cdrkit + OpenSUSE: mkisofs java: deb: openjdk-11-jre-headless @@ -289,6 +298,7 @@ mappings: libaudit: deb: libaudit-dev rpm: audit-libs-devel + OpenSUSE: audit-devel cross-policy-deb: foreign libblkid: @@ -320,6 +330,7 @@ mappings: deb: libdbus-1-dev pkg: dbus rpm: dbus-devel + OpenSUSE: dbus-1-devel cross-policy-deb: foreign libgovirt: @@ -347,6 +358,7 @@ mappings: rpm: numactl-devel armv6l-deb: armv7l-deb: + OpenSUSE: libnuma-devel cross-policy-deb: foreign libparted: @@ -370,6 +382,7 @@ mappings: deb: librbd-dev Fedora: librbd-devel CentOS7: librbd1-devel + OpenSUSE: librbd-devel cross-policy-deb: foreign libselinux: @@ -436,6 +449,7 @@ mappings: deb: locales Fedora: glibc-langpack-en FreeBSD: + OpenSUSE: glibc-locale lsof: default: lsof @@ -458,6 +472,7 @@ mappings: ninja: default: ninja-build FreeBSD: ninja + OpenSUSE: ninja mingw32-curl: Fedora: mingw32-curl @@ -639,6 +654,7 @@ mappings: netcf: deb: libnetcf-dev rpm: netcf-devel + OpenSUSE: cross-policy-deb: skip net-tools: @@ -678,6 +694,7 @@ mappings: deb: perl pkg: perl5 rpm: perl-Archive-Tar + OpenSUSE: perl-Archive-Tar-Wrapper perl-CPAN-Changes: deb: libcpan-changes-perl @@ -709,6 +726,7 @@ mappings: deb: libio-compress-perl pkg: p5-IO-Compress rpm: perl-IO-Compress-Bzip2 + OpenSUSE: perl-Compress-Bzip2 perl-IO-String: deb: libio-string-perl @@ -747,6 +765,7 @@ mappings: deb: libtest-lwp-useragent-perl pkg: p5-Test-LWP-UserAgent Fedora: perl-Test-LWP-UserAgent + OpenSUSE: perl-Test-LWP-UserAgent perl-Test-Pod: deb: libtest-pod-perl @@ -809,20 +828,24 @@ mappings: deb: python-dev pkg: python2 rpm: python2-devel + OpenSUSE: python-devel cross-policy-deb: foreign python2-lxml: default: python-lxml Fedora: python2-lxml FreeBSD: py27-lxml + OpenSUSE: python2-lxml python2-nose: default: python-nose Fedora: python2-nose FreeBSD: py27-nose + OpenSUSE: python2-nose python2-setuptools: CentOS7: python2-setuptools + OpenSUSE: python2-setuptools python3: default: python3 @@ -831,6 +854,7 @@ mappings: default: python3-dbus FreeBSD: py36-dbus CentOS7: python36-dbus + OpenSUSE: python3-dbus-python python3-devel: deb: python3-dev @@ -838,17 +862,20 @@ mappings: Fedora: python3-devel CentOS7: python36-devel cross-policy-deb: foreign + OpenSUSE: python3-devel python3-gi: deb: python3-gi pkg: py36-gobject3 rpm: python3-gobject CentOS7: python36-gobject + OpenSUSE: python3-gobject python3-libxml2: default: python3-libxml2 FreeBSD: py36-libxml2 CentOS7: + OpenSUSE: python3-libxml2-python Ubuntu16: python3-lxml: @@ -864,6 +891,7 @@ mappings: python3-pip: CentOS7: python3-pip Debian9: python3-pip + OpenSUSE: python3-pip Ubuntu16: python3-pip Ubuntu18: python3-pip @@ -884,6 +912,7 @@ mappings: qemu-img: default: qemu-utils rpm: qemu-img + OpenSUSE: qemu-tools radvd: default: radvd @@ -929,6 +958,7 @@ mappings: deb: libspice-client-gtk-3.0-dev pkg: spice-gtk rpm: spice-gtk3-devel + OpenSUSE: spice-gtk-devel cross-policy-deb: foreign strace: @@ -942,6 +972,7 @@ mappings: deb: iproute2 rpm: iproute-tc CentOS7: iproute + OpenSUSE: iproute2 unzip: default: unzip @@ -964,10 +995,12 @@ mappings: wireshark: deb: wireshark-dev Fedora: wireshark-devel + OpenSUSE: wireshark-devel cross-policy-deb: skip xen: Fedora: xen-devel + OpenSUSE: xen-devel x86_64-deb: libxen-dev armv7l-deb: libxen-dev aarch64-deb: libxen-dev @@ -994,18 +1027,21 @@ mappings: xz-static: deb: liblzma-dev Fedora: xz-static + OpenSUSE: xz-static-devel cross-policy-deb: foreign yajl: deb: libyajl-dev pkg: yajl rpm: yajl-devel + OpenSUSE: libyajl-devel cross-policy-deb: foreign zfs: default: zfs-fuse CentOS: FreeBSD: + OpenSUSE: zlib: deb: zlib1g-dev @@ -1015,6 +1051,7 @@ mappings: zlib-static: deb: zlib1g-dev rpm: zlib-static + OpenSUSE: zlib-devel-static cross-policy-deb: foreign -- 2.24.0

3 13

[libvirt] [PATCH] maint: Post-release version bump to 5.11.0
by Jim Fehlig 03 Dec '19

03 Dec '19

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the trivial rule. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ef521e370c..d0ef7de750 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [5.10.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [5.11.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] if test $srcdir = "." then diff --git a/docs/news.xml b/docs/news.xml index 46a3466238..e4533cc46e 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,6 +42,14 @@ --> <libvirt> + <release version="v5.11.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v5.10.0" date="2019-12-02"> <section title="New features"> <change> -- 2.24.0

2 2

[libvirt] [PATCH v3 0/4] qemu: block: implement optional removal of committed snapshot images
by Pavel Mores 03 Dec '19

03 Dec '19

v3 aims to incorporate Peter's feedback to v2, mainly: - patch 1 was split into two - the delete flag propagation stays in patch 1, the actual enabling the feature was moved to what's now patch 4 - patch 2 was modified to handle NFS and to use g_strerror() instead of strerror_r() - the former patch 4 was squashed into patch 3. Pavel Mores (4): qemu: block: propagate the delete flag to where it can actually be used qemu: block: use the delete flag to delete snapshot images if requested qemu: block: store the delete flag in libvirtd's status XML qemu: block: enable the snapshot image deletion feature src/qemu/qemu_blockjob.c | 43 ++++++++++++++++++- src/qemu/qemu_blockjob.h | 4 +- src/qemu/qemu_domain.c | 6 ++- src/qemu/qemu_domain.h | 6 +++ src/qemu/qemu_driver.c | 5 ++- .../blockjob-blockdev-in.xml | 1 + 6 files changed, 60 insertions(+), 5 deletions(-) -- 2.21.0

2 9

[libvirt] [glib PATCH] glib,docs: Remove "object-tree" chapter
by Fabiano Fidêncio 03 Dec '19

03 Dec '19

gtk-doc-1.30+ does *not* create tree_index.sgml in case the library does not provide GObjects, which is the case of LibvirtGLib. In previous versions, though, an empty file would be generated. This seems to be a regression which hit *a* *lot* of different projects, all of them having to take the very same approach. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- docs/libvirt-glib/Libvirt-glib-docs.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/libvirt-glib/Libvirt-glib-docs.xml b/docs/libvirt-glib/Libvirt-glib-docs.xml index f2f3572..505f138 100644 --- a/docs/libvirt-glib/Libvirt-glib-docs.xml +++ b/docs/libvirt-glib/Libvirt-glib-docs.xml @@ -16,10 +16,6 @@ <xi:include href="xml/libvirt-glib-error.xml"/> <xi:include href="xml/libvirt-glib-event.xml"/> </chapter> - <chapter id="object-tree"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> <index id="api-index-full"> <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> -- 2.23.0

2 1

[libvirt] Libvirt 5.9.0 Lags
by Dincer Beken 03 Dec '19

03 Dec '19

Hello all, I am using Arch Linux 5.3.13-arch1-1 and libvirt 5.9.0. After I made a linux update (sudo pacman -Syu), I got the new, libvirt version mentioned above. But soon after I realized, while programming in eclipse, that copy paste does not work anymore. After couple of tries, when I try to copy some lines of code, it freezes for a short time, and looses the copied text in the clipboard. I converted the VM's into vdi and continuing to work with virtual box. There, on the same laptop and the same VM, I don't have that issue! Is this a known issue? I really need a fix urgently, since I ve got other VMs which are optimized for KVM. I ve also post this issue to stackoverflow: https://stackoverflow.com/questions/59155986/lags-in-libvirt-5-9-0 Many Thanks, Dincer

2 2

[libvirt] [PATCH 00/21] Incremental backup support for qemu
by Peter Krempa 03 Dec '19

03 Dec '19

This is a finished version of my RFC posted here: https://www.redhat.com/archives/libvir-list/2019-October/msg01193.html All cleanups of that series are now merged and this series has new cleanups and depending patches that I posted earlier this week. For convenience everything can be fetched at: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-backup This series requires qemu 4.2 to work properly. Please make sure to fetch the current head. Compared to previous versions: - The API is similar to what was posted last time or in Eric's version - the backup job ID was removed, this can't be integrated with qemu async jobs as there is only one async jobs. - the virDomainBackupEnd API was removed as virDomainAbortJob can be used instead - the usage of domain job APIs is fully implemented as it was documented in previous eric's postings - the domain job completion event and completed job statistics are used to notify about the state and successful finishing of the job (see virDomainGetJobStats/virsh domjobinfo) - unfortunately block jobs and snapshots are still not supported, thus this feature will stay disabled for now: If you want to give the feature a spin you must use the following XML override: <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> ... <qemu:capabilities> <qemu:add capability='incremental-backup'/> </qemu:capabilities> </domain> Eric Blake (5): backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup Peter Krempa (16): API: Introduce field for reporting temporary disk space usage of a domain job virsh: Implement VIR_DOMAIN_JOB_DISK_TEMP_(USED|TOTAL) in cmdDomjobinfo API: Add domain job operation for backups qemu: Add infrastructure for statistics of a backup job qemu: domain: Introduce QEMU_ASYNC_JOB_BACKUP async job type Add 'backup' block job type qemu: monitor: Add support for blockdev-backup via 'transaction' qemu: domain: Track backup job data in the status XML qemu: blockjob: Track internal data for 'backup' blockjob tests: qemustatusxml2xml: Add test for 'pull' type backup job conf: backup: Add fields for tracking stats of completed sub-jobs doc: Document quirk of getting block job info for a 'backup' blockjob qemu: Implement backup job APIs and qemu handling qemu: backup: Implement stats gathering while the job is running qemu: driver: Allow cancellation of the backup job qemu: blockjob: Implement concluded blockjob handler for backup blockjobs docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 161 +++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 214 ++++ examples/c/misc/event-test.c | 3 + include/libvirt/libvirt-domain.h | 32 +- libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + po/POTFILES.in | 3 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 499 ++++++++ src/conf/backup_conf.h | 108 ++ src/conf/domain_conf.c | 2 +- src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 12 + src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 142 +++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 6 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_backup.c | 1017 +++++++++++++++++ src/qemu/qemu_backup.h | 46 + src/qemu/qemu_blockjob.c | 96 +- src/qemu/qemu_blockjob.h | 17 + src/qemu/qemu_domain.c | 140 +++ src/qemu/qemu_domain.h | 14 + src/qemu/qemu_driver.c | 68 +- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 15 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 8 + src/qemu/qemu_process.c | 25 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 33 +- src/remote_protocol-structs | 15 + tests/Makefile.am | 3 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/qemumonitorjsontest.c | 8 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 607 ++++++++++ .../qemustatusxml2xmldata/backup-pull-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + tests/virschematest.c | 2 + tools/Makefile.am | 1 + tools/virsh-backup.c | 144 +++ tools/virsh-backup.h | 21 + tools/virsh-domain.c | 26 +- tools/virsh.c | 2 + tools/virsh.h | 1 + tools/virsh.pod | 32 + 57 files changed, 3639 insertions(+), 25 deletions(-) create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/qemu/qemu_backup.c create mode 100644 src/qemu/qemu_backup.h create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/qemustatusxml2xmldata/backup-pull-in.xml create mode 120000 tests/qemustatusxml2xmldata/backup-pull-out.xml create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 2.23.0

3 38

[libvirt] [jenkins-ci PATCH] lcitool: Explain our use of the 'ks' kernel parameter
by Andrea Bolognani 03 Dec '19

03 Dec '19

It's not immediately obvious why we're using it even when installing a distribution like Debian, so explain the motivation in a comment. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index a630971..0e27796 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -540,7 +540,9 @@ class Application: # preseed files must use a well-known name to be picked up by # d-i; for kickstart files, we can use whatever name we please # but we need to point anaconda in the right direction through - # a kernel argument + # the 'ks' kernel parameter. We can use 'ks' unconditionally + # for simplicity's sake, because distributions that don't use + # kickstart for unattended installation will simply ignore it extra_arg = "console=ttyS0 ks=file:/{}".format(install_config) virt_install = distutils.spawn.find_executable("virt-install") -- 2.23.0

2 3

[libvirt] [PATCH] maint: post-post-version-bump version bump to 6.0.0
by Ján Tomko 03 Dec '19

03 Dec '19

My commit 3bbe10205b79c8803e69c61897a0491d7a3f57c0 forgot to update the news. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed under the trivial paper bag rule. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index e4533cc46e..43aa96f497 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,7 +42,7 @@ --> <libvirt> - <release version="v5.11.0" date="unreleased"> + <release version="v6.0.0" date="unreleased"> <section title="New features"> </section> <section title="Improvements"> -- 2.19.2

1 0

[libvirt] [PATCH] spec: Fix printing test-suite.log when make check fails
by Jiri Denemark 03 Dec '19

03 Dec '19

Commit v5.7.0-248-g03449e2504 removed "cd tests" without updating the patch to test-suite.log. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c7fac104d9..4c6161a26f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1307,7 +1307,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ cd %{_vpath_builddir} if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1 then - cat test-suite.log || true + cat tests/test-suite.log || true exit 1 fi -- 2.24.0

2 1

[libvirt] [PATCH] maint: post-version bump version bump to 6.0.0
by Ján Tomko 03 Dec '19

03 Dec '19

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d0ef7de750..76d28d2f67 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [5.11.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [6.0.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] if test $srcdir = "." then -- 2.21.0

1 0