- Devel - libvirt List Archives

[libvirt PATCH 0/2] Improve entry point for new contributors
by Andrea Bolognani 14 Apr '20

14 Apr '20

Use the path most people will look for, reduce building instructions to the bare minimum necessary to locally bootstrap the learning process, and ensure duplication doesn't creep in over time by pointing to the full documentation. Andrea Bolognani (2): CONTRIBUTING: Add entry point for new contributors README-hacking: Drop from the git repository CONTRIBUTING.md | 18 ++++++++++++++++ README-hacking | 56 ------------------------------------------------- 2 files changed, 18 insertions(+), 56 deletions(-) create mode 100644 CONTRIBUTING.md delete mode 100644 README-hacking -- 2.25.1

2 6

[libvirt-jenkins-ci PATCH v3 0/5] Introduce the new 'gitlab' flavor
by Erik Skultety 14 Apr '20

14 Apr '20

since v1: - .bash_logout is removed from the user home environment (causes builds to fail on Debian) - gitlab-runner is now downloaded to and executed from user's bin/ directory instead of using /usr/local/bin - both RC and systemd service files now define the user explicitly that the init system changes to when spawning the gitlab-runner service - the gitlab flavour tasks file now relies on shell's 'creates' module argument so that the agent registration is idempotent rather than touching the dirs/files explicitly - both gitlab URL and runner token are now files editable under ~/.config/lcitool since v2: - download location changed to /usr/local/bin - config location changed to /etc/gitlab-runner (readable to the gitlab user) - machine tagging changed to 'os_version-distro_major_number' - fixed the regression caused by the gitlab code which was checking the gitlab config files unconditionally for all flavours - cosmetic syntactic changes to the Python code as requested by the reviewer Both the config.toml improvement in terms of replacing the ~/.config/lcitool files as discussed during the v1 review process as well as cloudinit usage is planned for a separate respective series, so for now, we'll have to live with 2 new config files and cloud images will need to be built manually. Erik Skultety (5): guests: users: Discard the .bash_logout skeleton file guests: templates: Introduce a gitlab-runner systemd service template guests: templates: Introduce a gitlab-runner RC init service template guests: Introduce the new 'gitlab' flavor guests: lcitool: Enable the new 'gitlab' flavor in the lcitool script guests/lcitool | 46 ++++++++++++++- guests/playbooks/update/main.yml | 5 ++ guests/playbooks/update/tasks/gitlab.yml | 58 +++++++++++++++++++ guests/playbooks/update/tasks/users.yml | 3 +- .../update/templates/gitlab-runner.j2 | 31 ++++++++++ .../update/templates/gitlab-runner.service.j2 | 14 +++++ 6 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 guests/playbooks/update/tasks/gitlab.yml create mode 100644 guests/playbooks/update/templates/gitlab-runner.j2 create mode 100644 guests/playbooks/update/templates/gitlab-runner.service.j2 -- 2.25.1

2 12

[PATCH ocaml 0/1] RFC: add/switch to dune build system
by Pino Toscano 14 Apr '20

14 Apr '20

ocaml-libvirt is currently built using manually written makefiles, and an autoconf script to detect libvirt (using pkg-config). While this seems OK, it has a lot of downsides: - all the OCaml rules are manually written - there is some form of duplication in the OCaml rules - the bytecode vs native build is fragile Initially named jhbuild, dune is a native OCaml build system which plans to eventually replace the others (omake, oasis, ocamlbuild), with a growing user base in the OCaml community. This is a very simple patch adding support for dune. The idea is to replace the current autoconf+makefile build system, which can be removed more or less easily. I'd prefer to not maintain two build systems at once, so this patch is also a way to start a discussion about the proposed approach. Things not yet done (pending the discussion): - rewrite/simplify the release bits, currently interwonen in the makefiles - update the documentation - update libvirt-ci - remove the autoconf+makefile build system Pino Toscano (1): Add dune build system .gitignore | 3 +++ dune | 18 +++++++++++++ dune-project | 1 + dune.inc | 22 ++++++++++++++++ examples/dune | 50 ++++++++++++++++++++++++++++++++++++ libvirt/discover.ml | 40 +++++++++++++++++++++++++++++ libvirt/dune | 57 ++++++++++++++++++++++++++++++++++++++++++ libvirt/dune-project | 2 ++ libvirt/mllibvirt.opam | 33 ++++++++++++++++++++++++ 9 files changed, 226 insertions(+) create mode 100644 dune create mode 100644 dune-project create mode 100644 dune.inc create mode 100644 examples/dune create mode 100644 libvirt/discover.ml create mode 100644 libvirt/dune create mode 100644 libvirt/dune-project create mode 100644 libvirt/mllibvirt.opam -- 2.25.2

2 2

[PATCH] driver.c: Use g_autofree
by Seeteena Thoufeek 14 Apr '20

14 Apr '20

This is the only instance of g_autofree change applicable for driver.c Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com> --- src/driver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/driver.c b/src/driver.c index a2047be..e745210 100644 --- a/src/driver.c +++ b/src/driver.c @@ -48,7 +48,7 @@ virDriverLoadModule(const char *name, const char *regfunc, bool required) { - char *modfile = NULL; + g_autofree char *modfile = NULL; int ret; VIR_DEBUG("Module load %s", name); @@ -62,9 +62,6 @@ virDriverLoadModule(const char *name, return -1; ret = virModuleLoad(modfile, regfunc, required); - - VIR_FREE(modfile); - return ret; } -- 1.8.3.1

2 1

FYI: Report about libvirt failing to compile on MSYS2 with an XDR error
by Richard W.M. Jones 14 Apr '20

14 Apr '20

.. is here: https://github.com/msys2/MINGW-packages/issues/6384 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

1 0

[PATCH 0/4] libxl: add e820_host option to the libvirt config
by Marek Marczykowski-Górecki 13 Apr '20

13 Apr '20

Context: - old thread on xen-devel: http://xen.markmail.org/thread/awcswnywzei4s65e - new thread here: https://www.redhat.com/archives/libvir-list/2020-April/msg00447.html Marek Marczykowski-Górecki (4): conf: add xen specific feature: e820_host libxl: make use of e820_host feature xenconfig: parse e820_host option tests: check e820_host option handling docs/schemas/domaincommon.rng | 16 +++- src/conf/domain_conf.c | 106 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++- src/libxl/libxl_conf.c | 14 ++- src/libxl/xen_common.c | 14 ++- src/qemu/qemu_validate.c | 1 +- tests/xlconfigdata/test-paravirt-e820_host.cfg | 13 ++- tests/xlconfigdata/test-paravirt-e820_host.xml | 37 ++++++- tests/xlconfigtest.c | 1 +- 9 files changed, 211 insertions(+) create mode 100644 tests/xlconfigdata/test-paravirt-e820_host.cfg create mode 100644 tests/xlconfigdata/test-paravirt-e820_host.xml base-commit: 7118bdee1550b6022e7362402ca8204add4cf80b -- git-series 0.9.1

2 8

[PATCH] util: fix iteration in virSocketAddrResolveService
by Nikolay Shirokovskiy 13 Apr '20

13 Apr '20

getaddrinfo returns linked list. Fix iteration accordingly. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/util/virsocketaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4cad329..4c9f124 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -271,7 +271,7 @@ int virSocketAddrResolveService(const char *service) port = ntohs(in.sin6_port); goto cleanup; } - tmp++; + tmp = tmp->ai_next; } virReportError(VIR_ERR_SYSTEM_ERROR, -- 1.8.3.1

2 1

[PATCH] formatdomain.html.in: document emulator/vcpu pin delay
by Daniel Henrique Barboza 10 Apr '20

10 Apr '20

In a guest with only one vcpu, when pinning the emulator in say CPU184 and the vcpu0 in CPU0 of the host, the user might expect that only CPU0 and CPU184 of the host will be used by the guest. The reality is that Libvirt takes some time to honor the emulator and vcpu pinning, taking care of NUMA constraints first. This will result in other CPUs of the host being potentially used by the QEMU thread until the emulator/vcpu pinning is done. The user then might be confused by the output of 'virsh cpu-stats' in this scenario, showing around 200 microseconds of cycles being spent in other CPUs. Let's document this behavior, which is explained in detail in Libvirt commit v5.0.0-199-gf136b83139, in the cputune section of formatdomain.html.in. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/formatdomain.html.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 47e10a836c..932bf8841f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -808,6 +808,13 @@ <dd> The optional <code>cputune</code> element provides details regarding the CPU tunable parameters for the domain. + + Note: for the qemu driver, the optional <code>vcpupin</code> + and <code>emulatorpin</code> pinning settings are honored after + the emulator is launched and NUMA constraints considered. This + means that it is expected that other physical CPUs of the host + will be used during this time by the domain, which will be + reflected by the output of <code>virsh cpu-stats</code>. <span class="since">Since 0.9.0</span> </dd> <dt><code>vcpupin</code></dt> -- 2.25.1

2 1

[libvirt-ci PATCH v2] dco: build and publish a container image for DCO check
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

This builds a container image containing the DCO checking script. It is then published at: registry.gitlab.com/libvirt/libvirt-jenkins-ci/check-dco:master from where it can be used in all other project repositories. This avoids having to copy the check-dco.py script into every repo when we want to make changes to it. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Drop -f arg to docker - Drop .py suffix .gitlab-ci.yml | 39 +++++++++++++++++ check-dco/Dockerfile | 6 +++ check-dco/check-dco.py | 99 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 check-dco/Dockerfile create mode 100755 check-dco/check-dco.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..7735bb3 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,39 @@ + +stages: + - containers + - postbuild + +.build_container_template: &build_container_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - 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 push ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} + after_script: + - docker logout + +build-dco: + <<: *build_container_definition + variables: + NAME: check-dco + +# 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: + # In most projects we'd put this in a "prebuild", but this + # repo is a special case as we need to actually build the + # container first! + stage: postbuild + image: ${CI_REGISTRY_IMAGE}/check-dco:${CI_COMMIT_REF_SLUG} + script: + - /check-dco + only: + - branches + except: + - master diff --git a/check-dco/Dockerfile b/check-dco/Dockerfile new file mode 100644 index 0000000..366f72b --- /dev/null +++ b/check-dco/Dockerfile @@ -0,0 +1,6 @@ +FROM centos:8 + +RUN dnf -y install python3 git && \ + dnf -y clean all + +COPY check-dco.py /check-dco diff --git a/check-dco/check-dco.py b/check-dco/check-dco.py new file mode 100755 index 0000000..f8204ca --- /dev/null +++ b/check-dco/check-dco.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 +# +# ci-job.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.24.1

2 1

[libvirt-jenkins-ci PATCH] dco: build and publish a container image for DCO check
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

This builds a container image containing the DCO checking script. It is then published at: registry.gitlab.com/libvirt/libvirt-jenkins-ci/check-dco:master from where it can be used in all other project repositories. This avoids having to copy the check-dco.py script into every repo when we want to make changes to it. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 39 +++++++++++++++++ check-dco/Dockerfile | 6 +++ check-dco/check-dco.py | 99 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 check-dco/Dockerfile create mode 100755 check-dco/check-dco.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..83b0d64 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,39 @@ + +stages: + - containers + - postbuild + +.build_container_template: &build_container_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - 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} -f ${NAME}/Dockerfile ${NAME} + - docker push ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} + after_script: + - docker logout + +build-dco: + <<: *build_container_definition + variables: + NAME: check-dco + +# 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: + # In most projects we'd put this in a "prebuild", but this + # repo is a special case as we need to actually build the + # container first! + stage: postbuild + image: ${CI_REGISTRY_IMAGE}/check-dco:${CI_COMMIT_REF_SLUG} + script: + - /check-dco.py + only: + - branches + except: + - master diff --git a/check-dco/Dockerfile b/check-dco/Dockerfile new file mode 100644 index 0000000..86cada7 --- /dev/null +++ b/check-dco/Dockerfile @@ -0,0 +1,6 @@ +FROM centos:8 + +RUN dnf -y install python3 git && \ + dnf -y clean all + +COPY check-dco.py check-dco.py diff --git a/check-dco/check-dco.py b/check-dco/check-dco.py new file mode 100755 index 0000000..f8204ca --- /dev/null +++ b/check-dco/check-dco.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 +# +# ci-job.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.24.1

2 7

[libvirt PATCH] gitdm: Add missing entries
by Andrea Bolognani 09 Apr '20

09 Apr '20

One new company has contributed to libvirt since the last time the gitdm configuration was updated. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/gitdm/companies/others | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others index f459163dd2..37d590a6b9 100644 --- a/docs/gitdm/companies/others +++ b/docs/gitdm/companies/others @@ -16,6 +16,7 @@ citrix.com Citrix cloudwatt.com Cloudwatt cmss.chinamobile.com China Mobile codethink.co.uk Codethink +crudebyte.com Crudebyte cumulusnetworks.com Cumulus Networks dataductus.se Data Ductus datagravity.com DataGravity -- 2.25.1

2 2

[libvirt PATCH 0/6] docs: misc updates for gitlab changes
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

Daniel P. Berrangé (6): docs: point users to gitlab for issue tracking docs: point to gitlab as primary git repo host docs: style git mirror links less prominently docs: update for rename of libvirt-jenkins.ci repository docs: add link to bug tracker against each download docs: replace site name with link type in download table docs/best-practices.rst | 5 +- docs/bugs.html.in | 27 +++--- docs/downloads.html.in | 187 ++++++++++++++++++++++++++++------------ docs/libvirt.css | 9 ++ 4 files changed, 159 insertions(+), 69 deletions(-) -- 2.24.1

