- Devel - libvirt List Archives

[PATCH] virsh: Fix return code for dump
by Xuyandong (Yandong Xu) 04 May '20

04 May '20

>From 4899d04fab878d5a0e13f01b8b137af233bc7d33 Mon Sep 17 00:00:00 2001 From: Xu Yandong <xuyandong2(a)huawei.com> Date: Mon, 4 May 2020 16:36:19 +0800 Subject: [PATCH] virsh: Fix return code for dump After the commit dc0771c, ret variable no longer represents the status of the return code, use data->ret replace it. Signed-off-by: Xu Yandong <xuyandong2(a)huawei.com> --- tools/virsh-domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0704529458..61cd72f714 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5522,7 +5522,6 @@ static bool cmdDump(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - bool ret = false; bool verbose = false; const char *name = NULL; const char *to = NULL; @@ -5556,12 +5555,12 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); - if (!ret) + if (!data.ret) vshPrintExtra(ctl, _("\nDomain %s dumped to %s\n"), name, to); cleanup: virshDomainFree(dom); - return !ret; + return !data.ret; } static const vshCmdInfo info_screenshot[] = { -- 2.21.0

4 4

[PATCH 0/2] qemucapabilitiesdata: Update qemu-5.0 data after release and add qemu-5.1
by Peter Krempa 04 May '20

04 May '20

Peter Krempa (2): qemucapabilitiesdata: Update x86_64 capabilities to 5.0.0 release qemucapabilitiesdata: Add test data for x86_64 for the qemu-5.1 dev cycle .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 194 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 197 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 194 + .../caps_5.0.0.x86_64.replies | 8 +- .../caps_5.0.0.x86_64.xml | 4 +- .../caps_5.1.0.x86_64.replies | 28830 ++++++++++++++++ .../caps_5.1.0.x86_64.xml | 3016 ++ 7 files changed, 32437 insertions(+), 6 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.1.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml -- 2.26.2

2 3

[PATCH] systemd: start libvirtd after firewalld/iptables services
by Laine Stump 04 May '20

04 May '20

When a system has enabled the iptables/ip6tables services rather than firewalld, there is no explicit ordering of the start of those services vs. libvirtd. This creates a problem when libvirtd.service is started before ip[6]tables, as the latter, when it finally is started, will remove all of the iptables rules that had previously been added by libvirt, including the custom chains where libvirt's rules are kept. This results in an error message similar to the following when a user subsequently tries to start a new libvirt network: "Error while activating network: Call to virNetworkCreate failed: internal error: Failed to apply firewall rules /usr/sbin/ip6tables -w --table filter --insert LIBVIRT_FWO \ --in-interface virbr2 --jump REJECT: ip6tables: No chain/target/match by that name." (Prior to logging this error, it also would have caused failure to forward (or block) traffic in some cases, e.g. for guests on a NATed network, since libvirt's rules to forward/block had all been deleted and libvirt didn't know about it, so it couldn't fix the problem) When this happens, the problem can be remedied by simply restarting libvirtd.service (which has the side-effect of reloading all libvirt-generated firewall rules) Instead, we can just explicitly stating in the libvirtd.service file that libvirtd.service should start after ip6tables.service and ip6tables.service, eliminating the race condition that leads to the error. There is also nothing (that I can see) in the systemd .service files to guarantee that firewalld.service will be started (if enabled) prior to libvirtd.service. The same error scenario given above would occur if libvirtd.service started before firewalld.service. Even before that, though libvirtd would have detected that firewalld.service was disabled, and then turn off all firewalld support. So, for example, firewalld's libvirt zone wouldn't be used, and most likely traffic from guests would therefore be blocked (all with no external indication of the source of the problem other than a debug-level log when libvirtd was started saying that firewalld wasn't in use); also libvirtd wouldn't notice when firewalld reloaded its rules (which also simultaneously deletes all of libvirt's rules). I'm not aware of any reports that have been traced back to libvirtd.service starting before firewalld.service, but have seen that error reported multiple times, and also don't see an existing dependency that would guarantee firewalld.service starts before libvirtd.service, so it's possible it's been happening and we just haven't gotten to the bottom of it. This patch adds an After= line to the libvirtd.service file for each of iptables.service, ip6tables.service, and firewalld.servicee, which should guarantee that libvirtd.service isn't started until systemd has started whichever of the others is enabled. This race was diagnosed, and patch proposed, by Jason Montleon in https://bugzilla.redhat.com/1723698 . At the time (April 2019) danpb agreed with him that this change to libvirtd.service was a reasonable thing to do, but I guess everyone thought someone else was going to post a patch, so in the end nobody did. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/remote/libvirtd.service.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 90b2cad5b0..cc0d4e3693 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -11,6 +11,9 @@ Wants=libvirtd-admin.socket Wants=systemd-machined.service Before=libvirt-guests.service After=network.target +After=firewalld.service +After=iptables.service +After=ip6tables.service After=dbus.service After=iscsid.service After=apparmor.service -- 2.25.4

4 3

[libvirt PATCHv2] docs: note that <dnsmasq:option> was added in libvirt 5.6.0
by Laine Stump 04 May '20

04 May '20

To make it simpler to answer questions of "Why doesn't this thing work for me?" Signed-off-by: Laine Stump <laine(a)redhat.com> --- Sigh. As danpb pointed out when I sent this before, I had copy/pasted a "since" clause (and taken the time to make sure I could still do a build) but hadn't bothered to replace the version number itself in the bit that I pasted :-/ (this is why I don't allow the "trivial" rule for pushing patches to apply to myself) docs/formatnetwork.html.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 2bccac014b..9f86e9567d 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -1124,9 +1124,11 @@ <h3><a id="elementsNamespaces">Network namespaces</a></h3> <p> - A special XML namespace is available for passing options directly to the - underlying dnsmasq configuration file. Usage of XML namespaces comes with no - support guarantees, so use at your own risk. + A special XML namespace is available for passing options + directly to the underlying dnsmasq configuration + file <span class="since">Since 5.6.0</span>. Usage of XML + namespaces comes with no support guarantees, so use at your own + risk. </p> <p> -- 2.25.4

2 1

[PATCH] news: Update for libvirt 6.3.0
by Michal Privoznik 04 May '20

04 May '20

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 80819aec23..986e7ca5f8 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -121,8 +121,82 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + qemu: Allow checkpoint redefine for offline VMs + </summary> + <description> + Skip the liveness and capability checks when redefining checkpoints as + we don't need qemu interactions to update the metadata. + </description> + </change> + <change> + <summary> + daemons: Improve timeout handling + </summary> + <description> + Daemons now support <code> --timeout 0 </code> which suppresses daemon + killing after given time of inactivity. + </description> + </change> + <change> + <summary> + qemu: add support for 'multidevs' option + </summary> + <description> + This option prevents misbehaviours on guest if a QEMU 9pfs export + contains multiple devices, due to the potential file ID collisions + this otherwise may cause. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Various embed driver fixes + </summary> + <description> + When using shared resources from embed driver (e.g. hugepages, + machined, etc.) libvirt now generates an unique handler that is not + conflicting with other embed drivers or system or session daemons. + </description> + </change> + <change> + <summary> + Distinguish Cascadelake-Server from Skylake-Server + </summary> + <description> + Libvirt now properly detects Cascadelake-Server and Skylake-Server + processors which differ only in stepping. + </description> + </change> + <change> + <summary> + qemu: Fix domain restore from a block device + </summary> + <description> + When using namespaces, libvirt was unable to restore a domain from a + block device because libvirt tried to relabel the device inside the + namespace while QEMU was given FD to the block device in the host. + </description> + </change> + <change> + <summary> + node_device_udev: handle move events + </summary> + <description> + Libvirt now handles <code>move</code> event which is emitted on a NIC rename. + </description> + </change> + <change> + <summary> + qemu: Fix capabilities probing with TCG + </summary> + <description> + Libvirt no long assumes TCG is always available. It now detects + whether QEMU supports TCG and reports it accordingly. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.26.2

2 1

[libvirt PATCH] gitlab: convert to shared container for DCO check
by Daniel P. Berrangé 01 May '20

01 May '20

This removes the locally maintained DCO checking script in favour of the shared containre image provided by libvirt-ci.git. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 21 ++++----- scripts/require-dco.py | 99 ------------------------------------------ 2 files changed, 9 insertions(+), 111 deletions(-) delete mode 100755 scripts/require-dco.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99e7b510c7..3752618b43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,18 +221,15 @@ potfile: - libvirt.pot -# Check that all commits are signed-off for the DCO. Skip -# on master branch and -maint branches, since we only need -# to test developer's personal branches. -dco: +# Check that all commits are signed-off for the DCO. +# Skip on "libvirt" namespace, since we only need to run +# this test on developer's personal forks from which +# merge requests are submitted +check-dco: stage: prebuild - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest - before_script: - - *script_variables + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master script: - - ./scripts/require-dco.py - only: - - branches + - /check-dco except: - - /^v.*-maint$/ - - master + variables: + - $CI_PROJECT_NAMESPACE == 'libvirt' diff --git a/scripts/require-dco.py b/scripts/require-dco.py deleted file mode 100755 index ae94393319..0000000000 --- a/scripts/require-dco.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env python3 - -# require-dco.py: validate all commits are signed off -# -# Copyright (C) 2020 Red Hat, Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see -# <http://www.gnu.org/licenses/>. - -import os -import os.path -import sys -import subprocess - -cwd = os.getcwd() -reponame = os.path.basename(cwd) -repourl = "https://gitlab.com/libvirt/%s.git" % reponame - -subprocess.check_call(["git", "remote", "add", "dcocheck", repourl]) -subprocess.check_call(["git", "fetch", "dcocheck", "master"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) - -ancestor = subprocess.check_output(["git", "merge-base", "dcocheck/master", "HEAD"], - universal_newlines=True) - -ancestor = ancestor.strip() - -subprocess.check_call(["git", "remote", "rm", "dcocheck"]) - -errors = False - -print("\nChecking for 'Signed-off-by: NAME <EMAIL>' on all commits since %s...\n" % ancestor) - -log = subprocess.check_output(["git", "log", "--format=%H %s", ancestor + "..."], - universal_newlines=True) - -if log == "": - commits = [] -else: - commits = [[c[0:40], c[41:]] for c in log.strip().split("\n")] - -for sha, subject in commits: - - msg = subprocess.check_output(["git", "show", "-s", sha], - universal_newlines=True) - lines = msg.strip().split("\n") - - print("🔍 %s %s" % (sha, subject)) - sob = False - for line in lines: - if "Signed-off-by:" in line: - sob = True - if "localhost" in line: - print(" ❌ FAIL: bad email in %s" % line) - errors = True - - if not sob: - print(" ❌ FAIL missing Signed-off-by tag") - errors = True - -if errors: - print(""" - -❌ ERROR: One or more commits are missing a valid Signed-off-By tag. - - -This project requires all contributors to assert that their contributions -are provided in compliance with the terms of the Developer's Certificate -of Origin 1.1 (DCO): - - https://developercertificate.org/ - -To indicate acceptance of the DCO every commit must have a tag - - Signed-off-by: REAL NAME <EMAIL> - -This can be achieved by passing the "-s" flag to the "git commit" command. - -To bulk update all commits on current branch "git rebase" can be used: - - git rebase -i master -x 'git commit --amend --no-edit -s' - -""") - - sys.exit(1) - -sys.exit(0) -- 2.25.4

2 1

[libvirt-python PATCH v3 0/3] gitlab: introduce CI jobs for validating python build
by Daniel P. Berrangé 01 May '20

01 May '20

This introduces GitLab CI to the python module. Traditional Jenkins has validated the python build across all distros, using libvirt git. This tested one axis - a variety of python versions - but failed to test the other interesting axis - a variety of libvirt versions. This new CI setup fixes that mistake validating both axis. Daniel P. Berrangé (3): test: workaround missing VIR_TYPED_PARAM enums in API definition gitlab: introduce CI jobs testing git master & distro libvirt travis: delete redundant configuration .gitlab-ci.yml | 185 +++++++++++++++++++++++++++ .travis.yml | 55 -------- ci/README.rst | 13 ++ ci/libvirt-centos-7.Dockerfile | 86 +++++++++++++ ci/libvirt-centos-8.Dockerfile | 64 +++++++++ ci/libvirt-debian-10.Dockerfile | 56 ++++++++ ci/libvirt-debian-9.Dockerfile | 59 +++++++++ ci/libvirt-debian-sid.Dockerfile | 56 ++++++++ ci/libvirt-fedora-31.Dockerfile | 53 ++++++++ ci/libvirt-fedora-32.Dockerfile | 53 ++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 54 ++++++++ ci/libvirt-opensuse-151.Dockerfile | 55 ++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 59 +++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 56 ++++++++ ci/refresh | 27 ++++ sanitytest.py | 6 +- 16 files changed, 881 insertions(+), 56 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.25.4

3 6

Entering freeze for libvirt 6.3.0
by Daniel Veillard 01 May '20

01 May '20

We are getting close to the end of the month, so I tagged RC1 in git and pushed signed source tarball and rpms to the usual place: https://libvirt.org/sources/ Seems to work fine in my very limited testing, CI seems green except for a couple of mingw tests, so that looks good from a distance. Please give it some testing, RC2 should land on Thursday, and then if everything looks fine I could push the final version over the coming week-end. Stay safe, please test it, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt PATCH] docs: Fix grammar in virsh.rst
by Andrea Bolognani 01 May '20

01 May '20

"allows to" -> "allows one to" Spotted by Lintian (spelling-error-in-manpage tag). Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/manpages/virsh.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index dc404ddfe8..969a4d5543 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -6567,8 +6567,8 @@ secret-set-value Set the value associated with *secret* (specified by its UUID) to the value Base64-encoded value *base64* or Base-64-encoded contents of file named -*filename*. Using the *--plain* flag is together with *--file* allows to use -the file contents directly as the secret value. +*filename*. Using the *--plain* flag is together with *--file* allows one to +use the file contents directly as the secret value. If *--interactive* flag is used the secret value is read as a password from the terminal. @@ -6752,7 +6752,7 @@ xml. Each <diskspec> is in the form ``disk[,snapshot=type][,driver=type][,stype=type][,file=name]``. A *diskspec* must be provided for disks backed by block devices as libvirt doesn't auto-generate file names for those. The optional ``stype`` parameter -allows to control the type of the source file. Supported values are 'file' +allows one to control the type of the source file. Supported values are 'file' (default) and 'block'. To exclude a disk from an external snapshot use ``--diskspec disk,snapshot=no``. -- 2.25.4

1 0

[libvirt-python PATCH v2 0/3] gitlab: introduce CI jobs for validating python build
by Daniel P. Berrangé 01 May '20

01 May '20

This introduces GitLab CI to the python module. Traditional Jenkins has validated the python build across all distros, using libvirt git. This tested one axis - a variety of python versions - but failed to test the other interesting axis - a variety of libvirt versions. This new CI setup fixes that mistake validating both axis. Daniel P. Berrangé (3): test: workaround missing VIR_TYPED_PARAM enums in API definition gitlab: introduce CI jobs testing git master & distro libvirt travis: delete redundant configuration .gitlab-ci.yml | 171 +++++++++++++++++++++++++++ .travis.yml | 55 --------- ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 86 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 64 ++++++++++ ci/libvirt-debian-10.Dockerfile | 56 +++++++++ ci/libvirt-debian-9.Dockerfile | 59 +++++++++ ci/libvirt-debian-sid.Dockerfile | 56 +++++++++ ci/libvirt-fedora-30.Dockerfile | 53 +++++++++ ci/libvirt-fedora-31.Dockerfile | 53 +++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 54 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 55 +++++++++ ci/libvirt-ubuntu-1604.Dockerfile | 59 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 59 +++++++++ ci/refresh | 27 +++++ sanitytest.py | 6 +- 16 files changed, 869 insertions(+), 56 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-30.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1604.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100755 ci/refresh -- 2.25.4

2 6

[PATCH] docs: note that <dnsmasq:option> was added in libvirt 5.6.0
by Laine Stump 01 May '20

01 May '20

To make it simpler to answer questions of "Why doesn't this thing work for me?" Signed-off-by: Laine Stump <laine(a)redhat.com> --- docs/formatnetwork.html.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 2bccac014b..3571d44cd6 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -1124,9 +1124,11 @@ <h3><a id="elementsNamespaces">Network namespaces</a></h3> <p> - A special XML namespace is available for passing options directly to the - underlying dnsmasq configuration file. Usage of XML namespaces comes with no - support guarantees, so use at your own risk. + A special XML namespace is available for passing options + directly to the underlying dnsmasq configuration + file <span class="since">Since 1.0.3</span>. Usage of XML + namespaces comes with no support guarantees, so use at your own + risk. </p> <p> -- 2.25.4

2 1

[libvirt-ci PATCH 0/4] check-dco: Support namespaces other than libvirt
by Andrea Bolognani 01 May '20

01 May '20

See patch 4/4. Andrea Bolognani (4): containers: New top-level directory check-dco: Fix script name in top comment check-dco: Change remote name check-dco: Support namespaces other than libvirt .gitlab-ci.yml | 2 +- {check-dco => containers/check-dco}/Dockerfile | 0 {check-dco => containers/check-dco}/check-dco.py | 16 ++++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) rename {check-dco => containers/check-dco}/Dockerfile (100%) rename {check-dco => containers/check-dco}/check-dco.py (84%) -- 2.25.4

2 5

ANNOUNCE: libvirt-dbus 1.4.0 released
by Pavel Hrdina 01 May '20

01 May '20

I'm happy to announce the release of libvirt-dbus 1.4.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. https://libvirt.org/sources/dbus/libvirt-dbus-1.4.0.tar.xz * New features - Support for all relevant domain snapshot APIs * Build-system changes - Converted to meson/ninja build system * Documentation - Everything was converted to reStructuredText Thanks everybody who contributed! Pavel

1 0

[libvirt-dbus PATCH] HACKING: add dbus-daemon as dependency to run tests
by Pavel Hrdina 01 May '20

01 May '20

We are using dbus-daemon to run our tests but it was never listed as it was installed by default on most distributions, however, Fedora switched to dbus-broker which is not that easy to use so we need to explicitly require it as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. HACKING.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/HACKING.rst b/HACKING.rst index 6f2bca1..1c63de0 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -36,7 +36,11 @@ Running from git repository ninja -C build test - The test tool requires python3, python3-pytest, python3-dbus and flake8. + The test tool requires these packages: + + :: + + python3, python3-pytest, python3-dbus, flake8, dbus-daemon It is possible to run only specific test using: -- 2.25.4

1 0

[PATCH] libvirt-guests.sh: fix log output with new systemd
by Christian Ehrhardt 30 Apr '20

30 Apr '20

Newer systemd is too smart, it detects the PIDs of the gettext calls and due to that a log lists libvirt-guests.sh with many different PIDs. Furthermore it struggles to collect the output in time, so it can be truncated and overall looks like: libvirt-guests.sh[37986]: Running guests on default URI: libvirt-guests.sh[37995]: Running guests on libvirt-guests.sh[37977]: R Gather the gettext result into a local variable and printing the value from libvirt-guests.sh itself fixes both issues. Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1875708 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 74 +++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 7af24dab3b..324abe3623 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -28,6 +28,16 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions || # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh +# Avoid output being listed under gettext PID and being truncated +unbuffered_gettext () { + msg="$(gettext "$1")" + echo "$msg" +} +unbuffered_eval_gettext () { + msg="$(eval_gettext "$1")" + echo "$msg" +} + export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" URIS=default @@ -91,7 +101,7 @@ test_connect() if run_virsh "$uri" connect 2>/dev/null; then return 0; else - eval_gettext "Can't connect to \$uri. Skipping." + unbuffered_eval_gettext "Can't connect to \$uri. Skipping." return 1 fi } @@ -160,7 +170,7 @@ start() { [ -f "$LISTFILE" ] || { started; return 0; } if [ "x$ON_BOOT" != xstart ]; then - gettext "libvirt-guests is configured not to start any guests on boot" + unbuffered_gettext "libvirt-guests is configured not to start any guests on boot" echo rm -f "$LISTFILE" started @@ -184,19 +194,19 @@ start() { done set +f if ! "$configured"; then - eval_gettext "Ignoring guests on \$uri URI"; echo + unbuffered_eval_gettext "Ignoring guests on \$uri URI"; echo continue fi test_connect "$uri" || continue - eval_gettext "Resuming guests on \$uri URI..."; echo + unbuffered_eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do local name=$(guest_name "$uri" "$guest") - eval_gettext "Resuming guest \$name: " + unbuffered_eval_gettext "Resuming guest \$name: " if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - gettext "already active"; echo + unbuffered_gettext "already active"; echo else if "$isfirst"; then isfirst=false @@ -205,7 +215,7 @@ start() { fi retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ - gettext "done"; echo + unbuffered_gettext "done"; echo if "$sync_time"; then run_virsh "$uri" domtime --sync "$name" >/dev/null fi @@ -226,7 +236,7 @@ suspend_guest() local uri=$1 local guest=$2 local name=$(guest_name "$uri" "$guest") - local label=$(eval_gettext "Suspending \$name: ") + local label=$(unbuffered_eval_gettext "Suspending \$name: ") local bypass= local slept=0 @@ -249,7 +259,7 @@ suspend_guest() fi fi done - retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(gettext "done")" + retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(unbuffered_gettext "done")" } # shutdown_guest URI GUEST @@ -265,16 +275,16 @@ shutdown_guest() local format= local slept= - eval_gettext "Starting shutdown on guest: \$name" + unbuffered_eval_gettext "Starting shutdown on guest: \$name" echo retval run_virsh "$uri" shutdown "$guest" >/dev/null || return if [ $timeout -gt 0 ]; then check_timeout=true - format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") + format=$(unbuffered_eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") else slept=0 - format=$(eval_gettext "Waiting for guest %s to shut down\n") + format=$(unbuffered_eval_gettext "Waiting for guest %s to shut down\n") fi while ! $check_timeout || [ "$timeout" -gt 0 ]; do sleep 1 @@ -296,9 +306,9 @@ shutdown_guest() if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - eval_gettext "Shutdown of guest \$name failed to complete in time." + unbuffered_eval_gettext "Shutdown of guest \$name failed to complete in time." else - eval_gettext "Shutdown of guest \$name complete." + unbuffered_eval_gettext "Shutdown of guest \$name complete." fi echo fi @@ -313,7 +323,7 @@ shutdown_guest_async() local guest=$2 local name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" + unbuffered_eval_gettext "Starting shutdown on guest: \$name" echo retval run_virsh "$uri" shutdown "$guest" > /dev/null } @@ -339,7 +349,7 @@ check_guests_shutdown() guests_shutting_down= for guest in $guests_to_check; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." + unbuffered_eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." echo continue fi @@ -366,7 +376,7 @@ print_guests_shutdown() local name=$(guest_name "$uri" "$guest") if [ -n "$name" ]; then - eval_gettext "Shutdown of guest \$name complete." + unbuffered_eval_gettext "Shutdown of guest \$name complete." echo fi done @@ -386,10 +396,10 @@ shutdown_guests_parallel() if [ $timeout -gt 0 ]; then check_timeout=true - format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") + format=$(unbuffered_eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") else slept=0 - format=$(eval_gettext "Waiting for %d guests to shut down\n") + format=$(unbuffered_eval_gettext "Waiting for %d guests to shut down\n") fi while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do while [ -n "$guests" ] && @@ -417,7 +427,7 @@ shutdown_guests_parallel() fi timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then - eval_gettext "Timeout expired while shutting down domains"; echo + unbuffered_eval_gettext "Timeout expired while shutting down domains"; echo RETVAL=1 return fi @@ -447,7 +457,7 @@ stop() { if [ "/x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" + unbuffered_gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo RETVAL=6 return @@ -461,7 +471,7 @@ stop() { test_connect "$uri" || continue - eval_gettext "Running guests on \$uri URI: " + unbuffered_eval_gettext "Running guests on \$uri URI: " local list=$(list_guests "$uri") if [ $? -eq 0 ]; then @@ -473,7 +483,7 @@ stop() { done if "$empty"; then - gettext "no running guests." + unbuffered_gettext "no running guests." fi echo fi @@ -486,7 +496,7 @@ stop() { for uuid in $transient; do if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " + unbuffered_eval_gettext "Not suspending transient guests on URI: \$uri: " empty=false else printf ", " @@ -497,14 +507,14 @@ stop() { # reload domain list to contain only persistent guests list=$(list_guests "$uri" "--persistent") if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" + unbuffered_eval_gettext "Failed to list persistent guests on \$uri" echo RETVAL=1 set +f return fi else - gettext "Failed to list transient guests" + unbuffered_gettext "Failed to list transient guests" echo RETVAL=1 set +f @@ -521,9 +531,9 @@ stop() { if [ -s "$LISTFILE" ]; then while read uri list; do if "$suspending"; then - eval_gettext "Suspending guests on \$uri URI..."; echo + unbuffered_eval_gettext "Suspending guests on \$uri URI..."; echo else - eval_gettext "Shutting down guests on \$uri URI..."; echo + unbuffered_eval_gettext "Shutting down guests on \$uri URI..."; echo fi if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && @@ -566,14 +576,14 @@ gueststatus() { # since there is no external daemon process matching this init script. rh_status() { if [ -f "$LISTFILE" ]; then - gettext "stopped, with saved guests"; echo + unbuffered_gettext "stopped, with saved guests"; echo RETVAL=3 else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - gettext "started"; echo + unbuffered_gettext "started"; echo RETVAL=0 else - gettext "stopped, with no saved guests"; echo + unbuffered_gettext "stopped, with no saved guests"; echo RETVAL=3 fi fi @@ -583,7 +593,7 @@ rh_status() { # Display usage string, then exit with VAL (defaults to 2). usage() { local program_name=$0 - eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ + unbuffered_eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ "condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo exit ${1-2} } -- 2.26.0

3 11

[libvirt-dockerfiles PATCH 0/4] Refresh after recent changes
by Andrea Bolognani 30 Apr '20

30 Apr '20

Pushed under the Dockerfile refresh rule. Andrea Bolognani (4): Remove Fedora 30 Remove Ubuntu 16.04 Refresh after installing python3-wheel Add new MinGW containers based on Fedora Rawhide buildenv-libosinfo-centos-7.zip | Bin 1782 -> 1790 bytes buildenv-libosinfo-centos-8.zip | Bin 716 -> 723 bytes buildenv-libosinfo-debian-10.zip | Bin 783 -> 790 bytes buildenv-libosinfo-debian-9.zip | Bin 804 -> 811 bytes buildenv-libosinfo-debian-sid.zip | Bin 783 -> 789 bytes ...denv-libosinfo-fedora-30-cross-mingw32.zip | Bin 754 -> 0 bytes ...denv-libosinfo-fedora-30-cross-mingw64.zip | Bin 757 -> 0 bytes buildenv-libosinfo-fedora-30.zip | Bin 668 -> 0 bytes buildenv-libosinfo-fedora-31.zip | Bin 668 -> 675 bytes ...libosinfo-fedora-rawhide-cross-mingw32.zip | Bin 0 -> 781 bytes ...libosinfo-fedora-rawhide-cross-mingw64.zip | Bin 0 -> 784 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 688 -> 694 bytes buildenv-libosinfo-opensuse-151.zip | Bin 694 -> 701 bytes buildenv-libosinfo-ubuntu-1604.zip | Bin 808 -> 0 bytes buildenv-libosinfo-ubuntu-1804.zip | Bin 808 -> 815 bytes buildenv-libvirt-centos-7.zip | Bin 2006 -> 2022 bytes buildenv-libvirt-centos-8.zip | Bin 928 -> 946 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 1110 -> 1117 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 1102 -> 1110 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 1108 -> 1115 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 1103 -> 1110 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1114 -> 1121 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 1105 -> 1113 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 1115 -> 1123 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-10.zip | Bin 1032 -> 1039 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1143 -> 1150 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1134 -> 1142 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1140 -> 1147 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1134 -> 1141 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1145 -> 1152 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1137 -> 1146 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1147 -> 1154 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1137 -> 1144 bytes buildenv-libvirt-debian-9.zip | Bin 1063 -> 1069 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1110 -> 1117 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 1102 -> 1110 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 1108 -> 1115 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 1104 -> 1112 bytes ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 1114 -> 1121 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1102 -> 1109 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1115 -> 1123 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-sid.zip | Bin 1032 -> 1039 bytes buildenv-libvirt-fedora-30-cross-mingw32.zip | Bin 1031 -> 0 bytes buildenv-libvirt-fedora-30-cross-mingw64.zip | Bin 1034 -> 0 bytes buildenv-libvirt-fedora-30.zip | Bin 904 -> 0 bytes buildenv-libvirt-fedora-31.zip | Bin 904 -> 910 bytes ...v-libvirt-fedora-rawhide-cross-mingw32.zip | Bin 0 -> 1057 bytes ...v-libvirt-fedora-rawhide-cross-mingw64.zip | Bin 0 -> 1060 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 925 -> 929 bytes buildenv-libvirt-opensuse-151.zip | Bin 914 -> 920 bytes buildenv-libvirt-ubuntu-1604.zip | Bin 1069 -> 0 bytes buildenv-libvirt-ubuntu-1804.zip | Bin 1069 -> 1075 bytes 55 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libosinfo-fedora-30-cross-mingw32.zip delete mode 100644 buildenv-libosinfo-fedora-30-cross-mingw64.zip delete mode 100644 buildenv-libosinfo-fedora-30.zip create mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw32.zip create mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libosinfo-ubuntu-1604.zip delete mode 100644 buildenv-libvirt-fedora-30-cross-mingw32.zip delete mode 100644 buildenv-libvirt-fedora-30-cross-mingw64.zip delete mode 100644 buildenv-libvirt-fedora-30.zip create mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw32.zip create mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libvirt-ubuntu-1604.zip -- 2.25.4