2 14

[libvirt PATCH v2] docs: list settings required in creating a new git repo
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

The libvirt project has alot of git repositories, and they must all be configured in the same way, more or less. This page documents the settings changes that I have made in GitLab and GitHub when configuring projects, both as a reminder for myself, and to help anyone else doing the same in future. Also included is info about the repo mirroring on the libvirt.org server. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Apply all Andrea's suggestions docs/docs.html.in | 3 + docs/newreposetup.rst | 137 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 docs/newreposetup.rst diff --git a/docs/docs.html.in b/docs/docs.html.in index 142c79bfa9..6bdf0c32b8 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -172,6 +172,9 @@ <dt><a href="testsuites.html">Functional testing</a></dt> <dd>Testing libvirt with <a href="testtck.html">TCK test suite</a> and <a href="testapi.html">Libvirt-test-API</a></dd> + + <dt><a href="newreposetup.html">New repo setup</a></dt> + <dd>Procedure for configuring new git repositories for libvirt</dd> </dl> </div> diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst new file mode 100644 index 0000000000..7da13830c0 --- /dev/null +++ b/docs/newreposetup.rst @@ -0,0 +1,137 @@ +=============================== +Repository infrastructure setup +=============================== + +GitLab Configuration +==================== + +The `GitLab organization <https://gitlab.com/libvirt>`_ hosts the master copy +of all the libvirt Git repositories. + +When creating a new repository the following changes to the defaults are +required under the **Settings** page: + +* **General** + + * **Naming, topics, avatar** + + * *Project avatar*: upload ``docs/logos/logo-square-256.png`` + + * **Visibility, project features, permissions** + + * *Packages*: disabled + + * *Wiki*: disabled + + * *Snippets*: disabled + + * **Merge Requests** + + * *Merge method*: Fast-forward merge + + * *Merge options*: Enable 'delete source branch' option by default + + * *Merge checks*: Pipelines must succeed + + * **Merge request approvals** + + * *Any eligible user*: Num approvals required == 1 + +* **Integrations** + + * **Pipelines emails** + + * *Recipients*: ``libvirt-ci(a)redhat.com`` + +* **Repository** + + * **Push rules** + + * *Do not allow users to remove git tags with git push*: enabled + + * *Commit message*: ``Signed-off-by:`` + + * *Branch name*: ``^(master|v.*-maint)$`` + + * **Mirroring repositories** + + * *Git repository URL*: ``https://libvirtmirror@github.com/libvirt/$repo.git`` + + * *Mirror direction*: push + + * *Password*: see ``/root/libvirt-mirror-github-api-token.txt`` on ``libvirt.org`` + + * **Protected branches** + + * *Branch*: ``master`` + + * *Allowed to merge*: Developers + Maintainers + + * *Allowed to push*: None (or Developers + Maintainers if MRs not used) + + * *Require approval from code owners*: disabled + +GitHub configuration +==================== + +The `GitHub organization <https://github.com/libvirt>`_ hosts read-only +mirrors of all the libvirt Git repositories. + +When creating a new repository the following changes to the defaults are +required under the **Settings** page: + +* **Options** + + * **Features** + + * *Wikis*: disabled + + * *Sponsorships*: disabled + + * *Projects*: disabled + + * **Manage access** + + * Add the ``@committers`` team with the role "Write", which + grants ``libvirtmirror`` access to sync from gitlab. + + * **Integrations** + + * Check for *Repo Lockdown* (should be set automatically for all projects) + +In the master git repository create a file `.github/lockdown.yml` to restrict +use of issue tracker and pull requests. + + +libvirt.org +=========== + +The `libvirt project server <https://libvirt.org>`_ hosts read-only mirrors of +all the libvirt Git repositories in the directory ``/data/git``. + +When creating a new repository the following steps are required: + +* Create repo with + :: + + $ sudo su - + # cd /data/git + # mkdir $repo.git + # cd $repo.git + # git init --bare + # touch export + # touch git-daemon-export-ok + # cd .. + # chown -R gitmirror.gitmirror $repo.git + # chmod -R g+w $repo.git + # find -type d $repo.git | xargs chmod g+s + +* Set the ``description`` and ``config`` files following other repos' example + +* Setup mirroring + :: + + $ sudo su - gitmirror + # ./newrepo.sh /data/git/$repo.git + # cd mirrors + # $HOME/sync-one.sh $repo.git -- 2.24.1

2 1

[PATCH] virsh: cmdUndefine: Properly extract delete-storage-volume-snapshots flag
by Peter Krempa 09 Apr '20

09 Apr '20

Commit 86608f787ee added the above flag as an alias for ambiguous 'delete-snapshots' flag, but forgot to actually change the code that extracts it, thus the new version actually doesn't work. https://bugzilla.redhat.com/show_bug.cgi?id=1821988 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2dc7c38b55..a203b34996 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3658,7 +3658,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) bool checkpoints_metadata = vshCommandOptBool(cmd, "checkpoints-metadata"); bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-storage"); - bool delete_snapshots = vshCommandOptBool(cmd, "delete-snapshots"); + bool delete_snapshots = vshCommandOptBool(cmd, "delete-storage-volume-snapshots"); bool nvram = vshCommandOptBool(cmd, "nvram"); bool keep_nvram = vshCommandOptBool(cmd, "keep-nvram"); /* Positive if these items exist. */ -- 2.26.0

2 1

[libvirt-dockerfiles PATCH 0/5] Update after libvirt-ci repo rename
by Andrea Bolognani 09 Apr '20

09 Apr '20

All pushed as trivial. Andrea Bolognani (5): README: Update git URLs to point to GitLab README: Update after libvirt-ci repo rename refresh: Update after libvirt-ci repo rename trigger: Update after libvirt-ci repo rename monitor: Update after libvirt-ci repo rename README.md | 5 ++--- monitor | 2 +- refresh | 4 ++-- trigger | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) -- 2.25.2

1 5

[PATCH 0/3] libxl: Add support for max_event_channels
by Jim Fehlig 09 Apr '20

09 Apr '20

This series implements support Xen's max_event_channels setting as proposed in this thread https://www.redhat.com/archives/libvir-list/2020-April/msg00376.html See the individual patches for details. Jim Fehlig (3): conf: Add a new xenbus controller option for event channels libxl: Add support for max_event_channels xenconfig: Add support for max_event_channels docs/formatdomain.html.in | 8 +- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 15 ++++ src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 14 +-- src/libxl/xen_xl.c | 57 ++++++------ .../max-eventchannels-hvm.json | 90 +++++++++++++++++++ .../max-eventchannels-hvm.xml | 37 ++++++++ tests/libxlxml2domconfigtest.c | 2 + tests/xlconfigdata/test-max-eventchannels.cfg | 13 +++ tests/xlconfigdata/test-max-eventchannels.xml | 32 +++++++ tests/xlconfigdata/test-usbctrl.xml | 2 +- tests/xlconfigtest.c | 2 + 13 files changed, 245 insertions(+), 33 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/max-eventchannels-hvm.json create mode 100644 tests/libxlxml2domconfigdata/max-eventchannels-hvm.xml create mode 100644 tests/xlconfigdata/test-max-eventchannels.cfg create mode 100644 tests/xlconfigdata/test-max-eventchannels.xml -- 2.26.0

2 6

[jenkins-ci PATCH 0/3] Update various files after repo rename
by Andrea Bolognani 09 Apr '20

09 Apr '20

All pushed as trivial. Andrea Bolognani (3): guests: Update README after repo rename git-publish: Update config after repo rename github: Update repo-lockdown config after repo rename .github/lockdown.yml | 6 +++--- .gitpublish | 2 +- guests/README.markdown | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.25.2

1 3

[PATCH V2 3/5] cpu: Introduce ARM related structs
by Zhenyu Zheng 09 Apr '20

09 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.0.windows.1

1 0

[libvirt PATCH] docs: list settings required in creating a new git repo
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

The libvirt project has alot of git repositories, and they must all be configured in the same way, more or less. This page documents the settings changes that I have made in GitLab and GitHub when configuring projects, both as a reminder for myself, and to help anyone else doing the same in future. Also included is info about the repo mirroring on the libvirt.org server. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/docs.html.in | 3 + docs/newreposetup.rst | 136 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 docs/newreposetup.rst diff --git a/docs/docs.html.in b/docs/docs.html.in index 142c79bfa9..6bdf0c32b8 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -172,6 +172,9 @@ <dt><a href="testsuites.html">Functional testing</a></dt> <dd>Testing libvirt with <a href="testtck.html">TCK test suite</a> and <a href="testapi.html">Libvirt-test-API</a></dd> + + <dt><a href="newreposetup.html">New repo setup</a></dt> + <dd>Procedure for configuring new git repositories for libvirt</dd> </dl> </div> diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst new file mode 100644 index 0000000000..897caaa1ec --- /dev/null +++ b/docs/newreposetup.rst @@ -0,0 +1,136 @@ +=============================== +Repository infrastructure setup +=============================== + +GitLab Configuration +==================== + +The `GitLab organization <https://gitlab.com/libvirt>`_ hosts the master copy +of all the libvirt Git repositories. + +When creating a new repository the following changes to the defaults are +required under the ``Settings`` page + +* **General** + + * **Naming, topics, avatar** + + * *Project avatar*: upload ``docs/logos/logo-square-256.png`` + + * **Visibility, project features, permissions** + + * *Packages*: disabled + + * *Wiki*: disabled + + * *Snippets*: disabled + + * **Merge Requests** + + * *Merge method*: Fast-forward merge + + * *Merge options*: Enable 'delete source branch' option by default + + * *Merge checks*: Pipelines must succeed + + * **Merge request approvals** + + * *Any eligible user*: Num approvals required == 1 + +* **Integrations** + + * **Pipelines emails** + + * *Recipients*: ``libvirt-ci(a)redhat.com`` + +* **Repository** + + * **Push rules** + + * *Do not allow users to remove git tags with git push*: enabled + + * *Commit message*: ``Signed-off-by:`` + + * *Branch name*: ``^(master|v.*-maint)$`` + + * **Mirroring repositories** + + * *Git repository URL*: ``https://libvirtmirror@github.com/libvirt/$repo.git`` + + * *Mirror direction*: push + + * *Password*: see ``/root/libvirt-mirror-github-api-token.txt`` on ``libvirt.org`` + + * **Protected branches** + + * *Branch*: ``master`` + + * *Allowed to merge*: Developers + Maintainers + + * *Allowed to push*: None (or Developers + Maintainers if MRs not used) + + * *Require approval from code owners*: disabled + +GitHub configuration +==================== + +The `GitHub organization <https://github.com/libvirt>`_ hosts read-only +mirrors of all the libvirt Git repositories. + +When creating a new repository the following changes to the defaults are +required under the ``Settings`` page + +* **Options** + + * **Features** + + * *Wikis*: disabled + + * *Sponsorships*: disabled + + * *Projects*: disabled + + * **Manage access** + + * Add @committers with role "Write" + + * **Integrations** + + * Check for *Repo Lockdown* (should be set automatically for all projects) + +In the master git repository create a file `.github/lockdown.yml` to restrict +use of issue tracker and pull requests. + + +libvirt.org +=========== + +The `Libvirt project server <https://libvirt.org>`_ hosts read-only mirrors of +all the libvirt Git repositories in the directory ``/data/git``. + +When creating a new repository the following steps are required + +* Create repo with + :: + + $ sudo su - + # cd /data/git + # mkdir repo.git + # cd repo.git + # git init --bare + # touch export + # touch git-daemon-export-ok + # cd .. + # chown -R gitmirror.gitmirror repo.git + # chmod -R g+w repo.git + # find -type d repo.git | xargs chmod g+s + +* Set the ``description`` and ``config`` files following other repos example + +* Setup mirroring + :: + + $ sudo su - gitmirror + # ./newrepo.sh /data/git/repo.git + # cd mirrors + # $HOME/sync-one.sh repo.git -- 2.24.1

2 1

ALERT: libvirt-jenkins-ci.git renamed to libvirt-ci.git
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

As the subject says, we have renamed the repository libvirt-jenkins-ci.git to be libvirt-ci.git, since it does more than just Jenkins and we are aiming to eliminate Jenkins If you have a checkout then you need to update the URL using: git remote set-url origin https://gitlab.com/libvirt/libvirt-ci.git 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 PATCH] docs: add 'edit this page' link to footer of every page
by Daniel P. Berrangé 09 Apr '20

09 Apr '20

To encourage contributors to make changes to the main website, add a footer link to every page which links to the corresponding source file in git. With gitlab, they are able to edit content directly in the web browser and then submit a merge request. This gives a way to contribute content that is arguably easier than our wiki which requires manual account creation, while this will also benefit from maintainer review. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 5 +++++ docs/page.xsl | 7 +++++++ docs/site.xsl | 1 + docs/subsite.xsl | 1 + 4 files changed, 14 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 61862c4ab7..483414105d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -429,6 +429,10 @@ manpages/%.html.in: manpages/%.rst %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ $(acl_generated) $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \ + genhtmlin=`echo $@ | sed -e 's/.tmp/.in/'`; \ + rst=`echo $@ | sed -e 's/.html.tmp/.rst/'`; \ + src="$$genhtmlin"; \ + test -f "$$genhtmlin" && src="$$rst"; \ dir=`dirname $@` ; \ if test "$$dir" = "."; \ then \ @@ -438,6 +442,7 @@ manpages/%.html.in: manpages/%.rst style=subsite.xsl; \ fi; \ $(XSLTPROC) --stringparam pagename $$name \ + --stringparam pagesrc $$src \ --stringparam builddir '$(abs_top_builddir)' \ --stringparam timestamp $(timestamp) --nonet \ $(top_srcdir)/docs/$$style $< > $@ \ diff --git a/docs/page.xsl b/docs/page.xsl index ddae5ab508..6e3ed6c688 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -77,6 +77,7 @@  <xsl:template match="/" mode="page"> <xsl:param name="pagename"/> + <xsl:param name="pagesrc"/> <xsl:param name="timestamp"/> <xsl:text disable-output-escaping="yes"><!DOCTYPE html> </xsl:text> @@ -150,6 +151,12 @@ </div> </div> <div id="footer"> + <div id="contact"> + <h3>Contribute</h3> + <ul> + <li><a href="https://gitlab.com/libvirt/libvirt/-/blob/master/docs/{$pagesrc}">edit this page</a></li> + </ul> + </div> <div id="contact"> <h3>Contact</h3> <ul> diff --git a/docs/site.xsl b/docs/site.xsl index c9d41f2c93..73ddd8ca6b 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -27,6 +27,7 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="pagesrc" select="$pagesrc"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:template> diff --git a/docs/subsite.xsl b/docs/subsite.xsl index f56ac0491c..bfd34eebd2 100644 --- a/docs/subsite.xsl +++ b/docs/subsite.xsl @@ -17,6 +17,7 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="pagesrc" select="$pagesrc"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:template> -- 2.24.1

3 5

[PATCH] apparmor: avoid denials on libpmem initialization
by Christian Ehrhardt 09 Apr '20

09 Apr '20

With libpmem support compiled into qemu it will trigger the following denials on every startup. apparmor="DENIED" operation="open" name="/" apparmor="DENIED" operation="open" name="/sys/bus/nd/devices/" This is due to [1] that tries to auto-detect if the platform supports auto flush for all region. Once we know all the paths that are potentially needed if this feature is really used we can add them conditionally in virt-aa-helper and labelling calls in case </pmem> is enabled. But until then the change here silences the denial warnings seen above. [1]: https://github.com/pmem/pmdk/blob/master/src/libpmem2/auto_flush_linux.c#L1… Bug: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1871354 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/apparmor/libvirt-qemu | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index 80986aec61..602f5eb587 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -227,3 +227,8 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, /etc/gss/mech.d/* r, + + # scanned on libpmem init, but harmless on any lsb compliant system + / r, + /sys/bus/nd/devices/ r, + /sys/bus/nd/devices/* r, -- 2.26.0

2 3

[PATCH v2 0/4] support for virtio packed virtqueues
by Bjoern Walk 08 Apr '20

08 Apr '20

QEMU recently (86044b24e) introduced packed virtqueues for virtio that supposedly have better cache utilization and performance compared to the default split queues. So here's a patch set that expose the virtio parameter as a optional libvirt XML attribute to virtio-backed devices, e.g.: <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> <driver packed='on'/> </interface> The default value if the attribute is omitted is still 'off' and regular split virtqueues are used. v1 -> v2: * rebased on current master * reworded documentation as suggested by Jason and Michael Bjoern Walk (4): qemu: capabilities: add 'packed' capability conf: domain: support for virtio packed option qemu: command: support for virtio packed option docs: documentation for virtio packed option docs/formatdomain.html.in | 10 ++++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 28 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 ++++++ .../caps_4.2.0.aarch64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + tests/qemuxml2argvdata/virtio-options.args | 32 ++++++++++--------- tests/qemuxml2argvdata/virtio-options.xml | 26 +++++++-------- tests/qemuxml2argvtest.c | 3 +- tests/qemuxml2xmltest.c | 3 +- 16 files changed, 100 insertions(+), 30 deletions(-) -- 2.24.1

3 9

[libvirt-jenkins-ci PATCH v2 0/6] Introduce the new 'gitlab' flavor
by Erik Skultety 08 Apr '20

08 Apr '20

since v1: - .bash_logout is removed from the user home environment (causes builds to fail on Debian) - gitlab-runner is now downloaded to and executed from user's bin/ directory instead of using /usr/local/bin - both RC and systemd service files now define the user explicitly that the init system changes to when spawning the gitlab-runner service - the gitlab flavour tasks file now relies on shell's 'creates' module argument so that the agent registration is idempotent rather than touching the dirs/files explicitly - both gitlab URL and runner token are now files editable under ~/.config/lcitool Both the config.toml improvement in terms of replacing the ~/.config/lcitool files as discussed during the v1 review process as well as cloudinit usage is planned for a separate respective series, so for now, we'll have to live with 2 new config files and cloud images will need to be built manually. Erik Skultety (6): guests: users: Discard the .bash_logout skeleton file guests: users: Create a bin/ directory in the flavor user's home guests: templates: Introduce a gitlab-runner systemd service template guests: templates: Introduce a gitlab-runner RC init service template guests: Introduce the new 'gitlab' flavor guests: lcitool: Enable the new 'gitlab' flavor in the lcitool script guests/lcitool | 50 ++++++++++++++++-- guests/playbooks/update/main.yml | 5 ++ guests/playbooks/update/tasks/gitlab.yml | 52 +++++++++++++++++++ guests/playbooks/update/tasks/users.yml | 10 +++- .../update/templates/gitlab-runner.j2 | 31 +++++++++++ .../update/templates/gitlab-runner.service.j2 | 14 +++++ 6 files changed, 156 insertions(+), 6 deletions(-) create mode 100644 guests/playbooks/update/tasks/gitlab.yml create mode 100644 guests/playbooks/update/templates/gitlab-runner.j2 create mode 100644 guests/playbooks/update/templates/gitlab-runner.service.j2 -- 2.25.1

3 19

[libvirt PATCH 00/39] Distinguish Cascadelake-Server from Skylake-Server
by Jiri Denemark 08 Apr '20

08 Apr '20

The signatures of these two CPU model differ only in stepping as both report family 6 and model 85. Skylake-Server uses stepping 4 or less and Cascadelake-Server uses stepping 5..7. https://bugzilla.redhat.com/show_bug.cgi?id=1761678 Jiri Denemark (39): cpu_x86: Drop noTSX hint for incompatible CPUs cpu_x86: Use glib allocation for virCPU{,x86}Data cpu_x86: Use glib allocation for virCPUx86Vendor cpu_x86: Use glib allocation for virCPUx86Feature cpu_x86: Use glib allocation for virCPUx86Model cpu_x86: Use glib allocation for virCPUx86Map cpu_x86: Use glib allocation in virCPUx86GetModels cpu_x86: Use g_auto* in x86DataToCPU cpu_x86: Use g_auto* in x86VendorParse cpu_x86: Use g_auto* in x86FeatureParse cpu_x86: Use g_auto* in x86ModelFromCPU cpu_x86: Use g_auto* in x86ModelParse cpu_x86: Use g_auto* in virCPUx86LoadMap cpu_x86: Use g_auto* in virCPUx86DataParse cpu_x86: Use g_auto* in x86Compute cpu_x86: Use g_auto* in virCPUx86Compare cpu_x86: Use g_auto* in x86Decode cpu_x86: Use g_auto* in x86EncodePolicy cpu_x86: Use g_auto* in x86Encode cpu_x86: Use g_auto* in virCPUx86CheckFeature cpu_x86: Use g_auto* in virCPUx86GetHost cpu_x86: Use g_auto* in virCPUx86Baseline cpu_x86: Use g_auto* in x86UpdateHostModel cpu_x86: Use g_auto* in virCPUx86Update cpu_x86: Use g_auto* in virCPUx86UpdateLive cpu_x86: Use g_auto* in virCPUx86Translate cpu_x86: Use g_auto* in virCPUx86ExpandFeatures cpu_x86: Use g_auto* in virCPUx86CopyMigratable cpu_x86: Move and rename x86ModelCopySignatures cpu_x86: Move and rename x86ModelHasSignature cpu_x86: Move and rename x86FormatSignatures cpu_x86: Introduce virCPUx86SignaturesFree cpu_x86: Introduce virCPUx86SignatureFromCPUID cpu_x86: Replace 32b signatures in virCPUx86Model with a struct cpu_x86: Don't check return value of x86ModelCopy cpu_x86: Add support for stepping part of CPU signature cputest: Add data for Intel(R) Xeon(R) Platinum 9242 CPU cputest: Add data for Intel(R) Xeon(R) Gold 6130 CPU cpu_map: Distinguish Cascadelake-Server from Skylake-Server src/cpu/cpu_x86.c | 936 +++++------ src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 2 +- src/cpu_map/x86_Cascadelake-Server.xml | 2 +- src/cpu_map/x86_Skylake-Server-IBRS.xml | 2 +- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 2 +- src/cpu_map/x86_Skylake-Server.xml | 2 +- tests/cputest.c | 2 + .../x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 7 + .../x86_64-cpuid-Xeon-Gold-6130-enabled.xml | 9 + .../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 34 + .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 35 + .../x86_64-cpuid-Xeon-Gold-6130-json.xml | 17 + .../x86_64-cpuid-Xeon-Gold-6130.json | 1201 ++++++++++++++ .../x86_64-cpuid-Xeon-Gold-6130.sig | 4 + .../x86_64-cpuid-Xeon-Gold-6130.xml | 54 + ...6_64-cpuid-Xeon-Platinum-9242-disabled.xml | 7 + ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 10 + .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 38 + .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 39 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 21 + .../x86_64-cpuid-Xeon-Platinum-9242.json | 1405 +++++++++++++++++ .../x86_64-cpuid-Xeon-Platinum-9242.sig | 4 + .../x86_64-cpuid-Xeon-Platinum-9242.xml | 68 + 23 files changed, 3372 insertions(+), 529 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml -- 2.26.0

2 81

[libvirt] [PATCH v2 1/1] qemu: hide details of fake reboot
by Nikolay Shirokovskiy 08 Apr '20

08 Apr '20

If we use fake reboot then domain goes thru running->shutdown->running state changes with shutdown state only for short period of time. At least this is implementation details leaking into API. And also there is one real case when this is not convinient. I'm doing a backup with the help of temporary block snapshot (with the help of qemu's API which is used in the newly created libvirt's backup API). If guest is shutdowned I want to continue to backup so I don't kill the process and domain is in shutdown state. Later when backup is finished I want to destroy qemu process. So I check if it is in shutdowned state and destroy it if it is. Now if instead of shutdown domain got fake reboot then I can destroy process in the middle of fake reboot process. After shutdown event we also get stop event and now as domain state is running it will be transitioned to paused state and back to running later. Though this is not critical for the described case I guess it is better not to leak these details to user too. So let's leave domain in running state on stop event if fake reboot is in process. Reconnection code handles this patch without modification. It detects that qemu is not running due to shutdown and then calls qemuProcessShutdownOrReboot which reboots as fake reboot flag is set. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Changes from v1[1]: - rebase on current master - add comments - use special flag to check if we should go paused or not* - add notes about reconnection to commit message * Using just fake reboot flag is not reliable. What if ACPI shutdown is ignored by guest? Reboot flag will remain set and now domain state will remain running on plain pause. [1] https://www.redhat.com/archives/libvir-list/2019-October/msg01827.html src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 61 ++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a32852047c..a39b9546ae 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -319,6 +319,7 @@ struct _qemuDomainObjPrivate { char *lockState; bool fakeReboot; + bool pausedShutdown; virTristateBool allowReboot; int jobs_queued; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e1db50e8f..3e5fe3b6de 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -505,6 +505,7 @@ qemuProcessFakeReboot(void *opaque) qemuDomainObjEndJob(driver, vm); cleanup: + priv->pausedShutdown = false; if (ret == -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); @@ -528,6 +529,7 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT)); + priv->pausedShutdown = false; virObjectUnref(vm); } } else { @@ -589,35 +591,41 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED, goto unlock; } - VIR_DEBUG("Transitioned guest %s to shutdown state", - vm->def->name); - virDomainObjSetState(vm, - VIR_DOMAIN_SHUTDOWN, - VIR_DOMAIN_SHUTDOWN_UNKNOWN); + /* In case of fake reboot qemu shutdown state is transient so don't + * change domain state nor send events. */ + if (!priv->fakeReboot) { + VIR_DEBUG("Transitioned guest %s to shutdown state", + vm->def->name); + virDomainObjSetState(vm, + VIR_DOMAIN_SHUTDOWN, + VIR_DOMAIN_SHUTDOWN_UNKNOWN); - switch (guest_initiated) { - case VIR_TRISTATE_BOOL_YES: - detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST; - break; + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST; + break; - case VIR_TRISTATE_BOOL_NO: - detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST; - break; + case VIR_TRISTATE_BOOL_NO: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST; + break; - case VIR_TRISTATE_BOOL_ABSENT: - case VIR_TRISTATE_BOOL_LAST: - default: - detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED; - break; - } + case VIR_TRISTATE_BOOL_ABSENT: + case VIR_TRISTATE_BOOL_LAST: + default: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED; + break; + } - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SHUTDOWN, - detail); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + detail); - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); + if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + } else { + priv->pausedShutdown = true; } if (priv->agent) @@ -651,7 +659,10 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, reason = priv->pausedReason; priv->pausedReason = VIR_DOMAIN_PAUSED_UNKNOWN; - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { + /* In case of fake reboot qemu paused state is transient so don't + * reveal it in domain state nor sent events */ + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING && + !priv->pausedShutdown) { if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) { if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) reason = VIR_DOMAIN_PAUSED_POSTCOPY; -- 2.23.0