1 6

[libvirt-appdev-guide-python PATCH] gitlab: introduce CI jobs for building content
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

This generates the HTML docs using publican and publishes the result as an artifact which are then browseable online via GitLab pages. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++ Makefile | 7 +++-- ci/libvirt-fedora-32.Dockerfile | 50 +++++++++++++++++++++++++++++++++ ci/refresh | 17 +++++++++++ 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100755 ci/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..0e48e12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,34 @@ stages: - prebuild + - containers + - docs + +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-perl/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.docs_job_template: &docs_job_definition + stage: docs + before_script: + - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" + script: + - git clone --depth 1 https://gitlab.com/libvirt/libvirt-publican.git brand + - $MAKE branddir=$PWD/brand + - mv tmp/en-US/html public # Check that all commits are signed-off for the DCO. # Skip on "libvirt" namespace, since we only need to run @@ -14,3 +42,15 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE == 'libvirt' + +fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +pages: + <<: *docs_job_definition + image: $CI_REGISTRY_IMAGE/ci-fedora-32:latest + artifacts: + paths: + - public diff --git a/Makefile b/Makefile index 85935a1..237961a 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,18 @@ prefix=/usr datadir=$(prefix)/share pkgdatadir=$(datadir)/publican contentdir=$(pkgdatadir)/Common_Content +branddir=$(contentdir) all: html pdf html: - publican build --langs=en-US --formats=html --common_content=$(contentdir) + publican build --langs=en-US --formats=html --common_content=$(contentdir) --brand_dir=$(branddir) pdf: - publican build --langs=en-US --formats=pdf --common_content=$(contentdir) + publican build --langs=en-US --formats=pdf --common_content=$(contentdir) --brand_dir=$(branddir) rpm: - publican package --lang=en-US --binary --desktop --common_content=$(contentdir) + publican package --lang=en-US --binary --desktop --common_content=$(contentdir) --brand_dir=$(branddir) clean: publican clean --common_content=$(contentdir) diff --git a/ci/libvirt-fedora-32.Dockerfile b/ci/libvirt-fedora-32.Dockerfile new file mode 100644 index 0000000..8539d7d --- /dev/null +++ b/ci/libvirt-fedora-32.Dockerfile @@ -0,0 +1,50 @@ +FROM fedora:32 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glibc-devel \ + glibc-langpack-en \ + libtool \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + publican \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/refresh b/ci/refresh new file mode 100755 index 0000000..ce0c20a --- /dev/null +++ b/ci/refresh @@ -0,0 +1,17 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +$LCITOOL dockerfile libvirt-fedora-32 libvirt-publican > libvirt-fedora-32.Dockerfile -- 2.25.4

1 0

[libvirt-ci PATCH] lcitool: Calculate pkg_align properly
by Andrea Bolognani 30 Apr '20

30 Apr '20

In one instance, the alignment was incorrectly based on the name of the packaging format rather than that of the packaging command. Fixes: 6c6ed1b925a03ed4223231a932a85668ba4bf8d8 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/lcitool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index abc87d2..ab3b95f 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -817,7 +817,7 @@ class Application: if cross_pkgs[package] is None: del cross_pkgs[package] - pkg_align = " \\\n" + (" " * len("RUN " + facts["packaging"]["format"] + " ")) + pkg_align = " \\\n" + (" " * len("RUN " + facts["packaging"]["command"] + " ")) pip_pkg_align = " \\\n" + (" " * len("RUN pip3 ")) varmap = {} -- 2.25.4

1 0

[RFC PATCH 0/3] Make use of deprecated QMP commands/fields more obvious
by Peter Krempa 30 Apr '20

30 Apr '20

This is based on top of the recent capabilities update: https://www.redhat.com/archives/libvir-list/2020-April/msg01490.html Whole series can be fetched by: git fetch https://gitlab.com/pipo.sk/libvirt.git deprecated-crash and requires a qemu which includes Markus' patches adding the -compat feature: https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg05380.html Note that it was pushed partially, for convenience I'm providing a branch with the patches applied and rebased: git fetch https://gitlab.com/pipo.sk/qemu.git compat-deprecated The main idea is to add developers and other interested parties the ability to enable the -compat options to crash qemu in cases when deprecated QMP command is used and stop formating any deprecated response. The qemu code is not pushed yet and doesn't have any way to be detected but I want to query whether such feature makes sense for developers. Peter Krempa (3): qemu: capabilities: Introduce QEMU_CAPS_COMPAT_DEPRECATED qemu: conf: Add 'deprecated_debug' setting to qemu.conf qemu: command: Handle formatting of '-compat' options src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 11 +++++++++++ src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 16 ++++++++++++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 9 files changed, 39 insertions(+) -- 2.26.2

3 6

[libvirt-ci PATCH 0/4] Add Ubuntu 20.04, drop Ubuntu 16.04
by Andrea Bolognani 30 Apr '20

30 Apr '20

Andrea Bolognani (4): guests: Add Ubuntu 20.04 Start building on Ubuntu 20.04 Stop building on Ubuntu 16.04 guests: Drop Ubuntu 16.04 guests/host_vars/libvirt-ubuntu-1604/docker.yml | 2 -- guests/host_vars/libvirt-ubuntu-1604/install.yml | 2 -- guests/host_vars/libvirt-ubuntu-2004/docker.yml | 2 ++ .../{libvirt-ubuntu-1604 => libvirt-ubuntu-2004}/main.yml | 3 ++- guests/inventory | 2 +- guests/playbooks/build/jobs/defaults.yml | 2 +- guests/playbooks/build/projects/libvirt-dbus.yml | 4 ++-- guests/playbooks/build/projects/libvirt-sandbox.yml | 2 +- guests/playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- guests/playbooks/build/projects/virt-manager.yml | 4 +++- guests/vars/mappings.yml | 8 +------- jenkins/projects/libvirt-dbus.yaml | 3 +-- jenkins/projects/virt-manager.yaml | 2 +- 14 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/docker.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-2004/docker.yml rename guests/host_vars/{libvirt-ubuntu-1604 => libvirt-ubuntu-2004}/main.yml (94%) -- 2.25.4

2 7

[libvirt-ci PATCH 0/3] vault: Add Fedora 32, remove unused secrets
by Andrea Bolognani 30 Apr '20

30 Apr '20

Pushed under the unreviewable vault update rule. Andrea Bolognani (3): vault: Remove unused secrets vault: Add secret for Fedora 32 vault: Remove secret for Fedora 30 guests/vars/vault.yml | 100 +++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 59 deletions(-) -- 2.25.4

1 3

[libvirt-perl PATCH v3 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg01157.html v2: https://www.redhat.com/archives/libvir-list/2020-April/msg01408.html This is a different approach from v1, because we don't inherit from the main libvirt container images. Instead we use the libvirt-minimal project as a dependancy. The cost is that the container build stage is more expensive, but the main project build stage is cheaper. This is a net win because the container build stage is cached so is only a penalty the first time, or when the distro parent image has changes to pull in. It also makes the CI process of the binding more self-contained avoiding by avoiding a dep on the container image for libvirt. Daniel P. Berrangé (3): Build: bump min perl to 5.16.0 gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML .gitlab-ci.yml | 158 +++++++++++++++++++++++++++ Build.PL | 2 +- ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 97 ++++++++++++++++ ci/libvirt-centos-8.Dockerfile | 68 ++++++++++++ ci/libvirt-debian-10.Dockerfile | 68 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 71 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 68 ++++++++++++ ci/libvirt-fedora-30.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 67 ++++++++++++ ci/libvirt-opensuse-151.Dockerfile | 66 +++++++++++ ci/libvirt-ubuntu-1604.Dockerfile | 71 ++++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 71 ++++++++++++ ci/refresh | 22 ++++ 15 files changed, 972 insertions(+), 1 deletion(-) create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-30.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1604.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100755 ci/refresh -- 2.25.4

1 3

[libvirt-ci PATCH v2] guests: introduce libvirt+dist and libvirt+minimal projects
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

The language bindings have traditionally built against a full libvirt, however, this is serious overkill because all they should really need most of the time is access to the main API, and the test driver if they want to run functional tests. The full libvirt build with virt drivers is only needed for integration testing which most bindings won't do. Thus this introduces a new project "libvirt+minimal" which lists the bare minimum dependencies required to build libvirt. Taking libvirt-perl as an example, if creating a container using the current "libvirt,libvirt-perl" project set, the result with 1.4 GB in size for Fedora 31. With the "libvirt+minimal,libvirt-perl" set, the size is just 777 MB. Some projects also wish to have the ability to build against the distro provided libvirt instead of the latest git master, and for this purpose a "libvirt+dist" project is defined which pulls in the package needed for building against the distro libvirt. Thus when building any downstream project there is now a choice of building it against "libvirt" (full git) or "libvirt+minimal" (minimal git) or "libvirt+dist" (prebuilt distro). The same can be added later for example "libvirt-perl+dist" to refer to the distro provided perl binding. In the lcitool dockerfile command, there is a check that the requested project is configured against the requested host. These new projects are not listed against any host, because we don't want them installed by default in the VMs. Thus the dockerfile check is no longer valid and is removed. Whomever is invoking lcitool knows what combination they want and whether it will work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Use "+suffix" syntax for new projects - Rename new package to "libvirt" guests/lcitool | 7 ------- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt+dist.yml | 3 +++ guests/vars/projects/libvirt+minimal.yml | 12 ++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 guests/vars/projects/libvirt+dist.yml create mode 100644 guests/vars/projects/libvirt+minimal.yml diff --git a/guests/lcitool b/guests/lcitool index 0c89e13..abc87d2 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -1007,13 +1007,6 @@ class Application: for project in projects: if project.rfind("+mingw") >= 0: raise Exception("Obsolete syntax, please use --cross-arch") - if project not in facts["projects"]: - raise Exception( - "Host {} doesn't support project {}".format( - host, - project, - ) - ) varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch) self._dockerfile_format(facts, cross_arch, varmap) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4a19fb4..9dcad46 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -450,6 +450,11 @@ mappings: rpm: libuuid-devel cross-policy-deb: foreign + libvirt: + rpm: libvirt-devel + deb: libvirt-dev + pkg: libvirt + libxml2: deb: libxml2-dev pkg: libxml2 diff --git a/guests/vars/projects/libvirt+dist.yml b/guests/vars/projects/libvirt+dist.yml new file mode 100644 index 0000000..1fc1b2c --- /dev/null +++ b/guests/vars/projects/libvirt+dist.yml @@ -0,0 +1,3 @@ +--- +packages: + - libvirt diff --git a/guests/vars/projects/libvirt+minimal.yml b/guests/vars/projects/libvirt+minimal.yml new file mode 100644 index 0000000..96335f2 --- /dev/null +++ b/guests/vars/projects/libvirt+minimal.yml @@ -0,0 +1,12 @@ +--- +packages: + - glib2 + - gnutls + - libnl3 + - libnlroute3 + - libtirpc + - libxml2 + - python3-docutils + - rpcgen + - xmllint + - xsltproc -- 2.25.4

2 1

[libvirt-ci PATCH 0/4] Add Fedora 32, drop Fedora 30
by Andrea Bolognani 30 Apr '20

30 Apr '20

Fedora 32 was released earlier this week, and Fedora 30 goes EOL the next one. Andrea Bolognani (4): guests: Add Fedora 32 Start building on Fedora 32 Stop building on Fedora 30 guests: Remove Fedora 30 guests/host_vars/libvirt-fedora-30/docker.yml | 2 - guests/host_vars/libvirt-fedora-32/docker.yml | 2 + .../install.yml | 2 +- .../main.yml | 2 +- guests/inventory | 2 +- guests/playbooks/build/jobs/defaults.yml | 4 +- guests/playbooks/build/projects/gtk-vnc.yml | 2 +- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 4 +- .../build/projects/libvirt-sandbox.yml | 4 +- .../playbooks/build/projects/libvirt-tck.yml | 4 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 6 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jenkins/jobs/defaults.yaml | 4 +- jenkins/new.xml | 6423 ++++++++++++++++ jenkins/old.xml | 6435 +++++++++++++++++ jenkins/projects/gtk-vnc.yaml | 2 +- jenkins/projects/libosinfo.yaml | 2 +- jenkins/projects/libvirt-dbus.yaml | 4 +- jenkins/projects/libvirt-sandbox.yaml | 4 +- jenkins/projects/libvirt-tck.yaml | 4 +- jenkins/projects/libvirt.yaml | 2 +- jenkins/projects/osinfo-db-tools.yaml | 2 +- jenkins/projects/virt-manager.yaml | 6 +- jenkins/projects/virt-viewer.yaml | 2 +- 27 files changed, 12895 insertions(+), 37 deletions(-) delete mode 100644 guests/host_vars/libvirt-fedora-30/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-32/docker.yml rename guests/host_vars/{libvirt-fedora-30 => libvirt-fedora-32}/install.yml (66%) rename guests/host_vars/{libvirt-fedora-30 => libvirt-fedora-32}/main.yml (97%) create mode 100644 jenkins/new.xml create mode 100644 jenkins/old.xml -- 2.25.4

2 7

[libvirt-python PATCH 0/3] gitlab: introduce CI jobs for validating python build
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

This introduces GitLab CI to the python module. Traditional Jenkins has validated the python build across all distros, using libvirt git. This tested one axis - a variety of python versions - but failed to test the other interesting axis - a variety of libvirt versions. This new CI setup fixes that mistake validating both axis and in the process uncovered a bug in Ubuntu 1804. Daniel P. Berrangé (3): test: workaround missing VIR_TYPED_PARAM enums in API definition gitlab: introduce CI jobs testing git master & distro libvirt travis: delete redundant configuration .gitlab-ci.yml | 172 ++++++++++++++++++++++++++++++++++ .travis.yml | 55 ----------- ci/libvirt-centos-7.dkr | 85 +++++++++++++++++ ci/libvirt-centos-8.dkr | 64 +++++++++++++ ci/libvirt-debian-10.dkr | 55 +++++++++++ ci/libvirt-debian-9.dkr | 58 ++++++++++++ ci/libvirt-debian-sid.dkr | 55 +++++++++++ ci/libvirt-fedora-30.dkr | 52 ++++++++++ ci/libvirt-fedora-31.dkr | 52 ++++++++++ ci/libvirt-fedora-rawhide.dkr | 53 +++++++++++ ci/libvirt-opensuse-151.dkr | 54 +++++++++++ ci/libvirt-ubuntu-1604.dkr | 58 ++++++++++++ ci/libvirt-ubuntu-1804.dkr | 58 ++++++++++++ ci/refresh | 21 +++++ sanitytest.py | 6 +- 15 files changed, 842 insertions(+), 56 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml create mode 100644 ci/libvirt-centos-7.dkr create mode 100644 ci/libvirt-centos-8.dkr create mode 100644 ci/libvirt-debian-10.dkr create mode 100644 ci/libvirt-debian-9.dkr create mode 100644 ci/libvirt-debian-sid.dkr create mode 100644 ci/libvirt-fedora-30.dkr create mode 100644 ci/libvirt-fedora-31.dkr create mode 100644 ci/libvirt-fedora-rawhide.dkr create mode 100644 ci/libvirt-opensuse-151.dkr create mode 100644 ci/libvirt-ubuntu-1604.dkr create mode 100644 ci/libvirt-ubuntu-1804.dkr create mode 100755 ci/refresh -- 2.25.4

2 9

[libvirt-ci PATCH] guests: introduce libvirt-dist and libvirt-minimal projects
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

The language bindings have traditionally built against a full libvirt, however, this is serious overkill because all they should really need most of the time is access to the main API, and the test driver if they want to run functional tests. The full libvirt build with virt drivers is only needed for integration testing which most bindings won't do. Thus this introduces a new project "libvirt-minimal" which lists the bare minimum dependencies required to build libvirt. Taking libvirt-perl as an example, if creating a container using the current "libvirt,libvirt-perl" project set, the result with 1.4 GB in size for Fedora 31. With the "libvirt-minimal,libvirt-perl" set, the size is just 777 MB. Some projects also wish to have the ability to build against the distro provided libvirt instead of the latest git master, and for this purpose a "libvirt-dist" project is defined which pulls in the package needed for building against the distro libvirt. In the lcitool dockerfile command, there is a check that the requested project is configured against the requested host. These new projects are not listed against any host, because we don't want them installed by default in the VMs. Thus the dockerfile check is no longer valid and is removed. Whomever is invoking lcitool knows what combination they want and whether it will work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/lcitool | 7 ------- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt-dist.yml | 3 +++ guests/vars/projects/libvirt-minimal.yml | 13 +++++++++++++ 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 guests/vars/projects/libvirt-dist.yml create mode 100644 guests/vars/projects/libvirt-minimal.yml diff --git a/guests/lcitool b/guests/lcitool index 0c89e13..abc87d2 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -1007,13 +1007,6 @@ class Application: for project in projects: if project.rfind("+mingw") >= 0: raise Exception("Obsolete syntax, please use --cross-arch") - if project not in facts["projects"]: - raise Exception( - "Host {} doesn't support project {}".format( - host, - project, - ) - ) varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch) self._dockerfile_format(facts, cross_arch, varmap) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 753f0fe..a9ab3d5 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -450,6 +450,11 @@ mappings: rpm: libuuid-devel cross-policy-deb: foreign + libvirt-devel: + rpm: libvirt-devel + deb: libvirt-dev + pkg: libvirt + libxml2: deb: libxml2-dev pkg: libxml2 diff --git a/guests/vars/projects/libvirt-dist.yml b/guests/vars/projects/libvirt-dist.yml new file mode 100644 index 0000000..aa95f23 --- /dev/null +++ b/guests/vars/projects/libvirt-dist.yml @@ -0,0 +1,3 @@ +--- +packages: + - libvirt-devel diff --git a/guests/vars/projects/libvirt-minimal.yml b/guests/vars/projects/libvirt-minimal.yml new file mode 100644 index 0000000..9402c4f --- /dev/null +++ b/guests/vars/projects/libvirt-minimal.yml @@ -0,0 +1,13 @@ +--- +packages: + - glib2 + - gnutls + - libnl3 + - libnlroute3 + - libpcap + - libtirpc + - libxml2 + - python3-docutils + - rpcgen + - xmllint + - xsltproc -- 2.25.4

2 3

Live migration garp
by Ignazio Cassano 30 Apr '20

30 Apr '20

Hello All, I am facing issues under openstack rocky with last libvirt available on centos 7. There is an open discussione here: https://bugs.launchpad.net/neutron/+bug/1866139 About sending garp when an instance live migrate. What must send garp ? The problem is this: when live migrate a vm from a node to another it stops to responds to ping requests. It starts to respond only when it send a network request for example when its chrony daemon pools a server. Anyone could help me, please? Best Regards Ignazio

2 2

Re: Libvirt Application Development Guide
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

Replying again to re-add the mailing list On Thu, Apr 30, 2020 at 08:56:12AM +0000, charalambous s. (sc3n17) wrote: > Hello Daniel, > > Thank you for getting back to me! > > I understand that the state of the document was perhaps not as polished > as one would like, however it was immensely helpful to me when developing > my project. If it is not too difficult / costly, I personally would prefer > if it was left up, since there aren't really any alternatives that are as > useful. I do understand however that if I'm the only person that has used > it in recent times, it may not be worth the effort. Since you say it was useful to you, it is likely useful to other people as well. Based on this I've temporarily re-enabled the cronjob that was publishing it at: https://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/ I only re-enabled it for the python appdev guide, not the even older C appdev guide. I'll see about moving the cronjob into GitLab CI so we have a more formal publishing approach. This will mean we can validate it when we accept merge requests for the content too. > Personally, I feel that the guide was good enough to guide me in > the right direction when using the library, and the examples > provided were useful in getting an idea of what was going on. A > section of my project report is a short list of improvements that > could be made to the guide, so if you do decide to reinstate it, > I could help with improving some sections a little bit. Since it lacks any current maintainer, we'd be happy if anyone wants to volunteer to contribute improvements to it, whether little or large! Thankyou for your interest in, and feedback to, the libvirt project. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

Libvirt Application Development Guide
by charalambous s. (sc3n17) 30 Apr '20

30 Apr '20

Hello, For my third year project, I've developed a piece of software in python, making use of the Libvirt application development guide for python. I'm currently writing a report that references it. I've noticed that you seem to have removed the guide from the libvirt site - has it been moved somewhere else, or deleted entirely? Will it be reinstated at some point, or is this a permanent change? Thank you in advance and Best Regards, Stephanos Charalambous

2 1

[libvirt-jenkins-ci PATCH] guests: allow for container image inheritance
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

Currently when creating a Dockerfile for a container, we include the full set of base packages, along with the packages for the project itself. If building a Perl binding, this would require us to install the base package, libvirt packages and Perl packages. With the use of the "--inherit libvirt-fedora-30" arg, it is possible to have a dockerfile that only adds the Perl packages, getting everything else from the parent image. For example, a full Dockerfile for libvirt-go would thus be: FROM libvirt-centos-7:latest RUN yum install -y \ golang && \ yum autoremove -y && \ yum clean all -y Note there is no need to set ENV either, as that's inherited from the parent container. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/lcitool | 108 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 98 insertions(+), 10 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 689a8cf..b3afb6a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -396,6 +396,12 @@ class Application: help="target architecture for cross compiler", ) + def add_inherit_arg(parser): + parser.add_argument( + "-i", "--inherit", + help="inherit from an intermediate container image", + ) + def add_wait_arg(parser): parser.add_argument( "-w", "--wait", @@ -442,6 +448,7 @@ class Application: add_hosts_arg(dockerfileparser) add_projects_arg(dockerfileparser) add_cross_arch_arg(dockerfileparser) + add_inherit_arg(dockerfileparser) def _execute_playbook(self, playbook, hosts, projects, git_revision): base = Util.get_base() @@ -644,11 +651,11 @@ class Application: with open(keyfile, "r") as r: return r.read().rstrip() - def _dockerfile_build_varmap(self, facts, mappings, pip_mappings, projects, cross_arch): + def _dockerfile_build_varmap(self, facts, mappings, pip_mappings, projects, cross_arch, needbase): if facts["package_format"] == "deb": - varmap = self._dockerfile_build_varmap_deb(facts, mappings, pip_mappings, projects, cross_arch) + varmap = self._dockerfile_build_varmap_deb(facts, mappings, pip_mappings, projects, cross_arch, needbase) if facts["package_format"] == "rpm": - varmap = self._dockerfile_build_varmap_rpm(facts, mappings, pip_mappings, projects, cross_arch) + varmap = self._dockerfile_build_varmap_rpm(facts, mappings, pip_mappings, projects, cross_arch, needbase) varmap["package_manager"] = facts["package_manager"] varmap["cc"] = facts["cc"] @@ -662,7 +669,7 @@ class Application: return varmap - def _dockerfile_build_varmap_deb(self, facts, mappings, pip_mappings, projects, cross_arch): + def _dockerfile_build_varmap_deb(self, facts, mappings, pip_mappings, projects, cross_arch, needbase): package_format = facts["package_format"] package_manager = facts["package_manager"] os_name = facts["os_name"] @@ -682,7 +689,10 @@ class Application: # We need to add the base project manually here: the standard # machinery hides it because it's an implementation detail - for project in projects + ["base"]: + pkgprojects = projects + if needbase: + pkgprojects = projects + ["base"] + for project in pkgprojects: for package in self._projects.get_packages(project): cross_policy = "native" for key in cross_keys: @@ -730,7 +740,7 @@ class Application: return varmap - def _dockerfile_build_varmap_rpm(self, facts, mappings, pip_mappings, projects, cross_arch): + def _dockerfile_build_varmap_rpm(self, facts, mappings, pip_mappings, projects, cross_arch, needbase): package_format = facts["package_format"] package_manager = facts["package_manager"] os_name = facts["os_name"] @@ -744,7 +754,10 @@ class Application: # We need to add the base project manually here: the standard # machinery hides it because it's an implementation detail - for project in projects + ["base"]: + pkgprojects = projects + if needbase: + pkgprojects = projects + ["base"] + for project in pkgprojects: for package in self._projects.get_packages(project): for key in keys: if key in mappings[package]: @@ -791,7 +804,7 @@ class Application: return varmap - def _dockerfile_format(self, facts, cross_arch, varmap): + def _dockerfile_base_format(self, facts, cross_arch, varmap): package_format = facts["package_format"] package_manager = facts["package_manager"] os_name = facts["os_name"] @@ -931,6 +944,74 @@ class Application: ENV CONFIGURE_OPTS "--host={cross_abi}" """).format(**varmap)) + def _dockerfile_child_format(self, facts, cross_arch, inherit, varmap): + package_format = facts["package_format"] + package_manager = facts["package_manager"] + os_name = facts["os_name"] + os_version = facts["os_version"] + + print("FROM {}".format(inherit)) + + commands = [] + + if package_format == "deb": + commands.extend([ + "export DEBIAN_FRONTEND=noninteractive", + "{package_manager} update", + "{package_manager} install --no-install-recommends -y {pkgs}", + "{package_manager} autoremove -y", + "{package_manager} autoclean -y", + ]) + elif package_format == "rpm": + commands.extend([ + "{package_manager} install -y {pkgs}", + ]) + + # openSUSE doesn't seem to have a convenient way to remove all + # unnecessary packages, but CentOS and Fedora do + if os_name == "OpenSUSE": + commands.extend([ + "{package_manager} clean --all", + ]) + else: + commands.extend([ + "{package_manager} autoremove -y", + "{package_manager} clean all -y", + ]) + + + script = "\nRUN " + (" && \\\n ".join(commands)) + "\n" + sys.stdout.write(script.format(**varmap)) + + if cross_arch: + cross_commands = [] + + # Intentionally a separate RUN command from the above + # so that the common packages of all cross-built images + # share a Docker image layer. + if package_format == "deb": + cross_commands.extend([ + "export DEBIAN_FRONTEND=noninteractive", + "{package_manager} update", + "{package_manager} install --no-install-recommends -y {cross_pkgs}", + "{package_manager} autoremove -y", + "{package_manager} autoclean -y", + ]) + elif package_format == "rpm": + cross_commands.extend([ + "{package_manager} install -y {cross_pkgs}", + "{package_manager} clean all -y", + ]) + + cross_script = "\nRUN " + (" && \\\n ".join(cross_commands)) + "\n" + sys.stdout.write(cross_script.format(**varmap)) + + if "pip_pkgs" in varmap: + sys.stdout.write(textwrap.dedent(""" + RUN pip3 install {pip_pkgs} + """).format(**varmap)) + + def _action_dockerfile(self, args): mappings = self._projects.get_mappings() pip_mappings = self._projects.get_pip_mappings() @@ -947,6 +1028,7 @@ class Application: os_version = facts["os_version"] os_full = os_name + os_version cross_arch = args.cross_arch + inherit = args.inherit if package_format not in ["deb", "rpm"]: raise Exception("Host {} doesn't support Dockerfiles".format(host)) @@ -983,8 +1065,14 @@ class Application: ) ) - varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch) - self._dockerfile_format(facts, cross_arch, varmap) + needbase = True + if inherit is not None: + needbase = False + varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch, needbase) + if inherit is None: + self._dockerfile_base_format(facts, cross_arch, varmap) + else: + self._dockerfile_child_format(facts, cross_arch, inherit, varmap) def run(self): args = self._parser.parse_args() -- 2.24.1

2 5

Re: [PATCH] qemu: fix code format problem
by yubihong 30 Apr '20

30 Apr '20