4 5

[PATCH] qemu: backup: Fix handling of backing store for backup target images
by Peter Krempa 08 Apr '20

08 Apr '20

We always tried to install backing store for the image even if it didn't make sesne, e.g. for a full backup into a raw image. Additionally we didn't record the backing file into the qcow2 metadata so the image itself contained the diff of data but reading from it would be incomplete as it depends on the backing image. This patch fixes both issues by carefully installing the correct backing file when appropriate and also recording it into the metadata when creating the image. https://bugzilla.redhat.com/show_bug.cgi?id=1813310 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 9a056fa407..5d18720f53 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -105,6 +105,8 @@ struct qemuBackupDiskData { virDomainDiskDefPtr domdisk; qemuBlockJobDataPtr blockjob; virStorageSourcePtr store; + virStorageSourcePtr terminator; + virStorageSourcePtr backingStore; char *incrementalBitmap; qemuBlockStorageSourceChainDataPtr crdata; bool labelled; @@ -146,6 +148,7 @@ qemuBackupDiskDataCleanupOne(virDomainObjPtr vm, qemuBlockJobStartupFinalize(vm, dd->blockjob); qemuBlockStorageSourceChainDataFree(dd->crdata); + virObjectUnref(dd->terminator); } @@ -295,6 +298,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, virDomainBackupDiskDefPtr backupdisk, struct qemuBackupDiskData *dd, virJSONValuePtr actions, + bool pull, virDomainMomentDefPtr *incremental, virHashTablePtr blockNamedNodeData, virQEMUDriverConfigPtr cfg) @@ -314,6 +318,19 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, if (!dd->store->format) dd->store->format = VIR_STORAGE_FILE_QCOW2; + /* calculate backing store to use: + * push mode: + * full backups: no backing store + * incremental: original disk if format supports backing store + * pull mode: + * both: original disk + */ + if (pull || (incremental && dd->store->format >= VIR_STORAGE_FILE_BACKING)) { + dd->backingStore = dd->domdisk->src; + } else { + dd->backingStore = dd->terminator = virStorageSourceNew(); + } + if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, dd->domdisk->src) < 0) return -1; @@ -337,7 +354,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, /* use original disk as backing to prevent opening the backing chain */ if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->store, - dd->domdisk->src, + dd->backingStore, priv->qemuCaps))) return -1; @@ -398,6 +415,7 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm, struct qemuBackupDiskData *disks = NULL; ssize_t ndisks = 0; size_t i; + bool pull = def->type == VIR_DOMAIN_BACKUP_TYPE_PULL; disks = g_new0(struct qemuBackupDiskData, def->ndisks); @@ -410,12 +428,12 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm, ndisks++; - if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, + if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, pull, incremental, blockNamedNodeData, cfg) < 0) goto error; - if (def->type == VIR_DOMAIN_BACKUP_TYPE_PULL) { + if (pull) { if (qemuBackupDiskPrepareDataOnePull(actions, dd) < 0) goto error; } else { @@ -480,7 +498,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObjPtr vm, dd->store, dd->domdisk->src) < 0) return -1; - if (qemuBlockStorageSourceCreate(vm, dd->store, NULL, NULL, + if (qemuBlockStorageSourceCreate(vm, dd->store, dd->backingStore, NULL, dd->crdata->srcdata[0], QEMU_ASYNC_JOB_BACKUP) < 0) return -1; -- 2.25.1

2 1

[PATCH v2] qemu: capabilities: update qemu-4.2 capabilities for s390x
by Bjoern Walk 08 Apr '20

08 Apr '20

Update s390x capabilities for QEMU 4.2 with the actual GA version for QEMU and on the latest z15 machine. This picks up the new blockdev capability, so we need to refresh a bunch of test cases as well. Acked-by: Christian Borntraeger <borntraeger(a)de.ibm.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- Replies are stripped, full patch here: https://gitlab.com/bwalk/libvirt/-/commit/90d7b52567fdce4ad5158ff4e0863d054… tests/domaincapsdata/qemu_4.2.0.s390x.xml | 47 +- .../caps_4.2.0.s390x.replies | 3230 +++++++++-------- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 216 +- ...default-video-type-s390x.s390x-latest.args | 8 +- .../disk-error-policy-s390x.s390x-latest.args | 30 +- .../fs9p-ccw.s390x-latest.args | 7 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 14 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 8 +- .../s390x-ccw-graphics.s390x-latest.args | 8 +- .../s390x-ccw-headless.s390x-latest.args | 8 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 7 +- .../vhost-vsock-ccw.s390x-latest.args | 7 +- 12 files changed, 1892 insertions(+), 1698 deletions(-) diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index fbb3905f..6b87e450 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -27,9 +27,17 @@ <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> - <model fallback='forbid'>z13.2-base</model> + <model fallback='forbid'>gen15a-base</model> <feature policy='require' name='aen'/> + <feature policy='require' name='cmmnt'/> + <feature policy='require' name='vxpdeh'/> <feature policy='require' name='aefsi'/> + <feature policy='require' name='csske'/> + <feature policy='require' name='mepoch'/> + <feature policy='require' name='msa9'/> + <feature policy='require' name='msa8'/> + <feature policy='require' name='msa7'/> + <feature policy='require' name='msa6'/> <feature policy='require' name='msa5'/> <feature policy='require' name='msa4'/> <feature policy='require' name='msa3'/> @@ -38,15 +46,26 @@ <feature policy='require' name='sthyi'/> <feature policy='require' name='edat'/> <feature policy='require' name='ri'/> + <feature policy='require' name='deflate'/> <feature policy='require' name='edat2'/> + <feature policy='require' name='etoken'/> <feature policy='require' name='vx'/> <feature policy='require' name='ipter'/> + <feature policy='require' name='mepochptff'/> <feature policy='require' name='ap'/> + <feature policy='require' name='vxeh'/> + <feature policy='require' name='vxpd'/> <feature policy='require' name='esop'/> + <feature policy='require' name='msa9_pckmo'/> + <feature policy='require' name='vxeh2'/> + <feature policy='require' name='esort'/> + <feature policy='require' name='apqi'/> <feature policy='require' name='apft'/> + <feature policy='require' name='iep'/> <feature policy='require' name='apqci'/> <feature policy='require' name='cte'/> <feature policy='require' name='bpb'/> + <feature policy='require' name='gs'/> <feature policy='require' name='ppa15'/> <feature policy='require' name='zpci'/> <feature policy='require' name='sea_esop2'/> @@ -58,8 +77,8 @@ <model usable='yes'>z890.2-base</model> <model usable='yes'>z9EC.2</model> <model usable='yes'>z13.2</model> - <model usable='yes'>z990.5-base</model> <model usable='yes'>z9BC-base</model> + <model usable='yes'>z990.5-base</model> <model usable='yes'>z890.2</model> <model usable='yes'>z890</model> <model usable='yes'>z9BC</model> @@ -69,9 +88,9 @@ <model usable='yes'>z990.3</model> <model usable='yes'>z13s-base</model> <model usable='yes'>z9EC</model> - <model usable='no'>gen15a</model> - <model usable='no'>z14ZR1-base</model> - <model usable='no'>z14.2-base</model> + <model usable='yes'>gen15a</model> + <model usable='yes'>z14ZR1-base</model> + <model usable='yes'>z14.2-base</model> <model usable='yes'>z900.3-base</model> <model usable='yes'>z13.2-base</model> <model usable='yes'>z196.2-base</model> @@ -86,18 +105,18 @@ <model usable='yes'>z10EC.2</model> <model usable='yes'>z10EC-base</model> <model usable='yes'>z900.3</model> - <model usable='no'>z14ZR1</model> + <model usable='yes'>z14ZR1</model> <model usable='yes'>z10BC</model> <model usable='yes'>z10BC.2-base</model> - <model usable='yes'>z9BC.2</model> <model usable='yes'>z990.2</model> + <model usable='yes'>z9BC.2</model> <model usable='yes'>z990</model> - <model usable='no'>z14</model> - <model usable='no'>gen15b-base</model> + <model usable='yes'>z14</model> + <model usable='yes'>gen15b-base</model> <model usable='yes'>z990.4</model> <model usable='yes'>max</model> <model usable='yes'>z10EC.2-base</model> - <model usable='no'>gen15a-base</model> + <model usable='yes'>gen15a-base</model> <model usable='yes'>z800</model> <model usable='yes'>zEC12.2</model> <model usable='yes'>z10EC</model> @@ -111,12 +130,12 @@ <model usable='yes'>z196-base</model> <model usable='yes'>z9EC.2-base</model> <model usable='yes'>z196.2</model> - <model usable='no'>z14.2</model> + <model usable='yes'>z14.2</model> <model usable='yes'>z990-base</model> <model usable='yes'>z900.2</model> <model usable='yes'>z890-base</model> <model usable='yes'>z10EC.3</model> - <model usable='no'>z14-base</model> + <model usable='yes'>z14-base</model> <model usable='yes'>z990.4-base</model> <model usable='yes'>z10EC.3-base</model> <model usable='yes'>z10BC-base</model> @@ -126,7 +145,7 @@ <model usable='yes'>zBC12</model> <model usable='yes'>z890.3-base</model> <model usable='yes'>z990.5</model> - <model usable='no'>gen15b</model> + <model usable='yes'>gen15b</model> <model usable='no'>qemu</model> </mode> </cpu> @@ -198,7 +217,7 @@ <gic supported='no'/> <vmcoreinfo supported='no'/> <genid supported='no'/> - <backingStoreInput supported='no'/> + <backingStoreInput supported='yes'/> <backup supported='no'/> <sev supported='no'/> </features> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies index be709b3c..82b60bf0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -17,11 +17,11 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 47894de6..ae52b0c9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -8,12 +8,14 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> + <flag name='usb-redir'/> <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> + <flag name='usb-redir.filter'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> @@ -49,6 +51,7 @@ <flag name='gic-version'/> <flag name='incoming-defer'/> <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> @@ -115,6 +118,7 @@ <flag name='chardev-fd-pass'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> + <flag name='blockdev'/> <flag name='vfio-ap'/> <flag name='zpci'/> <flag name='memory-backend-memfd'/> @@ -134,20 +138,30 @@ <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='blockdev-file-dynamic-auto-read-only'/> + <flag name='savevm-monitor-nodes'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> + <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='storage.werror'/> <flag name='fsdev.multidevs'/> - <version>4001050</version> + <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100242</microcodeVersion> - <package>v4.1.0-1686-g419af24e7e-dirty</package> + <package>qemu-4.2.0-20200115.0.1e4aa2da.fc31</package> <arch>s390x</arch> - <hostCPU type='kvm' model='z13.2-base' migratability='no'> + <hostCPU type='kvm' model='gen15a-base' migratability='no'> <property name='aen' type='boolean' value='true'/> + <property name='cmmnt' type='boolean' value='true'/> + <property name='vxpdeh' type='boolean' value='true'/> <property name='aefsi' type='boolean' value='true'/> + <property name='csske' type='boolean' value='true'/> + <property name='mepoch' type='boolean' value='true'/> + <property name='msa9' type='boolean' value='true'/> + <property name='msa8' type='boolean' value='true'/> + <property name='msa7' type='boolean' value='true'/> + <property name='msa6' type='boolean' value='true'/> <property name='msa5' type='boolean' value='true'/> <property name='msa4' type='boolean' value='true'/> <property name='msa3' type='boolean' value='true'/> @@ -156,15 +170,26 @@ <property name='sthyi' type='boolean' value='true'/> <property name='edat' type='boolean' value='true'/> <property name='ri' type='boolean' value='true'/> + <property name='deflate' type='boolean' value='true'/> <property name='edat2' type='boolean' value='true'/> + <property name='etoken' type='boolean' value='true'/> <property name='vx' type='boolean' value='true'/> <property name='ipter' type='boolean' value='true'/> + <property name='mepochptff' type='boolean' value='true'/> <property name='ap' type='boolean' value='true'/> + <property name='vxeh' type='boolean' value='true'/> + <property name='vxpd' type='boolean' value='true'/> <property name='esop' type='boolean' value='true'/> + <property name='msa9_pckmo' type='boolean' value='true'/> + <property name='vxeh2' type='boolean' value='true'/> + <property name='esort' type='boolean' value='true'/> + <property name='apqi' type='boolean' value='true'/> <property name='apft' type='boolean' value='true'/> + <property name='iep' type='boolean' value='true'/> <property name='apqci' type='boolean' value='true'/> <property name='cte' type='boolean' value='true'/> <property name='bpb' type='boolean' value='true'/> + <property name='gs' type='boolean' value='true'/> <property name='ppa15' type='boolean' value='true'/> <property name='zpci' type='boolean' value='true'/> <property name='sea_esop2' type='boolean' value='true'/> @@ -175,8 +200,8 @@ <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> @@ -187,46 +212,9 @@ <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='no'> - <blocker name='etoken'/> - <blocker name='vxpdeh'/> - <blocker name='vxeh2'/> - <blocker name='mepoch'/> - <blocker name='vxeh'/> - <blocker name='vxpd'/> - <blocker name='gs'/> - <blocker name='iep'/> - <blocker name='minste3'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='deflate'/> - <blocker name='mepochptff'/> - <blocker name='msa9_pckmo'/> - <blocker name='msa9'/> - <blocker name='msa8'/> - <blocker name='msa7'/> - <blocker name='msa6'/> - <blocker name='type'/> - </cpu> - <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='type'/> - </cpu> - <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/> @@ -241,66 +229,18 @@ <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'> - <blocker name='mepoch'/> - <blocker name='vxeh'/> - <blocker name='vxpd'/> - <blocker name='gs'/> - <blocker name='iep'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='mepochptff'/> - <blocker name='msa8'/> - <blocker name='msa7'/> - <blocker name='msa6'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='no'> - <blocker name='mepoch'/> - <blocker name='vxeh'/> - <blocker name='vxpd'/> - <blocker name='gs'/> - <blocker name='iep'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='mepochptff'/> - <blocker name='msa8'/> - <blocker name='msa7'/> - <blocker name='msa6'/> - <blocker name='type'/> - </cpu> - <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'> - <blocker name='minste3'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/> <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'> - <blocker name='minste3'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/> <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/> @@ -314,35 +254,12 @@ <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='no'> - <blocker name='mepoch'/> - <blocker name='vxeh'/> - <blocker name='vxpd'/> - <blocker name='gs'/> - <blocker name='iep'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='mepochptff'/> - <blocker name='msa8'/> - <blocker name='msa7'/> - <blocker name='msa6'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='no'> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/> @@ -352,30 +269,7 @@ <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/> - <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='no'> - <blocker name='etoken'/> - <blocker name='vxpdeh'/> - <blocker name='vxeh2'/> - <blocker name='mepoch'/> - <blocker name='vxeh'/> - <blocker name='vxpd'/> - <blocker name='gs'/> - <blocker name='iep'/> - <blocker name='minste3'/> - <blocker name='tsi'/> - <blocker name='sema'/> - <blocker name='minste2'/> - <blocker name='eec'/> - <blocker name='opc'/> - <blocker name='deflate'/> - <blocker name='mepochptff'/> - <blocker name='msa9_pckmo'/> - <blocker name='msa9'/> - <blocker name='msa8'/> - <blocker name='msa7'/> - <blocker name='msa6'/> - <blocker name='type'/> - </cpu> + <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='yes'/> <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'> <blocker name='ais'/> </cpu> @@ -595,7 +489,7 @@ <blocker name='gen13ptff'/> <blocker name='tods'/> </cpu> - <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'> + <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> <blocker name='km-tdea-192'/> @@ -607,9 +501,13 @@ <blocker name='kmac-tdea-192'/> <blocker name='kmac-tdea-128'/> <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> </cpu> - <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'> + <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> <blocker name='km-tdea-192'/> @@ -621,11 +519,7 @@ <blocker name='kmac-tdea-192'/> <blocker name='kmac-tdea-128'/> <blocker name='kmac-dea'/> - <blocker name='dateh2'/> - <blocker name='hfpue'/> <blocker name='hfpm'/> - <blocker name='asnlxr'/> - <blocker name='tods'/> </cpu> <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> @@ -1869,7 +1763,7 @@ <blocker name='asnlxr'/> <blocker name='tods'/> </cpu> - <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'> + <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> <blocker name='km-tdea-192'/> @@ -1881,16 +1775,9 @@ <blocker name='kmac-tdea-192'/> <blocker name='kmac-tdea-128'/> <blocker name='kmac-dea'/> - <blocker name='cmm'/> - <blocker name='dateh2'/> - <blocker name='sthyi'/> - <blocker name='hfpue'/> <blocker name='hfpm'/> - <blocker name='asnlxr'/> - <blocker name='msa1'/> - <blocker name='tods'/> </cpu> - <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'> + <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> <blocker name='km-tdea-192'/> @@ -1902,7 +1789,14 @@ <blocker name='kmac-tdea-192'/> <blocker name='kmac-tdea-128'/> <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> </cpu> <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 934c5d59..47818085 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ -machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \ --cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ -sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ -cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ +-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ +msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ +edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ +vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ +apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index 0d9254e1..414ffdba 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -26,17 +26,29 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\ -cache=none \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"file","filename":"/var/images/image1",\ +"node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-3-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-3-format,\ id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \ --drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\ -cache=none \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\ +-blockdev '{"driver":"file","filename":"/var/images/image2",\ +"node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=libvirt-2-format,\ id=virtio-disk1,write-cache=on,werror=enospc \ --drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\ -cache=none \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\ +-blockdev '{"driver":"file","filename":"/var/images/image3",\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=libvirt-1-format,\ id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args index 4a93ee37..50d4bc42 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ id=virtio-disk0,bootindex=1 \ -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index bdc060aa..20288f2a 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -29,12 +29,18 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-shutdown \ -boot strict=on \ -device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\ +"file":"libvirt-2-storage"}' \ -device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\ -drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-2-0 \ +drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,\ -device_id=drive-scsi0-0-2-0,drive=drive-scsi0-0-2-0,id=scsi0-0-2-0 \ +device_id=drive-scsi0-0-2-0,drive=libvirt-1-format,id=scsi0-0-2-0 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 03860194..35093d4f 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ -machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off \ --cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ -sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ -cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ +-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ +msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ +edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ +vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ +apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ -m 256 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 8f72b20b..5850b265 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -26,9 +26,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -no-shutdown \ -boot strict=on \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0003 \ --drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ id=virtio-disk0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 95caf9e9..211cc24b 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -27,9 +27,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -no-shutdown \ -boot strict=on \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0002 \ --drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ id=virtio-disk0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index 17b5ded6..4c5542d8 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ id=virtio-disk0,bootindex=1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index 81a6b8cb..de229bd0 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ id=virtio-disk0,bootindex=1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ -- 2.24.1

2 2

[PATCH v2] util: virdaemon: fix waiting for child processes
by Rafael Fonseca 08 Apr '20

08 Apr '20

Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0 (success), so comparing that to `pid` will always be false and the parent will report failure with: error : main:851 : Failed to fork as daemon: No such file or directory even though the grandchild process is succesfully running. Note that the errno message is misleading: it was last set when trying to find a restart state file. Signed-off-by: Rafael Fonseca <r4f4rfs(a)gmail.com> Reported-by: Marcin Krol <hawk(a)tld-linux.org> --- src/util/virdaemon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 5d92c7def7..99530fd146 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0) default: { /* parent */ - int got, exitstatus = 0; + int exitstatus = 0; int ret; char status; VIR_FORCE_CLOSE(statuspipe[1]); /* We wait to make sure the first child forked successfully */ - if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 || - got != pid || + if (virProcessWait(pid, &exitstatus, 0) < 0 || exitstatus != 0) { goto error; } -- 2.25.2

2 2

[libvirt PATCH 00/10] Disable hotplug on pcie-root-ports
by Laine Stump 08 Apr '20

08 Apr '20

This series enables use of QEMU 5.0's new "hotplug=off" setting for pcie-root-ports and pcie-switch-downstream-ports. When set (in the <target> subelement of the <controller> config), the emulated controller will report to the guest OS that devices cannot be hotplugged into or, maybe more importantly, out of the port. The result is that when a device is plugged into such a port at boot time, "certain guest OSes" won't show a menu to all users listing all PCIe devices as available to "Safely Remove". I had to hand-edit several capabilities results files in patch 1, since the pcie-root-port device has been present in QEMU for a long time, but we previously had not been gathering the list of options for that device. If someone has a setup to regenerate *actual* results for all those versions of QEMU, I would be very appreciative and gladly use that instead (Hi Kyle Two!) NB: the last 3 patches are each trivial, and I'd be happy to squash them, but had already committed them separately, and thought it helped in explaining. This resolves https://bugzilla.redhat.com/1802592 Laine Stump (10): qemu: new capabilities flag pcie-root-port.hotplug conf: new attribute "hotplug" for pci controllers qemu: hook up pcie-root-port hotplug='off' option docs: mention hotplug='off' in news.xml conf: add new PCI_CONNECT flag AUTOASSIGN conf/qemu: s/VIR_PCI_CONNECT_HOTPLUGGABLE/VIR_PCI_CONNECT_AUTOASSIGN/g conf: simplify logic when checking for AUTOASSIGN PCI addresses qemu/conf: set HOTPLUGGABLE connect flag during PCI address set init conf: check HOTPLUGGABLE connect flag when validating a PCI address conf: during PCI hotplug, require that the controller support hotplug docs/formatdomain.html.in | 11 ++ docs/news.xml | 12 ++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_addr.c | 85 ++++---- src/conf/domain_addr.h | 44 +++-- src/conf/domain_conf.c | 20 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain_address.c | 24 ++- src/qemu/qemu_validate.c | 31 +++ .../caps_2.10.0.aarch64.replies | 142 ++++++++++++-- .../caps_2.10.0.x86_64.replies | 154 ++++++++++++--- .../caps_2.11.0.x86_64.replies | 154 ++++++++++++--- .../caps_2.12.0.aarch64.replies | 158 ++++++++++++--- .../caps_2.12.0.x86_64.replies | 170 +++++++++++++--- .../caps_2.9.0.x86_64.replies | 154 ++++++++++++--- .../caps_3.0.0.x86_64.replies | 170 +++++++++++++--- .../caps_3.1.0.x86_64.replies | 170 +++++++++++++--- .../caps_4.0.0.aarch64.replies | 158 ++++++++++++--- .../caps_4.0.0.ppc64.replies | 150 +++++++++++++-- .../caps_4.0.0.riscv32.replies | 150 +++++++++++++-- .../caps_4.0.0.riscv64.replies | 150 +++++++++++++-- .../caps_4.0.0.x86_64.replies | 170 +++++++++++++--- .../caps_4.1.0.x86_64.replies | 162 +++++++++++++--- .../caps_4.2.0.aarch64.replies | 166 +++++++++++++--- .../caps_4.2.0.ppc64.replies | 150 +++++++++++++-- .../caps_4.2.0.x86_64.replies | 162 +++++++++++++--- .../caps_5.0.0.aarch64.replies | 166 +++++++++++++--- .../caps_5.0.0.ppc64.replies | 150 +++++++++++++-- .../caps_5.0.0.x86_64.replies | 181 +++++++++++++++--- .../caps_5.0.0.x86_64.xml | 1 + .../pcie-root-port-nohotplug.args | 39 ++++ .../pcie-root-port-nohotplug.xml | 35 ++++ tests/qemuxml2argvtest.c | 7 + .../pcie-root-port-nohotplug.xml | 64 +++++++ tests/qemuxml2xmltest.c | 7 + 38 files changed, 3038 insertions(+), 548 deletions(-) create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.args create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml create mode 100644 tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.xml -- 2.25.2

3 12

[PATCH] storage: use local dom_disk parameter
by Yi Li 08 Apr '20

08 Apr '20

replace vm->def->disks[i] with dom_disk parameter Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index daa3cb397d..27f43124ac 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14841,14 +14841,13 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, active) < 0) return -1; - if (vm->def->disks[i]->src->format > 0 && - vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) { + if (dom_disk->src->format > 0 && + dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("internal snapshot for disk %s unsupported " "for storage type %s"), disk->name, - virStorageFileFormatTypeToString( - vm->def->disks[i]->src->format)); + virStorageFileFormatTypeToString(dom_disk->src->format)); return -1; } break; -- 2.13.6

3 2

[PATCH] util: virdaemon: fix waiting for child processes
by Rafael Fonseca 08 Apr '20