OK, Michal. I will do this job later, thanks for your advice. > On 4/26/20 1:56 PM, yubihong wrote: > > There are some code format problems in src/libvirt-domain.c. This > > patch fixes these problems. > > > >>From 55cd85345b2dc50f44c1e382563482d40142382b Mon Sep 17 00:00:00 > > 2001 > > From: yubihong <yubihong(a)huawei.com> > > Date: Fri, 24 Apr 2020 17:44:43 +0800 > > Subject: [PATCH] qemu: fix code format problem > > > > Signed-off-by:Yu Bihong <yubihong(a)huawei.com> > > --- > > src/libvirt-domain.c | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index > > a12809c..d659f1b > > 100644 > > --- a/src/libvirt-domain.c > > +++ b/src/libvirt-domain.c > > @@ -8194,11 +8194,11 @@ virDomainAttachDevice(virDomainPtr domain, > > const char *xml) > > virCheckReadOnlyGoto(conn->flags, error); > > > > if (conn->driver->domainAttachDevice) { > > - int ret; > > - ret = conn->driver->domainAttachDevice(domain, xml); > > - if (ret < 0) > > - goto error; > > - return ret; > > + int ret; > > + ret = conn->driver->domainAttachDevice(domain, xml); > > + if (ret < 0) > > + goto error; > > + return ret; > > } > > > > virReportUnsupportedError(); > > @@ -8299,9 +8299,9 @@ virDomainDetachDevice(virDomainPtr domain, > const > > char *xml) > > if (conn->driver->domainDetachDevice) { > > int ret; > > ret = conn->driver->domainDetachDevice(domain, xml); > > - if (ret < 0) > > - goto error; > > - return ret; > > + if (ret < 0) > > + goto error; > > + return ret; > > } > > > > virReportUnsupportedError(); > > -- > > 1.8.3.1 > > > > This patch doesn't apply cleanly. Can you please resend using git-send-email > as our documentation suggest? > > https://libvirt.org/submitting-patches.html > > The idea looks good, but I guess there are more places in the file that are > misaligned. Might be worth extending your patch and include them. > > Michal

1 0

[libvirt-ci PATCH] vars: Add python3-wheel to the base package dependencies
by Erik Skultety 29 Apr '20

29 Apr '20

On platforms where we need to install meson from pip, one will very likely see something similar to this when building a container from the generated Dockerfile: Collecting meson==0.49.0 Downloading <url>/meson-0.49.0.tar.gz (1.3MB) 100% |################################| 1.3MB 874kB/s Building wheels for collected packages: meson Running setup.py bdist_wheel for meson ... error error: invalid command 'bdist_wheel' ---------------------------------------- Failed building wheel for meson Running setup.py clean for meson Failed to build meson Pip is missing the 'wheel' package necessary to build a wheel from sources, if it fails to do that, it falls back to the good old: $ setup.py install meson which succeeds and no harm was done. However, seeing an error in the log always raises eyebrows, so let's fix that very simply by installing the 'wheel' package which is available on all supported platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Alternatively, we could use --no-cache-dir with pip install, but I'm not sure whether it would be enough with new versions of pip. I still feel like installing the 'wheel' package explicitly is a more transparent and safe fix even though we don't benefit from the resulting meson wheel package inside containers at all. guests/vars/mappings.yml | 4 ++++ guests/vars/projects/base.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 753f0fe..4a19fb4 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -909,6 +909,10 @@ mappings: default: python3-setuptools FreeBSD: py37-setuptools + python3-wheel: + default: python3-wheel + FreeBSD: py37-wheel + qemu-img: default: qemu-utils rpm: qemu-img diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index 29c10b4..81c4462 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -28,6 +28,7 @@ packages: - python3 - python3-pip - python3-setuptools + - python3-wheel - rpmbuild - screen - strace -- 2.25.3

2 1

[libvirt-jenkins-ci PATCH] guests: Run libvirt-dbus test suite on Fedora 31
by Andrea Bolognani 29 Apr '20

29 Apr '20

This was left out by mistake. Fixes: f7ffff9cd9cc250ac32d7e343c15b4697e931a68 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/playbooks/build/projects/libvirt-dbus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index e29d74b..4cf435d 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -19,6 +19,7 @@ - libvirt-debian-10 - libvirt-debian-sid - libvirt-fedora-30 + - libvirt-fedora-31 - libvirt-fedora-rawhide - libvirt-opensuse-151 - libvirt-ubuntu-1804 -- 2.25.4

1 0

[jenkins-ci PATCH] jenkins: Fix machine order for libvirt-sandbox
by Andrea Bolognani 29 Apr '20

29 Apr '20

Fixes: f7ffff9cd9cc250ac32d7e343c15b4697e931a68 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. jenkins/projects/libvirt-sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/projects/libvirt-sandbox.yaml b/jenkins/projects/libvirt-sandbox.yaml index 6a8acec..10c2441 100644 --- a/jenkins/projects/libvirt-sandbox.yaml +++ b/jenkins/projects/libvirt-sandbox.yaml @@ -25,5 +25,5 @@ parent_jobs: 'libvirt-sandbox-check' machines: - libvirt-fedora-30 - - libvirt-fedora-rawhide - libvirt-fedora-31 + - libvirt-fedora-rawhide -- 2.25.4

1 0

[PATCH] docs: Describe protected virtualization guest setup
by Boris Fiuczynski 29 Apr '20

29 Apr '20

From: Viktor Mihajlovski <mihajlov(a)linux.ibm.com> Protected virtualization/IBM Secure Execution for Linux protects guest memory and state from the host. Add some basic information about technology and a brief guide on setting up secure guests with libvirt. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Paulo de Rezende Pinatti <ppinatti(a)linux.ibm.com> --- docs/kbase.html.in | 3 + docs/kbase/protected_virtualization.rst | 188 ++++++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 docs/kbase/protected_virtualization.rst diff --git a/docs/kbase.html.in b/docs/kbase.html.in index c586e0f676..05a3239224 100644 --- a/docs/kbase.html.in +++ b/docs/kbase.html.in @@ -14,6 +14,9 @@ <dt><a href="kbase/secureusage.html">Secure usage</a></dt> <dd>Secure usage of the libvirt APIs</dd> + <dt><a href="kbase/protected_virtualization.html">Protected virtualization</a></dt> + <dd>Running secure guests with IBM Secure Execution</dd> + <dt><a href="kbase/launch_security_sev.html">Launch security</a></dt> <dd>Securely launching VMs with AMD SEV</dd> diff --git a/docs/kbase/protected_virtualization.rst b/docs/kbase/protected_virtualization.rst new file mode 100644 index 0000000000..48f2add14e --- /dev/null +++ b/docs/kbase/protected_virtualization.rst @@ -0,0 +1,188 @@ +======================== +Protected Virtualization +======================== + +.. contents:: + +Overview +======== + +Protected virtualization, also known as IBM Secure Execution is a +hardware-based privacy protection technology for s390x (IBM Z). +It allows to execute virtual machines such that the host system +has no access to a VM's state and memory contents. + +Unlike other similar technologies, the memory of a running guest +is not encrypted but protected by hardware access controls, which +may only be manipulated by trusted system firmware, called +ultravisor. + +For the cases where the host needs access to guest memory (e.g. for +paging), it can request pages to be exported to it. The exported page +will be encrypted with a unique key for the running guest by the +ultravisor. The ultravisor also computes an integrity value for +the page, and stores it in a special table, together with the page +index and a counter. This way it can verify the integrity of +the page content upon re-import into the guest. + +In other cases it may be necessary for a guest to grant the host access +to dedicated memory regions (e.g. for I/O). The guest can request +that the ultravisor removes the memory protection from individual +pages, so that they can be shared with the host. Likewise, the +guest can undo the sharing. + +A secure guest will initially start in a regular non-protected VM. +The start-up is controlled by a small bootstrap program loaded +into memory together with encrypted operating system components and +a control structure (the PV header). +The operating system components (e.g. Linux kernel, initial RAM +file system, kernel parameters) are encrypted and integrity +protected. The component encryption keys and integrity values are +stored in the PV header. +The PV header is wrapped with a public key belonging to a specific +system (in fact it can be wrapped with multiple such keys). The +matching private key is only accessible by trusted hardware and +firmware in that specific system. +Consequently, such a secure guest boot image can only be run on the +systems it has been prepared for. Its contents can't be decrypted +without access to the private key and it can't be modified as +it is integrity protected. + +Host Requirements +================= + +IBM Secure Execution for Linux has some hardware and firmware +requirements. The system hardware must be an IBM z15 (or newer), +or an IBM LinuxONE III (or newer). + +It is also necessary that the IBM Secure Execution feature is +enabled for that system. Check for facility '158', e.g. + +:: + + $ grep facilities /proc/cpuinfo | grep 158 + +The kernel must include the protected virtualization support +which can be verified by checking for the presence of directory +``/sys/firmware/uv``. It will only be present when both the +hardware and the kernel support are available. + +Finally, the host operating system must donate some memory to +the ultravisor needed to store memory security information. +This is achieved by specifying the following kernel command +line parameter to the host boot configuration + +:: + + prot_virt=1 + + +Guest Requirements +================== + +Guest Boot +---------- + +To start a guest in protected virtualization secure mode, the +boot image must have been prepared first with the program +``genprotimg`` using the correct public key for this host. +``genprotimg`` is part of the package ``s390-tools``, or +``s390-utils``, depending on the Linux distribution being used. +It can also be found at +`<https://github.com/ibm-s390-tools/s390-tools/tree/master/genprotimg>`_ + +The guests have to be configured to use the host CPU model, which +must contain the ``unpack`` facility indicating ultravisor guest support. + +With the following command it's possible to check whether the host +CPU model satisfies the requirement + +:: + + $ virsh domcapabilities | grep unpack + +which should return + +:: + + <feature policy='require' name='unpack'/> + +If the check fails despite the host system actually supporting +protected virtualization guests, this can be caused by a stale +libvirt capabilities cache. To recover, run the following +commands + +:: + + $ systemctl stop libvirtd + $ rm /var/cache/libvirt/qemu/capabilities/*.xml + $ systemctl start libvirtd + + +Guest I/O +--------- + +Protected virtualization guests support I/O using virtio devices. +As the virtio datastructures of secure guests are not accessible +by the host, it is necessary to use shared memory ('bounce buffers'). + +To enable virtio devices to use shared buffers, it is necessary +to configure them with platform_iommu enabled. This can done by adding +``iommu='on'`` to the driver element of a virtio device definition in the +guest's XML, e.g. + +:: + + <interface type='network'> + <source network='default'/> + <model type='virtio'/> + <driver name='vhost' iommu='on'/> + </interface> + +It is mandatory to define all virtio bus devices in this way to +prevent the host from attempting to access protected memory. +Ballooning will not work and is fenced by QEMU. It should be +disabled by specifying + +:: + + <memballoon model='none'/> + +Finally, the guest Linux must be instructed to allocate I/O +buffers using memory shared between host and guest using SWIOTLB. +This is done by adding ``swiotlb=nnn`` to the guest's kernel command +line string, where ``nnn`` stands for the number of statically +allocated 2K entries. A commonly used value for swiotlb is 262144. + +Example guest definition +======================== + +Minimal domain XML for a protected virtualization guest, essentially +it's mostly about the ``iommu`` property + +:: + + <domain type='kvm'> + <name>protected</name> + <memory unit='KiB'>2048000</memory> + <currentMemory unit='KiB'>2048000</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='s390x'>hvm</type> + </os> + <cpu mode='host-model'/> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none' io='native' iommu='on'> + <source file='/var/lib/libvirt/images/protected.qcow2'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='network'> + <driver iommu='on'/> + <source network='default'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <memballoon model='none'/> + </devices> + </domain> -- 2.25.1

5 13

[PATCH 0/3] doc: minor improvements
by Sebastian Mitterle 29 Apr '20

29 Apr '20

Minor man/doc improvements related to blockpull. Sebastian Mitterle (3): Improve blockpull man entry Improve Disk image chains documentation Add version info on domaincaps doc docs/formatdomaincaps.html.in | 3 ++- docs/kbase/backing_chains.rst | 36 +++++++++++++++++------------------ docs/manpages/virsh.rst | 19 ++++++++++++------ 3 files changed, 33 insertions(+), 25 deletions(-) -- 2.25.2

3 14

[jenkins-ci PATCH] lcitool: Move gtk-vnc MinGW builds to Fedora Rawhide
by Andrea Bolognani 29 Apr '20

29 Apr '20

When moving MinGW builds off Fedora 30, gtk-vnc was mistakenly left behind. Fixes: 6ede7a19e7aa1670bbe13b10d8014977d3bb2203 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI fix. guests/host_vars/libvirt-fedora-30/main.yml | 2 -- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/host_vars/libvirt-fedora-30/main.yml b/guests/host_vars/libvirt-fedora-30/main.yml index 227db89..a8f6fb9 100644 --- a/guests/host_vars/libvirt-fedora-30/main.yml +++ b/guests/host_vars/libvirt-fedora-30/main.yml @@ -1,8 +1,6 @@ --- projects: - gtk-vnc - - gtk-vnc+mingw32 - - gtk-vnc+mingw64 - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 2367fe1..bd42a87 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,6 +1,8 @@ --- projects: - gtk-vnc + - gtk-vnc+mingw32 + - gtk-vnc+mingw64 - libosinfo - libosinfo+mingw32 - libosinfo+mingw64 -- 2.25.4

1 0

[libvirt-perl PATCH v2 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 29 Apr '20

29 Apr '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg01157.html This is a different approach from v1, because we don't inherit from the main libvirt container images. Instead we use the libvirt-minimal project as a dependancy. The cost is that the container build stage is more expensive, but the main project build stage is cheaper. This is a net win because the container build stage is cached so is only a penalty the first time, or when the distro parent image has changes to pull in. It also makes the CI process of the binding more self-contained avoiding by avoiding a dep on the container image for libvirt. Daniel P. Berrangé (3): Build: bump min perl to 5.16.0 gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML .gitlab-ci.yml | 158 ++++++++++++++++++++++++++++++++++ Build.PL | 2 +- ci/libvirt-centos-7.dkr | 97 +++++++++++++++++++++ ci/libvirt-centos-8.dkr | 68 +++++++++++++++ ci/libvirt-debian-10.dkr | 68 +++++++++++++++ ci/libvirt-debian-9.dkr | 71 +++++++++++++++ ci/libvirt-debian-sid.dkr | 68 +++++++++++++++ ci/libvirt-fedora-30.dkr | 66 ++++++++++++++ ci/libvirt-fedora-31.dkr | 66 ++++++++++++++ ci/libvirt-fedora-rawhide.dkr | 67 ++++++++++++++ ci/libvirt-opensuse-151.dkr | 66 ++++++++++++++ ci/libvirt-ubuntu-1604.dkr | 71 +++++++++++++++ ci/libvirt-ubuntu-1804.dkr | 71 +++++++++++++++ ci/refresh | 16 ++++ 14 files changed, 954 insertions(+), 1 deletion(-) create mode 100644 ci/libvirt-centos-7.dkr create mode 100644 ci/libvirt-centos-8.dkr create mode 100644 ci/libvirt-debian-10.dkr create mode 100644 ci/libvirt-debian-9.dkr create mode 100644 ci/libvirt-debian-sid.dkr create mode 100644 ci/libvirt-fedora-30.dkr create mode 100644 ci/libvirt-fedora-31.dkr create mode 100644 ci/libvirt-fedora-rawhide.dkr create mode 100644 ci/libvirt-opensuse-151.dkr create mode 100644 ci/libvirt-ubuntu-1604.dkr create mode 100644 ci/libvirt-ubuntu-1804.dkr create mode 100755 ci/refresh -- 2.25.4

1 3

[libvirt-ci PATCH 0/2] Move MinGW builds back to Fedora Rawhide
by Andrea Bolognani 29 Apr '20

29 Apr '20

Andrea Bolognani (2): lcitool: Prepare Fedora Rawhide for MinGW builds Move MinGW builds back to Fedora Rawhide guests/host_vars/libvirt-fedora-30/main.yml | 10 ---------- guests/host_vars/libvirt-fedora-rawhide/main.yml | 10 ++++++++++ guests/playbooks/build/jobs/defaults.yml | 2 +- jenkins/jobs/defaults.yaml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) -- 2.25.3

2 4

[libvirt-ci PATCH] containers: New top-level directory
by Andrea Bolognani 29 Apr '20

29 Apr '20

Let's keep the repository structure tidy. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 2 +- {check-dco => containers/check-dco}/Dockerfile | 0 {check-dco => containers/check-dco}/check-dco.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {check-dco => containers/check-dco}/Dockerfile (100%) rename {check-dco => containers/check-dco}/check-dco.py (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7735bb3..6de69d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: - docker info - docker login registry.gitlab.com -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} script: - - docker build --tag ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} ${NAME} + - docker build --tag ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} containers/${NAME} - docker push ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} after_script: - docker logout diff --git a/check-dco/Dockerfile b/containers/check-dco/Dockerfile similarity index 100% rename from check-dco/Dockerfile rename to containers/check-dco/Dockerfile diff --git a/check-dco/check-dco.py b/containers/check-dco/check-dco.py similarity index 100% rename from check-dco/check-dco.py rename to containers/check-dco/check-dco.py -- 2.25.4

1 0

[libvirt-ci PATCH 0/4] lcitool: Use more dictionaries in the inventory
by Andrea Bolognani 29 Apr '20

29 Apr '20

It's the most sensible way to represent related data in YAML. Andrea Bolognani (4): lcitool: Tweak formatting lcitool: Store OS information a dictionary lcitool: Store packaging information as a dictionary lcitool: Store paths information as a dictionary guests/host_vars/libvirt-centos-7/main.yml | 30 ++-- guests/host_vars/libvirt-centos-8/main.yml | 30 ++-- guests/host_vars/libvirt-debian-10/main.yml | 30 ++-- guests/host_vars/libvirt-debian-9/main.yml | 30 ++-- guests/host_vars/libvirt-debian-sid/main.yml | 30 ++-- guests/host_vars/libvirt-fedora-30/main.yml | 30 ++-- guests/host_vars/libvirt-fedora-31/main.yml | 30 ++-- .../host_vars/libvirt-fedora-rawhide/main.yml | 30 ++-- guests/host_vars/libvirt-freebsd-11/main.yml | 30 ++-- guests/host_vars/libvirt-freebsd-12/main.yml | 30 ++-- .../libvirt-freebsd-current/main.yml | 30 ++-- .../host_vars/libvirt-opensuse-151/main.yml | 30 ++-- guests/host_vars/libvirt-ubuntu-1604/main.yml | 30 ++-- guests/host_vars/libvirt-ubuntu-1804/main.yml | 30 ++-- guests/lcitool | 154 ++++++++---------- guests/playbooks/update/tasks/base.yml | 72 ++++---- guests/playbooks/update/tasks/bootloader.yml | 2 +- guests/playbooks/update/tasks/bootstrap.yml | 6 +- guests/playbooks/update/tasks/gitlab.yml | 2 +- guests/playbooks/update/tasks/global.yml | 4 +- guests/playbooks/update/tasks/jenkins.yml | 2 +- guests/playbooks/update/tasks/kludges.yml | 8 +- guests/playbooks/update/tasks/packages.yml | 24 +-- guests/playbooks/update/tasks/services.yml | 2 +- guests/playbooks/update/tasks/users.yml | 4 +- guests/playbooks/update/templates/bashrc.j2 | 12 +- .../update/templates/jenkins.service.j2 | 2 +- 27 files changed, 380 insertions(+), 334 deletions(-) -- 2.25.4

2 8

[PATCH V4 5/5] cpu_map: Introduce ARM cpu models
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Introduce vendors and some commonly used models for ARM arch, these will be used for virConnectionGetCapabilities for ARM CPUs. Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu_map/Makefile.inc.am | 7 +++++++ src/cpu_map/arm_Falkor.xml | 16 ++++++++++++++++ src/cpu_map/arm_Kunpeng-920.xml | 24 ++++++++++++++++++++++++ src/cpu_map/arm_ThunderX299xx.xml | 16 ++++++++++++++++ src/cpu_map/arm_cortex-a53.xml | 16 ++++++++++++++++ src/cpu_map/arm_cortex-a57.xml | 15 +++++++++++++++ src/cpu_map/arm_cortex-a72.xml | 15 +++++++++++++++ src/cpu_map/arm_vendors.xml | 14 ++++++++++++++ src/cpu_map/index.xml | 15 +++++++++++++++ 9 files changed, 138 insertions(+) create mode 100644 src/cpu_map/arm_Falkor.xml create mode 100644 src/cpu_map/arm_Kunpeng-920.xml create mode 100644 src/cpu_map/arm_ThunderX299xx.xml create mode 100644 src/cpu_map/arm_cortex-a53.xml create mode 100644 src/cpu_map/arm_cortex-a57.xml create mode 100644 src/cpu_map/arm_cortex-a72.xml create mode 100644 src/cpu_map/arm_vendors.xml diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index be64c9a0d4..5d9190e27d 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -2,7 +2,14 @@ cpumapdir = $(pkgdatadir)/cpu_map cpumap_DATA = \ + cpu_map/arm_cortex-a53.xml \ + cpu_map/arm_cortex-a57.xml \ + cpu_map/arm_cortex-a72.xml \ cpu_map/arm_features.xml \ + cpu_map/arm_Kunpeng-920.xml \ + cpu_map/arm_ThunderX299xx.xml \ + cpu_map/arm_Falkor.xml \ + cpu_map/arm_vendors.xml \ cpu_map/index.xml \ cpu_map/ppc64_vendors.xml \ cpu_map/ppc64_POWER7.xml \ diff --git a/src/cpu_map/arm_Falkor.xml b/src/cpu_map/arm_Falkor.xml new file mode 100644 index 0000000000..902ed2b6ba --- /dev/null +++ b/src/cpu_map/arm_Falkor.xml @@ -0,0 +1,16 @@ +<cpus> + <model name='Falkor'> + <vendor name='Qualcomm'/> + <pvr value='0xc00'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="cpuid"/> + <feature name="asimdrdm"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Kunpeng-920.xml b/src/cpu_map/arm_Kunpeng-920.xml new file mode 100644 index 0000000000..668b8b50dc --- /dev/null +++ b/src/cpu_map/arm_Kunpeng-920.xml @@ -0,0 +1,24 @@ +<cpus> + <model name='Kunpeng-920'> + <vendor name='HiSilicon'/> + <pvr value='0xd01'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="atomics"/> + <feature name="fphp"/> + <feature name="asimdhp"/> + <feature name="cpuid"/> + <feature name="asimdrdm"/> + <feature name="jscvt"/> + <feature name="fcma"/> + <feature name="dcpop"/> + <feature name="asimddp"/> + <feature name="asimdfhm"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_ThunderX299xx.xml b/src/cpu_map/arm_ThunderX299xx.xml new file mode 100644 index 0000000000..9ab3d939e9 --- /dev/null +++ b/src/cpu_map/arm_ThunderX299xx.xml @@ -0,0 +1,16 @@ +<cpus> + <model name='ThunderX2 99xx'> + <vendor name='Cavium'/> + <pvr value='0x0af'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="cpuid"/> + <feature name="asimdrdm"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a53.xml b/src/cpu_map/arm_cortex-a53.xml new file mode 100644 index 0000000000..963d6d36e3 --- /dev/null +++ b/src/cpu_map/arm_cortex-a53.xml @@ -0,0 +1,16 @@ +<cpus> + <model name='cortex-a53'> + <vendor name='ARM'/> + <pvr value='0xd03'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="cpuid"/> + <feature name="asimdrdm"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a57.xml b/src/cpu_map/arm_cortex-a57.xml new file mode 100644 index 0000000000..92a044ea92 --- /dev/null +++ b/src/cpu_map/arm_cortex-a57.xml @@ -0,0 +1,15 @@ +<cpus> + <model name='cortex-a57'> + <vendor name='ARM'/> + <pvr value='0xd07'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="cpuid"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a72.xml b/src/cpu_map/arm_cortex-a72.xml new file mode 100644 index 0000000000..9664eacd7b --- /dev/null +++ b/src/cpu_map/arm_cortex-a72.xml @@ -0,0 +1,15 @@ +<cpus> + <model name='cortex-a72'> + <vendor name='ARM'/> + <pvr value='0xd08'/> + <feature name="fp"/> + <feature name="asimd"/> + <feature name="evtstrm"/> + <feature name="aes"/> + <feature name="pmull"/> + <feature name="sha1"/> + <feature name="sha2"/> + <feature name="crc32"/> + <feature name="cpuid"/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml new file mode 100644 index 0000000000..703c2112b1 --- /dev/null +++ b/src/cpu_map/arm_vendors.xml @@ -0,0 +1,14 @@ +<cpus> + <vendor name="ARM" value="0x41"/> + <vendor name="Broadcom" value="0x42"/> + <vendor name="Cavium" value="0x43"/> + <vendor name="DigitalEquipment" value="0x44"/> + <vendor name="HiSilicon" value="0x48"/> + <vendor name="Infineon" value="0x49"/> + <vendor name="Freescale" value="0x4D"/> + <vendor name="NVIDIA" value="0x4E"/> + <vendor name="APM" value="0x50"/> + <vendor name="Qualcomm" value="0x51"/> + <vendor name="Marvell" value="0x56"/> + <vendor name="Intel" value="0x69"/> +</cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 50b030de29..20646a031c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -85,6 +85,21 @@ </arch> <arch name='arm'> + <include filename="arm_vendors.xml"/> <include filename='arm_features.xml'/> + +  + <include filename="arm_cortex-a53.xml"/> + <include filename="arm_cortex-a57.xml"/> + <include filename="arm_cortex-a72.xml"/> + +  + <include filename='arm_Falkor.xml'/> + +  + <include filename='arm_ThunderX299xx.xml'/> + +  + <include filename="arm_Kunpeng-920.xml"/> </arch> </cpus> -- 2.26.2

1 1

[PATCH V4 4/5] cpu: Introduce getHost support for ARM CPU driver
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Introduce getHost support for ARM CPU driver, read CPU vendor_id, part_id and flags from registers directly. These codes will only be compiled on aarch64 hardwares. Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu/cpu_arm.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 24404eac2c..887932cc5a 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -21,6 +21,10 @@ */ #include <config.h> +#if defined(__aarch64__) +# include <asm/hwcap.h> +# include <sys/auxv.h> +#endif #include "viralloc.h" #include "cpu.h" @@ -31,6 +35,12 @@ #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU +#if defined(__aarch64__) +/* Shift bit mask for parsing cpu flags */ +# define BIT_SHIFTS(n) (1UL << (n)) +/* The current max number of cpu flags on ARM is 32 */ +# define MAX_CPU_FLAGS 32 +#endif VIR_LOG_INIT("cpu.cpu_arm"); @@ -495,12 +505,203 @@ virCPUarmValidateFeatures(virCPUDefPtr cpu) return 0; } +#if defined(__aarch64__) +/** + * virCPUarmCpuDataFromRegs: + * + * @data: 64-bit arm CPU specific data + * + * Fetches CPU vendor_id and part_id from MIDR_EL1 register, parse CPU + * flags from AT_HWCAP. There are currently 32 valid flags on ARM arch + * represented by each bit. + */ +static int +virCPUarmCpuDataFromRegs(virCPUarmData *data) +{ + /* Generate human readable flag list according to the order of */ + /* AT_HWCAP bit map */ + const char *flag_list[MAX_CPU_FLAGS] = { + "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", + "crc32", "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", + "jscvt", "fcma", "lrcpc", "dcpop", "sha3", "sm3", "sm4", + "asimddp", "sha512", "sve", "asimdfhm", "dit", "uscat", + "ilrcpc", "flagm", "ssbs", "sb", "paca", "pacg"}; + unsigned long cpuid, hwcaps; + char **features = NULL; + g_autofree char *cpu_feature_str = NULL; + int cpu_feature_index = 0; + size_t i; + + if (!(getauxval(AT_HWCAP) & HWCAP_CPUID)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("CPUID registers unavailable")); + return -1; + } + + /* read the cpuid data from MIDR_EL1 register */ + asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); + VIR_DEBUG("CPUID read from register: 0x%016lx", cpuid); + + /* parse the coresponding part_id bits */ + data->pvr = cpuid>>4&0xFFF; + /* parse the coresponding vendor_id bits */ + data->vendor_id = cpuid>>24&0xFF; + + hwcaps = getauxval(AT_HWCAP); + VIR_DEBUG("CPU flags read from register: 0x%016lx", hwcaps); + + if (VIR_ALLOC_N(features, MAX_CPU_FLAGS) < 0) + return -1; + + /* shift bit map mask to parse for CPU flags */ + for (i = 0; i< MAX_CPU_FLAGS; i++) { + if (hwcaps & BIT_SHIFTS(i)) { + features[cpu_feature_index] = g_strdup(flag_list[i]); + cpu_feature_index++; + } + } + + if (cpu_feature_index > 1) { + cpu_feature_str = virStringListJoin((const char **)features, " "); + if (!cpu_feature_str) + goto error; + } + data->features = g_strdup(cpu_feature_str); + + return 0; + + error: + virStringListFree(features); + return -1; +} + +static int +virCPUarmDataParseFeatures(virCPUDefPtr cpu, + const virCPUarmData *cpuData) +{ + int ret = -1; + size_t i; + char **features; + + if (!cpu || !cpuData) + return ret; + + if (!(features = virStringSplitCount(cpuData->features, " ", + 0, &cpu->nfeatures))) + return ret; + if (cpu->nfeatures) { + if (VIR_ALLOC_N(cpu->features, cpu->nfeatures) < 0) + goto error; + + for (i = 0; i < cpu->nfeatures; i++) { + cpu->features[i].policy = VIR_CPU_FEATURE_REQUIRE; + cpu->features[i].name = g_strdup(features[i]); + } + } + + ret = 0; + + cleanup: + virStringListFree(features); + return ret; + + error: + for (i = 0; i < cpu->nfeatures; i++) + VIR_FREE(cpu->features[i].name); + VIR_FREE(cpu->features); + cpu->nfeatures = 0; + goto cleanup; +} + +static int +virCPUarmDecode(virCPUDefPtr cpu, + const virCPUarmData *cpuData, + virDomainCapsCPUModelsPtr models) +{ + virCPUarmMapPtr map; + virCPUarmModelPtr model; + virCPUarmVendorPtr vendor = NULL; + + if (!cpuData || !(map = virCPUarmGetMap())) + return -1; + + if (!(model = virCPUarmModelFindByPVR(map, cpuData->pvr))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Cannot find CPU model with PVR 0x%03lx"), + cpuData->pvr); + return -1; + } + + if (!virCPUModelIsAllowed(model->name, models)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CPU model %s is not supported by hypervisor"), + model->name); + return -1; + } + + cpu->model = g_strdup(model->name); + + if (cpuData->vendor_id && + !(vendor = virCPUarmVendorFindByID(map, cpuData->vendor_id))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Cannot find CPU vendor with vendor id 0x%02lx"), + cpuData->vendor_id); + return -1; + } + + if (vendor) + cpu->vendor = g_strdup(vendor->name); + + if (cpuData->features && + virCPUarmDataParseFeatures(cpu, cpuData) < 0) + return -1; + + return 0; +} + +static int +virCPUarmDecodeCPUData(virCPUDefPtr cpu, + const virCPUData *data, + virDomainCapsCPUModelsPtr models) +{ + return virCPUarmDecode(cpu, &data->data.arm, models); +} + +static int +virCPUarmGetHost(virCPUDefPtr cpu, + virDomainCapsCPUModelsPtr models) +{ + virCPUDataPtr cpuData = NULL; + int ret = -1; + + if (virCPUarmDriverInitialize() < 0) + goto cleanup; + + if (!(cpuData = virCPUDataNew(archs[0]))) + goto cleanup; + + if (virCPUarmCpuDataFromRegs(&cpuData->data.arm) < 0) + goto cleanup; + + ret = virCPUarmDecodeCPUData(cpu, cpuData, models); + + cleanup: + virCPUarmDataFree(cpuData); + return ret; +} +#endif + struct cpuArchDriver cpuDriverArm = { .name = "arm", .arch = archs, .narch = G_N_ELEMENTS(archs), .compare = virCPUarmCompare, +#if defined(__aarch64__) + .getHost = virCPUarmGetHost, + .decode = virCPUarmDecodeCPUData, +#else .decode = NULL, +#endif .encode = NULL, .dataFree = virCPUarmDataFree, .baseline = virCPUarmBaseline, -- 2.26.2

1 1

[PATCH V4 3/5] cpu: Add helper funtions to parse vendor and model
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Add helper functions to parse vendor and model from xml for ARM arch, and use them as callbacks when load cpu maps. Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu/cpu_arm.c | 171 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 1 deletion(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index d8f571cae3..24404eac2c 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -206,6 +206,174 @@ virCPUarmMapFeatureParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, return 0; } +static virCPUarmVendorPtr +virCPUarmVendorFindByID(virCPUarmMapPtr map, + unsigned long vendor_id) +{ + size_t i; + + for (i = 0; i < map->nvendors; i++) { + if (map->vendors[i]->value == vendor_id) + return map->vendors[i]; + } + + return NULL; +} + + +static virCPUarmVendorPtr +virCPUarmVendorFindByName(virCPUarmMapPtr map, + const char *name) +{ + size_t i; + + for (i = 0; i < map->nvendors; i++) { + if (STREQ(map->vendors[i]->name, name)) + return map->vendors[i]; + } + + return NULL; +} + + +static int +virCPUarmVendorParse(xmlXPathContextPtr ctxt, + const char *name, + void *data) +{ + virCPUarmMapPtr map = data; + virCPUarmVendorPtr vendor = NULL; + int ret = -1; + + if (VIR_ALLOC(vendor) < 0) + return ret; + + vendor->name = g_strdup(name); + + if (virCPUarmVendorFindByName(map, vendor->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor %s already defined"), + vendor->name); + goto cleanup; + } + + if (virXPathULongHex("string(@value)", ctxt, &vendor->value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing CPU vendor value")); + goto cleanup; + } + + if (virCPUarmVendorFindByID(map, vendor->value)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor value 0x%2lx already defined"), + vendor->value); + goto cleanup; + } + + if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virCPUarmVendorFree(vendor); + return ret; + +} + +static virCPUarmModelPtr +virCPUarmModelFind(virCPUarmMapPtr map, + const char *name) +{ + size_t i; + + for (i = 0; i < map->nmodels; i++) { + if (STREQ(map->models[i]->name, name)) + return map->models[i]; + } + + return NULL; +} + +#if defined(__aarch64__) +static virCPUarmModelPtr +virCPUarmModelFindByPVR(virCPUarmMapPtr map, + unsigned long pvr) +{ + size_t i; + + for (i = 0; i < map->nmodels; i++) { + if (map->models[i]->data.pvr == pvr) + return map->models[i]; + } + + return NULL; +} +#endif + +static int +virCPUarmModelParse(xmlXPathContextPtr ctxt, + const char *name, + void *data) +{ + virCPUarmMapPtr map = data; + virCPUarmModel *model; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *vendor = NULL; + + if (VIR_ALLOC(model) < 0) + goto error; + + model->name = g_strdup(name); + + if (virCPUarmModelFind(map, model->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU model %s already defined"), + model->name); + goto error; + } + + if (virXPathBoolean("boolean(./vendor)", ctxt)) { + vendor = virXPathString("string(./vendor/@name)", ctxt); + if (!vendor) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid vendor element in CPU model %s"), + model->name); + goto error; + } + + if (!(model->vendor = virCPUarmVendorFindByName(map, vendor))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown vendor %s referenced by CPU model %s"), + vendor, model->name); + goto error; + } + } + + if (!virXPathBoolean("boolean(./pvr)", ctxt)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing PVR information for CPU model %s"), + model->name); + goto error; + } + + if (virXPathULongHex("string(./pvr/@value)", ctxt, &model->data.pvr) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing or invalid PVR value in CPU model %s"), + model->name); + goto error; + } + + if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) + goto error; + + return 0; + + error: + virCPUarmModelFree(model); + return -1; +} + static virCPUarmMapPtr virCPUarmLoadMap(void) { @@ -213,7 +381,8 @@ virCPUarmLoadMap(void) map = virCPUarmMapNew(); - if (cpuMapLoad("arm", NULL, virCPUarmMapFeatureParse, NULL, map) < 0) + if (cpuMapLoad("arm", virCPUarmVendorParse, virCPUarmMapFeatureParse, + virCPUarmModelParse, map) < 0) return NULL; return g_steal_pointer(&map); -- 2.26.2

1 1

[PATCH V4 2/5] cpu: Introduce ARM related structs
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Introduce vendor and model struct and related cleanup functions for ARM cpu. Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu/cpu_arm.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index ee5802198f..d8f571cae3 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -1,6 +1,7 @@ /* * cpu_arm.c: CPU driver for arm CPUs * + * Copyright (C) 2020 Huawei Technologies Co., Ltd. * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) Canonical Ltd. 2012 * @@ -23,12 +24,16 @@ #include "viralloc.h" #include "cpu.h" +#include "cpu_arm.h" #include "cpu_map.h" +#include "virlog.h" #include "virstring.h" #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU +VIR_LOG_INIT("cpu.cpu_arm"); + static const virArch archs[] = { VIR_ARCH_ARMV6L, VIR_ARCH_ARMV7B, @@ -36,6 +41,21 @@ static const virArch archs[] = { VIR_ARCH_AARCH64, }; +typedef struct _virCPUarmVendor virCPUarmVendor; +typedef virCPUarmVendor *virCPUarmVendorPtr; +struct _virCPUarmVendor { + char *name; + unsigned long value; +}; + +typedef struct _virCPUarmModel virCPUarmModel; +typedef virCPUarmModel *virCPUarmModelPtr; +struct _virCPUarmModel { + char *name; + virCPUarmVendorPtr vendor; + virCPUarmData data; +}; + typedef struct _virCPUarmFeature virCPUarmFeature; typedef virCPUarmFeature *virCPUarmFeaturePtr; struct _virCPUarmFeature { @@ -64,6 +84,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmFeature, virCPUarmFeatureFree); typedef struct _virCPUarmMap virCPUarmMap; typedef virCPUarmMap *virCPUarmMapPtr; struct _virCPUarmMap { + size_t nvendors; + virCPUarmVendorPtr *vendors; + size_t nmodels; + virCPUarmModelPtr *models; GPtrArray *features; }; @@ -81,12 +105,62 @@ virCPUarmMapNew(void) return map; } +static void +virCPUarmDataClear(virCPUarmData *data) +{ + if (!data) + return; + + VIR_FREE(data->features); +} + +static void +virCPUarmDataFree(virCPUDataPtr cpuData) +{ + if (!cpuData) + return; + + virCPUarmDataClear(&cpuData->data.arm); + VIR_FREE(cpuData); +} + +static void +virCPUarmModelFree(virCPUarmModelPtr model) +{ + if (!model) + return; + + virCPUarmDataClear(&model->data); + g_free(model->name); + g_free(model); +} + +static void +virCPUarmVendorFree(virCPUarmVendorPtr vendor) +{ + if (!vendor) + return; + + g_free(vendor->name); + g_free(vendor); +} + static void virCPUarmMapFree(virCPUarmMapPtr map) { if (!map) return; + size_t i; + + for (i = 0; i < map->nmodels; i++) + virCPUarmModelFree(map->models[i]); + g_free(map->models); + + for (i = 0; i < map->nvendors; i++) + virCPUarmVendorFree(map->vendors[i]); + g_free(map->vendors); + g_ptr_array_free(map->features, TRUE); g_free(map); @@ -259,6 +333,7 @@ struct cpuArchDriver cpuDriverArm = { .compare = virCPUarmCompare, .decode = NULL, .encode = NULL, + .dataFree = virCPUarmDataFree, .baseline = virCPUarmBaseline, .update = virCPUarmUpdate, .validateFeatures = virCPUarmValidateFeatures, -- 2.26.2

1 1

[PATCH V4 1/5] cpu: Introduce virCPUarmData to virCPUData
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Introduce virCPUarmData to virCPUData Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu/Makefile.inc.am | 1 + src/cpu/cpu.h | 2 ++ src/cpu/cpu_arm_data.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/cpu/cpu_arm_data.h diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am index 0abeee87b6..228112a3c6 100644 --- a/src/cpu/Makefile.inc.am +++ b/src/cpu/Makefile.inc.am @@ -9,6 +9,7 @@ CPU_SOURCES = \ cpu/cpu_s390.h \ cpu/cpu_s390.c \ cpu/cpu_arm.h \ + cpu/cpu_arm_data.h \ cpu/cpu_arm.c \ cpu/cpu_ppc64.h \ cpu/cpu_ppc64.c \ diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index f779d2be17..ec22a183a1 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -27,6 +27,7 @@ #include "cpu_conf.h" #include "cpu_x86_data.h" #include "cpu_ppc64_data.h" +#include "cpu_arm_data.h" typedef struct _virCPUData virCPUData; @@ -36,6 +37,7 @@ struct _virCPUData { union { virCPUx86Data x86; virCPUppc64Data ppc64; + virCPUarmData arm; /* generic driver needs no data */ } data; }; diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h new file mode 100644 index 0000000000..cf12ca8c2e --- /dev/null +++ b/src/cpu/cpu_arm_data.h @@ -0,0 +1,31 @@ +/* + * cpu_arm_data.h: 64-bit arm CPU specific data + * + * Copyright (C) 2020 Huawei Technologies Co., Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#define VIR_CPU_ARM_DATA_INIT { 0 } + +typedef struct _virCPUarmData virCPUarmData; +struct _virCPUarmData { + unsigned long vendor_id; + unsigned long pvr; + char *features; +}; -- 2.26.2

1 1

[PATCH V4 1/5] cpu: Introduce virCPUarmData to virCPUData
by Zhenyu Zheng 29 Apr '20

29 Apr '20

Introduce virCPUarmData to virCPUData Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> --- src/cpu/Makefile.inc.am | 1 + src/cpu/cpu.h | 2 ++ src/cpu/cpu_arm_data.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/cpu/cpu_arm_data.h diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am index 0abeee87b6..228112a3c6 100644 --- a/src/cpu/Makefile.inc.am +++ b/src/cpu/Makefile.inc.am @@ -9,6 +9,7 @@ CPU_SOURCES = \ cpu/cpu_s390.h \ cpu/cpu_s390.c \ cpu/cpu_arm.h \ + cpu/cpu_arm_data.h \ cpu/cpu_arm.c \ cpu/cpu_ppc64.h \ cpu/cpu_ppc64.c \ diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index f779d2be17..ec22a183a1 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -27,6 +27,7 @@ #include "cpu_conf.h" #include "cpu_x86_data.h" #include "cpu_ppc64_data.h" +#include "cpu_arm_data.h" typedef struct _virCPUData virCPUData; @@ -36,6 +37,7 @@ struct _virCPUData { union { virCPUx86Data x86; virCPUppc64Data ppc64; + virCPUarmData arm; /* generic driver needs no data */ } data; }; diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h new file mode 100644 index 0000000000..cf12ca8c2e --- /dev/null +++ b/src/cpu/cpu_arm_data.h @@ -0,0 +1,31 @@ +/* + * cpu_arm_data.h: 64-bit arm CPU specific data + * + * Copyright (C) 2020 Huawei Technologies Co., Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#define VIR_CPU_ARM_DATA_INIT { 0 } + +typedef struct _virCPUarmData virCPUarmData; +struct _virCPUarmData { + unsigned long vendor_id; + unsigned long pvr; + char *features; +}; -- 2.26.2

1 0

[PATCH v2 0/5] qemu: Support rbd namespace attribute
by Han Han 29 Apr '20

29 Apr '20

Change from v1: - Add rbd namespace member to aarch64 capability replies. Add rbd namespace capability test for aarch64. - Provide more details in news xml v1: https://www.redhat.com/archives/libvir-list/2020-April/msg00388.html git repo: https://github.com/qiankehan/libvirt/tree/rbd-namespace-v2 Han Han (5): qemu_capabilities: Add QEMU_CAPS_RBD_NAMESPACE conf: Support to parse rbd namespace attribute qemu: Implement rbd namespace attribute doc: rng schemas and html doc for rbd namespace attribute news: qemu: Support rbd namespace docs/formatdomain.html.in | 5 +++ docs/news.xml | 10 +++++ docs/schemas/domaincommon.rng | 3 ++ src/conf/domain_conf.c | 4 ++ src/qemu/qemu_block.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 ++++++- src/util/virstoragefile.h | 1 + .../caps_5.0.0.aarch64.replies | 5 +++ .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + ...k-network-rbd-namespace.x86_64-latest.args | 41 +++++++++++++++++++ .../disk-network-rbd-namespace.xml | 33 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...sk-network-rbd-namespace.x86_64-latest.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 18 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-latest.xml -- 2.25.0

1 6

[libvirt PATCH v4 0/3] QEMU: support QEMU built without TCG
by Tobin Feldman-Fitzthum 28 Apr '20

28 Apr '20

Rebased and resent from about a month ago. Since version 2.10, QEMU can be built without TCG. This patch adds capabillity QEMU_CAPS_TCG_DISABLED that allows libvirt to use a QEMU built without TCG. Rather than create a capability that is set whenever TCG is enabled (almost always), QEMU_CAPS_TCG_DISABLED is set only when the TCG is not available. This avoids some issues with backwards compatability. For a domain that was created using QEMU >= 2.10 with KVM, there is no information in the cached XML file that says whether or not TCG was enabled. Versions of QEMU older than 2.10 do not have a QMP interface for determining whether QEMU is available. Since QEMU_CAPS_TCG_DISABLED is set only when TCG is disabled, we do not have to do any extra work to infer an appropriate value in either of these cases. New in vesion 4: Move virQEMUCapsProbeQMPTCGState into virQEMUCapsProbeQMPDevices so that we can reuse the qom call. Rename, virQEMUCapsProbeQMPDevices to virQEMUProbeQMPTypes. All patches compile. Tobin Feldman-Fitzthum (3): add QEMU_CAPS_TCG_DISABLED and probe conditionally add virQEMUCapsGetVirtType convenience function add virQEMUCapsProbeQMPTCGState function to set QEMU_CAPS_TCG_DISABLED src/qemu/qemu_capabilities.c | 81 +++++++++++++++++++++++++++--------- src/qemu/qemu_capabilities.h | 3 ++ 2 files changed, 65 insertions(+), 19 deletions(-) -- 2.20.1 (Apple Git-117)

5 16

[libvirt-ci RFC PATCH 00/13] Introduce a new global TOML config file for lcitool
by Erik Skultety 28 Apr '20

28 Apr '20

This series is trying to consolidate the number of config files we currently recognize under ~/.config/lcitool to a single global TOML config file. Thanks to this effort we can expose more seetings than we previously could which will come handy in terms of generating cloudinit images for OpenStack. Patches 1-4 patches are just a little extra - not heavily related to the series See patch 5/13 why TOML was selected. Erik Skultety (13): requirements: Introduce a requirements.txt file lcitool: Decrease the indent when creating a tempdir for initrd injection lcitool: Prefer tempfile's native wrappers over low level primitives lcitool: Use a temporary JSON file to pass extra variables config: Introduce a new global config.toml configuration file lcitool: Introduce methods to load and validate the TOML config lcitool: Drop the get_flavor() method lcitool: Drop the get_root_password_file() method lcitool: Drop the gitlab-related getter methods lcitool: Use d.update() on extra_vars for options coming from the config config: Move the virt-install settings from install.yml to the config lcitool: Use the config install options rather than install facts guests: README: Document the existence and usage of config.toml config.toml | 43 +++++ guests/README.markdown | 19 +- guests/lcitool | 235 +++++++++++------------ guests/playbooks/update/tasks/gitlab.yml | 2 - guests/playbooks/update/tasks/users.yml | 2 +- requirements.txt | 3 + 6 files changed, 175 insertions(+), 129 deletions(-) create mode 100644 config.toml create mode 100644 requirements.txt -- 2.25.3

2 36

[PATCH 0/4] move validation of virtio options
by Bjoern Walk 28 Apr '20

28 Apr '20

Move validation of virtio options (iommu, ats, packed) from QEMU command line generation to domain validation. As a drive-by, increase the granularity of tests for virtio options. Bjoern Walk (4): tests: use latest caps for virtio-options test tests: more fine-granular tests for virtio-options qemu: move virtio capability validation qemu: command: make qemuBuildVirtioOptionsStr void src/qemu/qemu_command.c | 59 +++------- src/qemu/qemu_validate.c | 70 +++++++++++- .../virtio-options-controller-ats.args | 32 ++++++ .../virtio-options-controller-ats.xml | 38 +++++++ .../virtio-options-controller-iommu.args | 34 ++++++ .../virtio-options-controller-iommu.xml | 38 +++++++ .../virtio-options-controller-packed.args | 32 ++++++ .../virtio-options-controller-packed.xml | 38 +++++++ .../virtio-options-disk-ats.args | 36 +++++++ .../virtio-options-disk-ats.xml | 34 ++++++ .../virtio-options-disk-iommu.args | 36 +++++++ .../virtio-options-disk-iommu.xml | 34 ++++++ .../virtio-options-disk-packed.args | 36 +++++++ .../virtio-options-disk-packed.xml | 34 ++++++ .../virtio-options-fs-ats.args | 34 ++++++ .../virtio-options-fs-ats.xml | 34 ++++++ .../virtio-options-fs-iommu.args | 34 ++++++ .../virtio-options-fs-iommu.xml | 34 ++++++ .../virtio-options-fs-packed.args | 34 ++++++ .../virtio-options-fs-packed.xml | 34 ++++++ .../virtio-options-input-ats.args | 30 ++++++ .../virtio-options-input-ats.xml | 30 ++++++ .../virtio-options-input-iommu.args | 30 ++++++ .../virtio-options-input-iommu.xml | 30 ++++++ .../virtio-options-input-packed.args | 30 ++++++ .../virtio-options-input-packed.xml | 30 ++++++ .../virtio-options-memballoon-ats.args | 28 +++++ .../virtio-options-memballoon-ats.xml | 23 ++++ .../virtio-options-memballoon-iommu.args | 28 +++++ .../virtio-options-memballoon-iommu.xml | 23 ++++ .../virtio-options-memballoon-packed.args | 28 +++++ .../virtio-options-memballoon-packed.xml | 23 ++++ .../virtio-options-net-ats.args | 34 ++++++ .../virtio-options-net-ats.xml | 34 ++++++ .../virtio-options-net-iommu.args | 34 ++++++ .../virtio-options-net-iommu.xml | 34 ++++++ .../virtio-options-net-packed.args | 34 ++++++ .../virtio-options-net-packed.xml | 34 ++++++ .../virtio-options-rng-ats.args | 32 ++++++ .../virtio-options-rng-ats.xml | 32 ++++++ .../virtio-options-rng-iommu.args | 34 ++++++ .../virtio-options-rng-iommu.xml | 32 ++++++ .../virtio-options-rng-packed.args | 32 ++++++ .../virtio-options-rng-packed.xml | 32 ++++++ .../virtio-options-video-ats.args | 34 ++++++ .../virtio-options-video-ats.xml | 36 +++++++ .../virtio-options-video-iommu.args | 34 ++++++ .../virtio-options-video-iommu.xml | 36 +++++++ .../virtio-options-video-packed.args | 34 ++++++ .../virtio-options-video-packed.xml | 36 +++++++ .../virtio-options.x86_64-latest.args | 69 ++++++++++++ tests/qemuxml2argvdata/virtio-options.xml | 5 +- tests/qemuxml2argvtest.c | 101 ++++++++++++++++-- .../virtio-options.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 16 +-- 55 files changed, 1818 insertions(+), 70 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.args create mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.args create mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.args create mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.xml create mode 100644 tests/qemuxml2argvdata/virtio-options.x86_64-latest.args create mode 120000 tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml -- 2.24.1

4 15

[libvirt-dbus PATCH 0/9] Convert documentation to reStructuredText, other cleanups
by Andrea Bolognani 27 Apr '20

27 Apr '20

I think it's high time that we have a new libvirt-dbus release, since the last one was more than a year ago: since then, there has been at least one bug fix necessary to keep it building on modern platforms, an additional API has been implemented, and of course we've switched the build system from autotools to Meson. I validated the status of what's in master by importing a snapshot into the Debian package and everything seems to be in order, so I'm fairly confident we could basically just tag a release right away; there are, however, a few straightforward improvements that I would like to get into the new release, so here we are :) Andrea Bolognani (9): git: Minimize ignore patterns spec: Install fewer documentation files README: Convert to reStructuredText HACKING: Convert to reStructuredText NEWS: Convert to reStructuredText AUTHORS: Convert to reStructuredText man: Convert to reStructuredText meson: Install documentation spec: Pick documentation from installation directory .gitignore | 47 --------- AUTHORS.in | 16 ---- AUTHORS.rst.in | 17 ++++ HACKING.md | 205 --------------------------------------- HACKING.rst | 207 ++++++++++++++++++++++++++++++++++++++++ NEWS | 88 ----------------- NEWS.rst | 94 ++++++++++++++++++ README.md => README.rst | 37 +++---- docs/libvirt-dbus.pod | 66 ------------- docs/libvirt-dbus.rst | 71 ++++++++++++++ docs/meson.build | 6 +- libvirt-dbus.spec.in | 7 +- meson.build | 24 ++++- tools/gen-authors.sh | 2 +- 14 files changed, 437 insertions(+), 450 deletions(-) delete mode 100644 AUTHORS.in create mode 100644 AUTHORS.rst.in delete mode 100644 HACKING.md create mode 100644 HACKING.rst delete mode 100644 NEWS create mode 100644 NEWS.rst rename README.md => README.rst (68%) delete mode 100644 docs/libvirt-dbus.pod create mode 100644 docs/libvirt-dbus.rst -- 2.25.3

4 27

[libvirt-dbus PATCH] docs/meson: fix rst2man detection
by Pavel Hrdina 27 Apr '20

27 Apr '20

In libvirt project we use python3 version exclusively so we should do the same in libvirt-dbus. This means that we have to check other possible binary names. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/meson.build | 2 +- libvirt-dbus.spec.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index fbeaf12..c2e8ae7 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,4 +1,4 @@ -prog_rst2man = find_program('rst2man') +prog_rst2man = find_program('rst2man', 'rst2man.py', 'rst2man-3') configure_file( command: [prog_rst2man.path(), '@INPUT@', '@OUTPUT@'], diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 84172fa..4e6ff85 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -19,7 +19,11 @@ BuildRequires: meson >= %{meson_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libvirt-devel >= %{libvirt_version} BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version} -BuildRequires: /usr/bin/rst2man +%if 0%{?rhel} == 7 +BuildRequires: python36-docutils +%else +BuildRequires: python3-docutils +%endif Requires: dbus Requires: glib2 >= %{glib2_version} -- 2.25.4

2 2

[libvirt PATCH] qemu: re-add padding to the saved state images
by Daniel P. Berrangé 27 Apr '20

27 Apr '20

In the past we added 1024 bytes of padding to saved state images so that users can run "virsh managedsave-edit $GUEST" and make XML changes which increase the size of the XML document. This padding was accidentally lost a while back commit 6b9b21db7079888a05d192b079e68290bdf14a76 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Wed Feb 17 13:10:11 2016 +0100 qemu: Remove unnecessary calculations in qemuDomainSaveMemory The original 1024 bytes was unreasonably stingy when we consider that the QEMU state is typically going to be many 100's of MB in size. Thus this adds 64 KB of padding after the XML which should cope with any plausible modifications a user will want to make. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 01330e55e7..d5aeeac66d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2922,20 +2922,23 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, len = xml_len + cookie_len; - if (header->data_len > 0) { + if (header->data_len == 0) { + /* This 64kb padding allows the user to edit the XML in + * a saved state image and have the new XML be larger + * that what was originally saved + */ + header->data_len = len + (64 * 1024); + } else { if (len > header->data_len) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("new xml too large to fit in file")); return -1; } - - zerosLen = header->data_len - len; - if (VIR_ALLOC_N(zeros, zerosLen) < 0) - return -1; - } else { - header->data_len = len; } + zerosLen = header->data_len - len; + zeros = g_new0(char, zerosLen); + if (data->cookie) header->cookieOffset = xml_len; -- 2.25.3

3 2

[libvirt-dbus PATCH 0/2] Revert recent commits
by Andrea Bolognani 27 Apr '20

27 Apr '20

Pushed under the "we agreed to get rid of this" rule. Andrea Bolognani (2): spec: Pick documentation from source directory meson: Don't install documentation libvirt-dbus.spec.in | 4 +--- meson.build | 18 ------------------ 2 files changed, 1 insertion(+), 21 deletions(-) -- 2.25.4

1 2

[PATCH RESEND v1 0/7] add Spectre related PowerPC features
by Daniel Henrique Barboza 27 Apr '20

27 Apr '20