08 Apr '20

Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0 (success), so comparing that to `pid` will always be false and the parent will report failure with: error : main:851 : Failed to fork as daemon: No such file or directory even though the grandchild process is succesfully running. Note that the errno message is misleading: it was last set when trying to find a restart state file. Signed-off-by: Rafael Fonseca <r4f4rfs(a)gmail.com> --- src/util/virdaemon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 5d92c7def7..99530fd146 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0) default: { /* parent */ - int got, exitstatus = 0; + int exitstatus = 0; int ret; char status; VIR_FORCE_CLOSE(statuspipe[1]); /* We wait to make sure the first child forked successfully */ - if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 || - got != pid || + if (virProcessWait(pid, &exitstatus, 0) < 0 || exitstatus != 0) { goto error; } -- 2.25.1

2 2

A few XML modeling questions
by Jim Fehlig 07 Apr '20

07 Apr '20

Hi All, I've been struggling a bit deciding how to model Xen's max_event_channels and e820_host xl.cfg(5) settings. For max_event_channels the man page says: Limit the guest to using at most N event channels (PV interrupts). Guests use hypervisor resources for each event channel they use. The default of 1023 should be sufficient for typical guests. The maximum value depends on what the guest supports. Guests supporting the FIFO-based event channel ABI support up to 131,071 event channels. Other guests are limited to 4095 (64-bit x86 and ARM) or 1023 (32-bit x86). So event channels are PV interrupts that are used by PV devices and timers, and as inter-processor interrupts. My initial thought was to add a maxEventChannels attribute to the xenbus controller, similar maxGrantFrames. The latter was added to allow specifying the max shared pages a guest could use, which in conjunction with event channels provides data transfer mechanism between front and backends for PV drivers. My only hesitation is that event channels are also used for inter-processor interrupts, which is a bit outside the notion of a virtual controller for Xen PV devices. However, the first sentence in the xenbus wiki [1] states: In practice, the bus is used for configuration negotiation, leaving most data transfer to be done via an interdomain channel composed of a shared page and an event channel. So perhaps it is tolerable to consider max_event_channels an attribute of xenbus that is specified at domain creation, to then be used by the guest however it pleases up to the max value? e820_host is a bit trickier. For this setting, which is PV-specific, the man page says: Selects whether to expose the host e820 (memory map) to the guest via the virtual e820. When this option is false (0) the guest pseudo-physical address space consists of a single contiguous RAM region. When this option is specified the virtual e820 instead reflects the host e820 and contains the same PCI holes. The total amount of RAM represented by the memory map is always the same, this option configures only how it is laid out. Exposing the host e820 to the guest gives the guest kernel the opportunity to set aside the required part of its pseudo-physical address space in order to provide address space to map passedthrough PCI devices. It is guest Operating System dependent whether this option is required, specifically it is required when using a mainline Linux ("pvops") kernel. This option defaults to true (1) if any PCI passthrough devices are configured and false (0) otherwise. If you do not configure any passthrough devices at domain creation time but expect to hotplug devices later then you should set this option. Conversely if your particular guest kernel does not require this behavior then it is safe to allow this to be enabled but you may wish to disable it anyway. I'm tempted to unconditionally enable this setting. It is required for pvops kernels and apparently harmless for other PV kernels. I asked one of the Xen devs about any downsides to always enabling e820_host, to which he replied "Scattered memory blocks inside the guest, possibly leading to slightly higher overhead. But nothing really severe afaics.". If there is a strong desire to model this setting it might best be placed under hypervisor features, e.g. <features> <xen> <hoste820 state='on'/> </xen> </features> Opinions and/or comments are much appreciated. Regards, Jim [1] https://wiki.xen.org/wiki/XenBus

1 1

[PATCH ocaml] build: skip github lockdown file in manifest check
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

The github lockdown file is not intended to be included in any built dist, so should be excluded when checking the manifest. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 4357ba6..54ecaf3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,7 +86,7 @@ dist: ChangeLog ls -l $(PACKAGE)-$(VERSION).tar.gz check-manifest: - git ls-files > .check-manifest; \ + git ls-files | grep -v .github/lockdown.yml > .check-manifest; \ echo aclocal.m4 >> .check-manifest; \ sort -o .check-manifest .check-manifest; \ sort MANIFEST > .orig-manifest; \ -- 2.24.1

2 1

Re: Domain backup file explodes on s3fs
by Eric Blake 07 Apr '20

07 Apr '20

[adding libvirt list] On 4/7/20 2:13 PM, Tim Haley wrote: > Hi all, > > Have been playing with `virsh backup-begin` of late and think it's an > excellent feature. I've noticed one behavior I'm not sure I understand. It looks like https://bugzilla.redhat.com/show_bug.cgi?id=1814664 is a similar description of the same problem: namely, if qemu is not able to determine that the destination already reads as zero, then it forcefully zeroes the destination of a backup job. We may want to copy the fact that qemu 5.0 is adding 'qemu-img convert --target-is-zero' to add a similar knob to the QMP commands that trigger disk copying (blockdev-backup, blockdev-mirror, possibly others) as well as logic to avoid writing zeroes when the destination is already treated as zero (whether by a probe, or by the knob being set). ... > If my /backups directory is just XFS, I get a backup file that looks > like it is just the size of data blocks in use > > -rw------- 1 root root 2769551360 Mar 19 16:56 > vda.2aa450cc-6d2e-11ea-8de0-52542e0d008a For a local file, qemu is easily able to probe whether the destination starts as all zeroes (thanks to lseek(SEEK_DATA)); > > but if I write to an s3fs (object storage backend) the file blows up to > the whole size of the disk > > -rw------- 1 root root 8591507456 Mar 18 19:03 > vda.2aa450cc-6d2e-11ea-8de0-52542e0d008a whereas for s3fs, it looks like qemu does not have access to a quick test to learn if the image starts all zero (POSIX does not provide a quick way for doing this on a generic block device, but if you are aware of an ioctl or otherwise that qemu could use, that might be helpful). Or maybe the s3fs really is random contents rather than all zero, in which case forcefully writing zeroes is the only correct behavior. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org

1 0

[virttools-planet PATCH 0/4] Switch planet.virt-tools.org over to use GitLab Pages
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

This introduces use of GitLab CI + Pages to replace the current OpenShift application which is only admin accessible by myself. It also has automatic integration with LetsEncrypt guaranteeing that we'll never have expired certificates. Daniel P. Berrangé (4): Convert README to markdown format Introduce use of GitLab CI for publishing to GitLab Pages Remove obsolete openshift hosting configuration Drop Amit Shah and Nathan Gauër .gitlab-ci.yml | 14 + README | 39 -- README.md | 43 ++ openshift/templates/.gitignore | 2 - openshift/templates/update-tls.sh | 16 - openshift/templates/virttools-planet-tls.json | 82 ---- openshift/templates/virttools-planet.json | 425 ------------------ updater/planet-cache.py => planet-cache.py | 0 updater/planet.py => planet.py | 0 {updater/planet => planet}/__init__.py | 0 {updater/planet => planet}/atomstyler.py | 0 {updater/planet => planet}/cache.py | 0 .../compat_logging/__init__.py | 0 .../compat_logging/config.py | 0 .../compat_logging/handlers.py | 0 {updater/planet => planet}/feedparser.py | 0 {updater/planet => planet}/htmltmpl.py | 0 {updater/planet => planet}/sanitize.py | 0 {updater/planet => planet}/tests/__init__.py | 0 .../planet => planet}/tests/test_channel.py | 0 {updater/planet => planet}/tests/test_main.py | 0 .../planet => planet}/tests/test_sanitize.py | 0 {updater/planet => planet}/timeoutsocket.py | 0 .../images/alexbennee.jpeg | Bin .../virt-tools => public}/images/berrange.png | Bin .../virt-tools => public}/images/cole.png | Bin .../images/ehabkost.jpeg | Bin .../images/header-bg.png | Bin .../virt-tools => public}/images/kashyap.jpeg | Bin .../virt-tools => public}/images/logo.png | Bin .../virt-tools => public}/images/logo.xcf | Bin .../virt-tools => public}/images/otubo.png | Bin .../virt-tools => public}/images/qemu.png | Bin .../virt-tools => public}/images/rjones.jpeg | Bin .../virt-tools => public}/images/sgarzare.png | Bin .../virt-tools => public}/images/teuf.png | Bin .../images/thomashuth.png | Bin .../virt-tools => public}/images/ybettan.png | Bin .../virt-tools => public}/images/zeenix.png | Bin updater/app.py | 18 - .../virt-tools => virt-tools}/atom.xml.tmpl | 0 .../basic/index.html.tmpl | 7 +- .../basic/style.css.tmpl | 0 {updater/virt-tools => virt-tools}/config.ini | 10 +- .../foafroll.xml.tmpl | 0 .../virt-tools => virt-tools}/opml.xml.tmpl | 0 .../virt-tools => virt-tools}/rss10.xml.tmpl | 0 .../virt-tools => virt-tools}/rss20.xml.tmpl | 0 web/httpd-cfg/cors.conf | 3 - 49 files changed, 62 insertions(+), 597 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 README create mode 100644 README.md delete mode 100644 openshift/templates/.gitignore delete mode 100755 openshift/templates/update-tls.sh delete mode 100644 openshift/templates/virttools-planet-tls.json delete mode 100644 openshift/templates/virttools-planet.json rename updater/planet-cache.py => planet-cache.py (100%) rename updater/planet.py => planet.py (100%) rename {updater/planet => planet}/__init__.py (100%) rename {updater/planet => planet}/atomstyler.py (100%) rename {updater/planet => planet}/cache.py (100%) rename {updater/planet => planet}/compat_logging/__init__.py (100%) rename {updater/planet => planet}/compat_logging/config.py (100%) rename {updater/planet => planet}/compat_logging/handlers.py (100%) rename {updater/planet => planet}/feedparser.py (100%) rename {updater/planet => planet}/htmltmpl.py (100%) rename {updater/planet => planet}/sanitize.py (100%) rename {updater/planet => planet}/tests/__init__.py (100%) rename {updater/planet => planet}/tests/test_channel.py (100%) rename {updater/planet => planet}/tests/test_main.py (100%) rename {updater/planet => planet}/tests/test_sanitize.py (100%) rename {updater/planet => planet}/timeoutsocket.py (100%) rename {updater/virt-tools => public}/images/alexbennee.jpeg (100%) rename {updater/virt-tools => public}/images/berrange.png (100%) rename {updater/virt-tools => public}/images/cole.png (100%) rename {updater/virt-tools => public}/images/ehabkost.jpeg (100%) rename {updater/virt-tools => public}/images/header-bg.png (100%) rename {updater/virt-tools => public}/images/kashyap.jpeg (100%) rename {updater/virt-tools => public}/images/logo.png (100%) rename {updater/virt-tools => public}/images/logo.xcf (100%) rename {updater/virt-tools => public}/images/otubo.png (100%) rename {updater/virt-tools => public}/images/qemu.png (100%) rename {updater/virt-tools => public}/images/rjones.jpeg (100%) rename {updater/virt-tools => public}/images/sgarzare.png (100%) rename {updater/virt-tools => public}/images/teuf.png (100%) rename {updater/virt-tools => public}/images/thomashuth.png (100%) rename {updater/virt-tools => public}/images/ybettan.png (100%) rename {updater/virt-tools => public}/images/zeenix.png (100%) delete mode 100755 updater/app.py rename {updater/virt-tools => virt-tools}/atom.xml.tmpl (100%) rename {updater/virt-tools => virt-tools}/basic/index.html.tmpl (91%) rename {updater/virt-tools => virt-tools}/basic/style.css.tmpl (100%) rename {updater/virt-tools => virt-tools}/config.ini (96%) rename {updater/virt-tools => virt-tools}/foafroll.xml.tmpl (100%) rename {updater/virt-tools => virt-tools}/opml.xml.tmpl (100%) rename {updater/virt-tools => virt-tools}/rss10.xml.tmpl (100%) rename {updater/virt-tools => virt-tools}/rss20.xml.tmpl (100%) delete mode 100644 web/httpd-cfg/cors.conf -- 2.24.1

2 10

[libvirt PATCH 00/10] docs: Convert hacking to rst, split and rework it
by Andrea Bolognani 07 Apr '20

07 Apr '20

hacking.html is the canonical entry point for people looking to help with libvirt's development, but its sheer size makes it a farily ineffective tool. Move most non-critical information off to separate pages and brush up what's left so that it works as a quick introduction. As a prerequisite, convert the existing page to reStructuredText. I have compared the HTML version and the conversion visually and didn't spot any massive differences, save for a few spacing changes that are not specific to the page itself but rather to the HTML generated by docutils and which will require CSS tweaks to address, which is a job I'm leaving to someone else. I have also spent very little time actually changing the contents, and mostly just moved them around. There's plenty of opportunities for improvement there, but once again that's someone else's job. Andrea Bolognani (10): docs: Convert hacking.html to reStructuredText docs: Add glib-adoption.rst docs: Add coding-style.rst docs: Add programming-languages.rst docs: Add developer-tooling.rst docs: Add committer-guidelines.rst docs: Add advanced-tests.rst docs: Add submitting-patches.rst docs: Add best-practices.rst docs: Update hacking.rst build-aux/syntax-check.mk | 4 +- docs/advanced-tests.rst | 178 ++++ docs/best-practices.rst | 37 + docs/coding-style.rst | 919 +++++++++++++++++++ docs/committer-guidelines.rst | 33 + docs/developer-tooling.rst | 13 + docs/glib-adoption.rst | 96 ++ docs/hacking.html.in | 1555 -------------------------------- docs/hacking.rst | 79 ++ docs/programming-languages.rst | 21 + docs/submitting-patches.rst | 88 ++ 11 files changed, 1466 insertions(+), 1557 deletions(-) create mode 100644 docs/advanced-tests.rst create mode 100644 docs/best-practices.rst create mode 100644 docs/coding-style.rst create mode 100644 docs/committer-guidelines.rst create mode 100644 docs/developer-tooling.rst create mode 100644 docs/glib-adoption.rst delete mode 100644 docs/hacking.html.in create mode 100644 docs/hacking.rst create mode 100644 docs/programming-languages.rst create mode 100644 docs/submitting-patches.rst -- 2.25.1

2 13

ALERT: cimtest.git repository history recreated
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

In attempting to import the cimtest.git repository to gitlab I discovered some serious problems in the current git history. Specifically the author and committer email addresses were badly mangled for many commits. For example an author of: Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> <Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com>> This is so badly malformed that both gitlab and github refuse to allow the commits in question to be pushed. Not only that, but "git filter-branch" and "git fast-import" will both crash and burn when trying to parse these, so if you try to rewrite email addresses with "git filter-branch" it makes it even worse. The only solution was to use "git fast-export --all" to dump the entire history to a file, then hand edit this to fix the broken addresses that were confusing filter-branch, then use "git fast-import" to initialize a new repository. cimtest.git is a ancient repo that hasn't seen changes since 2014, so I'm guessing it is unlikely any current contributor has a checkout of it. If someone does though, you'll have to throw away your current checkout and get a new clone, as the history has been fully rewritten to fix this problem. I suspect the root cause dates from when we imported the original Mercurial repo into Git. Our conversion process probably mangled some addresses without us realizing at the time. 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-go-xml PATCH 0/2] Switch CI from Travis to GitLab
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

Daniel P. Berrangé (2): gitlab: add CI definition for GitLab travis: delete CI configuration .gitlab-ci.yml | 25 +++++++++++++++++++++++++ .travis.yml | 13 ------------- README.md | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml -- 2.24.1

2 5

[virttools-web PATCH 0/3] Switch www.virt-tools.org over to use GitLab Pages
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

This introduces use of GitLab CI + Pages to replace the current OpenShift application which is only admin accessible by myself. It also has automatic integration with LetsEncrypt guaranteeing that we'll never have expired certificates. Daniel P. Berrangé (3): Convert README to markdown format Introduce use of GitLab CI for publishing to GitLab Pages Remove obsolete openshift hosting configuration .gitlab-ci.yml | 9 + README | 19 -- README.md | 15 ++ openshift/templates/.gitignore | 2 - openshift/templates/update-tls.sh | 16 -- openshift/templates/virttools-web-tls.json | 82 ------- openshift/templates/virttools-web.json | 272 --------------------- {web => public}/header-bg.png | Bin {web => public}/index.css | 0 {web => public}/index.html | 4 +- {web => public}/logo-kvm.png | Bin {web => public}/logo-libguestfs.png | Bin {web => public}/logo-libosinfo.png | Bin {web => public}/logo-libvirt.png | Bin {web => public}/logo-qemu.png | Bin {web => public}/logo-virt-manager.png | Bin {web => public}/logo.png | Bin {web => public}/logo.xcf | Bin 18 files changed, 25 insertions(+), 394 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 README create mode 100644 README.md delete mode 100644 openshift/templates/.gitignore delete mode 100755 openshift/templates/update-tls.sh delete mode 100644 openshift/templates/virttools-web-tls.json delete mode 100644 openshift/templates/virttools-web.json rename {web => public}/header-bg.png (100%) rename {web => public}/index.css (100%) rename {web => public}/index.html (93%) rename {web => public}/logo-kvm.png (100%) rename {web => public}/logo-libguestfs.png (100%) rename {web => public}/logo-libosinfo.png (100%) rename {web => public}/logo-libvirt.png (100%) rename {web => public}/logo-qemu.png (100%) rename {web => public}/logo-virt-manager.png (100%) rename {web => public}/logo.png (100%) rename {web => public}/logo.xcf (100%) -- 2.24.1

2 4

[PATCHv2 0/1] Use g_autoptr and g_autofree in cpu.c
by Seeteena Thoufeek 07 Apr '20

07 Apr '20

return NULL for all the failure cases for the function virCPUDataParse(). Previous discussion can be found at https://www.redhat.com/archives/libvir-list/2020-April/msg00191.html Seeteena Thoufeek (1): cpu: Use g_autoptr and g_autofree in cpu.c src/cpu/cpu.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) -- 1.8.3.1

2 2

[libvirt PATCH 00/15] RFC: basic CGroup support with qemu:///session
by marcandre.lureau＠redhat.com 07 Apr '20

07 Apr '20

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This is a small series that allows basic QEMU VM CGroup support with the help of machined --user: https://github.com/systemd/systemd/pull/15312 The first few patches are fixes to register dbus and slirp-helper correctly with the VM cgroup. A few changes are done to the machined support, adding session support, and registering the VM to get a systemd scope cgroup under user machine.slice. Marc-André Lureau (15): 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 dbus: rename virDBusIs* -> virDBusSystemIs* dbus: add virDBusIsService{Enabled,Registered} with @conn argument systemd: check org.freedesktop.machine1 registration systemd: only check for activitable machine1 service systemd: register machines against session service cgroup: return directly if there is nothing to remove qemu-cgroup: register ext devices when cpu/cpuset controller are missing qemu: create cgroup regardless of controller support qemu-cgroup: drop the need for privileges to use cgroup src/qemu/qemu_cgroup.c | 13 ------- src/qemu/qemu_dbus.c | 29 +++++++++++++- src/qemu/qemu_dbus.h | 3 ++ src/qemu/qemu_extdevice.c | 12 ++++++ src/qemu/qemu_process.c | 6 +-- src/qemu/qemu_slirp.c | 16 +++++++- src/qemu/qemu_slirp.h | 3 ++ src/util/vircgroup.c | 5 +++ src/util/vircgroupv2devices.c | 7 ++-- src/util/virdbus.c | 71 ++++++++++++++++++++++++++--------- src/util/virdbus.h | 7 +++- src/util/virfirewalld.c | 2 +- src/util/virsystemd.c | 27 +++++-------- tests/virsystemdtest.c | 35 ----------------- 14 files changed, 140 insertions(+), 96 deletions(-) -- 2.26.0.rc2.42.g98cedd0233

5 23

ANNOUNCE: primary git repos switched to https://gitlab.com/libvirt/
by Daniel P. Berrangé 07 Apr '20

07 Apr '20

Hello All, As of this email, the primary host for libvirt project git repositories has been switched to gitlab.com with all projects under the following group: https://gitlab.com/libvirt The development process remains the same for now, with patches still to be submitted to this mailing list as before. The repositories on libvirt.org will continue to exist, but as an automated read-only mirror of the primary gitlab.com repositories, so may be delayed 30-60 minutes vs the primary repos. To update your current checkouts to point to the new primary repos use the following: git remote set-url origin https://gitlab.com/libvirt/$REPO.git eg git remote set-url origin https://gitlab.com/libvirt/libvirt.git (if you are a person with commit rights you'll need to use the ssh URL instead which I've emailed you about directly) Switching over to require merge requests is a separate task that will be done incrementally for repos over a period of time, with further announcements made on this at a later date. As long as a ".gitpublish" config file exists in a repo, then patches for that repo should continue to be sent to this mailing list. 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

backport new changes to 4.0.0
by Jiatong Shen 07 Apr '20

07 Apr '20

Hello, Sorry in advance if I am asking questions at the wrong place. I would like know if we have plans to backport new features to old releases, for example block copy remote disks. If the answer is no, then where can I find some guidance on building a libvirt debian packages? Thank you very much for the help. -- Best Regards, Jiatong Shen

3 2

[PATCH v3 00/10] Another round of qemu:///embed fixes
by Michal Privoznik 06 Apr '20

06 Apr '20

v3 of: https://www.redhat.com/archives/libvir-list/2020-March/msg01112.html diff to v2: - Patch 2/10 is new; after discussion to v2 we can access driver->privileged and driver->embeddedRoot directly - Patch 3/10 is slightly reworked; it still drops unnecessary layers of nesting in the default case (/var/lib/libvirt/qemu/ram) but it doesn't do that if user provides a path via qemu.conf Michal Prívozník (10): tests: Fix virQEMUDriverConfigNew() calling with respect to @root qemu: Drop virQEMUDriverIsPrivileged() qemu: Drop two layers of nesting of memoryBackingDir conf: Move virDomainGenerateMachineName to hypervisor/ virDomainDriverGenerateMachineName: Factor out embed path hashing qemuDomainGetMachineName: Access embeddedRoot from driver rather than cfg Revert "qemu_conf: Track embed root dir" qemu: Make hugepages path generation embed driver aware qemu: Make memory path generation embed driver aware qemu: Make auto dump path generation embed driver aware src/conf/domain_conf.c | 72 --------------- src/conf/domain_conf.h | 7 -- src/hypervisor/domain_driver.c | 88 +++++++++++++++++++ src/hypervisor/domain_driver.h | 11 +++ src/libvirt_private.syms | 3 +- src/lxc/lxc_domain.c | 3 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 23 +++-- src/qemu/qemu_conf.c | 76 +++++++++------- src/qemu/qemu_conf.h | 23 +++-- src/qemu/qemu_domain.c | 19 ++-- src/qemu/qemu_driver.c | 42 ++++----- src/qemu/qemu_interface.c | 6 +- src/qemu/qemu_process.c | 7 +- tests/domaincapstest.c | 2 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 8 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-numa-topology.args | 4 +- .../fd-memory-numa-topology2.args | 8 +- .../fd-memory-numa-topology3.args | 12 +-- .../hugepages-memaccess2.args | 12 +-- .../qemuxml2argvdata/pages-dimm-discard.args | 4 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- tests/testutilsqemu.c | 2 +- tests/virsystemdtest.c | 5 +- 25 files changed, 235 insertions(+), 210 deletions(-) -- 2.24.1

2 11

[libvirt-jenkins-ci PATCH 0/5] Introduce the new 'gitlab' flavor
by Erik Skultety 06 Apr '20

06 Apr '20

Erik Skultety (5): guests: templates: Introduce a gitlab-runner systemd service template guests: templates: Introduce a gitlab-runner RC init service template guests: Introduce the new 'gitlab' flavor playbooks: gitlab: Force a random password for the root account guests: lcitool: Enable the new 'gitlab' flavor in the lcitool script guests/group_vars/all/main.yml | 3 + guests/lcitool | 29 ++++++-- guests/playbooks/update/main.yml | 5 ++ guests/playbooks/update/tasks/gitlab.yml | 68 +++++++++++++++++++ .../update/templates/gitlab-runner.j2 | 32 +++++++++ .../update/templates/gitlab-runner.service.j2 | 12 ++++ 6 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 guests/playbooks/update/tasks/gitlab.yml create mode 100644 guests/playbooks/update/templates/gitlab-runner.j2 create mode 100644 guests/playbooks/update/templates/gitlab-runner.service.j2 -- 2.25.1

2 26

[PATCH] libxl: fix crash when initializing driver
by Jim Fehlig 06 Apr '20

06 Apr '20

Commit 54a401af478 split out DriverConfigInit from DriverConfigNew, but then called it a bit late from libxlStateInitialize. The cfg is used in libxlDriverConfigLoadFile and when uninitialized results in a crash. Calling DriverConfigInit immediately after DriverConfigNew fixes the crash. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7ec4fcc3d1..980984b199 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged, if (!(cfg = libxlDriverConfigNew())) goto error; + if (libxlDriverConfigInit(cfg) < 0) + goto error; + driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir); if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) goto error; - if (libxlDriverConfigInit(cfg) < 0) - goto error; - /* Register the callbacks providing access to libvirt's event loop */ libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx); -- 2.26.0

3 3

[PATCH] formatdomain.html.in: fix 'sockets' info in topology element
by Daniel Henrique Barboza 06 Apr '20

06 Apr '20

In the 'topology' element it is mentioned, regarding the sockets value, "They refer to the total number of CPU sockets". This is not accurate. What we're doing is calculating the number of sockets per NUMA node, which can be checked in the current implementation of virHostCPUGetInfoPopulateLinux(). Calculating the total number of sockets would break the topology sanity check nodes*sockets*cores*threads=online_cpus. This documentation fix is important to avoid user confusion when seeing the output of 'virsh capabilities' and expecting it to be equal to the output of 'lscpu'. E.g in a Power 9 host this 'lscpu' output: Architecture: ppc64le Byte Order: Little Endian CPU(s): 160 On-line CPU(s) list: 0-159 Thread(s) per core: 4 Core(s) per socket: 20 Socket(s): 2 NUMA node(s): 2 Model: 2.2 (pvr 004e 1202) Model name: POWER9, altivec supported And this XML output from virsh capabilities: <cpu> <arch>ppc64le</arch> <model>POWER9</model> <vendor>IBM</vendor> <topology sockets='1' dies='1' cores='20' threads='4'/> (...) </cpu> Both are correct, as long as we mention in the Libvirt documentation that 'sockets' in the topology element represents the number of sockets per NUMA node. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index aaeb05961f..7940d6ace5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1675,9 +1675,9 @@ <dd>The <code>topology</code> element specifies requested topology of virtual CPU provided to the guest. Four attributes, <code>sockets</code>, <code>dies</code>, <code>cores</code>, and <code>threads</code>, - accept non-zero positive integer values. They refer to the total number - of CPU sockets, number of dies per socket, number of cores per die, and - number of threads per core, respectively. The <code>dies</code> + accept non-zero positive integer values. They refer to the number of + CPU sockets per NUMA node, number of dies per socket, number of cores + per die, and number of threads per core, respectively. The <code>dies</code> attribute is optional and will default to 1 if omitted, while the other attributes are all mandatory. Hypervisors may require that the maximum number of vCPUs specified by the <code>cpus</code> element equals to -- 2.25.1

2 1

[PATCH] tools: variables clean-up in libvirt-guests script
by Prathamesh Chavan 06 Apr '20

06 Apr '20