Recent changes in master (adding aio_io_uring cap, splitting feature parsing code to a new function, updates in news.xml) broke rebase for all patches in the series. Re-sending it, rebased with master at 606fb3979ab4. **** Hi, This series implements 3 Spectre related PowerPC features that were added back in QEMU 2.12: - CFPC: Cache Flush on Privilege Change - SBBC: Speculation Barrier Bounds Checking - IBS: Indirect Branch Speculation These options aren't much of a problem for users using latest hardware and guests with recent Linux kernels. Users with outdated hardware/firmware or trying to run AIX guests/guests with older kernels, however, will need to fine tune these options because QEMU defaults won't work. Instead of making users rely on <qemu:commandline> elements to hardcode the options in the XML, let's support them in Libvirt. Daniel Henrique Barboza (7): qemu: Add capability for CFPC pSeries feature qemu: Implement the CFPC pSeries feature qemu: Add capability for SBBC pSeries feature qemu: Implement the SBBC pSeries feature qemu: Add capability for IBS pSeries feature qemu: Implement the IBS pSeries feature news: Update for the recent added pSeries features docs/formatdomain.html.in | 36 +++++ docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 47 ++++++ src/conf/domain_conf.c | 134 ++++++++++++++++++ src/conf/domain_conf.h | 38 +++++ src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 8 ++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 15 ++ src/qemu/qemu_validate.c | 33 +++++ .../caps_2.12.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 + tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 3 + tests/qemuxml2argvtest.c | 53 ++++++- tests/qemuxml2xmloutdata/pseries-features.xml | 3 + tests/qemuxml2xmltest.c | 5 +- 21 files changed, 411 insertions(+), 3 deletions(-) -- 2.25.4

2 9

[PATCH v1 0/7] add Spectre related PowerPC features
by Daniel Henrique Barboza 27 Apr '20

27 Apr '20

Hi, This series implements 3 Spectre related PowerPC features that were added back in QEMU 2.12: - CFPC: Cache Flush on Privilege Change - SBBC: Speculation Barrier Bounds Checking - IBS: Indirect Branch Speculation These options aren't much of a problem for users using latest hardware and guests with recent Linux kernels. Users with outdated hardware/firmware or trying to run AIX guests/guests with older kernels, however, will need to fine tune these options because QEMU defaults won't work. Instead of making users rely on <qemu:commandline> elements to hardcode the options in the XML, let's support them in Libvirt. Daniel Henrique Barboza (7): qemu: Add capability for CFPC pSeries feature qemu: Implement the CFPC pSeries feature qemu: Add capability for SBBC pSeries feature qemu: Implement the SBBC pSeries feature qemu: Add capability for IBS pSeries feature qemu: Implement the IBS pSeries feature news: Update for the recent added pSeries features docs/formatdomain.html.in | 36 +++++ docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 47 ++++++ src/conf/domain_conf.c | 134 ++++++++++++++++++ src/conf/domain_conf.h | 38 +++++ src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 8 ++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 15 ++ src/qemu/qemu_validate.c | 33 +++++ .../caps_2.12.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 + tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 3 + tests/qemuxml2argvtest.c | 53 ++++++- tests/qemuxml2xmloutdata/pseries-features.xml | 3 + tests/qemuxml2xmltest.c | 5 +- 21 files changed, 411 insertions(+), 3 deletions(-) -- 2.25.2

2 9

[PATCH] qemu: fix code format problem
by yubihong 27 Apr '20

27 Apr '20

There are some code format problems in src/libvirt-domain.c. This patch fixes these problems. >From 55cd85345b2dc50f44c1e382563482d40142382b Mon Sep 17 00:00:00 2001 From: yubihong <yubihong(a)huawei.com> Date: Fri, 24 Apr 2020 17:44:43 +0800 Subject: [PATCH] qemu: fix code format problem Signed-off-by:Yu Bihong <yubihong(a)huawei.com> --- src/libvirt-domain.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a12809c..d659f1b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8194,11 +8194,11 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) virCheckReadOnlyGoto(conn->flags, error); if (conn->driver->domainAttachDevice) { - int ret; - ret = conn->driver->domainAttachDevice(domain, xml); - if (ret < 0) - goto error; - return ret; + int ret; + ret = conn->driver->domainAttachDevice(domain, xml); + if (ret < 0) + goto error; + return ret; } virReportUnsupportedError(); @@ -8299,9 +8299,9 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) if (conn->driver->domainDetachDevice) { int ret; ret = conn->driver->domainDetachDevice(domain, xml); - if (ret < 0) - goto error; - return ret; + if (ret < 0) + goto error; + return ret; } virReportUnsupportedError(); -- 1.8.3.1

3 2

[PATCH 0/4] Remove unfinished support for external data store of qcow2 files
by Peter Krempa 27 Apr '20

27 Apr '20

The implementation was never finished properly. Since there isn't any push to finish it either, let's remove the code so that it doesn't keep rotting. Peter Krempa (4): security: Remove labelling of 'externalDataStore' util: Remove 'externalDataStore' field from virStorageSource util: Remove 'externalDataStoreRaw' field from virStorageSource util: qcow2GetExtensions: Remove support for 'data file' extension src/security/security_dac.c | 15 ------- src/security/security_selinux.c | 17 +------- src/security/virt-aa-helper.c | 4 -- src/util/virstoragefile.c | 74 ++------------------------------- src/util/virstoragefile.h | 5 --- 5 files changed, 5 insertions(+), 110 deletions(-) -- 2.26.0

3 12

[PATCH libvirt-python] examples: Fix connection error handling 2
by Philipp Hahn 27 Apr '20

27 Apr '20

Fix two more cases in examples as libvirt.open*() does not return None but raises an exception Fixes: 283e2bc693746164b22226e14d6fe3ccd38a07bf Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- examples/dhcpleases.py | 5 +++-- examples/domipaddrs.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py index f394541..6f80fd5 100755 --- a/examples/dhcpleases.py +++ b/examples/dhcpleases.py @@ -22,8 +22,9 @@ else: usage() sys.exit(2) -conn = libvirt.open(uri) -if conn == None: +try: + conn = libvirt.open(uri) +except libvirt.libvirtError: print("Unable to open connection to libvirt") sys.exit(1) diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py index bda308c..e893995 100755 --- a/examples/domipaddrs.py +++ b/examples/domipaddrs.py @@ -21,8 +21,9 @@ else: usage() sys.exit(2) -conn = libvirt.open(uri) -if conn == None: +try: + conn = libvirt.open(uri) +except libvirt.libvirtError: print "Unable to open connection to libvirt" sys.exit(1) -- 2.20.1

2 1

[libvirt PATCH] CONTRIBUTING: Include information on build dependencies
by Andrea Bolognani 27 Apr '20

27 Apr '20

libvirt depends on a ton of packages, so trying to install them all by using the classic approach of repeatedly running configure and reacting to each failure by installing the corresponding missing package will inevitably lead to frustration. Luckily there's an easy solution to get most dependencies installed in one fell swoop, and we just need to document it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- CONTRIBUTING.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 68c7b547c6..f476700fdd 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -17,3 +17,22 @@ your git clone run: $ make You'll find the freshly-built document in ``docs/contribute.html``. + +If ``configure`` fails because of missing dependencies, you can set +up your system by calling + +:: + + $ sudo dnf builddep libvirt + +if you're on a RHEL-based distribution or + +:: + + $ sudo apt-get build-dep libvirt + +if you're on a Debian-based one. + +You might still be missing some dependencies if your distribution is +shipping an old libvirt version, but that will get you much closer to +where you need to be to build successfully from source. -- 2.25.3

2 3

[PATCH] network: Remove memory leak caused by wrong initialization
by Julio Faracco 27 Apr '20

27 Apr '20

This commit fix a wrong variable initialization. There is a variable called `new_lease` which is being initialized with the content of parameter `lease`. To avoid memory leak, the proper way is initialize with NULL first. This wrong statement was added by commit 97a0aa24. There are some other improvements also. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/conf/network_conf.c | 38 ++++++++++++++++++------------------- src/network/bridge_driver.c | 8 ++------ 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index cd60ee7548..a7c177f8db 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -412,38 +412,32 @@ static int virNetworkDHCPLeaseTimeDefParseXML(virNetworkDHCPLeaseTimeDefPtr *lease, xmlNodePtr node) { - virNetworkDHCPLeaseTimeDefPtr new_lease = *lease; - g_autofree char *expiry = NULL; - g_autofree char *unit = NULL; - int unitInt; + virNetworkDHCPLeaseTimeDefPtr new_lease = NULL; + g_autofree char *expirystr = NULL; + g_autofree char *unitstr = NULL; + unsigned long expiry; + int unit = VIR_NETWORK_DHCP_LEASETIME_UNIT_MINUTES; - if (!(expiry = virXMLPropString(node, "expiry"))) + if (!(expirystr = virXMLPropString(node, "expiry"))) return 0; - if (VIR_ALLOC(new_lease) < 0) - return -1; - new_lease->unit = VIR_NETWORK_DHCP_LEASETIME_UNIT_MINUTES; - - if (virStrToLong_ul(expiry, NULL, 10, &new_lease->expiry) < 0) + if (virStrToLong_ul(expirystr, NULL, 10, &expiry) < 0) return -1; - if ((unit = virXMLPropString(node, "unit"))) { - if ((unitInt = virNetworkDHCPLeaseTimeUnitTypeFromString(unit)) < 0) { + if ((unitstr = virXMLPropString(node, "unit"))) { + if ((unit = virNetworkDHCPLeaseTimeUnitTypeFromString(unitstr)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid unit: %s"), unit); + _("Invalid unit: %s"), unitstr); return -1; } - new_lease->unit = unitInt; } /* infinite */ - if (new_lease->expiry > 0) { + if (expiry > 0) { /* This boundary check is related to dnsmasq man page settings: * "The minimum lease time is two minutes." */ - if ((new_lease->unit == VIR_NETWORK_DHCP_LEASETIME_UNIT_SECONDS && - new_lease->expiry < 120) || - (new_lease->unit == VIR_NETWORK_DHCP_LEASETIME_UNIT_MINUTES && - new_lease->expiry < 2)) { + if ((unit == VIR_NETWORK_DHCP_LEASETIME_UNIT_SECONDS && expiry < 120) || + (unit == VIR_NETWORK_DHCP_LEASETIME_UNIT_MINUTES && expiry < 2)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("The minimum lease time should be greater " "than 2 minutes")); @@ -451,6 +445,12 @@ virNetworkDHCPLeaseTimeDefParseXML(virNetworkDHCPLeaseTimeDefPtr *lease, } } + if (VIR_ALLOC(new_lease) < 0) + return -1; + + new_lease->expiry = expiry; + new_lease->unit = unit; + *lease = new_lease; return 0; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 87f0452611..e8f0dcf7d0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -969,7 +969,6 @@ static int networkConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) static char * networkBuildDnsmasqLeaseTime(virNetworkDHCPLeaseTimeDefPtr lease) { - char *leasetime = NULL; const char *unit; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; @@ -984,9 +983,7 @@ networkBuildDnsmasqLeaseTime(virNetworkDHCPLeaseTimeDefPtr lease) virBufferAsprintf(&buf, "%lu%c", lease->expiry, unit[0]); } - leasetime = virBufferContentAndReset(&buf); - - return leasetime; + return virBufferContentAndReset(&buf); } @@ -999,14 +996,13 @@ networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx, { size_t i; bool ipv6 = false; - g_autofree char *leasetime = NULL; if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) ipv6 = true; for (i = 0; i < ipdef->nhosts; i++) { virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); + g_autofree char *leasetime = networkBuildDnsmasqLeaseTime(host->lease); - leasetime = networkBuildDnsmasqLeaseTime(host->lease); if (VIR_SOCKET_ADDR_VALID(&host->ip)) if (dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name, host->id, leasetime, -- 2.25.3

2 1

[PATCH v2 0/5] qemu: spport AIO interface io_uring
by Han Han 26 Apr '20

26 Apr '20

Changes from v1: - Separate the news XML patch from the docs patch - More details in the descrition of news XML - Change bus type of unit tests XML from ide to virtio - Fix missing spaces in docs patch - Reorder the sequence of patches git repo: https://github.com/qiankehan/libvirt/tree/io_uring-v2 v1: https://www.redhat.com/archives/libvir-list/2020-April/msg00883.html Han Han (5): qemu_capabilities: Introduce QEMU_CAPS_AIO_IO_URING qemu: Implement the aio mode io_uring docs: Docs and rng schemas for io_uring tests: Tests for io mode io_uring news: qemu: support async IO mode 'io_uring' docs/formatdomain.html.in | 3 +- docs/news.xml | 11 ++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++ tests/qemublocktest.c | 1 + ...le-backing_basic-aio_io_uring-srconly.json | 44 +++++++++++++ .../file-backing_basic-aio_io_uring.json | 66 +++++++++++++++++++ .../file-backing_basic-aio_io_uring.xml | 47 +++++++++++++ .../caps_5.0.0.aarch64.replies | 3 +- .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.ppc64.replies | 3 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.x86_64.replies | 3 +- .../caps_5.0.0.x86_64.xml | 1 + .../disk-aio-io_uring.x86_64-latest.args | 41 ++++++++++++ tests/qemuxml2argvdata/disk-aio-io_uring.xml | 30 +++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-aio-io_uring.x86_64-latest.xml | 39 +++++++++++ tests/qemuxml2xmltest.c | 1 + 23 files changed, 306 insertions(+), 4 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml create mode 100644 tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-aio-io_uring.xml create mode 100644 tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml -- 2.25.0

3 12

[PATCH 0/5] Xen: Add support for xl.cfg passthrough setting
by Jim Fehlig 24 Apr '20

24 Apr '20

Hi All, Note: This series is based on Marek's patches adding support for e820_host https://www.redhat.com/archives/libvir-list/2020-April/msg00633.html which I've ACK'ed, but am waiting to commit until this related setting is hashed out. This series adds support for Xen's xl.cfg(5) 'passthrough' setting. Starting with xen 4.13 this setting must be enabled in order to assign PCI passthrough devices to a guest. libxl will enable it automatically if the guest config has PCI devices at creation time, but otherwise 'passthrough' must be enabled to hotplug PCI devices. The passthrough setting is mapped to a xen hypervisor feature of the same name. Xen hypervisor features were recently added by the series mentioned above. Jim Fehlig (5): conf: add xen hypervisor feature 'passthrough' libxl: make use of passthrough hypervisor feature libxl: refactor cpu and hypervisor feature parser/formatter xenconfig: Add support for 'passthrough' hypervisor feature tests: check conversion of passthrough hypervisor feature docs/formatdomain.html.in | 7 ++ docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 115 ++++++++++++++---- src/conf/domain_conf.h | 11 ++ src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 21 ++++ src/libxl/xen_common.c | 86 ++++++++++--- .../test-fullvirt-hypervisor-features.cfg | 26 ++++ .../test-fullvirt-hypervisor-features.xml | 50 ++++++++ .../xlconfigdata/test-paravirt-e820_host.cfg | 1 + .../xlconfigdata/test-paravirt-e820_host.xml | 1 + tests/xlconfigtest.c | 3 + 12 files changed, 290 insertions(+), 45 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-hypervisor-features.xml -- 2.26.0

3 8

[PATCH] virStorageSourceParseNBDColonString: Rewrite to match what qemu does
by Peter Krempa 24 Apr '20

24 Apr '20

Our implementation wasn't quite able to parse everything that qemu does. This patch rewrites the parser to a code that semantically resembles the combination of 'nbd_parse_filename' and 'inet_parse' methods in qemu to be able to parse the strings in an equivalent manner. The only thing that libvirt doesn't do is to check the lenghts of various components in the nbd string in places where qemu uses constant size buffers. The test cases validate that some of the corner cases involving colons are parsed properly. https://bugzilla.redhat.com/show_bug.cgi?id=1826652 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 90 +++++++++++++++++++++++---------------- tests/virstoragetest.c | 16 +++++++ 2 files changed, 70 insertions(+), 36 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ffc8bdb344..a2ecdc3928 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -3072,59 +3072,77 @@ static int virStorageSourceParseNBDColonString(const char *nbdstr, virStorageSourcePtr src) { - VIR_AUTOSTRINGLIST backing = NULL; - const char *exportname; - - if (!(backing = virStringSplit(nbdstr, ":", 0))) - return -1; - - /* we know that backing[0] now equals to "nbd" */ - - if (VIR_ALLOC_N(src->hosts, 1) < 0) - return -1; + g_autofree char *nbd = g_strdup(nbdstr); + char *export_name; + char *host_spec; + char *unixpath; + char *port; + src->hosts = g_new0(virStorageNetHostDef, 1); src->nhosts = 1; - src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + + /* We extract the parameters in a similar way qemu does it */ /* format: [] denotes optional sections, uppercase are variable strings * nbd:unix:/PATH/TO/SOCKET[:exportname=EXPORTNAME] * nbd:HOSTNAME:PORT[:exportname=EXPORTNAME] */ - if (!backing[1]) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing remote information in '%s' for protocol nbd"), - nbdstr); - return -1; - } else if (STREQ(backing[1], "unix")) { - if (!backing[2]) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing unix socket path in nbd backing string %s"), - nbdstr); - return -1; - } - src->hosts->socket = g_strdup(backing[2]); + /* first look for ':exportname=' and cut it off */ + if ((export_name = strstr(nbd, ":exportname="))) { + src->path = g_strdup(export_name + strlen(":exportname=")); + export_name[0] = '\0'; + } + + /* Verify the prefix and contents. Note that we require a + * "host_spec" part to be present. */ + if (!(host_spec = STRSKIP(nbd, "nbd:")) || host_spec[0] == '\0') + goto malformed; + + if ((unixpath = STRSKIP(host_spec, "unix:"))) { src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_UNIX; - } else { - src->hosts->name = g_strdup(backing[1]); - if (!backing[2]) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing port in nbd string '%s'"), - nbdstr); - return -1; + if (unixpath[0] == '\0') + goto malformed; + + src->hosts->socket = g_strdup(unixpath); + } else { + src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + + if (host_spec[0] == ':') { + /* no host given */ + goto malformed; + } else if (host_spec[0] == '[') { + host_spec++; + /* IPv6 addr */ + if (!(port = strstr(host_spec, "]:"))) + goto malformed; + + port[0] = '\0'; + port += 2; + + if (host_spec[0] == '\0') + goto malformed; + } else { + if (!(port = strchr(host_spec, ':'))) + goto malformed; + + port[0] = '\0'; + port++; } - if (virStringParsePort(backing[2], &src->hosts->port) < 0) + if (virStringParsePort(port, &src->hosts->port) < 0) return -1; - } - if ((exportname = strstr(nbdstr, "exportname="))) { - exportname += strlen("exportname="); - src->path = g_strdup(exportname); + src->hosts->name = g_strdup(host_spec); } return 0; + + malformed: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("malformed nbd string '%s'"), nbdstr); + return -1; } diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6d2b21c25f..ac1480de4e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1261,10 +1261,26 @@ mymain(void) "<source protocol='nbd' name=':test'>\n" " <host name='example.org' port='6000'/>\n" "</source>\n"); + TEST_BACKING_PARSE("nbd:[::1]:6000:exportname=:test", + "<source protocol='nbd' name=':test'>\n" + " <host name='::1' port='6000'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd:127.0.0.1:6000:exportname=:test", + "<source protocol='nbd' name=':test'>\n" + " <host name='127.0.0.1' port='6000'/>\n" + "</source>\n"); TEST_BACKING_PARSE("nbd:unix:/tmp/sock:exportname=/", "<source protocol='nbd' name='/'>\n" " <host transport='unix' socket='/tmp/sock'/>\n" "</source>\n"); + TEST_BACKING_PARSE("nbd:unix:/tmp/sock:", + "<source protocol='nbd'>\n" + " <host transport='unix' socket='/tmp/sock:'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd:unix:/tmp/sock::exportname=:", + "<source protocol='nbd' name=':'>\n" + " <host transport='unix' socket='/tmp/sock:'/>\n" + "</source>\n"); TEST_BACKING_PARSE("nbd://example.org:1234", "<source protocol='nbd'>\n" " <host name='example.org' port='1234'/>\n" -- 2.26.0

2 2

[libvirt PATCH] travis: explicitly include gnutls to ensure it is updated
by Daniel P. Berrangé 24 Apr '20

24 Apr '20

Travis includes gnutls in the default package set, but it is an outdated version linkng to an incompatible libffi version. The 'update: true' stanza causes the brew toolchain to be updated but not the installed formula. It is possible to run 'brew upgrade' to update installed formula, but this is very slow adding more than 5 minutes to the build time. Listing the gnutls package explicitly causes it to be updated without extending the build time. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 29097cab6c..7c8a114054 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ addons: - yajl - glib - docutils + - gnutls matrix: include: -- 2.25.3

1 0

Re: [libvirt-php] libvirt_list_storagepools() gives an error if all the storage pools on the host node are active
by Fernando Casas Schössow 24 Apr '20

24 Apr '20

I can confirm the problem is fixed in current master. Thanks and have a great weekend! On vie, abr 24, 2020 at 4:49 PM, Fernando Casas Schössow <casasfernando(a)outlook.com> wrote: > Hi Michal, > > Thanks for quick reply. > Let me pull from master, rebuild the container and test it. > I will report back with the result. > > Thanks, > > Fernando > > On vie, abr 24, 2020 at 4:16 PM, Michal Privoznik > <mprivozn(a)redhat.com> wrote: >> On 4/23/20 11:02 PM, Fernando Casas Schössow wrote: >>> Hi, >>> >>> While using the function libvirt_list_storagepools() I found that >>> if all the storage pools on the host node are active, the function >>> doesn't return the list of storage pools but it gives the following >>> error instead: >> >> Hey, I've switched the function to use more modern listing API. The >> change us pushed, so can you please fetch the master and see if that >> helped? >> >> Thanks, >> Michal > > >

1 0

[libvirt-php] libvirt_list_storagepools() gives an error if all the storage pools on the host node are active
by Fernando Casas Schössow 24 Apr '20

24 Apr '20

Hi, While using the function libvirt_list_storagepools() I found that if all the storage pools on the host node are active, the function doesn't return the list of storage pools but it gives the following error instead: names in virConnectListDefinedStoragePools must not be NULL Expected result, return an array of all the storage pools names on the host node regardless of their status (active or inactive). virsh output for the equivalent command: $ virsh pool-list --all Name State Autostart -------------------------------------------- default active yes resources active yes templates active yes virtual_machines_hdd active yes virtual_machines_ssd active yes Also in the same scenario (all storage pools active) libvirt_list_inactive_storagepools() gives the same error detailed above. I wouldn't say this is actually wrong but wouldn't it be better if these functions returns FALSE instead if there are no results (-no inactive storage pools in this case-)? System information: OS: Debian Buster PHP version (fast cgi): 7.3.14 Libvirt PHP version: latest from git repository @ gitlab Libvirt version: 5.0.0 KVM host libvirt version: 5.9.0 Thanks, Fernando

2 2

[PATCH 0/8] tests: qemumonitor: Make fake qemu monitor failures more obvious
by Peter Krempa 24 Apr '20

24 Apr '20

See patch 4 and 8 for details. Peter Krempa (8): tests: monitor: Rename qemuMonitorReportError to qemuMonitorTestAddErrorResponse qemuhotplugtest: detach: Add expected 'object-del' to disk-scsi-multipath case qemuhotplugtest: cpu: x86-modern-individual: Remove invalid test case qemumonitortestutils: Make test monitor failures more prominent qemucapabilitiesdata: riscv: Remove call to 'query-machines' qemuhotplugtest: Remove 'drive_del' expectation from failed cases qemumonitortestutils: Store a string identifying test monitor entry qemumonitortestutils: Enforce consumption of all items in test monitor build-aux/syntax-check.mk | 1 + tests/cputest.c | 2 + tests/qemuagenttest.c | 31 +-- .../caps_3.0.0.riscv32.replies | 42 ----- .../caps_3.0.0.riscv64.replies | 42 ----- .../caps_4.0.0.riscv32.replies | 42 ----- .../caps_4.0.0.riscv64.replies | 42 ----- tests/qemuhotplugtest.c | 12 +- tests/qemumonitorjsontest.c | 2 + tests/qemumonitortestutils.c | 176 +++++++++++------- tests/qemumonitortestutils.h | 5 +- 11 files changed, 141 insertions(+), 256 deletions(-) -- 2.26.0

2 10

[PATCH v3 0/2] Include lease time option into DHCP settings
by Julio Faracco 24 Apr '20

24 Apr '20

This series is based on latest series from Nehal. It includes a new entry called <lease/> under <range/> and <host/> from <dhcp/> scope. This was implemented to include independent lease time for each line and dnsmasq option. So, users are able to define one lease time for ranges and other different for each host entry. The new syntax is simlar with: <dhcp> <range ...> <lease expiry='14' unit='mins'/> </range> <host ...> <lease expiry='1' unit='hours'/> </host> </dhcp> It will produce a option in dnsmasq configuration file: dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0,14m And some contents into hostsfile: 00:16:3e:77:e2:ed,192.168.122.10,a.example.com,1h This series includes some test cases to cover lease time XML syntax also. Now, each test case requires a hostsfile to test this specific setting. - v1-v2: Change XML syntax according Daniel's suggestion. - v2-v3: Fix memory leak and test dependency issue. Julio Faracco (2): conf: Add <lease/> option for <dhcp/> settings tests: Add tests for <lease/> to cover dnsmasq settings docs/schemas/basictypes.rng | 8 + docs/schemas/network.rng | 20 +++ src/conf/network_conf.c | 159 +++++++++++++++--- src/conf/network_conf.h | 27 ++- src/libvirt_private.syms | 3 + src/network/bridge_driver.c | 56 +++++- src/network/bridge_driver.h | 1 + src/test/test_driver.c | 2 +- src/util/virdnsmasq.c | 60 ++++--- src/util/virdnsmasq.h | 3 + src/vbox/vbox_network.c | 16 +- .../dhcp6-nat-network.hostsfile | 7 + .../dhcp6-network.hostsfile | 5 + .../dhcp6host-routed-network.hostsfile | 7 + .../networkxml2confdata/leasetime-hours.conf | 16 ++ .../leasetime-hours.hostsfile | 2 + tests/networkxml2confdata/leasetime-hours.xml | 19 +++ .../leasetime-infinite.conf | 16 ++ .../leasetime-infinite.hostsfile | 2 + .../leasetime-infinite.xml | 19 +++ .../leasetime-minutes.conf | 16 ++ .../leasetime-minutes.hostsfile | 2 + .../networkxml2confdata/leasetime-minutes.xml | 19 +++ .../leasetime-seconds.conf | 16 ++ .../leasetime-seconds.hostsfile | 2 + .../networkxml2confdata/leasetime-seconds.xml | 19 +++ ...t-network-dns-srv-record-minimal.hostsfile | 2 + .../nat-network-dns-srv-record.hostsfile | 2 + .../nat-network-dns-txt-record.hostsfile | 2 + .../nat-network-mtu.hostsfile | 2 + .../nat-network-name-with-quotes.hostsfile | 2 + .../networkxml2confdata/nat-network.hostsfile | 2 + .../ptr-domains-auto.hostsfile | 2 + tests/networkxml2conftest.c | 42 ++++- tests/networkxml2xmlin/leasetime-hours.xml | 19 +++ tests/networkxml2xmlin/leasetime-infinite.xml | 19 +++ tests/networkxml2xmlin/leasetime-minutes.xml | 19 +++ tests/networkxml2xmlin/leasetime-seconds.xml | 19 +++ tests/networkxml2xmlout/leasetime-hours.xml | 21 +++ .../networkxml2xmlout/leasetime-infinite.xml | 21 +++ tests/networkxml2xmlout/leasetime-minutes.xml | 21 +++ tests/networkxml2xmlout/leasetime-seconds.xml | 21 +++ tests/networkxml2xmltest.c | 4 + 43 files changed, 676 insertions(+), 66 deletions(-) create mode 100644 tests/networkxml2confdata/dhcp6-nat-network.hostsfile create mode 100644 tests/networkxml2confdata/dhcp6-network.hostsfile create mode 100644 tests/networkxml2confdata/dhcp6host-routed-network.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-hours.conf create mode 100644 tests/networkxml2confdata/leasetime-hours.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-hours.xml create mode 100644 tests/networkxml2confdata/leasetime-infinite.conf create mode 100644 tests/networkxml2confdata/leasetime-infinite.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-infinite.xml create mode 100644 tests/networkxml2confdata/leasetime-minutes.conf create mode 100644 tests/networkxml2confdata/leasetime-minutes.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-minutes.xml create mode 100644 tests/networkxml2confdata/leasetime-seconds.conf create mode 100644 tests/networkxml2confdata/leasetime-seconds.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-seconds.xml create mode 100644 tests/networkxml2confdata/nat-network-dns-srv-record-minimal.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-dns-srv-record.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-dns-txt-record.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-mtu.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-name-with-quotes.hostsfile create mode 100644 tests/networkxml2confdata/nat-network.hostsfile create mode 100644 tests/networkxml2confdata/ptr-domains-auto.hostsfile create mode 100644 tests/networkxml2xmlin/leasetime-hours.xml create mode 100644 tests/networkxml2xmlin/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlin/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlin/leasetime-seconds.xml create mode 100644 tests/networkxml2xmlout/leasetime-hours.xml create mode 100644 tests/networkxml2xmlout/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlout/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlout/leasetime-seconds.xml -- 2.25.3

3 7

[PATCH] schema: backup: Make 'exportname' and 'exportbitmap' independent
by Peter Krempa 24 Apr '20

24 Apr '20

Both are optional but don't have to be specified together. Fix the schema. https://bugzilla.redhat.com/show_bug.cgi?id=1826746 Suggested-by: Yi Sun <yisun(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. docs/schemas/domainbackup.rng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/schemas/domainbackup.rng b/docs/schemas/domainbackup.rng index ac5b12c463..5165175152 100644 --- a/docs/schemas/domainbackup.rng +++ b/docs/schemas/domainbackup.rng @@ -200,6 +200,8 @@ <attribute name='exportname'> <text/> </attribute> + </optional> + <optional> <attribute name='exportbitmap'> <text/> </attribute> -- 2.26.0

1 0

[PATCH v2] docs: Document reserved PCI addresses for QEMU
by Michal Privoznik 24 Apr '20

24 Apr '20

>From time to time we are asked which PCI addresses are reserved in QEMU. Let's document them in one place, it's easier than reconstructing the list from the code each time. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - All Laine's comment worked in, hopefully. docs/pci-addresses.rst | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/pci-addresses.rst b/docs/pci-addresses.rst index 885d50517a..4f123c7eb9 100644 --- a/docs/pci-addresses.rst +++ b/docs/pci-addresses.rst @@ -235,3 +235,53 @@ guest OS rather than as ``0001:08:00.1``, which is the address of the device on the host. Of course, all the rules and behaviors described above still apply. + + +Reserved addresses +================== + +Due to some historical reasons hypervisors might expect some PCI +devices to appear at certain addresses instead of 'random' ones. +For QEMU this is machine type and guest architecture dependant. +But to give you at least a gist here is list of reserved PCI +addresses: + +For ``I440FX`` the following devices are hard coded into QEMU and can't be +moved or eliminated: + +============ ====================== +0000:00:00.0 Host bridge +0000:00:01.0 ISA bridge +0000:00:01.1 primary IDE controller +0000:00:01.2 PIIX3 USB controller +0000:00:01.3 ACPI (power management) and SMBus controller +============ ====================== + +The following addresses will be used as default ones for the corresponding +devices (if the address is free or a different address wasn't provided for the +device): + +============ ================== +0000:00:02.0 primary video card +============ ================== + + +For ``Q35`` the following devices are hard coded into QEMU and can't be moved +or eliminated: + +============ ======================= +0000:00:00.0 Host bridge +0000:00:1f.2 primary SATA controller +0000:00:1f.0 ISA bridge +0000:00:1f.3 SMBus +============ ======================= + +The following addresses will be used as default ones for the corresponding +devices (if the address is free or a different address wasn't provided for the +device) because that's how real ``Q35`` would do it: + +============ =============== +0000:00:1a.0 USB2 controller +0000:00:1b.0 ICH9 sound chip +0000:00:1d.0 USB2 controller +============ =============== -- 2.25.3

2 2

[PATCH v2] news: Include new DHCP network <lease/> feature
by Julio Faracco 24 Apr '20

24 Apr '20

This commit includes an entry for new network DHCP lease time information inside news.xml. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 956018b512..9c36f3bd51 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -88,6 +88,16 @@ hotplugging PCI devices. </description> </change> + <change> + <summary> + Lease time option included for network DHCP settings + </summary> + <description> + Users can now configure expiry time for leases for networks where + libvirt manages DHCP. The time can be specified for whole range + and/or fine tuned per individual host. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.25.3

2 1

[PATCH] qemu: Move interlocking of blockjobs and checkpoints after liveness check
by Peter Krempa 23 Apr '20

23 Apr '20

qemuDomainSupportsCheckpointsBlockjobs checks if the QEMU_CAPS_INCREMENTAL_BACKUP capability is supported to do the interlocking. Capabilities are not present when the VM isn't running though which would create false errors. Move the checks after the liveness check in block job implementations. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 00d276061e..5ecf12deef 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17439,6 +17439,9 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm, if (virDomainObjCheckActive(vm) < 0) goto endjob; + if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) + goto endjob; + if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -17994,6 +17997,9 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (virDomainObjCheckActive(vm) < 0) goto endjob; + if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) + goto endjob; + if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -18278,9 +18284,6 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, if (virDomainBlockRebaseEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto cleanup; - /* For normal rebase (enhanced blockpull), the common code handles * everything, including vm cleanup. */ if (!(flags & VIR_DOMAIN_BLOCK_REBASE_COPY)) @@ -18364,9 +18367,6 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, if (virDomainBlockCopyEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto cleanup; - for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; @@ -18429,11 +18429,6 @@ qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, return -1; } - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) { - virDomainObjEndAPI(&vm); - return -1; - } - /* qemuDomainBlockPullCommon consumes the reference on @vm */ return qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags); } -- 2.26.0

3 2

[PATCH 0/5] backup: Preserve error of failed backup job
by Peter Krempa 23 Apr '20

23 Apr '20

Aid in problem identification by storing the error for users as it wasn't accessible besides from logs. Peter Krempa (5): remote: remoteDispatchDomainGetJobStats: Encode typed parameter strings qemu: Add free and copy function for qemuDomainJobInfo and use it API: Add VIR_DOMAIN_JOB_ERRMSG domain job statistics field qemu: domain: Add 'errmsg' field to qemuDomainJobInfo backup: Store error message for failed backups include/libvirt/libvirt-domain.h | 9 +++++++ src/conf/backup_conf.c | 1 + src/conf/backup_conf.h | 2 ++ src/qemu/qemu_backup.c | 15 ++++++++---- src/qemu/qemu_backup.h | 1 + src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_domain.c | 33 +++++++++++++++++++++---- src/qemu/qemu_domain.h | 10 ++++++++ src/qemu/qemu_driver.c | 37 +++++++++++++++-------------- src/qemu/qemu_migration.c | 16 ++++++------- src/qemu/qemu_migration_cookie.c | 10 ++++---- src/remote/remote_daemon_dispatch.c | 2 +- tools/virsh-domain.c | 8 +++++++ 13 files changed, 101 insertions(+), 45 deletions(-) -- 2.26.0

2 10

[libvirt PATCH 0/3] qemu: block: basic implementation of deletion of external snapshots
by Pavel Mores 23 Apr '20

23 Apr '20

Deleting external snapshots has been unimplemented so far. This series aims to enable limited functionality in that direction, handling just the common cases for now. The intention is to subsequently build upon this to eventually cover the more complex/exotic cases as well. Please refer to the commit message of the final commit for a detailed description of features and limitations of this change. Pavel Mores (3): qemu: block: factor implementation out of qemuDomainBlockCommit() qemu: block: factor implementation out of qemuDomainBlockJobAbort() qemu: block: external snapshot-delete implementation for straightforward cases src/qemu/qemu_driver.c | 295 +++++++++++++++++++++++++++++++++-------- 1 file changed, 241 insertions(+), 54 deletions(-) -- 2.24.1

2 11

[PATCH] news: Include new DHCP network <lease/> feature
by Julio Faracco 23 Apr '20

23 Apr '20

This commit includes an entry for new network DHCP lease time information inside news.xml. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 956018b512..3a013ffbbd 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -88,6 +88,18 @@ hotplugging PCI devices. </description> </change> + <change> + <summary> + Lease time option included for network DHCP settings + </summary> + <description> + Dnsmasq does not support to configure a global lease time. There + is no configuration option that could specify lease time. The + only way to configure lease time is setting it for each range's + and host's lines mainly. Libvirt now can configure lease time + for <code>range</code> and <code>host</code>. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.25.3

2 2

[libvirt-perl PATCH 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 23 Apr '20

23 Apr '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. Daniel P. Berrangé (3): Build: bump min perl to 5.16.0 gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML .gitlab-ci.yml | 158 ++++++++++++++++++++++++++++++++++ Build.PL | 2 +- ci/libvirt-centos-7.dkr | 12 +++ ci/libvirt-centos-8.dkr | 13 +++ ci/libvirt-debian-10.dkr | 14 +++ ci/libvirt-debian-9.dkr | 14 +++ ci/libvirt-debian-sid.dkr | 14 +++ ci/libvirt-fedora-30.dkr | 13 +++ ci/libvirt-fedora-31.dkr | 13 +++ ci/libvirt-fedora-rawhide.dkr | 13 +++ ci/libvirt-opensuse-151.dkr | 11 +++ ci/libvirt-ubuntu-1604.dkr | 14 +++ ci/libvirt-ubuntu-1804.dkr | 14 +++ ci/refresh | 16 ++++ 14 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 ci/libvirt-centos-7.dkr create mode 100644 ci/libvirt-centos-8.dkr create mode 100644 ci/libvirt-debian-10.dkr create mode 100644 ci/libvirt-debian-9.dkr create mode 100644 ci/libvirt-debian-sid.dkr create mode 100644 ci/libvirt-fedora-30.dkr create mode 100644 ci/libvirt-fedora-31.dkr create mode 100644 ci/libvirt-fedora-rawhide.dkr create mode 100644 ci/libvirt-opensuse-151.dkr create mode 100644 ci/libvirt-ubuntu-1604.dkr create mode 100644 ci/libvirt-ubuntu-1804.dkr create mode 100755 ci/refresh -- 2.25.3

1 3

[PATCH] networkxml2xmltest: Complete renaming of @actual
by Michal Privoznik 23 Apr '20

23 Apr '20

In 97a0aa2467 the @actual variable was renamed to @confactual. However, the commit missed non-Linux case resulting in a broken build. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. tests/networkxml2conftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5d0bba7924..b35de50f0b 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -58,7 +58,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, "except-interface=lo\n"))) goto fail; VIR_FREE(confactual); - actual = g_steal_pointer(&tmp); + confactual = g_steal_pointer(&tmp); #endif if (virTestCompareToFile(confactual, outconf) < 0) -- 2.26.2

1 0

[PATCH 0/4] qemuhotplugtest: Fix timeouts
by Peter Krempa 23 Apr '20

23 Apr '20

The test takes too long for no good reason. One was caused by the compiler inlining too much and second one was a deliberate decision. Peter Krempa (4): qemuDomainGetUnplugTimeout: Add G_GNUC_NO_INLINE mock:qemuDomainGetUnplugTimeout: Remove unused attribute for '@vm' mock: qemuDomainGetUnplugTimeout: Decrease timeout qemuhotplugtest: detach: Remove commands which are not issued src/qemu/qemu_hotplug.c | 2 +- tests/qemuhotplugmock.c | 6 +++--- tests/qemuhotplugtest.c | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) -- 2.26.0

2 5

[libvirt PATCH 0/5] Remove virRun in favor of virCommand
by Ján Tomko 23 Apr '20

23 Apr '20

Ján Tomko (5): openvz: switch from virRun to virCommand vmware: use virCommand instead of virRun Remove all usage of virRun util: remove references to virRun/virExec util: remove virRun src/libvirt_private.syms | 1 - src/lxc/lxc_driver.c | 5 +- src/openvz/openvz_driver.c | 96 ++++++++++++++------------------ src/qemu/qemu_domain.c | 16 +++--- src/security/security_apparmor.c | 11 +--- src/util/vircommand.c | 35 ------------ src/util/vircommand.h | 2 - src/util/virnetdev.c | 24 +++----- src/util/virprocess.c | 4 +- src/vmware/vmware_conf.c | 9 ++- src/vmware/vmware_driver.c | 69 ++++++++++------------- 11 files changed, 98 insertions(+), 174 deletions(-) -- 2.25.1

2 7

[all PATCH v2] gitlab: add CI job for validating DCO signoff
by Daniel P. Berrangé 23 Apr '20

23 Apr '20

This job uses the shared "check-dco" image to validate that all commits on a branch in a developer's repo fork have a suitable Signed-off-by statement present. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- This patch was against the Perl repo, but if this is approved then I'll also apply it to *all* the other repos which currently lack a DCO check, without reposting further patches for each repo. For libvirt.git I'll send a patch to update its existing DCO job. Changed in v2: - Exclude based on project namespace, not branch names .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..50dae92 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ + +stages: + - prebuild + +# Check that all commits are signed-off for the DCO. +# Skip on "libvirt" namespace, since we only need to run +# this test on developer's personal forks from which +# merge requests are submitted +check-dco: + stage: prebuild + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + script: + - /check-dco + except: + variables: + - $CI_PROJECT_NAMESPACE == 'libvirt' -- 2.25.2

2 1

[PATCH] news: Document new Xen hypervisor features
by Jim Fehlig 23 Apr '20

23 Apr '20

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 99c65447b0..074dc22e97 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -66,6 +66,28 @@ feedback from users on how well it works in practice. </description> </change> + <change> + <summary> + Xen: add support for e820_host hypervisor feature + </summary> + <description> + e820_host is a Xen-specific option only available for PV guests. + When enabled it provides the guest with a virtual e820 memory map + based on the host one. It must be enabled to allow hotplugging + PCI devices to PV guests, particularly when memory ballooning + is enabled. + </description> + </change> + <change> + <summary> + Xen: add support for passthrough hypervisor feature + </summary> + <description> + passthrough is a Xen-specific option new to Xen 4.13 that enables + PCI passthrough for guests. It must be enabled to allow hotplugging + PCI devices. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.26.0

2 7

[PATCH v2 0/2] Include lease time option into DHCP settings
by Julio Faracco 22 Apr '20

22 Apr '20

This series is based on latest series from Nehal. It includes a new entry called <lease/> under <range/> and <host/> from <dhcp/> scope. This was implemented to include independent lease time for each line and dnsmasq option. So, users are able to define one lease time for ranges and other different for each host entry. The new syntax is simlar with: <dhcp> <range ...> <lease expiry='14' unit='mins'/> </range> <host ...> <lease expiry='1' unit='hours'/> </host> </dhcp> It will produce a option in dnsmasq configuration file: dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0,14m And some contents into hostsfile: 00:16:3e:77:e2:ed,192.168.122.10,a.example.com,1h This series includes some test cases to cover lease time XML syntax also. Now, each test case requires a hostsfile to test this specific setting. Julio Faracco (2): conf: Add <lease/> option for <dhcp/> settings tests: Add tests for <lease/> to cover dnsmasq settings docs/schemas/basictypes.rng | 8 + docs/schemas/network.rng | 20 +++ src/conf/network_conf.c | 159 +++++++++++++++--- src/conf/network_conf.h | 27 ++- src/libvirt_private.syms | 3 + src/network/bridge_driver.c | 56 +++++- src/network/bridge_driver.h | 1 + src/test/test_driver.c | 2 +- src/util/virdnsmasq.c | 68 +++++--- src/util/virdnsmasq.h | 3 + src/vbox/vbox_network.c | 16 +- .../dhcp6-nat-network.hostsfile | 7 + .../dhcp6-network.hostsfile | 5 + .../dhcp6host-routed-network.hostsfile | 7 + .../networkxml2confdata/leasetime-hours.conf | 16 ++ .../leasetime-hours.hostsfile | 2 + tests/networkxml2confdata/leasetime-hours.xml | 19 +++ .../leasetime-infinite.conf | 16 ++ .../leasetime-infinite.hostsfile | 2 + .../leasetime-infinite.xml | 19 +++ .../leasetime-minutes.conf | 16 ++ .../leasetime-minutes.hostsfile | 2 + .../networkxml2confdata/leasetime-minutes.xml | 19 +++ .../leasetime-seconds.conf | 16 ++ .../leasetime-seconds.hostsfile | 2 + .../networkxml2confdata/leasetime-seconds.xml | 19 +++ ...t-network-dns-srv-record-minimal.hostsfile | 2 + .../nat-network-dns-srv-record.hostsfile | 2 + .../nat-network-dns-txt-record.hostsfile | 2 + .../nat-network-mtu.hostsfile | 2 + .../nat-network-name-with-quotes.hostsfile | 2 + .../networkxml2confdata/nat-network.hostsfile | 2 + .../ptr-domains-auto.hostsfile | 2 + tests/networkxml2conftest.c | 41 ++++- tests/networkxml2xmlin/leasetime-hours.xml | 19 +++ tests/networkxml2xmlin/leasetime-infinite.xml | 19 +++ tests/networkxml2xmlin/leasetime-minutes.xml | 19 +++ tests/networkxml2xmlin/leasetime-seconds.xml | 19 +++ tests/networkxml2xmlout/leasetime-hours.xml | 21 +++ .../networkxml2xmlout/leasetime-infinite.xml | 21 +++ tests/networkxml2xmlout/leasetime-minutes.xml | 21 +++ tests/networkxml2xmlout/leasetime-seconds.xml | 21 +++ tests/networkxml2xmltest.c | 4 + 43 files changed, 683 insertions(+), 66 deletions(-) create mode 100644 tests/networkxml2confdata/dhcp6-nat-network.hostsfile create mode 100644 tests/networkxml2confdata/dhcp6-network.hostsfile create mode 100644 tests/networkxml2confdata/dhcp6host-routed-network.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-hours.conf create mode 100644 tests/networkxml2confdata/leasetime-hours.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-hours.xml create mode 100644 tests/networkxml2confdata/leasetime-infinite.conf create mode 100644 tests/networkxml2confdata/leasetime-infinite.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-infinite.xml create mode 100644 tests/networkxml2confdata/leasetime-minutes.conf create mode 100644 tests/networkxml2confdata/leasetime-minutes.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-minutes.xml create mode 100644 tests/networkxml2confdata/leasetime-seconds.conf create mode 100644 tests/networkxml2confdata/leasetime-seconds.hostsfile create mode 100644 tests/networkxml2confdata/leasetime-seconds.xml create mode 100644 tests/networkxml2confdata/nat-network-dns-srv-record-minimal.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-dns-srv-record.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-dns-txt-record.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-mtu.hostsfile create mode 100644 tests/networkxml2confdata/nat-network-name-with-quotes.hostsfile create mode 100644 tests/networkxml2confdata/nat-network.hostsfile create mode 100644 tests/networkxml2confdata/ptr-domains-auto.hostsfile create mode 100644 tests/networkxml2xmlin/leasetime-hours.xml create mode 100644 tests/networkxml2xmlin/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlin/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlin/leasetime-seconds.xml create mode 100644 tests/networkxml2xmlout/leasetime-hours.xml create mode 100644 tests/networkxml2xmlout/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlout/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlout/leasetime-seconds.xml -- 2.24.1

2 6

[all PATCH] gitlab: add CI job for validating DCO signoff
by Daniel P. Berrangé 22 Apr '20

22 Apr '20

This job uses the shared "check-dco" image to validate that all commits on a developer's branch have a suitable Signed-off-by statement present. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- This patch was against the Perl repo, but if this is approved then I'll also apply it to *all* the other repos which currently lack a DCO check, without reposting further patches for each repo. For libvirt.git I'll send a patch to update its existing DCO job. .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..56e0e02 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ + +stages: + - prebuild + +# Check that all commits are signed-off for the DCO. Skip +# on master branch and -maint branches, since we only need +# to test developer's personal branches. +check-dco: + stage: prebuild + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + script: + - /check-dco + only: + - branches + except: + - master -- 2.25.2

2 5

[PATCH] docs: drvqemu: trivial fix for qemu commands passthrough
by Chen Hanxiao 22 Apr '20

22 Apr '20

element <qemu:commandline> should be the child of <domain> Signed-off-by: Chen Hanxiao <chen_han_xiao(a)126.com> --- docs/drvqemu.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 5f412ba376..afc4ddf56d 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -578,7 +578,7 @@ mount -t cgroup none /dev/cgroup -o devices typically, the namespace is given the name of <code>qemu</code>. With the namespace in place, it is then possible to add an element <code><qemu:commandline></code> - under <code>driver</code>, with the following sub-elements + under <code>domain</code>, with the following sub-elements repeated as often as needed: </p> <dl> -- 2.23.0

2 1

[PATCH 0/6] qemuDomainSaveImageOpen: Fix startup with corrupted save image
by Peter Krempa 22 Apr '20

22 Apr '20

This is an alternative to https://www.redhat.com/archives/libvir-list/2020-April/msg01081.html which actually fixes qemuDomainSaveImageOpen in a way that would make it more obvious which value needs to be returned and also cleans up the code some more. Peter Krempa (6): qemu: fix domain start with corrupted save file virQEMUSaveData: Register autoclear function and use it in qemuDomainSaveImageOpen qemuDomainSaveImageOpen: Use g_autoptr for 'dom' qemuDomainSaveImageOpen: Automatically close 'fd' if unneeded qemuDomainSaveImageOpen: Use 'g_new0' instead of VIR_ALLOC(_N) qemuDomainSaveImageOpen: Refactor handling of errors src/qemu/qemu_driver.c | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) -- 2.26.0

3 13

[libvirt PATCH v2] qemu: fix domain start with corrupted save file
by Pavel Mores 22 Apr '20

22 Apr '20

This is to fix https://bugzilla.redhat.com/show_bug.cgi?id=1791522 With this change, if a domain comes across a corrupted save file during boot it removes the save file and logs a warning but continues to boot normally instead of failing to boot (with a subsequent boot attempt succeeding). The regression was introduced by 21ad56e932 and this change effectively reverts the relevant part of that commit. --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e8d47a41cd..2579ef3984 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6810,13 +6810,14 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def = def; *ret_data = data; + cleanup: return fd; error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - return -1; + goto cleanup; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 2.24.1

2 2

[libvirt PATCH] qemu: fix domain start with corrupted save file
by Pavel Mores 22 Apr '20

22 Apr '20

This is to fix https://bugzilla.redhat.com/show_bug.cgi?id=1791522 With this change, if a domain comes across a corrupted save file during boot it removes the save file and logs a warning but continues to boot normally instead of failing to boot (with a subsequent boot attempt succeeding). The regression was introduced by 21ad56e932 and this change effectively reverts the relevant part of that commit. --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e8d47a41cd..2579ef3984 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6810,13 +6810,14 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def = def; *ret_data = data; + cleanup: return fd; error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - return -1; + goto cleanup; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 2.24.1

2 2

[RFC 00/29] RFC: Generate object-model code based on relax-ng files
by Shi Lei 22 Apr '20

22 Apr '20

Outline ========= In libvirt world, objects(like domain, network, etc.) are described with two representations: structures in c-language and XML specified by relax-ng. Since c-language-implementation and xml restricted by relax-ng are merely the different expressions of the same object-model, we can make a tool to generate those C-language codes based on relax-ng files. RNG2C tool =========== RNG2C is a python tool which can translate hierarchy of notations in relax-ng into c-language structures. In general, <element> is converted to struct in C, struct's members derive from its <attribute>s and its sub <element>s; <choice> with multiple <value>s is converted to enum in C; <data> are converted into various builtin-type in C, such as int, char *. Also, RNG2C can generate relative conversion functions: vir[XXX]ParseXML, vir[XXX]FormatBuf and vir[XXX]Clear. These structures and functions can be used to replace hardcoded codes in current libvirt source. The tool RNG2C has three subcommands: 'list', 'show' and 'generate'. The 'list' and 'show' are used for previewing generated code, and the 'generate' is prepared to be invoked by Makefile. 1) list - list all types generated by this tool. Example: # ./rng2c/go list SHORT_ID META LOCATION -------- ---- ---------- 3df63b7a String String 9b81a5f5 UInt UInt 9d10c738 Enum /basictypes.rng/virOnOff.define/choice 5a024c44 Struct /network.rng/network.define/network.element/dns.element f6f0c927 Struct /network.rng/network.define/network.element ... ... 2) show - show details of the target type. The target is specified with SHORT_ID or LOCATION. Option '-k' specifies kinds of output information, 'scpf' stands for [s]tructure | [c]learfunc | [p]arsefunc | [f]ormatfunc. Example: # ./rng2c/go show 5a024c44 -kscpf Or # ./rng2c/go show /network.rng/network.define/network.element/dns.element -kscpf It will show four aspects of this Type: the directive of it; the declaration and implementation of its structure; code of its clearfunc; code of its parsefunc; code of its formatfunc. 3) generate - just like show, but it dosen't print information on screen. It is only for Makefile. It will generate c-language-code, such as struct/enum/ parsefunc/etc., to take the place of the relative hardcoded stuff. Problems ========= If we replace hardcoded code with generated code directly, there're still several problems. Problem1 - name convension Generated code follows specific name convension, now there're some differences between generated code and current libvirt codes. For example, generated struct's name will be like virXXXDef, parsefunc's name will be like virXXXDefParseXML; the 'XXX' is a kind of Camel-Case name which implies the struct's place in the hierarchy. But in current code, there're many variations of name. So if we replace current codes with generated codes directly, it requires a lot of modifications in the caller codes. Problem2 - error-checking codes in the parsefunc Most of current parse functions have error-checking codes after parsing XML code. These code lines validate existence and parsing results. Now RNG2C can't generate error-checking codes in the parsefunc. So we should find a way to handle it. Problem3 - hierarchy consistence The RNG2C generate a 'struct'(C code) for each 'element'(relax-ng). Most of current code follows this convention, but there're still some exceptions. For example, the element 'bridge'(in network.rng) should be translated into a struct called 'virNetworkBridgeDef'; but in fact, no this struct in the current codes, and its members (stp/delay/...) are exposed to the struct 'virNetworkDef'. Problem4 - target output files for generated code The current codes to be replaced exist in various source files. They include other source files, and are included by other source files. So we should specify proper target files for generated codes to take the place of old codes and inherit those original relationships. Directive =========== To solve these problems, the directive mechanism is introduced. stage1 stage2 relax-ng ---------> directives(json) ---------> c-language-code ^ | | | |---------------------| feedback-injection The basic process of generating codes includes two internal stages: Stage1: RNG2C parses the content of relax-ng files and generates directives. Stage2: RNG2C generates c-language code based on directives. So the code's form depends on directives directly. Injecting directives with new values into relax-ng files can override the default directives of stage1. Then in the stage2, the final c-code will be different. Directives are in the form of json and then wrapped as an special XML comment. So when common relax-ng parsers parse these relax-ng files, these directives will be ignored. Only RNG2C can recognize and handle them. For example: We want to replace the hardcoded virNetworkDNSHostDef with the generated structure. The original hardcoded structure is as below: typedef struct _virNetworkDNSHostDef virNetworkDNSHostDef; typedef virNetworkDNSHostDef *virNetworkDNSHostDefPtr; struct _virNetworkDNSHostDef { virSocketAddr ip; size_t nnames; char **names; }; Take several steps as below: 1) Execute subcommand list to find it # ./rng2c/go list | grep dns | grep host SHORT_ID META LOCATION 7892979d Struct /network.rng/network.define/network.element/dns.element/host.element 2) Execute subcommand show with SHORT-ID to check its generated structure # ./rng2c/go show 7892979d -ks ###### Directive ######  ###### Structure (Disabled: NO OUTPUT for "structure".) ###### [.h] typedef struct _virNetworkDNSHostDef virNetworkDNSHostDef; typedef virNetworkDNSHostDef *virNetworkDNSHostDefPtr; struct _virNetworkDNSHostDef { virSocketAddr ip; size_t nhostnames; char **hostnames; }; We can see, the name of the generated struct depends on root property "name" of the directive. Fortunately, it's the same and we don't need override it. There're two differences between generated structure and hardcoded stuff: In original struct, names of the second and third member are 'nnames' and 'names'; but in generated code, they are 'nhostnames' and 'hostnames'. These names are controlled by this part: "members": [{"id": "hostname", ...}]. 3) Override properties of the directive and reinject it into the relax-ng Based on "location" of the directive, we find the injection point and only need to fill changed parts, just as below:  <element name="host"> ... ... We need to specify which member will be altered by property "id". 4) Re-execute subcommand 'show' to confirm the sameness After we bridge the gap between the generated structure and the hardcoded stuff, we can perform the substitution. Directive properties ===================== The schema of directive are defined in rng2c/schema.json. Directive consists of properties. Properties retain or derive from the notations in the relax-ng. 1) root properties id - string, READ-ONLY. Unique identity of the type. The id is generated by SHA-1. Its leftmost 8 digits are taken out as SHORT-ID. location - string, READ-ONLY. The location where the type derive from. When injecting a directive into relax-ng file, the injection point is based on this location. tag - string, READ-ONLY. The type's source tag. It can be 'element', 'data' or 'choice'. name - string. The type's name. For struct and enum, name is generated automatically. For struct, its default form is vir[XXX]Def; for enum, its default form is vir[XXX]Type. The main part 'XXX' represents its position in the hierarchy. If name is specified, it will override the default name. For example, inject directive as below:  <element name="route"> ... ... Then the name of the generated struct will be 'virNetDevIPRoute'. This root property 'name' can be used to solve Problem1. meta - string. The type's meta. For struct, it is 'Struct'; for enum, it is 'Enum'; for builtins, it is the builtin's meta. Meta can be overrided. For example, inject directive as below: <define name="UUID">  <data type="string"> ... ... Then this builtin will change into UChars from String(i.e. char *). Note: RNG2C don't generate implementation for builtin, they need to be hardcoded in libvirt source. unpack - boolean. Only for struct. Only valid for struct. On setting it true, this type will expose its members to its upper-level struct rather than act as a standalone struct. For example, inject directive on element 'bridge' as below:  <element name="bridge"> So struct virNetworkBridgeDef will not appear. All of its members, such as bridgeName/bridgeZone/stp/delay, are exposed to its parent struct virNetworkDef. The 'unpack' and 'pack' can be used to solve Problem3. pack - boolean. It can only work on <define> in the relax-ng. Setting it true, children of <define> are converted into members; and then these members are packed into a struct for reuse. For example, inject directive as below:  <define name="pciaddress"> ... ... The <define name="pciaddress"> will be packed as a struct virPCIDeviceAddress which name is specified by the property "name". union - string. It can only work on <choice> in the relax-ng. By default, all children of <choice> will act as members and be exposed to the upper-level struct. When setting 'union' a non-null string which is called union-id, those members will be packed into a struct; then, a new member defined by this struct will be exposed to the upper-level struct. The new member's id and name are specified by the union-id. For example, inject directive as below:  <choice> <group> <zeroOrMore>  <element name='interface'> ... </group> <group> <zeroOrMore>  <element name='address'> ... </group> </choice> A new struct virNetworkForwardIfDef will be created; then a new member named 'if' is exposed to the parent struct. namespace - boolean. Only for struct. By default, there's no stuff about namespace in the struct. When setting it true, additional namespace members will be inserted into the struct. And the struct's clearfunc, parsefunc and formatfunc will include relative codes to handle these namespace stuff. For example, inject directive as below:  <element name="network"> Then in the struct virNetworkDef, there're two additional members: typedef virNetworkDef *virNetworkDefPtr; struct _virNetworkDef { ... ... void *namespaceData; virXMLNamespace ns; } In the virNetworkDefClear, there're the codes to invoke ns.free; in the virNetworkDefParseXML, there're the codes to invoke ns.parse; in the virNetworkDefFormatBuf, there're the codes to invoke ns.format. values - array. Only for enum. All values of an enum except 'none' and 'last'. It can be overrided. For example, inject directive as below:  <choice> ... ... <value>passthrough</value> <value>private</value> <value>vepa</value> <value>hostdev</value> </choice> Generally the property 'values' doesn't need to be overrided, only if the order of values in the enum need to be adjusted. members - array. Only for struct. Property 'members' is used to display all the members of the struct. But when altering a member, only fill in this member's 'id' and properties to be changed. For example, inject directive as below:  <element name="ip"> Specify the member "localPtr" and "tftp" by their id, then only these two members will be altered. In this case, their names are changed. For more member properties, refer to 6) PRESERVE and APPLY - string. By default, directives take effect on the injection point. But sometimes, we need preserve a directive at first and then apply it somewhere else. APPLY corresponds to PRESERVE through their value called preserve-id. This preserve-id can be any form of string. These two properties can be used on two notations, <choice> and <ref>. Here's an example for using them on <choice>, inject directive as below: <define name="virtualPortProfile">  <choice> <group>  <element name="virtualport"> </group> <group>  <element name="virtualport"> </group> ... ... In this case, there're many <element name="virtualport"> notation under <choice>. We can define a preserve directive and apply it to all the <element name="virtualport">. Here's an example for using them on <ref>, inject PRESERVE as below:  <ref name="portOptions"/> ... ... And in <define>, inject APPLY as below: <define name="portOptions">  <element name="port"> ... ... It is useful in a case: a <define> is referenced by several <ref>s. We can define different directives on different <ref>s and expect different effects when they are applied in the <define>. TOUCH - boolean. Request to handle the target <define> explicitly. By default, the process of RNG2C starts at <start>, and handles a <define> only when a <ref> references to it. If a <define> isn't touched, RNG2C cannot find it. Inject a directive with TOUCH on a <define> to touch it. For example, the <define> 'zpciaddress' hasn't been referenced in the process of parsing network.rng (also networkcommon.rng and basictypes.rng), but we hope that this notation will be handle. Just inject the directive as below:  <define name="zpciaddress"> <element name="zpci"> ... ... Then it can be discovered when executing subcommand 'list'. 2) structure properties output - string. Only for struct and enum. Control whether to output the structure code and where to output those code. Refer to 7) enum.default - string. Only for enum. By default, for enum, first item's name is 'none'. Override it with other name. For example, inject directive as below: <define name="macTableManager">  <choice> <value>kernel</value> ... ... Then the declaration of enum virNetworkBridgeMACTableManagerType will be like: typedef enum { VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_DEFAULT = 0, VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_KERNEL, ... ... } virNetworkBridgeMACTableManagerType; The first item is suffixed with '_DEFAULT' rather than '_NONE'. array.size - string. Only for char array or unsigned char array. It specifies length of array. The value can be a macro or a literal number. For example, inject directive as below: <define name="UUID"> <choice>  <data type="string"> ... ... Then it will generate an array type: unsigned char XXX[VIR_UUID_BUFLEN]; 3) clearfunc properties output - string. Only for struct. Control whether to output the clearfunc code and where to output those code. Refer to 7) name - string. The clearfunc's name. By default, its name is based type's name and suffixed 'Clear'. It can be overrided with any other name. args - array. Extra formal args for clearfunc. But now it hasn't been used. 4) parsefunc properties The parsefunc's declaration and implementation are controlled by properties. The basic form of parsefunc's declaration is as below: int ${parsefunc.name}(xmlNodePtr curnode, ${type.name}Ptr def, xmlXPathContextPtr ctxt, /* omit if args.noctxt is true */ const char *instanceName, /* exist if args.instname is true */ ${parent.name}Ptr parent, /* exist if args.parent is true */ ${args}); /* exist if args is NOT none */ output - string. Only for struct. Control whether to output the parsefunc code and where to output those code. Refer to 7) name - string. The parsefunc's name. By default, its name is based type's name and suffixed 'ParseXML'. It can be overrided with any other name. args - array. Extra formal args for parsefunc. Each arg can have four properties: name, type, pointer and ctype. The first three are according to the usage of namesake properties in member. And ctype is an alternate to type when type can't express the argument's type. For example, inject directive as below:  <element name="txt"> ... ... Then the args of parsefunc will be appended by a arg, as below: int virNetworkDNSTxtDefParseXML(xmlNodePtr curnode, virNetworkDNSTxtDefPtr def, xmlXPathContextPtr ctxt, bool partialOkay); args.noctxt - boolean. By default, there's a arg 'ctxt' in the function arguments. When 'args.noctxt' is set to true, omit ctxt from the arguments. For example, inject directive as below:  <element name="txt"> ... ... Then the arg 'ctxt' will be removed from the default args. int virNetworkDNSTxtDefParseXML(xmlNodePtr curnode, virNetworkDNSTxtDefPtr def); At the same time, the generated implementation of virNetworkDNSTxtDefParseXML will be different according to this property. args.instname - boolean. By default, there's no instance-name in the function arguments. When it is set to true, add instname into the arguments. For example, inject directive as below:  <element name="txt"> ... ... Then the arg 'instname' will be added into the args. int virNetworkDNSTxtDefParseXML(xmlNodePtr curnode, virNetworkDNSTxtDefPtr def, xmlXPathContextPtr ctxt, const char *instanceName); args.parent - boolean. By default, there's no parent struct pointer name in the function arguments. When it is set to true, add parent struct pointer into the arguments. For example, inject directive as below:  <element name="dhcp"> Then the arg 'parent' will be added into the args. int virNetworkIPDHCPDefParseXML(xmlNodePtr curnode, virNetworkIPDHCPDefPtr def, xmlXPathContextPtr ctxt, virNetworkIPDefPtr parentdef); post - boolean. By default, there's no post hook in the parse function. This property enables a post hook for parsefunc. The hook is invoked after all members have been parsed. The post hook function's name is based on parsefunc's name, and suffxied with 'Post'. To solve the foregoing Problem2, extract error-checking code from the current parsefunc and move them to the post hook function, then current parsefunc can be replaced with generated parsefunc. For example, inject directive as below:  <element name="dns"> ... ... The declaration of the post hook will be generated, as below: int virNetworkDNSDefParseXMLPost(xmlNodePtr curnode, virNetworkDNSDefPtr def, xmlXPathContextPtr ctxt, const char *enableStr, const char *forwardPlainNamesStr, int nForwarderNodes, int nTxtNodes, int nSrvNodes, int nHostNodes); Implement it. It will be invoked by generated parsefunc automatically. post.notmpvars - boolean. It is valid only when post is set. By default, all the temporary variables in the parsefunc will be passed to the post hook function. When it is set to true, there's no those temporary variables as arguments in the post hook functions. For example, inject directive as below:  <element name="dns"> ... ... The declaration of the post hook will be generated, as below: int virNetworkDNSDefParseXMLPost(xmlNodePtr curnode, virNetworkDNSDefPtr def, xmlXPathContextPtr ctxt); Now all tmpvars are removed from the args of parse hook function. 5) formatfunc properties output - string. Only for struct. Control whether to output the formatfunc code and where to output those code. Refer to 7) name - string. The formatfunc's name. By default, its name is based type's name and suffixed 'FormatBuf'. It can be overrided with any other name. args - array. Extra formal args for formatfunc. Just like the args of parsefunc. shorthand.ignore - boolean. By default, formatfunc adopts shorthand closing tag notation when there're no elements to output. If shorthand.ignore is set to true, this default optimization will be prevented. For example, virNetworkIPDefFormat does output <ip ...></ip> rather than <ip .../> when there're no child element 'tftp' and 'dhcp'. So this property is used to meet the need. order - array. It is a array which item is member's id. In formatfunc, the relative order of formatting members is sensitive. If the order is not correct, setting this property to re-arrange the order. And when the array includes only part of ids, other members will follow and keep their original relative order. For example, virPortGroupDefFormat has a special order to format its members.  Then format order will be altered according to this. 6) member properties Member properties can only appear in the members' array. Use these properties to override the struct members' default settings. id - string, READ-ONLY. When id is set, this property specify the member to be changed. When id is ignored, it means this member is a new member and needed to append to the struct's members. For example, inject a directive as below:  <element name='pf'> ... ... The the member 'dev' will be altered; and then, a new member 'connections' will be added. For a new member, its type must be specified. name - string. Member's name. By default, name is the same with id. It can be overrided with any name. opt - boolean. Whether optional or not. In the parsefunc, non-existence for optional member is legal; otherwise, there's a error-checking to check its existence and report error. For example, inject a directive as below:  <element name="txt"> ... ... Then in the virNetworkDNSTxtDefParseXML, it's ok when the notation 'value' is missing. more - boolean. When it is set, the member is a list. For example, inject a directive as below:  <element name="forward"> ... ... Then the member 'pf' will be declared as below: size_t npfs; virNetworkForwardPfDefPtr pfs; tag - string. Display the source's tag. When a new member is to add, it can be specified. type - string. Member's type. Its form is "meta[:short_id]", meta is the type's meta, short_id is the leftmost 8 digits of type's id. For builtins, ignore colon and short_id. This property can be overrided with other type. pointer - boolean. By default, member is an instance defined by its type. When this property is set to true, member is a pointer of its type. For example, inject directive as below:  Then type of the member 'bandwidth' will be changed to pointer, as below: virBandwidthDefPtr bandwidth; specified - boolean. When this property is set to true, member will be attached with a new member which specifies the existence of its master. The new additional member's form is "bool XXX_specified;". For example, inject directive as below:  <element name="parameters"> ... ... An addional member 'managerID_specified' will follow the 'managerID'. uint8_t managerID; bool managerID_specified; declare.comment - string. Specify a comment behind member's declaration in struct. For example, inject a directive like below:  <element name="zpci"> ... ... Then the declaration of the member 'uid' is like below: int uid; /* exempt from syntax-check */ parse.disable - boolean. When this property is set to true, member will not appear in parsefunc. parse.args - array. Only for struct-type member. Specify the extra actual arguments when member is parsed by calling parsefunc. If member's type is struct and the struct's parsefunc has extra formal argument, passing actual arguments by this property. For example, type of the member 'host' is virNetworkDHCPHostDef, and the parsefunc related to the type has an extra arg partialOkey(specified by "args" in "parsefunc"). Here this extra arg needs to be specified a value. Directive is like below:  <element name="dhcp"> ... ... Then the parsing code for 'host' in the parsefunc is like below: if (virNetworkIPDHCPHostDefParseXML(node, &def->hosts[i], ctxt, false) < 0) goto error; A specific value is passed into the function as an actual arg. parse.instname - string. Only for struct-type member. When member's type is struct and the struct's parsefunc needs a instance-name argument, passing instance name through this property. For example:  <element name="network"> ... ... Then parsing code for 'ip' in the parsefunc will be: if (virNetworkIPDefParseXML(node, &def->ips[i], ctxt, def->name) < 0) goto error; The 'def->name' is passed in as instance-name. parse.default - string. Specify a value for member when it doesn't get value from XML. For example:  Then when the member 'mode' dosen't get value in parsefunc, it will be assigned the default value 'VIR_NETWORK_FORWARD_NAT'. format.disable - boolean. When this property is set to true, member will not be skipped in formatfunc. format.nocheck - boolean. Format and dump member to XML despite of the conditions. By default, a member needs to be check whether its value is empty before handling it in formatfunc. When this property is set to true, ignore these checks and always output. For example:  <define name="pciaddress"> ... ... Then whether or not the member 'domain' is zero, it will be formatted and output. format.precheck - string. Only valid when format.nocheck isn't set. In formatfunc, invoke a function as condition-check rather than default checks. The function should be hardcoded in advance and its name is specified by this property. For example, in virNetworkDefFormatBuf, the member 'connections' will be formatted and output only when some conditions evaluate to true. So set this property to enable a check function named 'checkXMLInactive', and put logic of checking conditions into the function. For example:  <define name="network"> ... ... Then RNG2C generates the declaration of checkXMLInactive. bool checkXMLInactive(const unsigned int def G_GNUC_UNUSED, const virNetworkDef *parent G_GNUC_UNUSED, unsigned int flags); Implement this function in libvirt source. format.fmt - string. For every builtin, there's a default format when they're formatting. This property can be overrided to change the default format. For example:  <define name="pciaddress"> ... ... Then the member 'slot' will be formatting based on format "0x%02x". format.args - array. Only for struct-type member. This property is just like parse.args, except that it is for formatfunc. Now it hasn't been used. hint - string. READ-ONLY. Display special cases for member. The 'unpack' indicates member's type is unpack; 'pack' indicates member's type is pack; 'union' indicates member's type is union; 'new' means this member is added. 7) output property This property is for structure, clearfunc, parsefunc and formatfunc. It has two effects: First, it controls whether or not to output the code to the files. Second, it controls what file to output. Value of the property indicates a base path, and it is suffixed with ".generated.[c|h]" to form two generated files. The base path should be according to the file in which the code is about to be replaced with generated code. So the relationship between original files and generated files is as below: original.c ---> original.h --------- ^ | | v original.generated.c original.generated.h The original.generated.c includes original.h automatically, and the original.h needs to be inserted with a line '#include "original.generated.h"' manually. This method can solve the Problem4. Steps of each patch ===================== Replacing hardcoded code with generated stuff, we need a series of patches. Each patch just replaces a target, i.e. a structure or a function. The steps are as below: 1) Execute subcommand 'list' to query the target's id and location. 2) Execute subcommand 'show' to preview the target's directive and generated code. 3) Modify the directive and re-inject it into the relax-ng file to bridge the gap between current code and generated code. 4) Execute subcommand 'show' again to check the new directive and new generated code, until generated code can take the place of hardcoded stuff. 5) Remove the hardcoded code. 6) Compile & Test the libvirt source. About the series of patches ============================ Now I select network as a test target and make a try to generate virNetworkDef, virNetworkDefClear, virNetworkDefParseXML and virNetworkDefFormatBuf and their subordinate stuff automatically. But this needs around 130 patches. That's too many! So this series just include about 30 patches for evaluation. Thanks! Shi Lei (29): rng2c: Add tool RNG2C to translate relax-ng into c-language-code. maint: Call RNG2C automatically when relax-ng files change util: Add two helper functions virXMLChildNode and virXMLChildNodeSet util: Move VIR_ENUM_IMPL and VIR_ENUM_DECL from virenum.h to internal.h util: Replace virTristateBool|virTristateSwitch(hardcoded) with namesakes(generated) util: Add a helper function virStringParseOnOff util: Add some helper functions for virSocketAddr util: Add a helper function virStrToLong_u8p conf: Replace virNetworkDNSTxtDef(hardcoded) with namesake(generated) conf: Replace virNetworkDNSSrvDef(hardcoded) with namesake(generated) conf: Replace virNetworkDNSHostDef(hardcoded) with namesake(generated) conf: Replace virNetworkDNSForwarder(hardcoded) with namesake(generated) conf: Replace virNetworkDNSDef(hardcoded) with namesake(generated) conf: Replace virNetworkDNSDefClear(hardcoded) with namesake(generated) conf: Extract error-checking code from virNetworkDNSHostDefParseXML conf: Replace virNetworkDNSHostDefParseXML(hardcoded) with namesake(generated) conf: Extract error-checking code from virNetworkDNSSrvDefParseXML conf: Replace virNetworkDNSSrvDefParseXML(hardcoded) with namesake(generated) conf: Extract error-checking code from virNetworkDNSTxtDefParseXML conf: Replace virNetworkDNSTxtDefParseXML(hardcoded) with namesake(generated) conf: Add virNetworkDNSForwarderParseXML and virNetworkDNSForwarderParseXMLPost conf: Replace virNetworkDNSForwarderParseXML(hardcoded) with namesake(generated) conf: Extract error-checking code from virNetworkDNSDefParseXML conf: Replace virNetworkDNSDefParseXML(hardcoded) with namesake(generated) conf: Apply virNetworkDNSForwarderFormatBuf(generated) in virNetworkDNSDefFormat conf: Apply virNetworkDNSTxtDefFormatBuf(generated) in virNetworkDNSDefFormat conf: Apply virNetworkDNSSrvDefFormatBuf(generated) in virNetworkDNSDefFormat conf: Apply virNetworkDNSHostDefFormatBuf(generated) in virNetworkDNSDefFormat conf: Replace virNetworkDNSDefFormat(hardcoded) with virNetworkDNSDefFormatBuf(generated) docs/schemas/basictypes.rng | 15 + docs/schemas/network.rng | 76 ++ docs/schemas/networkcommon.rng | 2 +- po/POTFILES.in | 2 + rng2c/directive.py | 1693 +++++++++++++++++++++++++++++++ rng2c/generator.py | 504 +++++++++ rng2c/go | 8 + rng2c/schema.json | 113 +++ rng2c/utils.py | 163 +++ src/Makefile.am | 16 +- src/access/Makefile.inc.am | 2 +- src/conf/Makefile.inc.am | 12 +- src/conf/network_conf.c | 739 ++++---------- src/conf/network_conf.h | 51 +- src/esx/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/internal.h | 19 + src/lxc/Makefile.inc.am | 1 + src/network/Makefile.inc.am | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/Makefile.inc.am | 2 +- src/nwfilter/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/test/Makefile.inc.am | 2 +- src/util/Makefile.inc.am | 13 +- src/util/virenum.c | 15 - src/util/virenum.h | 39 +- src/util/virsocketaddr.c | 27 + src/util/virsocketaddr.h | 10 + src/util/virstring.c | 37 + src/util/virstring.h | 10 + src/util/virxml.c | 57 ++ src/util/virxml.h | 3 + src/vbox/Makefile.inc.am | 2 +- tests/Makefile.am | 2 + tools/Makefile.am | 2 + 39 files changed, 3000 insertions(+), 654 deletions(-) create mode 100644 rng2c/directive.py create mode 100755 rng2c/generator.py create mode 100755 rng2c/go create mode 100644 rng2c/schema.json create mode 100644 rng2c/utils.py -- 2.17.1