Redeclared variables in script functions marked as local. Variables `guest_running` and `guests_shutting_down` in the functions 'guest_is_on` and `check_guests_shutdown` were untouched, as the functions returned values in these variables. Signed-off-by: Prathamesh Chavan <pc44800(a)gmail.com> --- I'm submitting this as my BiteSizedTask for GSoC'20 I've cc'd Martin Kletzander, as he is mentor for this task, and to ensure that the needful was done by me. After running `make check`, I received "PASS: 98 and SKIP: 7" as the result. Travis-ci build report can be found at [1]. For my project, 'Introducing job control to the storage driver', right now I'm going through the `/src/qemu/THREADS.txt` as well as previous work done by Tucker DiNapoli during GSoC'14, as well as the proposal of Taowei Luo for GSoC'15. Their email threads are surely helping me get a better picture of the project. Apart from this, please let me know if there is anything else, which could help me with this project. Thansk! [1]: https://travis-ci.org/github/pratham-pc/libvirt/builds/668209157 tools/libvirt-guests.sh.in | 104 +++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index a881f6266e..90a18fee49 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -65,7 +65,7 @@ retval() { # If URI is "default" virsh is called without the "-c" argument # (using libvirt's default connection) run_virsh() { - uri=$1 + local uri=$1 shift if [ "x$uri" = xdefault ]; then @@ -86,7 +86,7 @@ run_virsh_c() { # check if URI is reachable test_connect() { - uri=$1 + local uri=$1 if run_virsh "$uri" connect 2>/dev/null; then return 0; @@ -103,8 +103,8 @@ test_connect() # --transient: list only transient guests # [none]: list both persistent and transient guests list_guests() { - uri=$1 - persistent=$2 + local uri=$1 + local persistent=$2 list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then @@ -118,8 +118,8 @@ list_guests() { # guest_name URI UUID # return name of guest UUID on URI guest_name() { - uri=$1 - uuid=$2 + local uri=$1 + local uuid=$2 run_virsh "$uri" domname "$uuid" 2>/dev/null } @@ -128,8 +128,8 @@ guest_name() { # check if guest UUID on URI is running # Result is returned by variable "guest_running" guest_is_on() { - uri=$1 - uuid=$2 + local uri=$1 + local uuid=$2 guest_running=false id=$(run_virsh "$uri" domid "$uuid") @@ -161,13 +161,13 @@ start() { return 0 fi - isfirst=true - bypass= - sync_time=false + local isfirst=true + local bypass= + local sync_time=false test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache test "x$SYNC_TIME" = x0 || sync_time=true while read uri list; do - configured=false + local configured=false set -f for confuri in $URIS; do set +f @@ -186,7 +186,7 @@ start() { eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do - name=$(guest_name "$uri" "$guest") + local name=$(guest_name "$uri" "$guest") eval_gettext "Resuming guest \$name: " if guest_is_on "$uri" "$guest"; then if "$guest_running"; then @@ -217,17 +217,17 @@ start() { # was saved. suspend_guest() { - uri=$1 - guest=$2 + local uri=$1 + local guest=$2 - name=$(guest_name "$uri" "$guest") - label=$(eval_gettext "Suspending \$name: ") - bypass= - slept=0 + local name=$(guest_name "$uri" "$guest") + local label=$(eval_gettext "Suspending \$name: ") + local bypass= + local slept=0 test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache printf '%s...\n' "$label" run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & - virsh_pid=$! + local virsh_pid=$! while true; do sleep 1 kill -0 "$virsh_pid" >/dev/null 2>&1 || break @@ -251,15 +251,17 @@ suspend_guest() # was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expired. shutdown_guest() { - uri=$1 - guest=$2 + local uri=$1 + local guest=$2 - name=$(guest_name "$uri" "$guest") + local name=$(guest_name "$uri" "$guest") eval_gettext "Starting shutdown on guest: \$name" echo retval run_virsh "$uri" shutdown "$guest" >/dev/null || return - timeout=$SHUTDOWN_TIMEOUT - check_timeout=false + local timeout=$SHUTDOWN_TIMEOUT + local check_timeout=false + local format= + local slept= if [ $timeout -gt 0 ]; then check_timeout=true format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") @@ -300,8 +302,8 @@ shutdown_guest() # was issued to libvirt to allow parallel shutdown. shutdown_guest_async() { - uri=$1 - guest=$2 + local uri=$1 + local guest=$2 name=$(guest_name "$uri" "$guest") eval_gettext "Starting shutdown on guest: \$name" @@ -323,8 +325,8 @@ guest_count() # Result is returned in "guests_shutting_down" check_guests_shutdown() { - uri=$1 - guests_to_check=$2 + local uri=$1 + local guests_to_check=$2 guests_shutting_down= for guest in $guests_to_check; do @@ -344,16 +346,16 @@ check_guests_shutdown() # a shutdown complete notice for guests that have finished print_guests_shutdown() { - uri=$1 - before=$2 - after=$3 + local uri=$1 + local before=$2 + local after=$3 for guest in $before; do case " $after " in *" $guest "*) continue;; esac - name=$(guest_name "$uri" "$guest") + local name=$(guest_name "$uri" "$guest") if [ -n "$name" ]; then eval_gettext "Shutdown of guest \$name complete." echo @@ -365,12 +367,14 @@ print_guests_shutdown() # Shutdown guests GUESTS on machine URI in parallel shutdown_guests_parallel() { - uri=$1 - guests=$2 - - on_shutdown= - check_timeout=false - timeout=$SHUTDOWN_TIMEOUT + local uri=$1 + local guests=$2 + + local on_shutdown= + local check_timeout=false + local timeout=$SHUTDOWN_TIMEOUT + local slept= + local format= if [ $timeout -gt 0 ]; then check_timeout=true format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") @@ -382,7 +386,7 @@ shutdown_guests_parallel() while [ -n "$guests" ] && [ $(guest_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ]; do set -- $guests - guest=$1 + local guest=$1 shift guests=$* if [ -z "$(echo $on_shutdown | grep $guest)" ] && @@ -394,9 +398,9 @@ shutdown_guests_parallel() sleep 1 set -- $guests - guestcount=$# + local guestcount=$# set -- $on_shutdown - shutdowncount=$# + local shutdowncount=$# if $check_timeout; then if [ $(($timeout % 5)) -eq 0 ]; then @@ -415,7 +419,7 @@ shutdown_guests_parallel() fi fi - on_shutdown_prev=$on_shutdown + local on_shutdown_prev=$on_shutdown check_guests_shutdown "$uri" "$on_shutdown" on_shutdown="$guests_shutting_down" print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" @@ -428,8 +432,8 @@ stop() { # last stop was not followed by start [ -f "$LISTFILE" ] && return 0 - suspending=true - if [ "x$ON_SHUTDOWN" = xshutdown ]; then + local suspending=true + if [ "/x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" @@ -448,9 +452,9 @@ stop() { eval_gettext "Running guests on \$uri URI: " - list=$(list_guests "$uri") + local list=$(list_guests "$uri") if [ $? -eq 0 ]; then - empty=true + local empty=true for uuid in $list; do "$empty" || printf ", " printf %s "$(guest_name "$uri" "$uuid")" @@ -464,9 +468,9 @@ stop() { fi if "$suspending"; then - transient=$(list_guests "$uri" "--transient") + local transient=$(list_guests "$uri" "--transient") if [ $? -eq 0 ]; then - empty=true + local empty=true for uuid in $transient; do if "$empty"; then eval_gettext "Not suspending transient guests on URI: \$uri: " @@ -563,7 +567,7 @@ rh_status() { # usage [val] # Display usage string, then exit with VAL (defaults to 2). usage() { - program_name=$0 + local program_name=$0 eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ "condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo exit ${1-2} -- 2.17.1

3 4

[PATCH] qemu_cgroup.c: use VIR_AUTOSTRINGLIST, g_autofree and g_autoptr
by Seeteena Thoufeek 06 Apr '20

06 Apr '20

Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com> --- src/qemu/qemu_cgroup.c | 91 +++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index c0e30f6..d34c515 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -62,7 +62,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; int perms = VIR_CGROUP_DEVICE_READ; - char **targetPaths = NULL; + VIR_AUTOSTRINGLIST targetPaths = NULL; size_t i; int rv; int ret = -1; @@ -82,12 +82,11 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, virCgroupGetDevicePermsString(perms), rv); if (rv < 0) - goto cleanup; + return ret; if (rv > 0) { /* @path is neither character device nor block device. */ - ret = 0; - goto cleanup; + return 0; } if (virDevMapperGetTargets(path, &targetPaths) < 0 && @@ -95,7 +94,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, virReportSystemError(errno, _("Unable to get devmapper targets for %s"), path); - goto cleanup; + return ret; } for (i = 0; targetPaths && targetPaths[i]; i++) { @@ -105,13 +104,10 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, virCgroupGetDevicePermsString(perms), rv); if (rv < 0) - goto cleanup; + return ret; } - ret = 0; - cleanup: - virStringListFree(targetPaths); - return ret; + return 0; } @@ -739,7 +735,7 @@ static int qemuSetupDevicesCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg = NULL; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); const char *const *deviceACL = NULL; int rv = -1; int ret = -1; @@ -757,15 +753,15 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm) return 0; } - goto cleanup; + return ret; } if (qemuSetupFirmwareCgroup(vm) < 0) - goto cleanup; + return ret; for (i = 0; i < vm->def->ndisks; i++) { if (qemuSetupImageChainCgroup(vm, vm->def->disks[i]->src) < 0) - goto cleanup; + return ret; } rv = virCgroupAllowDevice(priv->cgroup, 'c', DEVICE_PTY_MAJOR, -1, @@ -773,9 +769,8 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm) virDomainAuditCgroupMajor(vm, priv->cgroup, "allow", DEVICE_PTY_MAJOR, "pty", "rw", rv == 0); if (rv < 0) - goto cleanup; + return ret; - cfg = virQEMUDriverGetConfig(priv->driver); deviceACL = cfg->cgroupDeviceACL ? (const char *const *)cfg->cgroupDeviceACL : defaultDeviceACL; @@ -791,7 +786,7 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm) virDomainAuditCgroupMajor(vm, priv->cgroup, "allow", DEVICE_SND_MAJOR, "sound", "rw", rv == 0); if (rv < 0) - goto cleanup; + return ret; } for (i = 0; deviceACL[i] != NULL; i++) { @@ -805,57 +800,54 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm) virDomainAuditCgroupPath(vm, priv->cgroup, "allow", deviceACL[i], "rw", rv); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) - goto cleanup; + return ret; } if (virDomainChrDefForeach(vm->def, true, qemuSetupChardevCgroupCB, vm) < 0) - goto cleanup; + return ret; if (vm->def->tpm && qemuSetupTPMCgroup(vm) < 0) - goto cleanup; + return ret; for (i = 0; i < vm->def->nhostdevs; i++) { /* This may allow /dev/vfio/vfio multiple times, but that * is not a problem. Kernel will have only one record. */ if (qemuSetupHostdevCgroup(vm, vm->def->hostdevs[i]) < 0) - goto cleanup; + return ret; } for (i = 0; i < vm->def->nmems; i++) { if (qemuSetupMemoryDevicesCgroup(vm, vm->def->mems[i]) < 0) - goto cleanup; + return ret; } for (i = 0; i < vm->def->ngraphics; i++) { if (qemuSetupGraphicsCgroup(vm, vm->def->graphics[i]) < 0) - goto cleanup; + return ret; } for (i = 0; i < vm->def->nvideos; i++) { if (qemuSetupVideoCgroup(vm, vm->def->videos[i]) < 0) - goto cleanup; + return ret; } for (i = 0; i < vm->def->ninputs; i++) { if (qemuSetupInputCgroup(vm, vm->def->inputs[i]) < 0) - goto cleanup; + return ret; } for (i = 0; i < vm->def->nrngs; i++) { if (qemuSetupRNGCgroup(vm, vm->def->rngs[i]) < 0) - goto cleanup; + return ret; } if (vm->def->sev && qemuSetupSEVCgroup(vm) < 0) - goto cleanup; + return ret; - ret = 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } @@ -924,13 +916,13 @@ qemuInitCgroup(virDomainObjPtr vm, { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); if (!virQEMUDriverIsPrivileged(priv->driver)) - goto done; + return 0; if (!virCgroupAvailable()) - goto done; + return 0; virCgroupFree(&priv->cgroup); @@ -938,7 +930,7 @@ qemuInitCgroup(virDomainObjPtr vm, virDomainResourceDefPtr res; if (VIR_ALLOC(res) < 0) - goto cleanup; + return ret; res->partition = g_strdup("/machine"); @@ -949,7 +941,7 @@ qemuInitCgroup(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Resource partition '%s' must start with '/'"), vm->def->resource->partition); - goto cleanup; + return ret; } if (virCgroupNewMachine(priv->machineName, @@ -964,16 +956,9 @@ qemuInitCgroup(virDomainObjPtr vm, cfg->maxThreadsPerProc, &priv->cgroup) < 0) { if (virCgroupNewIgnoreError()) - goto done; - - goto cleanup; + return 0; } - - done: - ret = 0; - cleanup: - virObjectUnref(cfg); - return ret; + return ret; } static void @@ -1058,14 +1043,14 @@ int qemuConnectCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); int ret = -1; if (!virQEMUDriverIsPrivileged(priv->driver)) - goto done; + return 0; if (!virCgroupAvailable()) - goto done; + return 0; virCgroupFree(&priv->cgroup); @@ -1075,14 +1060,9 @@ qemuConnectCgroup(virDomainObjPtr vm) cfg->cgroupControllers, priv->machineName, &priv->cgroup) < 0) - goto cleanup; + return ret; qemuRestoreCgroupState(vm); - - done: - ret = 0; - cleanup: - virObjectUnref(cfg); return ret; } @@ -1269,7 +1249,7 @@ qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, qemuCgroupEmulatorAllNodesDataPtr *retData) { qemuCgroupEmulatorAllNodesDataPtr data = NULL; - char *all_nodes_str = NULL; + g_autofree char *all_nodes_str = NULL; virBitmapPtr all_nodes = NULL; int ret = -1; @@ -1298,7 +1278,6 @@ qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, ret = 0; cleanup: - VIR_FREE(all_nodes_str); virBitmapFree(all_nodes); qemuCgroupEmulatorAllNodesDataFree(data); -- 1.8.3.1

3 2