4 38

[PATCH 0/2] qemu: Add some cpu hotpluggable infomation when run "virsh setvcpus command"
by Jidong Xia 22 Apr '20

22 Apr '20

The optional cpu attribute current can be used to specify whether fewer than the maximum number of virtual CPUs should be enabled. With this patch, when run "virsh setvcpus vm --count <current>" with --live or --config, we can see some cpu information in vm xml. Jidong Xia (1): qemu: Add some cpu hotpluggable inforamtion in vm xml when run "virsh setvcpus vm --count <current> --config;virsh destroy vm; virsh start vm". xiajidong (1): qemu: Add some cpu hotpluggable inforamtion in vm xml when run "virsh setvcpus vm --count <current> --live". src/qemu/qemu_hotplug.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 1.8.3.1

3 4

[PATCH] qemucapstest: Refresh data for qemu 5.0 on x86_64
by Peter Krempa 22 Apr '20

22 Apr '20

Bump to v5.0.0-rc3-8-g3119154db0 and make sure that 'liburing' is picked up by qemu. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../caps_5.0.0.x86_64.replies | 99 +++++++++++++++++-- .../caps_5.0.0.x86_64.xml | 68 ++++++++++++- 2 files changed, 156 insertions(+), 11 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies index af2299a41e..39b6d4f182 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 91, + "micro": 93, "minor": 2, "major": 4 }, - "package": "v5.0.0-rc1" + "package": "v5.0.0-rc3-8-g3119154db0" }, "id": "libvirt-2" } @@ -882,6 +882,10 @@ "name": "tpm-passthrough", "parent": "tpm-backend" }, + { + "name": "Icelake-Server-v3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pentium3-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -1291,8 +1295,8 @@ "parent": "base-xhci" }, { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" + "name": "mioe3680_pci", + "parent": "pci-device" }, { "name": "i82551", @@ -1315,11 +1319,11 @@ "parent": "pci-ide" }, { - "name": "nvme", - "parent": "pci-device" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { - "name": "vmxnet3", + "name": "nvme", "parent": "pci-device" }, { @@ -1327,7 +1331,7 @@ "parent": "object" }, { - "name": "mioe3680_pci", + "name": "vmxnet3", "parent": "pci-device" }, { @@ -9055,6 +9059,39 @@ "static": false, "migration-safe": true }, + { + "name": "Icelake-Server-v3", + "typename": "Icelake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "avx512f", + "avx512dq", + "clwb", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "wbnoinvd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "rdctl-no", + "ibrs-all", + "mds-no", + "taa-no" + ], + "static": false, + "migration-safe": true + }, { "name": "Icelake-Server-v2", "typename": "Icelake-Server-v2-x86_64-cpu", @@ -22244,7 +22281,8 @@ "meta-type": "enum", "values": [ "threads", - "native" + "native", + "io_uring" ] }, { @@ -26527,6 +26565,49 @@ "static": false, "migration-safe": true }, + { + "name": "Icelake-Server-v3", + "typename": "Icelake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "fma", + "pcid", + "x2apic", + "tsc-deadline", + "avx", + "f16c", + "avx2", + "invpcid", + "avx512f", + "avx512dq", + "rdseed", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "umip", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "3dnowprefetch", + "wbnoinvd", + "xsavec", + "rdctl-no", + "ibrs-all", + "skip-l1dfl-vmentry", + "mds-no", + "pschange-mc-no", + "taa-no" + ], + "static": false, + "migration-safe": true + }, { "name": "Icelake-Server-v2", "typename": "Icelake-Server-v2-x86_64-cpu", diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 496d0e90d7..d524340843 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -230,10 +230,10 @@ <flag name='fsdev.multidevs'/> <flag name='virtio.packed'/> <flag name='pcie-root-port.hotplug'/> - <version>4002091</version> + <version>4002093</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> - <package>v5.0.0-rc1</package> + <package>v5.0.0-rc3-8-g3119154db0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -780,6 +780,33 @@ <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/> + <cpu type='kvm' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='clwb'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='wbnoinvd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='rdctl-no'/> + <blocker name='ibrs-all'/> + <blocker name='mds-no'/> + <blocker name='taa-no'/> + </cpu> <cpu type='kvm' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='avx512f'/> <blocker name='avx512dq'/> @@ -1978,6 +2005,43 @@ <blocker name='avx'/> <blocker name='f16c'/> </cpu> + <cpu type='tcg' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'> + <blocker name='fma'/> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='avx'/> + <blocker name='f16c'/> + <blocker name='avx2'/> + <blocker name='invpcid'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='rdseed'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='umip'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='3dnowprefetch'/> + <blocker name='wbnoinvd'/> + <blocker name='xsavec'/> + <blocker name='rdctl-no'/> + <blocker name='ibrs-all'/> + <blocker name='skip-l1dfl-vmentry'/> + <blocker name='mds-no'/> + <blocker name='pschange-mc-no'/> + <blocker name='taa-no'/> + </cpu> <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='fma'/> <blocker name='pcid'/> -- 2.25.1

2 1

[libvirt-python PATCH v2] setup: require python >= 3.5 to build
by Daniel P. Berrangé 22 Apr '20

22 Apr '20

Pytjon 3.5 is the oldest Python version available across our supported build platforms. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 56b6eea..39a07de 100755 --- a/setup.py +++ b/setup.py @@ -17,8 +17,8 @@ import re import shutil import time -if sys.version_info[0] != 3: - print("libvirt-python requires Python 3.x to build") +if sys.version_info < (3, 5): + print("libvirt-python requires Python >= 3.5 to build") sys.exit(1) MIN_LIBVIRT = "0.9.11" @@ -368,5 +368,9 @@ of recent versions of Linux (and other OSes).''', "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ] ) -- 2.25.2

2 2

[PATCH 0/3] udevHandleOneDevice: Remove old instance of device on "move"
by Michal Privoznik 22 Apr '20

22 Apr '20

Follow up to: https://www.redhat.com/archives/libvir-list/2020-April/msg00817.html I'd appreciate if somebody with systemd udev could test these and check if they are working as expected. Michal Prívozník (3): udevRemoveOneDevice: Unlock node device obj upon return node_device_udev: Split udevRemoveOneDevice() into two udevHandleOneDevice: Remove old instance of device on "move" src/node_device/node_device_udev.c | 34 +++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) -- 2.25.3

3 6

[libvirt PATCH] virsh: Fix return code for dump and migrate
by Andrea Bolognani 22 Apr '20

22 Apr '20

When the job monitoring logic was refactored, these two commands were not converted properly and the result is that a successful dump or migration (char '0') would be reported as a failed one (int 48) instead. Fixes: dc0771cfa2e78ffecd7c8234538ee548748d7bef Reported-by: Brian Rak <brak(a)gameservers.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tools/virsh-domain.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d52eb7bc2f..502685f44b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5436,7 +5436,6 @@ static const vshCmdOptDef opts_dump[] = { static void doDump(void *opaque) { - char ret = '1'; virshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; @@ -5508,7 +5507,7 @@ doDump(void *opaque) } } - ret = '0'; + data->ret = 0; out: #ifndef WIN32 pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); @@ -5516,7 +5515,6 @@ doDump(void *opaque) #endif /* !WIN32 */ if (dom) virshDomainFree(dom); - data->ret = ret; g_main_loop_quit(data->eventLoop); } @@ -10722,7 +10720,6 @@ static const vshCmdOptDef opts_migrate[] = { static void doMigrate(void *opaque) { - char ret = '1'; virDomainPtr dom = NULL; const char *desturi = NULL; const char *opt = NULL; @@ -11001,14 +10998,14 @@ doMigrate(void *opaque) if (flags & VIR_MIGRATE_PEER2PEER || vshCommandOptBool(cmd, "direct")) { if (virDomainMigrateToURI3(dom, desturi, params, nparams, flags) == 0) - ret = '0'; + data->ret = 0; } else { /* For traditional live migration, connect to the destination host directly. */ virDomainPtr ddom = NULL; if ((ddom = virDomainMigrate3(dom, dconn, params, nparams, flags))) { virshDomainFree(ddom); - ret = '0'; + data->ret = 0; } } @@ -11019,7 +11016,6 @@ doMigrate(void *opaque) #endif /* !WIN32 */ virTypedParamsFree(params, nparams); virshDomainFree(dom); - data->ret = ret; g_main_loop_quit(data->eventLoop); return; -- 2.25.3

3 3

[libvirt PATCH 0/6] Some slirp/dbus related fixes
by marcandre.lureau＠redhat.com 22 Apr '20

22 Apr '20

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, Here is a subset of the series posted earlier "RFC: basic CGroup support with qemu:///session", as requested by Pavel. Marc-André Lureau (6): slirp: leave the dbus daemon running on error slirp: add helper to VM cgroup qemu-dbus: prevent double start of the bus daemon qemu-dbus: remove unused variable qemu-dbus: register DBus bus to the VM cgroup qemu-cgroup: remove unnecessary include src/qemu/qemu_cgroup.c | 1 - src/qemu/qemu_dbus.c | 29 +++++++++++++++++++++++++++-- src/qemu/qemu_dbus.h | 3 +++ src/qemu/qemu_extdevice.c | 12 ++++++++++++ src/qemu/qemu_slirp.c | 16 +++++++++++++++- src/qemu/qemu_slirp.h | 3 +++ 6 files changed, 60 insertions(+), 4 deletions(-) -- 2.26.0.106.g9fadedd637

3 11

[libvirt PATCH v3 0/5] QEMU: support QEMU built without TCG
by Tobin Feldman-Fitzthum 22 Apr '20

22 Apr '20

Rebased and resent from about a month ago. Since version 2.10, QEMU can be built without TCG. This patch adds capabillity QEMU_CAPS_TCG_DISABLED that allows libvirt to use a QEMU built without TCG. Rather than create a capability that is set whenever TCG is enabled (almost always), QEMU_CAPS_TCG_DISABLED is set only when the TCG is not available. This avoids some issues with backwards compatability. For a domain that was created using QEMU >= 2.10 with KVM, there is no information in the cached XML file that says whether or not TCG was enabled. Versions of QEMU older than 2.10 do not have a QMP interface for determining whether QEMU is available. Since QEMU_CAPS_TCG_DISABLED is set only when TCG is disabled, we do not have to do any extra work to infer an appropriate value in either of these cases. QEMU_CAPS_TCG_DISABLED is set via QMP command qom-list-types. Tobin Feldman-Fitzthum (5): add QEMU_CAPS_TCG_DISABLED and probe conditionally add virQEMUCapsGetVirtType convenience function add virQEMUCapsProbeQMPTCGState function to set QEMU_CAPS_TCG_DISABLED use new functions when probing Add second qom-list-types call to test data. src/qemu/qemu_capabilities.c | 81 +- src/qemu/qemu_capabilities.h | 3 + .../caps_2.10.0.aarch64.replies | 2699 ++- .../caps_2.10.0.ppc64.replies | 2799 +++- .../caps_2.10.0.s390x.replies | 1027 +- .../caps_2.10.0.x86_64.replies | 1708 +- .../caps_2.11.0.s390x.replies | 1063 +- .../caps_2.11.0.x86_64.replies | 1692 +- .../caps_2.12.0.aarch64.replies | 2912 +++- .../caps_2.12.0.ppc64.replies | 2947 +++- .../caps_2.12.0.s390x.replies | 1087 +- .../caps_2.12.0.x86_64.replies | 1767 +- .../caps_3.0.0.ppc64.replies | 2979 +++- .../caps_3.0.0.s390x.replies | 1117 +- .../caps_3.0.0.x86_64.replies | 1783 +- .../caps_3.1.0.ppc64.replies | 2999 +++- .../caps_3.1.0.x86_64.replies | 1803 +- .../caps_4.0.0.aarch64.replies | 3175 +++- .../caps_4.0.0.ppc64.replies | 3171 +++- .../caps_4.0.0.s390x.replies | 1259 +- .../caps_4.0.0.x86_64.replies | 1915 ++- .../caps_4.1.0.x86_64.replies | 2155 ++- .../caps_4.2.0.aarch64.replies | 3355 +++- .../caps_4.2.0.ppc64.replies | 3208 +++- .../caps_4.2.0.s390x.replies | 1264 +- .../caps_4.2.0.x86_64.replies | 2244 ++- .../caps_5.0.0.aarch64.replies | 3391 +++- .../caps_5.0.0.ppc64.replies | 13986 +++++++++------- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1214 +- .../caps_5.0.0.x86_64.replies | 2267 ++- 30 files changed, 64897 insertions(+), 8173 deletions(-) -- 2.20.1 (Apple Git-117)

3 9

[libvirt PATCH] conf: split out virDomainFeaturesDefParse
by Ján Tomko 22 Apr '20

22 Apr '20

The virDomainDefParseXML function has grown so large it broke the build: ../../src/conf/domain_conf.c:20362:1: error: stack frame size of 4168 bytes in function 'virDomainDefParseXML' [-Werror,-Wframe-larger-than=] Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Technically a build breaker fix. I'm sure I will regret not having it pushed as such tomorrow. Formatted with patience. src/conf/domain_conf.c | 965 +++++++++++++++++++++-------------------- 1 file changed, 492 insertions(+), 473 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f3362c934..d9c4b487a8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19181,6 +19181,496 @@ virDomainResourceDefParse(xmlNodePtr node, return NULL; } + +static int virDomainFeaturesDefParse(virDomainDefPtr def, + xmlXPathContextPtr ctxt) +{ + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *tmp = NULL; + xmlNodePtr node = NULL; + int n, gic_version; + size_t i; + + if ((n = virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected feature '%s'"), nodes[i]->name); + goto error; + } + + switch ((virDomainFeature) val) { + case VIR_DOMAIN_FEATURE_APIC: + if ((tmp = virXPathString("string(./features/apic/@eoi)", ctxt))) { + int eoi; + if ((eoi = virTristateSwitchTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for attribute eoi: '%s'"), + tmp); + goto error; + } + def->apic_eoi = eoi; + VIR_FREE(tmp); + } + G_GNUC_FALLTHROUGH; + case VIR_DOMAIN_FEATURE_ACPI: + case VIR_DOMAIN_FEATURE_PAE: + case VIR_DOMAIN_FEATURE_VIRIDIAN: + case VIR_DOMAIN_FEATURE_PRIVNET: + case VIR_DOMAIN_FEATURE_HYPERV: + case VIR_DOMAIN_FEATURE_KVM: + case VIR_DOMAIN_FEATURE_MSRS: + case VIR_DOMAIN_FEATURE_XEN: + def->features[val] = VIR_TRISTATE_SWITCH_ON; + break; + + case VIR_DOMAIN_FEATURE_CAPABILITIES: + if ((tmp = virXMLPropString(nodes[i], "policy"))) { + if ((def->features[val] = virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown policy attribute '%s' of feature '%s'"), + tmp, virDomainFeatureTypeToString(val)); + goto error; + } + VIR_FREE(tmp); + } else { + def->features[val] = VIR_TRISTATE_SWITCH_ABSENT; + } + break; + + case VIR_DOMAIN_FEATURE_VMCOREINFO: + case VIR_DOMAIN_FEATURE_HAP: + case VIR_DOMAIN_FEATURE_PMU: + case VIR_DOMAIN_FEATURE_PVSPINLOCK: + case VIR_DOMAIN_FEATURE_VMPORT: + case VIR_DOMAIN_FEATURE_SMM: + if ((tmp = virXMLPropString(nodes[i], "state"))) { + if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) == -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown state attribute '%s' of feature '%s'"), + tmp, virDomainFeatureTypeToString(val)); + goto error; + } + VIR_FREE(tmp); + } else { + def->features[val] = VIR_TRISTATE_SWITCH_ON; + } + break; + + case VIR_DOMAIN_FEATURE_GIC: + if ((tmp = virXMLPropString(nodes[i], "version"))) { + gic_version = virGICVersionTypeFromString(tmp); + if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) { + virReportError(VIR_ERR_XML_ERROR, + _("malformed gic version: %s"), tmp); + goto error; + } + def->gic_version = gic_version; + VIR_FREE(tmp); + } + def->features[val] = VIR_TRISTATE_SWITCH_ON; + break; + + case VIR_DOMAIN_FEATURE_IOAPIC: + tmp = virXMLPropString(nodes[i], "driver"); + if (tmp) { + int value = virDomainIOAPICTypeFromString(tmp); + if (value < 0 || value == VIR_DOMAIN_IOAPIC_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown driver mode: %s"), + tmp); + goto error; + } + def->features[val] = value; + VIR_FREE(tmp); + } + break; + + case VIR_DOMAIN_FEATURE_HPT: + tmp = virXMLPropString(nodes[i], "resizing"); + if (tmp) { + int value = virDomainHPTResizingTypeFromString(tmp); + if (value < 0 || value == VIR_DOMAIN_HPT_RESIZING_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown HPT resizing setting: %s"), + tmp); + goto error; + } + def->hpt_resizing = (virDomainHPTResizing) value; + VIR_FREE(tmp); + } + + if (virDomainParseScaledValue("./features/hpt/maxpagesize", + NULL, + ctxt, + &def->hpt_maxpagesize, + 1024, + ULLONG_MAX, + false) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("Unable to parse HPT maxpagesize setting")); + goto error; + } + def->hpt_maxpagesize = VIR_DIV_UP(def->hpt_maxpagesize, 1024); + + if (def->hpt_resizing != VIR_DOMAIN_HPT_RESIZING_NONE || + def->hpt_maxpagesize > 0) { + def->features[val] = VIR_TRISTATE_SWITCH_ON; + } + break; + + case VIR_DOMAIN_FEATURE_HTM: + case VIR_DOMAIN_FEATURE_NESTED_HV: + case VIR_DOMAIN_FEATURE_CCF_ASSIST: + if (!(tmp = virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing state attribute '%s' of feature '%s'"), + tmp, virDomainFeatureTypeToString(val)); + goto error; + } + if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown state attribute '%s' of feature '%s'"), + tmp, virDomainFeatureTypeToString(val)); + goto error; + } + VIR_FREE(tmp); + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_FEATURE_LAST: + break; + } + } + VIR_FREE(nodes); + + if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) { + int feature; + int value; + node = ctxt->node; + if ((n = virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported HyperV Enlightenment feature: %s"), + nodes[i]->name); + goto error; + } + + ctxt->node = nodes[i]; + + if (!(tmp = virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->hyperv_features[feature] = value; + + switch ((virDomainHyperv) feature) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + case VIR_DOMAIN_HYPERV_VPINDEX: + case VIR_DOMAIN_HYPERV_RUNTIME: + case VIR_DOMAIN_HYPERV_SYNIC: + case VIR_DOMAIN_HYPERV_STIMER: + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: + case VIR_DOMAIN_HYPERV_TLBFLUSH: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (value != VIR_TRISTATE_SWITCH_ON) + break; + + if (virXPathUInt("string(./@retries)", ctxt, + &def->hyperv_spinlocks) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid HyperV spinlock retry count")); + goto error; + } + + if (def->hyperv_spinlocks < 0xFFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV spinlock retry count must be " + "at least 4095")); + goto error; + } + break; + + case VIR_DOMAIN_HYPERV_VENDOR_ID: + if (value != VIR_TRISTATE_SWITCH_ON) + break; + + if (!(def->hyperv_vendor_id = virXMLPropString(nodes[i], + "value"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing 'value' attribute for " + "HyperV feature 'vendor_id'")); + goto error; + } + + if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) { + virReportError(VIR_ERR_XML_ERROR, + _("HyperV vendor_id value must not be more " + "than %d characters."), + VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); + goto error; + } + + /* ensure that the string can be passed to qemu */ + if (strchr(def->hyperv_vendor_id, ',')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV vendor_id value is invalid")); + goto error; + } + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_HYPERV_LAST: + break; + } + } + VIR_FREE(nodes); + ctxt->node = node; + } + + if (def->features[VIR_DOMAIN_HYPERV_STIMER] == VIR_TRISTATE_SWITCH_ON) { + int value; + if ((n = virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (STRNEQ((const char *)nodes[i]->name, "direct")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Hyper-V stimer feature: %s"), + nodes[i]->name); + goto error; + } + + if (!(tmp = virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "Hyper-V stimer '%s' feature"), "direct"); + goto error; + } + + if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for Hyper-V stimer '%s' feature"), "direct"); + goto error; + } + + VIR_FREE(tmp); + def->hyperv_stimer_direct = value; + } + VIR_FREE(nodes); + } + + if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { + int feature; + int value; + if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported KVM feature: %s"), + nodes[i]->name); + goto error; + } + + switch ((virDomainKVM) feature) { + case VIR_DOMAIN_KVM_HIDDEN: + case VIR_DOMAIN_KVM_DEDICATED: + if (!(tmp = virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->kvm_features[feature] = value; + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_KVM_LAST: + break; + } + } + VIR_FREE(nodes); + } + + if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) { + int feature; + int value; + g_autofree char *ptval = NULL; + + if ((n = virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + feature = virDomainXenTypeFromString((const char *)nodes[i]->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Xen feature: %s"), + nodes[i]->name); + goto error; + } + + if (!(tmp = virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "Xen feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for Xen feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->xen_features[feature] = value; + + switch ((virDomainXen) feature) { + case VIR_DOMAIN_XEN_E820_HOST: + break; + + case VIR_DOMAIN_XEN_PASSTHROUGH: + if (value != VIR_TRISTATE_SWITCH_ON) + break; + + if ((ptval = virXMLPropString(nodes[i], "mode"))) { + int mode = virDomainXenPassthroughModeTypeFromString(ptval); + + if (mode < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported mode '%s' for Xen passthrough feature"), + ptval); + goto error; + } + + if (mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT && + mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'mode' attribute for Xen feature " + "'passthrough' must be 'sync_pt' or 'share_pt'")); + goto error; + } + def->xen_passthrough_mode = mode; + } + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_XEN_LAST: + break; + } + } + VIR_FREE(nodes); + } + + if (def->features[VIR_DOMAIN_FEATURE_SMM] == VIR_TRISTATE_SWITCH_ON) { + int rv = virDomainParseScaledValue("string(./features/smm/tseg)", + "string(./features/smm/tseg/@unit)", + ctxt, + &def->tseg_size, + 1024 * 1024, /* Defaults to mebibytes */ + ULLONG_MAX, + false); + if (rv < 0) + goto error; + def->tseg_specified = rv; + } + + if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) { + if ((node = virXPathNode("./features/msrs", ctxt)) == NULL) + goto error; + + if (!(tmp = virXMLPropString(node, "unknown"))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing 'unknown' attribute for feature '%s'"), + virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE_MSRS)); + goto error; + } + + if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = virDomainMsrsUnknownTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown 'unknown' value '%s'"), + tmp); + goto error; + } + VIR_FREE(tmp); + } + + if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + int val = virDomainProcessCapsFeatureTypeFromString((const char *)nodes[i]->name); + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected capability feature '%s'"), nodes[i]->name); + goto error; + } + + if ((tmp = virXMLPropString(nodes[i], "state"))) { + if ((def->caps_features[val] = virTristateSwitchTypeFromString(tmp)) == -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown state attribute '%s' of feature capability '%s'"), + tmp, virDomainProcessCapsFeatureTypeToString(val)); + goto error; + } + VIR_FREE(tmp); + } else { + def->caps_features[val] = VIR_TRISTATE_SWITCH_ON; + } + } + VIR_FREE(nodes); + return 0; + + error: + return -1; +} + + static int virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) { @@ -20366,7 +20856,7 @@ virDomainDefParseXML(xmlDocPtr xml, { xmlNodePtr node = NULL; size_t i, j; - int n, gic_version; + int n; long id = -1; virDomainDefPtr def; bool uuid_generated = false; @@ -20844,480 +21334,9 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; VIR_FREE(nodes); - if ((n = virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) + if (virDomainFeaturesDefParse(def, ctxt) < 0) goto error; - for (i = 0; i < n; i++) { - int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); - if (val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected feature '%s'"), nodes[i]->name); - goto error; - } - - switch ((virDomainFeature) val) { - case VIR_DOMAIN_FEATURE_APIC: - if ((tmp = virXPathString("string(./features/apic/@eoi)", ctxt))) { - int eoi; - if ((eoi = virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown value for attribute eoi: '%s'"), - tmp); - goto error; - } - def->apic_eoi = eoi; - VIR_FREE(tmp); - } - G_GNUC_FALLTHROUGH; - case VIR_DOMAIN_FEATURE_ACPI: - case VIR_DOMAIN_FEATURE_PAE: - case VIR_DOMAIN_FEATURE_VIRIDIAN: - case VIR_DOMAIN_FEATURE_PRIVNET: - case VIR_DOMAIN_FEATURE_HYPERV: - case VIR_DOMAIN_FEATURE_KVM: - case VIR_DOMAIN_FEATURE_MSRS: - case VIR_DOMAIN_FEATURE_XEN: - def->features[val] = VIR_TRISTATE_SWITCH_ON; - break; - - case VIR_DOMAIN_FEATURE_CAPABILITIES: - if ((tmp = virXMLPropString(nodes[i], "policy"))) { - if ((def->features[val] = virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown policy attribute '%s' of feature '%s'"), - tmp, virDomainFeatureTypeToString(val)); - goto error; - } - VIR_FREE(tmp); - } else { - def->features[val] = VIR_TRISTATE_SWITCH_ABSENT; - } - break; - - case VIR_DOMAIN_FEATURE_VMCOREINFO: - case VIR_DOMAIN_FEATURE_HAP: - case VIR_DOMAIN_FEATURE_PMU: - case VIR_DOMAIN_FEATURE_PVSPINLOCK: - case VIR_DOMAIN_FEATURE_VMPORT: - case VIR_DOMAIN_FEATURE_SMM: - if ((tmp = virXMLPropString(nodes[i], "state"))) { - if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature '%s'"), - tmp, virDomainFeatureTypeToString(val)); - goto error; - } - VIR_FREE(tmp); - } else { - def->features[val] = VIR_TRISTATE_SWITCH_ON; - } - break; - - case VIR_DOMAIN_FEATURE_GIC: - if ((tmp = virXMLPropString(nodes[i], "version"))) { - gic_version = virGICVersionTypeFromString(tmp); - if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed gic version: %s"), tmp); - goto error; - } - def->gic_version = gic_version; - VIR_FREE(tmp); - } - def->features[val] = VIR_TRISTATE_SWITCH_ON; - break; - - case VIR_DOMAIN_FEATURE_IOAPIC: - tmp = virXMLPropString(nodes[i], "driver"); - if (tmp) { - int value = virDomainIOAPICTypeFromString(tmp); - if (value < 0 || value == VIR_DOMAIN_IOAPIC_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown driver mode: %s"), - tmp); - goto error; - } - def->features[val] = value; - VIR_FREE(tmp); - } - break; - - case VIR_DOMAIN_FEATURE_HPT: - tmp = virXMLPropString(nodes[i], "resizing"); - if (tmp) { - int value = virDomainHPTResizingTypeFromString(tmp); - if (value < 0 || value == VIR_DOMAIN_HPT_RESIZING_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown HPT resizing setting: %s"), - tmp); - goto error; - } - def->hpt_resizing = (virDomainHPTResizing) value; - VIR_FREE(tmp); - } - - if (virDomainParseScaledValue("./features/hpt/maxpagesize", - NULL, - ctxt, - &def->hpt_maxpagesize, - 1024, - ULLONG_MAX, - false) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", - _("Unable to parse HPT maxpagesize setting")); - goto error; - } - def->hpt_maxpagesize = VIR_DIV_UP(def->hpt_maxpagesize, 1024); - - if (def->hpt_resizing != VIR_DOMAIN_HPT_RESIZING_NONE || - def->hpt_maxpagesize > 0) { - def->features[val] = VIR_TRISTATE_SWITCH_ON; - } - break; - - case VIR_DOMAIN_FEATURE_HTM: - case VIR_DOMAIN_FEATURE_NESTED_HV: - case VIR_DOMAIN_FEATURE_CCF_ASSIST: - if (!(tmp = virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing state attribute '%s' of feature '%s'"), - tmp, virDomainFeatureTypeToString(val)); - goto error; - } - if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature '%s'"), - tmp, virDomainFeatureTypeToString(val)); - goto error; - } - VIR_FREE(tmp); - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_FEATURE_LAST: - break; - } - } - VIR_FREE(nodes); - - if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) { - int feature; - int value; - node = ctxt->node; - if ((n = virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) < 0) - goto error; - - for (i = 0; i < n; i++) { - feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported HyperV Enlightenment feature: %s"), - nodes[i]->name); - goto error; - } - - ctxt->node = nodes[i]; - - if (!(tmp = virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "HyperV Enlightenment feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for HyperV Enlightenment feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->hyperv_features[feature] = value; - - switch ((virDomainHyperv) feature) { - case VIR_DOMAIN_HYPERV_RELAXED: - case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_VPINDEX: - case VIR_DOMAIN_HYPERV_RUNTIME: - case VIR_DOMAIN_HYPERV_SYNIC: - case VIR_DOMAIN_HYPERV_STIMER: - case VIR_DOMAIN_HYPERV_RESET: - case VIR_DOMAIN_HYPERV_FREQUENCIES: - case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: - case VIR_DOMAIN_HYPERV_TLBFLUSH: - case VIR_DOMAIN_HYPERV_IPI: - case VIR_DOMAIN_HYPERV_EVMCS: - break; - - case VIR_DOMAIN_HYPERV_SPINLOCKS: - if (value != VIR_TRISTATE_SWITCH_ON) - break; - - if (virXPathUInt("string(./@retries)", ctxt, - &def->hyperv_spinlocks) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid HyperV spinlock retry count")); - goto error; - } - - if (def->hyperv_spinlocks < 0xFFF) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV spinlock retry count must be " - "at least 4095")); - goto error; - } - break; - - case VIR_DOMAIN_HYPERV_VENDOR_ID: - if (value != VIR_TRISTATE_SWITCH_ON) - break; - - if (!(def->hyperv_vendor_id = virXMLPropString(nodes[i], - "value"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing 'value' attribute for " - "HyperV feature 'vendor_id'")); - goto error; - } - - if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) { - virReportError(VIR_ERR_XML_ERROR, - _("HyperV vendor_id value must not be more " - "than %d characters."), - VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); - goto error; - } - - /* ensure that the string can be passed to qemu */ - if (strchr(def->hyperv_vendor_id, ',')) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV vendor_id value is invalid")); - goto error; - } - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_HYPERV_LAST: - break; - } - } - VIR_FREE(nodes); - ctxt->node = node; - } - - if (def->features[VIR_DOMAIN_HYPERV_STIMER] == VIR_TRISTATE_SWITCH_ON) { - int value; - if ((n = virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &nodes)) < 0) - goto error; - - for (i = 0; i < n; i++) { - if (STRNEQ((const char *)nodes[i]->name, "direct")) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Hyper-V stimer feature: %s"), - nodes[i]->name); - goto error; - } - - if (!(tmp = virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Hyper-V stimer '%s' feature"), "direct"); - goto error; - } - - if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Hyper-V stimer '%s' feature"), "direct"); - goto error; - } - - VIR_FREE(tmp); - def->hyperv_stimer_direct = value; - } - VIR_FREE(nodes); - } - - if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { - int feature; - int value; - if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) - goto error; - - for (i = 0; i < n; i++) { - feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported KVM feature: %s"), - nodes[i]->name); - goto error; - } - - switch ((virDomainKVM) feature) { - case VIR_DOMAIN_KVM_HIDDEN: - case VIR_DOMAIN_KVM_DEDICATED: - if (!(tmp = virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "KVM feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for KVM feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->kvm_features[feature] = value; - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_KVM_LAST: - break; - } - } - VIR_FREE(nodes); - } - - if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) { - int feature; - int value; - g_autofree char *ptval = NULL; - - if ((n = virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) - goto error; - - for (i = 0; i < n; i++) { - feature = virDomainXenTypeFromString((const char *)nodes[i]->name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Xen feature: %s"), - nodes[i]->name); - goto error; - } - - if (!(tmp = virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Xen feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Xen feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->xen_features[feature] = value; - - switch ((virDomainXen) feature) { - case VIR_DOMAIN_XEN_E820_HOST: - break; - - case VIR_DOMAIN_XEN_PASSTHROUGH: - if (value != VIR_TRISTATE_SWITCH_ON) - break; - - if ((ptval = virXMLPropString(nodes[i], "mode"))) { - int mode = virDomainXenPassthroughModeTypeFromString(ptval); - - if (mode < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported mode '%s' for Xen passthrough feature"), - ptval); - goto error; - } - - if (mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT && - mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'mode' attribute for Xen feature " - "'passthrough' must be 'sync_pt' or 'share_pt'")); - goto error; - } - def->xen_passthrough_mode = mode; - } - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_XEN_LAST: - break; - } - } - VIR_FREE(nodes); - } - - if (def->features[VIR_DOMAIN_FEATURE_SMM] == VIR_TRISTATE_SWITCH_ON) { - int rv = virDomainParseScaledValue("string(./features/smm/tseg)", - "string(./features/smm/tseg/@unit)", - ctxt, - &def->tseg_size, - 1024 * 1024, /* Defaults to mebibytes */ - ULLONG_MAX, - false); - if (rv < 0) - goto error; - def->tseg_specified = rv; - } - - if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) { - if ((node = virXPathNode("./features/msrs", ctxt)) == NULL) - goto error; - - if (!(tmp = virXMLPropString(node, "unknown"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing 'unknown' attribute for feature '%s'"), - virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE_MSRS)); - goto error; - } - - if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = virDomainMsrsUnknownTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown 'unknown' value '%s'"), - tmp); - goto error; - } - VIR_FREE(tmp); - } - - if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0) - goto error; - - for (i = 0; i < n; i++) { - int val = virDomainProcessCapsFeatureTypeFromString((const char *)nodes[i]->name); - if (val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected capability feature '%s'"), nodes[i]->name); - goto error; - } - - if ((tmp = virXMLPropString(nodes[i], "state"))) { - if ((def->caps_features[val] = virTristateSwitchTypeFromString(tmp)) == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature capability '%s'"), - tmp, virDomainProcessCapsFeatureTypeToString(val)); - goto error; - } - VIR_FREE(tmp); - } else { - def->caps_features[val] = VIR_TRISTATE_SWITCH_ON; - } - } - VIR_FREE(nodes); - if (virDomainEventActionParseXML(ctxt, "on_reboot", "string(./on_reboot[1])", &def->onReboot, -- 2.25.1

2 1

[PATCH] docs: Remove stray parenthesis
by Jim Fehlig 22 Apr '20

22 Apr '20

Commit fadbaa2375 introduced a stray parenthesis in formatdomain.html.in. Remove it. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9ccae54e04..27275c8429 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2263,7 +2263,7 @@ </tr> <tr> <td>passthrough</td> - <td>Enable IOMMU mappings allowing PCI passthrough)</td> + <td>Enable IOMMU mappings allowing PCI passthrough</td> <td>on, off; mode - optional string sync_pt or share_pt</td> <td><span class="since">6.3.0</span></td> </tr> -- 2.26.0

1 0

[PATCH] docs: Document reserved PCI addresses for QEMU
by Michal Privoznik 21 Apr '20

21 Apr '20

>From time to time we are asked which PCI addresses are reserved in QEMU. Let's document them in one place, it's easier than reconstructing the list from the code each time. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/pci-addresses.rst | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/pci-addresses.rst b/docs/pci-addresses.rst index 885d50517a..6c203fb1ac 100644 --- a/docs/pci-addresses.rst +++ b/docs/pci-addresses.rst @@ -235,3 +235,43 @@ guest OS rather than as ``0001:08:00.1``, which is the address of the device on the host. Of course, all the rules and behaviors described above still apply. + + +Reserved addresses +================== + +Due to some historical reasons hypervisors might expect some PCI +devices to appear at certain addresses instead of 'random' ones. +For QEMU this is machine type and guest architecture dependant. +But to give you at least a gist here is list of reserved PCI +addresses: + +For ``I440FX`` the following addresses are reserved: + +============ ====================== +0000:00:01.0 ISA bridge +0000:00:01.1 primary IDE controller +0000:00:01.2 PIIX3 USB controller +0000:00:01.3 PCI bridge +0000:00:02.0 primary video card +============ ====================== + +For ``Q35`` the following addresses are reserved: + +============ ======================= +0000:00:1f.2 primary SATA controller +0000:00:1f.0 ISA bridge +0000:00:1f.3 SMBus +0000:00:01.0 primary video card +============ ======================= + +and the following are recommended (libvirt will try to place +corresponding devices there because that's how real ``Q35`` would +do it, but won't fail if the address is already taken): + +============ =============== +0000:00:1a.0 USB2 controller +0000:00:1b.0 ICH9 sound chip +0000:00:1d.0 USB2 controller +0000:00:1e.0 dmi-to-pci bridge +============ =============== -- 2.25.3

2 1