- Devel - libvirt List Archives

[libvirt PATCH] docs: introduce a page showing a overall CI dashboard
by Daniel P. Berrangé 07 May '20

07 May '20

With the move to GitLab CI one of the things we miss from Jenkins is a single page dashboard showing CI status across all projects. This is a very simple replacement that uses badges for CI pipeline status. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/ci.rst | 408 ++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 3 + 2 files changed, 411 insertions(+) create mode 100644 docs/ci.rst diff --git a/docs/ci.rst b/docs/ci.rst new file mode 100644 index 0000000000..2b997a9115 --- /dev/null +++ b/docs/ci.rst @@ -0,0 +1,408 @@ +============================== +Libvirt Continuous Integration +============================== + +The libvirt project primarily uses GitLab CI for automated testing of Linux +builds, and cross-compiled Windows builds. `Travis <https://travis-ci.org/libvirt/libvirt>`_ +is used for validating macOS builds, and `Jenkins <https://ci.centos.org/view/libvirt>`_ +is temporarily used for validating FreeBSD builds. + +GitLab CI Dashboard +=================== + +The dashboard below shows the current status of the GitLab CI jobs for each +repository: + +.. raw:: html + + <table> + <thead> + <tr> + <th>Project</th> + <th>Pipeline</th> + </tr> + </thead> + <tbody> + <tr> + <th colspan="2">Core</th> + </tr> + <tr> + <td>libvirt</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Language bindings</th> + </tr> + <tr> + <td>libvirt-csharp</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-csharp/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-go</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-go/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-java</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-java/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-ocaml</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-ocaml/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-perl</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-perl/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-php</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-php/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-python</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-python/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-rust</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-rust/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>ruby-libvirt</td> + <td> + <a href="https://gitlab.com/libvirt/ruby-libvirt/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/ruby-libvirt/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Object mappings</th> + </tr> + <tr> + <td>libvirt-cim</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-cim/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-dbus</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dbus/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-glib</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-glib/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-go-xml</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go-xml/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-go-xml/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-snmp</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-snmp/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Testing</th> + </tr> + <tr> + <td>libvirt-ci</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-ci/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-dockerfiles</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dockerfiles/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-dockerfiles/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-test-API</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-test-API/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-tck</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-tck/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Docs / web</th> + </tr> + <tr> + <td>libvirt-publican</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-publican/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-appdev-guide-python</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeli…"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-wiki</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-wiki/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>virttools-planet</td> + <td> + <a href="https://gitlab.com/libvirt/virttools-planet/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>virttools-web</td> + <td> + <a href="https://gitlab.com/libvirt/virttools-web/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Misc</th> + </tr> + <tr> + <td>libvirt-console-proxy</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-console-proxy/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-designer</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-designer/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-devaddr</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-devaddr/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-sandbox</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-sandbox/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-sandbox-image</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-security-notice</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-security-notice/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.s…"/> + </a> + </td> + </tr> + <tr> + <td>test</td> + <td> + <a href="https://gitlab.com/libvirt/test/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/test/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Archived</th> + </tr> + <tr> + <td>autotest</td> + <td> + <a href="https://gitlab.com/libvirt/autotest/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/autotest/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>cimtest</td> + <td> + <a href="https://gitlab.com/libvirt/cimtest/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/cimtest/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>hooks</td> + <td> + <a href="https://gitlab.com/libvirt/hooks/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/hooks/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libcmpiutil</td> + <td> + <a href="https://gitlab.com/libvirt/libcmpiutil/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libcmpiutil/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-appdev-guide</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-appdev-guide/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-appdev-guide/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-autobuild</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-autobuild/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-autobuild/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-builder</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-builder/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-builder/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-kube</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-kube/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-kube/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-media</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-media/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-media/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-qpid</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-qpid/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-qpid/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-virshcmdref</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-virshcmdref/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-virshcmdref/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>patchchecker</td> + <td> + <a href="https://gitlab.com/libvirt/patchchecker/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/patchchecker/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>php-virt-control</td> + <td> + <a href="https://gitlab.com/libvirt/php-virt-control/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/php-virt-control/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>scripts</td> + <td> + <a href="https://gitlab.com/libvirt/scripts/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/scripts/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + </tbody> + </table> diff --git a/docs/docs.html.in b/docs/docs.html.in index 6bdf0c32b8..f1d44fadc0 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -142,6 +142,9 @@ <dt><a href="strategy.html">Project strategy</a></dt> <dd>Sets a vision for future direction & technical choices</dd> + <dt><a href="ci.html">CI Testing</a></dt> + <dd>Details of the Continuous Integration testing strategy</dd> + <dt><a href="bugs.html">Bug reports</a></dt> <dd>How and where to report bugs and request features</dd> -- 2.26.2

2 2

Google Summer of Code 2020 Student self introduction
by GUOQING LI 07 May '20

07 May '20

Hi there I am Lee, an undergraduate student from Thailand (currently based in Japan) and I will be working as a Student Developer under Google Summer of Code 2020 program. The host organisation is *Libivirt <https://summerofcode.withgoogle.com/projects/#6371688154923008>**.* I will be contributing to *virt* module under *Saltstack* project. I proposed <https://docs.google.com/document/d/1oDGs8eszMreVQhaUrD8yVPOPyBIw-AQyPsaOJsr…> to make CPU tuning, CPU model and topology, Memory tuning, NUMA Node Tuning available. Looking forward to this learning journey. Any suggestions and comments will be appreciated [image: :slightly_smiling_face:] I would be nice if you want to connect me on *LinkedIn <https://www.linkedin.com/in/guoqing-li-538061a7/>* as well. 🙏 Best regards, Lee

2 1

[perl PATCH v2 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 07 May '20

07 May '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. Daniel P. Berrangé (3): gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 173 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 97 +++++++++++++++ ci/libvirt-centos-8.Dockerfile | 68 +++++++++++ ci/libvirt-debian-10.Dockerfile | 68 +++++++++++ ci/libvirt-debian-9.Dockerfile | 71 +++++++++++ ci/libvirt-debian-sid.Dockerfile | 68 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 66 ++++++++++ ci/libvirt-fedora-32.Dockerfile | 66 ++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 67 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 66 ++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 71 +++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 68 +++++++++++ ci/refresh | 22 ++++ 16 files changed, 1013 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[go PATCH 0/3] introduce GitLab CI jobs and merge requests
by Daniel P. Berrangé 07 May '20

07 May '20

This introduces GitLab CI jobs for the Go bindings and indicates that contributors should submit merge requests. Daniel P. Berrangé (3): Fix tests on Ubuntu 18.04 / Debian 9 with missing screenshot file gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 168 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 84 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 62 ++++++++++ ci/libvirt-debian-10.Dockerfile | 54 +++++++++ ci/libvirt-debian-9.Dockerfile | 57 +++++++++ ci/libvirt-debian-sid.Dockerfile | 54 +++++++++ ci/libvirt-fedora-31.Dockerfile | 51 ++++++++ ci/libvirt-fedora-32.Dockerfile | 51 ++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 52 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 53 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 57 +++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 54 +++++++++ ci/refresh | 27 +++++ domain_test.go | 5 + 17 files changed, 869 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 6

[PATCH] conf: Add qemu_job_wait_time option
by MIKI Nobuhiro 07 May '20

07 May '20

The waiting time to acquire the lock times out, which leads to a segment fault. In essence we should make improvements around locks, but as a workaround we will change the timeout to allow the user to increase it. This value was defined as 30 seconds, so use it as the default value. The logs are as follows: ``` Timed out during operation: cannot acquire state change lock \ (held by monitor=remoteDispatchDomainCreateWithFlags) libvirtd.service: main process exited, code=killed,status=11/SEGV ``` Signed-off-by: MIKI Nobuhiro <nmiki(a)yahoo-corp.jp> --- docs/news.xml | 9 +++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 3 +++ src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 7 ++----- src/qemu/test_libvirtd_qemu.aug.in | 1 + 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 80819ae..3755c49 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -119,6 +119,15 @@ Bounds Checking) and IBS (Indirect Branch Speculation). </description> </change> + <change> + <summary> + conf: Add job wait time setting to qemu.conf + </summary> + <description> + How many seconds the new job waits for the existing job to finish. + This only affects if you are using qemu as driver. + </description> + </change> </section> <section title="Improvements"> </section> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 404498b..76c896e 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -97,6 +97,7 @@ module Libvirtd_qemu = | bool_entry "dump_guest_core" | str_entry "stdio_handler" | int_entry "max_threads_per_process" + | int_entry "qemu_job_wait_time" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index abdbf07..a05aaa5 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -612,6 +612,9 @@ # #max_threads_per_process = 0 +# How many seconds the new job waits for the existing job to finish. +#qemu_job_wait_time = 30 + # If max_core is set to a non-zero integer, then QEMU will be # permitted to create core dumps when it crashes, provided its # RAM size is smaller than the limit set. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c598240..34d29ec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -272,6 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, cfg->keepAliveInterval = 5; cfg->keepAliveCount = 5; cfg->seccompSandbox = -1; + cfg->qemuJobWaitTime = 30; cfg->logTimestamp = true; cfg->glusterDebugLevel = 4; @@ -655,6 +656,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, return -1; if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0) return -1; + if (virConfGetValueUInt(conf, "qemu_job_wait_time", &cfg->qemuJobWaitTime) < 0) + return -1; if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { if (virConfGetValueString(conf, "max_core", &corestr) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index b9ef455..49dd7b6 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -218,6 +218,8 @@ struct _virQEMUDriverConfig { gid_t swtpm_group; char **capabilityfilters; + + unsigned int qemuJobWaitTime; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d63ec23..4badc0f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6212,9 +6212,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6225,7 +6222,7 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, * * Acquires job for a domain object which must be locked before * calling. If there's already a job running waits up to - * QEMU_JOB_WAIT_TIME after which the functions fails reporting + * cfg->qemuJobWaitTime after which the functions fails reporting * an error unless @nowait is set. * * If @nowait is true this function tries to acquire job and if @@ -6272,7 +6269,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, return -1; priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + 1000ull * cfg->qemuJobWaitTime; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 19da591..b2886df 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,6 +76,7 @@ module Test_libvirtd_qemu = { "max_processes" = "0" } { "max_files" = "0" } { "max_threads_per_process" = "0" } +{ "qemu_job_wait_time" = "30" } { "max_core" = "unlimited" } { "dump_guest_core" = "1" } { "mac_filter" = "1" } -- 1.8.3.1

4 3

Release of libvirt-6.3.0
by Daniel Veillard 07 May '20

07 May '20

It's out, tagged in git and the signed sources tarball and rpm are available from the usual place: https://libvirt.org/sources/ I have also pushed the python bindings 6.3.0 release at their usual place https://libvirt.org/sources/python/ Among the things to note is the revamp of the vbox support, deprecating old 5.x versions but adding new 6.x API to control the hypervisor. New features: - qemu: support disabling hotplug/unplug of PCIe devices libvirt can now set the "hotplug" option for pcie-root-ports and pcie-switch-downstream-ports, which can be used to disable hotplug/unplug of devices from these ports (default behavior is for these controllers to accept all hotplug/unplug attempts, but this is often undesireable). - vbox: added support for version 6.0 and 6.1 APIs libvirt can now support use of the VirtualBox 6.0 and 6.1 APIs. This is compile tested only, so we are looking for feedback from users on how well it works in practice. - xen: Add support for 'e820_host' hypervisor feature e820_host is a Xen-specific option only available for PV guests. When enabled it provides the guest with a virtual e820 memory map based on the host one. It must be enabled to allow hotplugging PCI devices to PV guests, particularly when memory ballooning is enabled. - xen: Add support for 'passthrough' hypervisor feature passthrough is a Xen-specific option new to Xen 4.13 that enables PCI passthrough for guests. It must be enabled to allow hotplugging PCI devices. - qemu: support async IO mode 'io_uring' Linux 5.1 introduces a fast and efficient async IO interface io_uring, then qemu implements that in version 5.0. It could be used in file, host device and host cdrom backend by io='io_uring' of disk XML. - Lease time option included for network DHCP settings Users can now configure expiry time for leases for networks where libvirt manages DHCP. The time can be specified for whole range and/or fine tuned per individual host. - qemu: Implement pSeries Spectre mitigation features Users can now setup the following capabilities of pSeries guests: CFPC (Cache Flush on Privilege Change), SBBC (Speculation Barrier Bounds Checking) and IBS (Indirect Branch Speculation). Improvements: - qemu: Allow checkpoint redefine for offline VMs Skip the liveness and capability checks when redefining checkpoints as we don't need QEMU interactions to update the metadata. - daemons: Improve timeout handling Daemons now support --timeout 0 which suppresses daemon killing after given time of inactivity. - qemu: Add support for 'multidevs' option This option prevents misbehaviours on guest if a QEMU 9pfs export contains multiple devices, due to the potential file ID collisions this otherwise may cause. Bug fixes: - qemu: Various embed driver fixes When using shared resources from embed driver (e.g. hugepages, machined, etc.) libvirt now generates an unique handler that is not conflicting with other embed drivers or system or session daemons. - cpu: Distinguish Cascadelake-Server from Skylake-Server Libvirt now properly detects Cascadelake-Server and Skylake-Server processors which differ only in stepping. - qemu: Fix domain restore from a block device When using namespaces, libvirt was unable to restore a domain from a block device because libvirt tried to relabel the device inside the namespace while QEMU was given FD to the block device in the host. - node_device_udev: Handle move events Libvirt now handles move event which is emitted on a NIC rename. - qemu: Fix capabilities probing with TCG Libvirt no long assumes TCG is always available. It now detects whether QEMU supports TCG and reports it accordingly. Removed features: - vbox: removed support for version 5.0 and 5.1 APIs libvirt no longer supports use of VirtualBox 5.0 and 5.1 since these versions reached their end of life on 2017/05 and 2018/04 respectively. Thanks everybody for your help with this release, stay safe, enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt-ocaml PATCH 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

Add GitLab CI jobs for the build and basic test, along with use of merge requests for contributions. Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 172 +++++++++++++++++++++++++++ CONTRIBUTING.rst | 28 +++++ MANIFEST | 1 + Makefile.in | 2 +- ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 85 +++++++++++++ ci/libvirt-centos-8.Dockerfile | 63 ++++++++++ ci/libvirt-debian-10.Dockerfile | 55 +++++++++ ci/libvirt-debian-9.Dockerfile | 58 +++++++++ ci/libvirt-debian-sid.Dockerfile | 55 +++++++++ ci/libvirt-fedora-31.Dockerfile | 52 ++++++++ ci/libvirt-fedora-32.Dockerfile | 52 ++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 58 +++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++ ci/refresh | 27 +++++ 17 files changed, 883 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[libvirt-php 0/6] introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

This series introduces use of GitLab CI and merge requests. In doing so several current build problems are fixes. Daniel P. Berrangé (6): m4: ignore --php-binary if it doesn't exist src: don't declare global variables in header files tests: mark skipped tests with exit status 77 tests: skip test if not running on host with running libvirtd gitlab: add CI jobs for validating build across platforms gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 146 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 12 +++ ci/libvirt-centos-7.Dockerfile | 92 +++++++++++++++++ ci/libvirt-debian-10.Dockerfile | 64 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 67 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 64 ++++++++++++ ci/libvirt-fedora-31.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-32.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 61 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 62 ++++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 67 ++++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 64 ++++++++++++ ci/refresh | 22 ++++ m4/virt-php-extension.m4 | 2 +- src/libvirt-connection.c | 2 + src/libvirt-connection.h | 2 +- src/libvirt-domain.c | 2 + src/libvirt-domain.h | 2 +- src/libvirt-network.c | 2 + src/libvirt-network.h | 2 +- src/libvirt-nodedev.c | 2 + src/libvirt-nodedev.h | 2 +- src/libvirt-nwfilter.c | 2 + src/libvirt-nwfilter.h | 2 +- src/libvirt-php.c | 2 + src/libvirt-php.h | 2 +- src/libvirt-snapshot.c | 2 + src/libvirt-snapshot.h | 2 +- src/libvirt-storage.c | 3 + src/libvirt-storage.h | 4 +- src/libvirt-stream.c | 2 + src/libvirt-stream.h | 2 +- tests/functions.phpt.in | 2 +- tests/runtests.sh | 2 +- tests/test-get-models.phpt | 4 +- 37 files changed, 903 insertions(+), 19 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

3 9

[libvirt-rust 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

Add GitLab CI jobs for the build and basic test, along with use of merge requests for contributions. Daniel P. Berrangé (2): gitlab: introduce GitLab CI job for build gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 166 +++++++++++++++++++++++++++ .gitpublish | 5 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 85 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 63 ++++++++++ ci/libvirt-debian-10.Dockerfile | 55 +++++++++ ci/libvirt-debian-9.Dockerfile | 58 ++++++++++ ci/libvirt-debian-sid.Dockerfile | 55 +++++++++ ci/libvirt-fedora-31.Dockerfile | 52 +++++++++ ci/libvirt-fedora-32.Dockerfile | 52 +++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 58 ++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++ ci/refresh | 27 +++++ 16 files changed, 875 insertions(+), 5 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[libvirt PATCH] keycodemapdb: update submodule for win32 keycode fix
by Daniel P. Berrangé 06 May '20

06 May '20

Fix win32 keycode for VK_OEM_102 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/keycodemapdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keycodemapdb b/src/keycodemapdb index 317d3eeb96..27acf0ef82 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 317d3eeb963a515e15a63fa356d8ebcda7041a51 +Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd -- 2.26.2

2 1

[PATCH v2] Improve blockpull man entry
by Sebastian Mitterle 06 May '20

06 May '20

1. Fix usage of bandwidth, base arguments. 2. Explain valid arguments for `base`. 3. Move explanation for `--keep-relative` to end considering it's not a very frequent use case. 4. Add reference to documentation for relative paths in backing chains. Signed-off-by: Sebastian Mitterle <smitterl(a)redhat.com> --- docs/manpages/virsh.rst | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index dc404ddfe8..71bd968fab 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -1345,7 +1345,7 @@ blockpull .. code-block:: - blockpull domain path [bandwidth] [--bytes] [base] + blockpull domain path [bandwidth [--bytes] [base]] [--wait [--verbose] [--timeout seconds] [--async]] [--keep-relative] @@ -1356,6 +1356,12 @@ the new backing file and only the intermediate portion of the chain is pulled. Once all requested data from the backing image chain has been pulled, the disk no longer depends on that portion of the backing chain. +*base* can be specified in two ways: either as indexed target name 'name[i]' +where 'name' corresponds to the disk target name (<target dev='name'/>) and +'i' corresponds to the 'index' of the '<backingStore>'; or as the file name +of the backing file (<source file='name'/>). + + By default, this command returns as soon as possible, and data for the entire disk is pulled in the background; the progress of the operation can be checked with ``blockjob``. However, if *--wait* is @@ -1367,16 +1373,19 @@ is triggered, *--async* will return control to the user as fast as possible, otherwise the command may continue to block a little while longer until the job is done cleaning up. -Using the *--keep-relative* flag will keep the backing chain names -relative. - *path* specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to *domain* (see also ``domblklist`` for listing these names). + *bandwidth* specifies copying bandwidth limit in MiB/s. For further information on the *bandwidth* argument see the corresponding section for the ``blockjob`` -command. +command. Using *--bytes* flag indicates the value in *bandwidth* is given in +bytes. + +Using the *--keep-relative* flag will keep the backing chain names +relative (details on `https://www.libvirt.org/kbase/backing_chains.html +<https://www.libvirt.org/kbase/backing_chains.html>`__). blockresize -- 2.25.2

2 1

[libvirt PATCH v2 0/1] tests: Introduce virhostdevmock
by Andrea Bolognani 06 May '20

06 May '20

Changes from [v1]: * move function to a separate mock library; * load mock library for all tests that use virHostdevManager. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg00020.html Andrea Bolognani (1): tests: Introduce virhostdevmock tests/Makefile.am | 7 +++++++ tests/qemuhotplugtest.c | 1 + tests/virhostdevmock.c | 29 +++++++++++++++++++++++++++++ tests/virhostdevtest.c | 4 +++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tests/virhostdevmock.c -- 2.25.4

2 3

[PATCH 0/4] bhyve: framebuffer resolution and VNC password
by Fabian Freyer 06 May '20

06 May '20

Add support for setting the bhyve framebuffer resolution and probe whether bhyve supports VNC password authentication. If it does, allow setting the password. While we're here, also add support for parsing bhyve's framebuffer argument string. Fabian Freyer (4): bhyve: support parsing fbuf PCI device bhyve: add support for setting fbuf resolution bhyve: probe for VNC password capability bhyve: add VNC password support docs/formatdomain.html.in | 2 +- docs/news.xml | 20 +++ src/bhyve/bhyve_capabilities.c | 16 ++- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 36 ++++-- src/bhyve/bhyve_parse_command.c | 116 +++++++++++++++++- src/libvirt_private.syms | 1 + .../bhyveargv2xml-vnc-listen.args | 10 ++ .../bhyveargv2xml-vnc-listen.xml | 22 ++++ .../bhyveargv2xml-vnc-password.args | 10 ++ .../bhyveargv2xml-vnc-password.xml | 22 ++++ .../bhyveargv2xml-vnc-resolution.args | 10 ++ .../bhyveargv2xml-vnc-resolution.xml | 24 ++++ .../bhyveargv2xml-vnc-vga-io.args | 10 ++ .../bhyveargv2xml-vnc-vga-io.xml | 22 ++++ .../bhyveargv2xml-vnc-vga-off.args | 10 ++ .../bhyveargv2xml-vnc-vga-off.xml | 23 ++++ .../bhyveargv2xml-vnc-vga-on.args | 10 ++ .../bhyveargv2xml-vnc-vga-on.xml | 23 ++++ .../bhyveargv2xmldata/bhyveargv2xml-vnc.args | 10 ++ tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml | 22 ++++ tests/bhyveargv2xmltest.c | 9 +- .../bhyvexml2argv-vnc-password-comma.xml | 26 ++++ .../bhyvexml2argv-vnc-password.args | 12 ++ .../bhyvexml2argv-vnc-password.ldargs | 1 + .../bhyvexml2argv-vnc-password.xml | 26 ++++ .../bhyvexml2argv-vnc-resolution.args | 10 ++ .../bhyvexml2argv-vnc-resolution.ldargs | 1 + .../bhyvexml2argv-vnc-resolution.xml | 20 +++ tests/bhyvexml2argvtest.c | 8 +- .../bhyvexml2xmlout-vnc-password.xml | 41 +++++++ .../bhyvexml2xmlout-vnc-resolution.xml | 28 +++++ tests/bhyvexml2xmltest.c | 2 + 33 files changed, 588 insertions(+), 16 deletions(-) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml -- 2.19.2

2 6

[libvirt PATCH] cputest: Add data for AMD Ryzen 9 3900X 12-Core Processor
by Jiri Denemark 06 May '20

06 May '20

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/cputest.c | 1 + ...4-cpuid-Ryzen-9-3900X-12-Core-disabled.xml | 8 + ...64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml | 10 + ...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 28 + ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 29 + ...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 24 + .../x86_64-cpuid-Ryzen-9-3900X-12-Core.json | 1838 +++++++++++++++++ .../x86_64-cpuid-Ryzen-9-3900X-12-Core.sig | 4 + .../x86_64-cpuid-Ryzen-9-3900X-12-Core.xml | 66 + 9 files changed, 2008 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml diff --git a/tests/cputest.c b/tests/cputest.c index 21f47a6853..2bef3eb52f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1252,6 +1252,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Pentium-P6100", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-3900X-12-Core", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS); diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml new file mode 100644 index 0000000000..7feb55f0b7 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml @@ -0,0 +1,8 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x08000008' edx='0x10000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml new file mode 100644 index 0000000000..def2fed823 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml @@ -0,0 +1,10 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7f83203' edx='0x078bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x219c01ab' ecx='0x00000004' edx='0xa8000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x008003f7' edx='0x2e500800'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x03001201' ecx='0x00000000' edx='0x00000000'/> + <msr index='0x10a' edx='0x00000000' eax='0x00000029'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml new file mode 100644 index 0000000000..717e2fbfae --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml @@ -0,0 +1,28 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature policy='require' name='ht'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='cmt'/> + <feature policy='require' name='clwb'/> + <feature policy='require' name='umip'/> + <feature policy='require' name='xsaves'/> + <feature policy='require' name='mbm_total'/> + <feature policy='require' name='mbm_local'/> + <feature policy='require' name='cmp_legacy'/> + <feature policy='require' name='extapic'/> + <feature policy='require' name='ibs'/> + <feature policy='require' name='skinit'/> + <feature policy='require' name='wdt'/> + <feature policy='require' name='tce'/> + <feature policy='require' name='topoext'/> + <feature policy='require' name='perfctr_core'/> + <feature policy='require' name='perfctr_nb'/> + <feature policy='require' name='invtsc'/> + <feature policy='require' name='clzero'/> + <feature policy='require' name='wbnoinvd'/> + <feature policy='require' name='amd-ssbd'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> + <feature policy='require' name='mds-no'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml new file mode 100644 index 0000000000..81930a84e7 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml @@ -0,0 +1,29 @@ +<cpu> + <arch>x86_64</arch> + <model>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature name='ht'/> + <feature name='osxsave'/> + <feature name='cmt'/> + <feature name='clwb'/> + <feature name='umip'/> + <feature name='xsaves'/> + <feature name='mbm_total'/> + <feature name='mbm_local'/> + <feature name='cmp_legacy'/> + <feature name='extapic'/> + <feature name='ibs'/> + <feature name='skinit'/> + <feature name='wdt'/> + <feature name='tce'/> + <feature name='topoext'/> + <feature name='perfctr_core'/> + <feature name='perfctr_nb'/> + <feature name='invtsc'/> + <feature name='clzero'/> + <feature name='wbnoinvd'/> + <feature name='amd-ssbd'/> + <feature name='rdctl-no'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='mds-no'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml new file mode 100644 index 0000000000..5f495e0452 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml @@ -0,0 +1,24 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='clwb'/> + <feature policy='require' name='umip'/> + <feature policy='require' name='stibp'/> + <feature policy='require' name='arch-capabilities'/> + <feature policy='require' name='ssbd'/> + <feature policy='require' name='xsaves'/> + <feature policy='require' name='cmp_legacy'/> + <feature policy='require' name='perfctr_core'/> + <feature policy='require' name='clzero'/> + <feature policy='require' name='wbnoinvd'/> + <feature policy='require' name='amd-ssbd'/> + <feature policy='require' name='virt-ssbd'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> + <feature policy='require' name='mds-no'/> + <feature policy='disable' name='monitor'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json new file mode 100644 index 0000000000..fbdf1a794a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json @@ -0,0 +1,1838 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "phys-bits": 0, + "core-id": -1, + "xlevel": 2147483679, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "arat": true, + "rdpid": true, + "vmx-page-walk-5": false, + "vmx-page-walk-4": false, + "vmx-desc-exit": false, + "gfni": false, + "ibrs-all": false, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": false, + "hv-frequencies": false, + "tsc-frequency": 0, + "vmx-rdseed-exit": false, + "xd": true, + "x-intel-pt-auto-level": true, + "hv-vendor-id": "", + "vmx-eptp-switching": false, + "kvm_asyncpf": true, + "kvm-asyncpf": true, + "perfctr_core": true, + "perfctr-core": true, + "mpx": false, + "avx512cd": false, + "pbe": false, + "decodeassists": false, + "vmx-exit-clear-bndcfgs": false, + "vmx-exit-load-efer": false, + "sse4_1": true, + "sse4-1": true, + "sse4.1": true, + "family": 23, + "legacy-cache": true, + "vmx-vmwrite-vmexit-fields": false, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "host-phys-bits-limit": 0, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "vmware-cpuid-freq": true, + "wbnoinvd": true, + "avx512f": false, + "xcrypt": false, + "hv-runtime": false, + "hv-stimer-direct": false, + "mce": true, + "mca": true, + "msr": true, + "thread-id": -1, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "hv-relaxed": false, + "avx512-bf16": false, + "ds": false, + "hv-crash": false, + "fxsr": true, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "tsx-ctrl": false, + "xtpr": false, + "vmx-ple": false, + "hv-evmcs": false, + "avx512-vpopcntdq": false, + "phe": false, + "avx512vl": false, + "extapic": false, + "vmx-vmfunc": false, + "3dnowprefetch": true, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "cpuid-0xb": true, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "kvm_pv_eoi": true, + "vmx-pml": false, + "apic-id": 4294967295, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vmx-unrestricted-guest": false, + "vendor": "AuthenticAMD", + "hv-ipi": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "smx": false, + "cmp-legacy": true, + "cmp_legacy": true, + "node-id": -1, + "avx512-4fmaps": false, + "vmcb_clean": false, + "vmcb-clean": false, + "hle": false, + "amd-no-ssb": false, + "3dnowext": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "memory": "/machine/unattached/system[0]", + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "svm_lock": false, + "svm-lock": false, + "pfthreshold": false, + "smap": true, + "smep": true, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vnni": false, + "avx512vbmi": false, + "vmx-apicv-x2apic": false, + "hv-stimer": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "x-hv-synic-kvm-only": false, + "vmx-invvpid-all-context": false, + "i64": true, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "die-id": -1, + "vmx-tsc-offset": false, + "phe-en": false, + "kvm_nopiodelay": true, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "socket-id": -1, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "level": 16, + "avx512dq": false, + "x-migrate-smi-count": true, + "svm": true, + "full-cpuid-auto-level": true, + "hv-reset": false, + "invtsc": false, + "vmx-monitor-exit": false, + "sse3": true, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "kvm_poll_control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "hv-reenlightenment": false, + "kvm_mmu": false, + "kvm-mmu": false, + "sse4-2": true, + "sse4.2": true, + "sse4_2": true, + "pge": true, + "fill-mtrr-mask": true, + "avx512bitalg": false, + "vmx-entry-load-bndcfgs": false, + "nodeid_msr": false, + "pdcm": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip_save": true, + "nrip-save": true, + "vmx-pause-exit": false, + "ssse3": true, + "kvm_pv_unhalt": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "enforce": false, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ds_cpl": false, + "ibs": false, + "fma4": false, + "host-phys-bits": false, + "vmx-exit-nosave-debugctl": false, + "vmx-invept": false, + "la57": false, + "osvw": true, + "check": true, + "hv-spinlocks": 4294967295, + "vmx-eptad": false, + "pmu": false, + "vmx-entry-noload-debugctl": false, + "pmm": false, + "apic": true, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "min-xlevel2": 0, + "tsc-adjust": true, + "tsc_adjust": true, + "kvm-steal-time": true, + "kvm_steal_time": true, + "kvmclock": true, + "vmx-zero-len-inject": false, + "l3-cache": true, + "pschange-mc-no": true, + "vmx-rdrand-exit": false, + "lwp": false, + "hv-passthrough": false, + "amd-ssbd": true, + "ibpb": true, + "xop": false, + "core-capability": false, + "avx": true, + "vmx-invept-single-context": false, + "movdiri": false, + "avx512bw": false, + "acpi": false, + "ace2": false, + "fsgsbase": true, + "hv-vapic": false, + "vmx-ept-1gb": false, + "vmx-ept-2mb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "xsaves": true, + "movdir64b": false, + "vmx-shadow-vmcs": false, + "tcg-cpuid": true, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "vmx-store-lma": false, + "umip": true, + "vmx-movdr-exit": false, + "avx2": true, + "pse": true, + "pclmuldq": true, + "sep": true, + "vmx-cr3-load-noexit": false, + "virt-ssbd": true, + "x-hv-max-vps": -1, + "nodeid-msr": false, + "md-clear": false, + "split-lock-detect": false, + "kvm": true, + "misalignsse": true, + "min-xlevel": 2147483679, + "realized": false, + "kvm-pv-unhalt": true, + "bmi2": true, + "bmi1": true, + "tsc_scale": false, + "tsc-scale": false, + "topoext": false, + "hv-vpindex": false, + "hv-no-nonarch-coresharing": "off", + "vmx-preemption-timer": false, + "xlevel2": 0, + "clflushopt": true, + "vmx-vnmi-pending": false, + "kvm-no-smi-migration": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "pmm-en": false, + "taa-no": false, + "pcid": false, + "vmx-secondary-ctls": false, + "arch-capabilities": true, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "x-force-features": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "lahf_lm": true, + "vmx-ins-outs": false, + "vpclmulqdq": false, + "xstore": false, + "fxsr-opt": true, + "fxsr_opt": true, + "hv-synic": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "hv-time": false, + "perfctr_nb": false, + "perfctr-nb": false, + "hv-tlbflush": false, + "ffxsr": true, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "vmx-rdpmc-exit": false, + "wdt": false, + "vmx-entry-load-efer": false, + "level-func7": 0, + "vmx-mtf": false, + "pause_filter": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "model-expansion" +} + +{ + "return": [ + { + "name": "max", + "typename": "max-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": false + }, + { + "name": "host", + "typename": "host-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": false + }, + { + "name": "base", + "typename": "base-x86_64-cpu", + "unavailable-features": [], + "static": true, + "migration-safe": true + }, + { + "name": "qemu64-v1", + "typename": "qemu64-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "qemu64", + "typename": "qemu64-x86_64-cpu", + "unavailable-features": [], + "alias-of": "qemu64-v1", + "static": false, + "migration-safe": true + }, + { + "name": "qemu32-v1", + "typename": "qemu32-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "qemu32", + "typename": "qemu32-x86_64-cpu", + "unavailable-features": [], + "alias-of": "qemu32-v1", + "static": false, + "migration-safe": true + }, + { + "name": "phenom-v1", + "typename": "phenom-v1-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "static": false, + "migration-safe": true + }, + { + "name": "phenom", + "typename": "phenom-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "alias-of": "phenom-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium3-v1", + "typename": "pentium3-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium3", + "typename": "pentium3-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium3-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium2-v1", + "typename": "pentium2-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium2", + "typename": "pentium2-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium2-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium-v1", + "typename": "pentium-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium", + "typename": "pentium-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium-v1", + "static": false, + "migration-safe": true + }, + { + "name": "n270-v1", + "typename": "n270-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "n270", + "typename": "n270-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "n270-v1", + "static": false, + "migration-safe": true + }, + { + "name": "kvm64-v1", + "typename": "kvm64-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "kvm64", + "typename": "kvm64-x86_64-cpu", + "unavailable-features": [], + "alias-of": "kvm64-v1", + "static": false, + "migration-safe": true + }, + { + "name": "kvm32-v1", + "typename": "kvm32-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "kvm32", + "typename": "kvm32-x86_64-cpu", + "unavailable-features": [], + "alias-of": "kvm32-v1", + "static": false, + "migration-safe": true + }, + { + "name": "coreduo-v1", + "typename": "coreduo-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "coreduo", + "typename": "coreduo-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "coreduo-v1", + "static": false, + "migration-safe": true + }, + { + "name": "core2duo-v1", + "typename": "core2duo-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "core2duo", + "typename": "core2duo-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "core2duo-v1", + "static": false, + "migration-safe": true + }, + { + "name": "athlon-v1", + "typename": "athlon-v1-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "static": false, + "migration-safe": true + }, + { + "name": "athlon", + "typename": "athlon-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "alias-of": "athlon-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-v2", + "typename": "Westmere-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-v1", + "typename": "Westmere-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-IBRS", + "typename": "Westmere-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "Westmere-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Westmere", + "typename": "Westmere-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Westmere-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge-v2", + "typename": "Snowridge-v2-x86_64-cpu", + "unavailable-features": [ + "erms", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "split-lock-detect" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge-v1", + "typename": "Snowridge-v1-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "mpx", + "mpx", + "split-lock-detect" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge", + "typename": "Snowridge-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "mpx", + "mpx", + "split-lock-detect" + ], + "alias-of": "Snowridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v3", + "typename": "Skylake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v2", + "typename": "Skylake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v1", + "typename": "Skylake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-noTSX-IBRS", + "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-IBRS", + "typename": "Skylake-Server-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server", + "typename": "Skylake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v3", + "typename": "Skylake-Client-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v2", + "typename": "Skylake-Client-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v1", + "typename": "Skylake-Client-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-noTSX-IBRS", + "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Skylake-Client-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-IBRS", + "typename": "Skylake-Client-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Skylake-Client-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client", + "typename": "Skylake-Client-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Skylake-Client-v1", + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-v2", + "typename": "SandyBridge-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-v1", + "typename": "SandyBridge-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-IBRS", + "typename": "SandyBridge-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "SandyBridge-v2", + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge", + "typename": "SandyBridge-x86_64-cpu", + "unavailable-features": [], + "alias-of": "SandyBridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Penryn-v1", + "typename": "Penryn-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Penryn", + "typename": "Penryn-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Penryn-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G5-v1", + "typename": "Opteron_G5-v1-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4", + "tbm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G5", + "typename": "Opteron_G5-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4", + "tbm" + ], + "alias-of": "Opteron_G5-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G4-v1", + "typename": "Opteron_G4-v1-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G4", + "typename": "Opteron_G4-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4" + ], + "alias-of": "Opteron_G4-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G3-v1", + "typename": "Opteron_G3-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G3", + "typename": "Opteron_G3-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G3-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G2-v1", + "typename": "Opteron_G2-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G2", + "typename": "Opteron_G2-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G2-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G1-v1", + "typename": "Opteron_G1-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G1", + "typename": "Opteron_G1-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G1-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-v2", + "typename": "Nehalem-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-v1", + "typename": "Nehalem-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-IBRS", + "typename": "Nehalem-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "Nehalem-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem", + "typename": "Nehalem-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Nehalem-v1", + "static": false, + "migration-safe": true + }, + { + "name": "KnightsMill-v1", + "typename": "KnightsMill-v1-x86_64-cpu", + "unavailable-features": [ + "ss", + "erms", + "avx512f", + "avx512pf", + "avx512er", + "avx512cd", + "avx512-vpopcntdq", + "avx512-4vnniw", + "avx512-4fmaps", + "avx512f", + "avx512f", + "avx512f" + ], + "static": false, + "migration-safe": true + }, + { + "name": "KnightsMill", + "typename": "KnightsMill-x86_64-cpu", + "unavailable-features": [ + "ss", + "erms", + "avx512f", + "avx512pf", + "avx512er", + "avx512cd", + "avx512-vpopcntdq", + "avx512-4vnniw", + "avx512-4fmaps", + "avx512f", + "avx512f", + "avx512f" + ], + "alias-of": "KnightsMill-v1", + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-v2", + "typename": "IvyBridge-v2-x86_64-cpu", + "unavailable-features": [ + "erms", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-v1", + "typename": "IvyBridge-v1-x86_64-cpu", + "unavailable-features": [ + "erms" + ], + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-IBRS", + "typename": "IvyBridge-IBRS-x86_64-cpu", + "unavailable-features": [ + "erms", + "spec-ctrl" + ], + "alias-of": "IvyBridge-v2", + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge", + "typename": "IvyBridge-x86_64-cpu", + "unavailable-features": [ + "erms" + ], + "alias-of": "IvyBridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-v2", + "typename": "Icelake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-v1", + "typename": "Icelake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-noTSX", + "typename": "Icelake-Server-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Icelake-Server-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server", + "typename": "Icelake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Icelake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-v2", + "typename": "Icelake-Client-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-v1", + "typename": "Icelake-Client-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-noTSX", + "typename": "Icelake-Client-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "alias-of": "Icelake-Client-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client", + "typename": "Icelake-Client-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "alias-of": "Icelake-Client-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v4", + "typename": "Haswell-v4-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v3", + "typename": "Haswell-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v2", + "typename": "Haswell-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v1", + "typename": "Haswell-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-noTSX-IBRS", + "typename": "Haswell-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Haswell-v4", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-noTSX", + "typename": "Haswell-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "alias-of": "Haswell-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-IBRS", + "typename": "Haswell-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Haswell-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell", + "typename": "Haswell-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Haswell-v1", + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-v2", + "typename": "EPYC-v2-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-v1", + "typename": "EPYC-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-IBPB", + "typename": "EPYC-IBPB-x86_64-cpu", + "unavailable-features": [], + "alias-of": "EPYC-v2", + "static": false, + "migration-safe": true + }, + { + "name": "EPYC", + "typename": "EPYC-x86_64-cpu", + "unavailable-features": [], + "alias-of": "EPYC-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Dhyana-v1", + "typename": "Dhyana-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Dhyana", + "typename": "Dhyana-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Dhyana-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Denverton-v1", + "typename": "Denverton-v1-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "spec-ctrl", + "mpx", + "mpx" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Denverton", + "typename": "Denverton-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "spec-ctrl", + "mpx", + "mpx" + ], + "alias-of": "Denverton-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Conroe-v1", + "typename": "Conroe-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Conroe", + "typename": "Conroe-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Conroe-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v3", + "typename": "Cascadelake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v2", + "typename": "Cascadelake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v1", + "typename": "Cascadelake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-noTSX", + "typename": "Cascadelake-Server-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "alias-of": "Cascadelake-Server-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server", + "typename": "Cascadelake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Cascadelake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v4", + "typename": "Broadwell-v4-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v3", + "typename": "Broadwell-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v2", + "typename": "Broadwell-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v1", + "typename": "Broadwell-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-noTSX-IBRS", + "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Broadwell-v4", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-noTSX", + "typename": "Broadwell-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "alias-of": "Broadwell-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-IBRS", + "typename": "Broadwell-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Broadwell-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell", + "typename": "Broadwell-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Broadwell-v1", + "static": false, + "migration-safe": true + }, + { + "name": "486-v1", + "typename": "486-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "486", + "typename": "486-x86_64-cpu", + "unavailable-features": [], + "alias-of": "486-v1", + "static": false, + "migration-safe": true + } + ], + "id": "definitions" +} diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig new file mode 100644 index 0000000000..522d6a5be2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig @@ -0,0 +1,4 @@ +870f10 +family: 23 (0x17) +model: 113 (0x71) +stepping: 0 (0x00) diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml new file mode 100644 index 0000000000..c8db5e3e10 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml @@ -0,0 +1,66 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000010' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00870f10' ebx='0x10180800' ecx='0x7ed8320b' edx='0x178bfbff'/> + <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000011'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x219c91a9' ecx='0x00400004' edx='0x00000000'/> + <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000010'/> + <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000007' ebx='0x00000018' ecx='0x00000201' edx='0x00000010'/> + <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000207' ebx='0x00000340' ecx='0x00000380' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x09' eax='0x00000040' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x000000ff' ecx='0x00000000' edx='0x00000002'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000040' ecx='0x000000ff' edx='0x00000007'/> + <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000004' edx='0x0000000f'/> + <cpuid eax_in='0x20000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000020' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00870f10' ebx='0x20000000' ecx='0x75c237ff' edx='0x2fd3fbff'/> + <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x657a7952' ecx='0x2039206e' edx='0x30303933'/> + <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x32312058' ebx='0x726f432d' ecx='0x72502065' edx='0x7365636f'/> + <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/> + <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff40ff40' ebx='0xff40ff40' ecx='0x20080140' edx='0x20080140'/> + <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x48006400' ebx='0x68006400' ecx='0x02006140' edx='0x02009140'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x0000001b' ecx='0x00000000' edx='0x00006799'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x010cb657' ecx='0x00007017' edx='0x00010000'/> + <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00008000' ecx='0x00000000' edx='0x0013bcff'/> + <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf040f040' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000006' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000003ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x01' eax='0x00004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x02' eax='0x00004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000002'/> + <cpuid eax_in='0x8000001d' ecx_in='0x03' eax='0x00014163' ebx='0x03c0003f' ecx='0x00003fff' edx='0x00000001'/> + <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000010' ebx='0x00000108' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001f' ecx_in='0x00' eax='0x0001000f' ebx='0x0000016f' ecx='0x000001fd' edx='0x00000001'/> + <cpuid eax_in='0x80000020' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000020' ecx_in='0x01' eax='0x0000000b' ebx='0x00000000' ecx='0x00000000' edx='0x0000000f'/> + <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <msr index='0x10a' edx='0x00000000' eax='0x00000069'/> +</cpudata> -- 2.26.2

2 1

[libvirt PATCH] tests: poison $HOME and $XDG_RUNTIME_DIR env variables
by Daniel P. Berrangé 06 May '20

06 May '20

To attempt to catch unit tests which accidentally create files in $HOME, or $XDG_RUNTIME_DIR, poison these env vars by pointing them to directories which don't exist. This should give easier to debug test failures. For example: $ VIR_TEST_DEBUG=1 ./qemuhotplugtest Could not initialize HostdevManager - operation failed: Failed to create state dir '/bad-test-used-env-xdg-runtime-dir/libvirt/hostdevmgr' Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/testutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index 5fd81b70a2..8533a02d73 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -767,6 +767,9 @@ int virTestMain(int argc, preloads[npreloads] = NULL; } + setenv("HOME", "/bad-test-used-env-home", 1); + setenv("XDG_RUNTIME_DIR", "/bad-test-used-env-xdg-runtime-dir", 1); + va_start(ap, func); while ((lib = va_arg(ap, const char *))) { if (!virFileIsExecutable(lib)) { -- 2.26.2

3 2

[libvirt PATCH] docs: documented protected branches and tags
by Daniel P. Berrangé 06 May '20

06 May '20

We need to prevent accidental deletion of release tags and maint branches. We need to ensure that shared CI runners are enabled on all repos. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/newreposetup.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst index ce54aa09d3..cac4f84813 100644 --- a/docs/newreposetup.rst +++ b/docs/newreposetup.rst @@ -71,6 +71,26 @@ required under the **Settings** page: * *Require approval from code owners*: disabled + * *Branch*: ``v*-maint`` + + * *Allowed to merge*: Developers + Maintainers + + * *Allowed to push*: None (or Developers + Maintainers if MRs not used) + + * *Require approval from code owners*: disabled + + * **Protected tags** + + * *Tag*: ``v*`` + + * *Allowed to create*: Developers + Maintainers + +* **CI/CD** + + * **Runners** + + * *Shared runners*: Enable shared runners + GitHub configuration ==================== -- 2.26.2

2 2

[libvirt PATCH] tests: Mock virGetUserRuntimeDirectory() for qemuhotplug
by Andrea Bolognani 06 May '20

06 May '20

Not mocking this function results in files being created in the user's home directory when running the test and in the build failing altogether inside a constrained environment such as the one used by pbuilder: Could not initialize HostdevManager - operation failed: Failed to create state dir '/nonexistent/.cache/libvirt/hostdevmgr' Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuhotplugmock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index d2324913cf..27c81670a3 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -27,6 +27,7 @@ static int (*real_virGetDeviceID)(const char *path, int *maj, int *min); static bool (*real_virFileExists)(const char *path); +static char *(*real_virGetUserRuntimeDirectory)(void); static void init_syms(void) @@ -36,6 +37,7 @@ init_syms(void) VIR_MOCK_REAL_INIT(virGetDeviceID); VIR_MOCK_REAL_INIT(virFileExists); + VIR_MOCK_REAL_INIT(virGetUserRuntimeDirectory); } unsigned long long @@ -106,3 +108,10 @@ void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED) { } + +char * +virGetUserRuntimeDirectory(void) +{ + return g_build_filename(g_getenv("LIBVIRT_FAKE_ROOT_DIR"), + "user-runtime-directory", NULL); +} -- 2.25.4

3 6

[PATCH] qemuProcessStop: Reattach NVMe disks a domain is mirroring into
by Michal Privoznik 06 May '20

06 May '20

In v5.10.0-rc1~42 (which was later fixed in v6.0.0-rc1~487) I am removing XATTRs for a file that QEMU is mirroring a disk into but it is killed meanwhile. Well, if we call qemuDomainStorageSourceAccessRevoke() instead of qemuBlockRemoveImageMetadata() then not only the file will have perms fixed (instead of left accessible to qemu) but if the mirror destination is not a file but a NVMe disk, then the disk will be reattached back to the host. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1825785 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8ea470f75f..70c71e069c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7605,7 +7605,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDiskDefPtr disk = def->disks[i]; if (disk->mirror) - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror); + qemuDomainStorageSourceAccessRevoke(driver, vm, disk->mirror); qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src); } -- 2.26.2

2 1

[libvirt PATCH 0/3] tests: Update capabilities for QEMU 5.0.0
by Andrea Bolognani 06 May '20

06 May '20

Now that QEMU 5.0.0 has been released, bring capabilities files for non-x86 architectures up to date. As usual, this series as posted to the mailing list is heavily trimmed: for the unabridged version, fetch https://gitlab.com/abologna/libvirt caps-5.0.0 Andrea Bolognani (3): tests: Update capabilities for QEMU 5.0.0 on aarch64 tests: Update capabilities for QEMU 5.0.0 on ppc64 tests: Add capabilities for QEMU 5.0.0 on riscv64 .../qemu_5.0.0-virt.aarch64.xml | 60 +- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 60 +- .../caps_5.0.0.aarch64.replies | 8937 ++--- .../caps_5.0.0.aarch64.xml | 384 +- .../caps_5.0.0.ppc64.replies | 2163 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 +- ...h64.replies => caps_5.0.0.riscv64.replies} | 27491 +++++++--------- .../caps_5.0.0.riscv64.xml | 201 + ...default-video-type-ppc64.ppc64-latest.args | 2 + ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 + ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 + ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 + ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 + .../ppc64-pseries-graphics.ppc64-latest.args | 2 + .../ppc64-pseries-headless.ppc64-latest.args | 2 + .../riscv64-virt-graphics.riscv64-latest.args | 8 +- .../riscv64-virt-headless.riscv64-latest.args | 8 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 + ...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 2 +- ...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +- ...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +- 24 files changed, 19067 insertions(+), 20294 deletions(-) copy tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies => caps_5.0.0.riscv64.replies} (78%) create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml -- 2.25.4

2 4

[libvirt-dbus PATCH] meson: Exclude some files from releases
by Andrea Bolognani 06 May '20

06 May '20

Both .mailmap and .travis.yml only make sense in the context of a git checkout, so we should not include them in releases. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 9 +++++++++ tools/nodist.sh | 5 +++++ 2 files changed, 14 insertions(+) create mode 100755 tools/nodist.sh diff --git a/meson.build b/meson.build index e765ed6..341abe9 100644 --- a/meson.build +++ b/meson.build @@ -263,6 +263,15 @@ if git foreach file : [ 'libvirt-dbus.spec', 'AUTHORS.rst' ] meson.add_dist_script('tools/dist.sh', meson.build_root(), file) endforeach + + nodist_files = [ + '.mailmap', + '.travis.yml', + ] + + foreach file : nodist_files + meson.add_dist_script('tools/nodist.sh', file) + endforeach endif diff --git a/tools/nodist.sh b/tools/nodist.sh new file mode 100755 index 0000000..f820147 --- /dev/null +++ b/tools/nodist.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +FILE=$1 + +rm -f $MESON_DIST_ROOT/$FILE -- 2.25.4

2 2

[libvirt PATCH] tests: Enable directory override for qemucapsprobe
by Andrea Bolognani 06 May '20

06 May '20

Currently, qemucapsprobe fails when libvirt is not already installed on the system: $ ./tests/qemucapsprobe /path/to/qemu-system-ppc64 >/dev/null I/O warning : failed to load external entity "/usr/share/libvirt/cpu_map/index.xml" 2020-05-06 09:49:59.136+0000: 269822: info : libvirt version: 6.4.0 2020-05-06 09:49:59.136+0000: 269822: info : hostname: [...] 2020-05-06 09:49:59.136+0000: 269822: warning : virQEMUCapsLogProbeFailure:5127 : Failed to probe capabilities for /path/to/qemu-system-ppc64: XML error: failed to parse xml document '/usr/share/libvirt/cpu_map/index.xml' It would be great if the tool could work entirely out of the build directory, and this patch achieves just that. Suggested-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemucapsprobe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index c7e8f3309d..ea88fd2e8a 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -55,6 +55,8 @@ main(int argc, char **argv) VIR_TEST_PRELOAD(mock); + virFileActivateDirOverrideForProg(argv[0]); + if (argc != 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); return EXIT_FAILURE; -- 2.25.4

2 1

[libvirt PATCH] qemu: Don't use CPU from host capabilities as host-model on ARM
by Jiri Denemark 06 May '20

06 May '20

We never supported host-model CPUs on ARM and we don't want to support them even once patches for direct detection of host CPU are merged. And since using host CPU definition for host-model CPUs exist only for backward compatibility, we should not use it for any host-model support added in the future. Such enhancement should exclusively use the result of query-cpu-model-expansion. Until proper host-model support is implemented for ARM (if ever), we need to make sure the detected host CPU is not accidentally used for host-model CPUs. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47f88481c8..7b32511c3d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3569,6 +3569,8 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, } else if (ARCH_IS_X86(qemuCaps->arch)) { ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, modelInfo, cpu, migratable); + } else if (ARCH_IS_ARM(qemuCaps->arch)) { + ret = 2; } if (ret == 0) -- 2.26.2

2 1

[libvirt RFC PATCH] network: NetworkManager script to monitor for conflicts with new interfaces
by Laine Stump 06 May '20

06 May '20

There has been a problem for several years with libvirt's default network conflicting with the host network connection on new installs, particularly when the "host" is actually virtual machine that is, itself, connected to the libvirt default network on its respective host. If the two default networks use the same subnet, and if the nested host's libvirtd happens to start its network before the system networking connects to the toplevel host, then network connectivity to the guest is just silently non-working. We've tried several things over the years to eliminate this problem, including: 1) Checking for conflicting routes/interfaces during installation of the libvirt-daemon-config-network package (the one containing the default network config file) which tries different subnets until it finds one that doesn't conflict. This helps in some cases, but fails on 2 points: a) if the installation environment is different from the environment where the system is actually run (e.g. a "live CD" image of a distro, which is built in a container by the distro maintainers, then could be run in any number of places, and b) it modifies the installed files during the rpm installation post_install script, which is now discouraged because people building container images don't like dealing with that. 2) When starting a libvirt network, we now check for any route or interface that conflicts with the new network's IP's and routes. This doesn't fix the problem, but does notify the user of the problem *as long as libvirt starts its networks after the host has started its system networks*. Neither of these help in the situation where libvirt's networks are started first. The script in this patch uses a NetworkManager facility (dispatcher.d scripts, which are run whenever any interface is brought up or down) to check for any libvirt networks that conflict with the new NetworkManager interface, and if it finds a conflict it logs a message and destroys the libvirt network. So as with case (2) above, it doesn't solve the problem, but it does make it more obvious, and also makes sure the host networking isn't borked, so you can still ssh into the machine and fix it. There are a few caveats/misgivings with the script I've come up with, which cause me to post it as just an RFC: 1) It's written in python, and uses libxml2 When I first sat down to make this script (following a suggestion by danpb during an IRC discussion), I immediately put #!/bin/bash at the top of the file, because it's supposed to be a script. But then I remembered that we're trying to narrow down the usage of languages in libvirt, and anyway it would be nice to be able to properly parse the XML to get the IP addresses/netmasks/prefixes. So I instead wrote it in python. This makes for a less ugly program, but it does mean that the daemon-config-network package is now dependent on python3-libxml (and python3 of course), which pulls in a bunch of other packages. Everybody's dev systems already have these packages and their dependencies installed (since both are required to build) and many other users systems already have them (they are required by virt-install and virt-manager, among others), including the Fedora live CD, for example. But not *all* systems have them. There has been a lot of work to reduce package bloat caused by pulling in more and more packages, so I'm reluctant to contribute to that. On the other hand, someone who is looking to minimize their system footprint will also probably not be installing the libvirt default network, so maybe it's acceptable (I'm leaning towards "not", but want to know if anyone else has a different opinion) 2) As delivered, it checks for conflicts with *all* libvirt networks. While that was fun to write, and in theory is the right thing to do, in practice it may be / probably is overkill. As we discussed in IRC, the main time when this is a problem is just after the first boot of a new OS / libvirt installation, and the only libvirt network that's going to exist at that time is the default network. So while having a loop that scans all libvirt networks is more complete, in almost all cases it is just wasting time. (I did provide a bool at the top of the script that can be modified to tell it to only check the default network, but of course the script is installed in /usr/lib, and it's not proper to modify files in /usr/lib, so that isn't a real-world solution, but more a way to allow people (i.e. "me") right now to test out the different behaviors. 3) This only works if NetworkManager is enabled. I brought this up when danpb first mentioned the idea, and he rightly pointed out that every report of this problem we've had has been from the first boot of a new install on a system that used Network Manager - anybody using any other method of networking config on their host has had to manually intervene to get it setup, but NM tries to do everything auto-magically. So while there may still be a very occasional rare occurence of a silent networking failure even with this script installed, this should eliminate 99% of the cases. So, the questions I have are: 1) Do we want to allow adding the dependency on python3-libxml to the libvirt-daemon-config-network package in order to avoid adding a bash script. Or should I just redo it in bash 2) Do we want something that checks all active networks as this does, or just the default network (and if the latter, should we make it easily modifiable to check all networks, or just strip it down as much as possible) 3) I could eliminate the libxml2 dependency by just grepping the xml for "<address .*ip=". Is reduced correctness (which is probably 0% different in practice) worth the reduced package dependencies? As a single question: on a sliding scale of "this script" -----> "simple bash script" where do we want to land? Signed-off-by: Laine Stump <laine(a)redhat.com> --- libvirt.spec.in | 2 + src/network/Makefile.inc.am | 8 +- src/network/nm-dispatcher-check-nets.py | 182 ++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 1 deletion(-) create mode 100755 src/network/nm-dispatcher-check-nets.py diff --git a/libvirt.spec.in b/libvirt.spec.in index 6abf97df85..e40068b2be 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -496,6 +496,7 @@ Requires: libvirt-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables +Requires: python3-libxml2 %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -1630,6 +1631,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%{_prefix}/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets %if %{with_firewalld_zone} %{_prefix}/lib/firewalld/zones/libvirt.xml diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 196a30e16c..d58e09f88b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -170,6 +170,9 @@ install-data-network: ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ rm -f default.xml && \ $(LN_S) ../default.xml default.xml ) + $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/NetworkManager/dispatcher.d" + $(INSTALL_DATA) $(srcdir)/network/nm-dispatcher-check-nets.py \ + $(DESTDIR)$(prefix)/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets if WITH_FIREWALLD_ZONE $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones" $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \ @@ -189,7 +192,10 @@ endif WITH_FIREWALLD_ZONE endif WITH_NETWORK -EXTRA_DIST += network/default.xml network/libvirt.zone +EXTRA_DIST += \ + network/default.xml \ + network/nm-dispatcher-check-nets.py \ + network/libvirt.zone .PHONY: \ install-data-network \ diff --git a/src/network/nm-dispatcher-check-nets.py b/src/network/nm-dispatcher-check-nets.py new file mode 100755 index 0000000000..9225a08ea1 --- /dev/null +++ b/src/network/nm-dispatcher-check-nets.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2012-2019 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# 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 libvirt +import sys +import os +import libxml2 +from ipaddress import ip_network + +# This script should be installed in +# /usr/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets. It will be +# called by NetworkManager every time a network interface is taken up +# or down. When a new network comes up, it checks the libvirt virtual +# networks to see if their IP address(es) (including any static +# routes) are in conflict with the IP address(es) (or static routes) +# of the newly added interface. If so, the libvirt network is +# disabled. It is assumed that the user will notice that their guests +# no longer have network connectvity (and/or the message logged by +# this script), see that the network has been disabled, and then +# realize the conflict when they try to restart it. +# +# set checkDefaultOnly=False to check *all* active libvirt networks +# for conflicts with the new interface. Set to True to check only the +# libvirt default network (since most networks other than the default +# network are added post-install at a time when all of the hosts other +# networks are already active, it may be overkill to check all of the +# libvirt networks for conflict here (and instead just add more +# needless overheard to bringing up a new host interface). +# +checkDefaultOnly = False + +# NB: since this file is installed in /usr/lib, it really shouldn't be +# modified by the user, but instead should be copied to +# /etc/NetworkManager/dispatcher.d, where it will override the copy in +# /usr/lib. Even that isn't a proper solution though - if we're going +# to actually have this config knob, perhaps we should check for it in +# the environment, and if someone wants to modify it they can put a +# short script in /etc that exports and environment variable and then +# calls this script? Just thinking out loud here... + +def checkconflict(conn, netname, hostnets, hostif): + + # ignore if the network has been brought down or removed since we + # got the list + try: + net = conn.networkLookupByName(netname) + except libvirt.libvirtError: + return + + if not net.isActive(): + return + + xml = net.XMLDesc() + doc = libxml2.parseDoc(xml) + ctx = doc.xpathNewContext() + + # see if NetworkManager is informing us that this libvirt network + # itself is coming online + bridge = ctx.xpathEval("/network/bridge/@name"); + if bridge and bridge[0].content == hostif: + return + + # check *all* the addresses of this network + addrs = ctx.xpathEval("/network/*[@address]") + for ip in addrs: + ctx.setContextNode(ip) + address = ctx.xpathEval("@address") + prefix = ctx.xpathEval("@prefix") + netmask = ctx.xpathEval("@netmask") + + if not (address and len(address[0].content)): + continue + + addrstr = address[0].content + if not (prefix and len(prefix[0].content)): + # check for a netmask + if not (netmask and len(netmask[0].content)): + # this element has address, but no prefix or netmask + # probably it is <mac address ...> so we can ignore it + continue + # convert netmask to prefix + prefixstr = str(ip_network("0.0.0.0/%s" % netmask[0].content).prefixlen) + else: + prefixstr = prefix[0].content + + virtnetaddress = ip_network("%s/%s" % (addrstr, prefixstr), strict = False) + # print("network %s address %s" % (netname, str(virtnetaddress))) + for hostnet in hostnets: + if virtnetaddress == hostnet: + # There is a conflict with this libvirt network and the specified + # net, so we need to disable the libvirt network + print("Conflict with host net %s when starting interface %s - bringing down libvirt network '%s'" + % (str(hostnet), hostif, netname)) + try: + net.destroy() + except libvirt.libvirtError: + print("Failed to destroy network %s" % netname) + return + return + + +def addHostNets(hostnets, countenv, addrenv): + + count = os.getenv(countenv) + if not count or count == 0: + return + + for num in range(int(count)): + addrstr = os.getenv("%s_%d" % (addrenv, num)) + if not addrstr or addrstr == "": + continue + + net = ip_network(addrstr.split()[0], strict=False) + if net: + hostnets.append(net) + return + + +############################################################ + +if sys.argv[2] != "up": + sys.exit(0) + +hostif = sys.argv[1] + +try: + conn = libvirt.open(None) +except libvirt.libvirtError: + print('Failed to open connection to the hypervisor') + sys.exit(0) + +if checkDefaultOnly: + nets = [] + net = conn.networkLookupByName("default") + if not (net and net.isActive()): + sys.exit(0) + nets.append(net) +else: + nets = conn.listAllNetworks(libvirt.VIR_CONNECT_LIST_NETWORKS_ACTIVE) + if not nets: + sys.exit(0) + +# We have at least one active network. Build a list of all network +# routes added by the new interface, and compare that list to the list +# of all networks used by each active libvirt network. If any are an +# exact match, then we have a conflict and need to shut down the +# libvirt network to avoid killing host networking. + +# When NetworkManager calls scripts in /etc/NetworkManager/dispatcher.d +# it will have all IP addresses and routes associated with the interface +# that is going up or down in the following environment variables: +# +# IP4_NUM_ADDRESSES - number of IPv4 addresses +# IP4_ADDRESS_N - one variable for each address, starting at _0 +# IP4_NUM_ROUTES - number of IPv5 routes +# IP4_ROUTE_N - one for each route, starting at _0 +# (replace "IP4" with "IP6" and repeat) +# +hostnets = [] +addHostNets(hostnets, "IP4_NUM_ADDRESSES", "IP4_ADDRESS"); +addHostNets(hostnets, "IP4_NUM_ROUTES", "IP4_ROUTE"); +addHostNets(hostnets, "IP6_NUM_ADDRESSES", "IP6_ADDRESS"); +addHostNets(hostnets, "IP6_NUM_ROUTES", "IP6_ROUTE"); + +for net in nets: + + checkconflict(conn, net.name(), hostnets, hostif) -- 2.25.4

3 3

[libvirt PATCH] gitlab: move some jobs onto CentOS 8
by Daniel P. Berrangé 05 May '20

05 May '20

So that we don't have to chase frequent Fedora releases, move the non-build related jobs onto the long life CentOS 8 distro. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3025f031a..149334ed6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ website: - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Website' name: 'website' @@ -191,7 +191,7 @@ codestyle: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE syntax-check - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest # This artifact published by this job is downloaded to push to Weblate @@ -211,7 +211,7 @@ potfile: - $MAKE -C po libvirt.pot - cd .. - mv build/po/libvirt.pot libvirt.pot - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Potfile' name: 'potfile' -- 2.26.2

2 1

[libvirt-ci PATCH] guests: add libvirt-rust project packages
by Daniel P. Berrangé 05 May '20

05 May '20

On FreeBSD there is no separate "cargo" package, as the command is part of the amin "rust" package. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 8 ++++++++ guests/vars/projects/libvirt-rust.yml | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 guests/vars/projects/libvirt-rust.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..b78ce95 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -109,6 +109,10 @@ mappings: default: ca-certificates FreeBSD: ca_root_nss + cargo: + default: cargo + pkg: + ccache: default: ccache @@ -935,6 +939,10 @@ mappings: rpmbuild: rpm: rpm-build + rust: + default: rust + deb: rustc + sanlock: deb: libsanlock-dev rpm: sanlock-devel diff --git a/guests/vars/projects/libvirt-rust.yml b/guests/vars/projects/libvirt-rust.yml new file mode 100644 index 0000000..978d5ef --- /dev/null +++ b/guests/vars/projects/libvirt-rust.yml @@ -0,0 +1,4 @@ +--- +packages: + - cargo + - rust -- 2.26.2

2 2

[libvirt-ci PATCH v3] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..d109d87 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,18 @@ mappings: OpenSUSE: CentOS7: + php: + deb: php-dev + rpm: php-devel + pkg: php74 + + php-imagick: + deb: php-imagick + rpm: php-pecl-imagick + pkg: php74-pecl-imagick + OpenSUSE: php-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 1

[libvirt-ci PATCH v2] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..3290201 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,18 @@ mappings: OpenSUSE: CentOS7: + php: + deb: php-dev + rpm: php-devel + pkg: php74 + + php-imagick: + default: php-imagick + FreeBSD: php74-pecl-imagick + Fedora: php-pecl-imagick + CentOS: php-pecl-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 9

Re: Backup of vm disk images
by Stefan Hajnoczi 05 May '20

05 May '20

On Wed, Apr 22, 2020 at 07:51:09AM +0200, Anders Östling wrote: > I am fighting to understand the difference between backing up a VM by > using a regular copy vs using the virsh blockcopy command. > What I want to do is to suspend the vm, copy the XML and .QCOW2 files > and then resume the vm again. What are your thoughts? What are the > drawbacks compared to other methods? Hi Anders, The kvm(a)vger.kernel.org mailing list is mostly for the discussion and development of the KVM kernel module so you may not get replies. I have CCed libvir-list and developers who have been involved in libvirt backup features. A naive cp(1) command will be very slow because the entire disk image is copied to a new file. The fastest solution with cp(1) is the --reflink flag which basically takes a snapshot of the file and shares the disk blocks (only available when the host file system supports it and not available across mounts). Libvirt's backup commands are more powerful. They can do things like copy out a point-in-time snapshot of the disk while the guest is running. They also support incremental backup so you don't need to store a full copy of the disk image each time you take a backup. I hope others will join the discussion and give examples of some of the available features. Stefan

4 3

[libvirt-ci PATCH] guests: add libvirt-publican and libvirt-appdev-guide-python projects
by Daniel P. Berrangé 05 May '20

05 May '20

The former provides a publican brand, while the latter provides the developer guide for the Python API. We want to use these to publish the docs in GitLab CI. Since the publican toolchain isn't available on FreeBSD, the projects aren't added to the VM host/project mappings. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt-appdev-guide-python.yml | 3 +++ guests/vars/projects/libvirt-publican.yml | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 guests/vars/projects/libvirt-appdev-guide-python.yml create mode 100644 guests/vars/projects/libvirt-publican.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..c5951d6 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -845,6 +845,10 @@ mappings: OpenSUSE: libpulse-devel cross-policy-deb: foreign + publican: + default: publican + pkg: + python3-docutils: default: python3-docutils FreeBSD: py37-docutils diff --git a/guests/vars/projects/libvirt-appdev-guide-python.yml b/guests/vars/projects/libvirt-appdev-guide-python.yml new file mode 100644 index 0000000..85f54bf --- /dev/null +++ b/guests/vars/projects/libvirt-appdev-guide-python.yml @@ -0,0 +1,3 @@ +--- +packages: + - publican diff --git a/guests/vars/projects/libvirt-publican.yml b/guests/vars/projects/libvirt-publican.yml new file mode 100644 index 0000000..85f54bf --- /dev/null +++ b/guests/vars/projects/libvirt-publican.yml @@ -0,0 +1,3 @@ +--- +packages: + - publican -- 2.26.2

1 0

[PATCH] virt-host-validate-bhyve.c: Reintroduce @ret to virHostValidateBhyve()
by Michal Privoznik 05 May '20

05 May '20

This partially reverts fe65e9c8b50c9029cba0e8c386162d293cd443d2. In the referenced commit I removed @ret from virHostValidateBhyve() thinking it wasn't used when in fact it is - it's usage is hidden under MODULE_STATUS_WARN(). Reintroduce the variable back. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virt-host-validate-bhyve.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virt-host-validate-bhyve.c b/tools/virt-host-validate-bhyve.c index 3e8cc59a38..2f0ec1e36c 100644 --- a/tools/virt-host-validate-bhyve.c +++ b/tools/virt-host-validate-bhyve.c @@ -47,6 +47,7 @@ int virHostValidateBhyve(void) { + int ret = 0; int fileid = 0; struct kld_file_stat stat; bool vmm_loaded = false, if_tap_loaded = false; @@ -72,5 +73,5 @@ int virHostValidateBhyve(void) MODULE_STATUS_WARN(if_bridge, "bridged networking will not work"); MODULE_STATUS_WARN(nmdm, "nmdm console will not work"); - return 0; + return ret; } -- 2.26.2

2 1

[PATCH 0/4] Random almost trivial improvements
by Michal Privoznik 05 May '20

05 May '20

These all stem out from me playing with coccinelle. Michal Prívozník (4): virnetserver: Check for virNetServerClientInitKeepAlive() retval rpc: Make some functions void lib: Drop needless ret variables src: Fix boolean assignment src/conf/nwfilter_conf.c | 6 +++--- src/conf/virstorageobj.c | 2 +- src/locking/lock_daemon.c | 3 +-- src/logging/log_daemon.c | 3 +-- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_agent.c | 10 +++++----- src/qemu/qemu_monitor.c | 4 ++-- src/remote/remote_daemon.c | 2 +- src/remote/remote_daemon_config.c | 8 ++++---- src/remote/remote_driver.c | 2 +- src/rpc/virnetlibsshsession.c | 4 +--- src/rpc/virnetlibsshsession.h | 4 ++-- src/rpc/virnetserver.c | 7 ++++--- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetsocket.c | 6 ++---- src/rpc/virnetsshsession.c | 4 +--- src/rpc/virnetsshsession.h | 4 ++-- src/storage/storage_backend_mpath.c | 3 +-- src/util/virnetlink.c | 2 +- src/util/virtime.c | 4 ++-- src/util/viruri.c | 2 +- src/vmx/vmx.c | 4 ++-- tools/virt-host-validate-bhyve.c | 3 +-- 24 files changed, 42 insertions(+), 51 deletions(-) -- 2.26.2

2 6

[libvirt-ci PATCH] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 11 +++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..4fec6f4 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,17 @@ mappings: OpenSUSE: CentOS7: + php: + default: php + FreeBSD: php74 + + php-imagick: + default: php-imagick + FreeBSD: php74-pecl-imagick + Fedora: php-pecl-imagick + CentOS: php-pecl-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 2

[libvirt-python PATCH] setup: post-release version bump to 6.4.0
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 71a2a7f..cb24f30 100755 --- a/setup.py +++ b/setup.py @@ -339,7 +339,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '6.3.0', + version = '6.4.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.26.2

1 0

[libvirt PATCH] remote: fix driver name check for libxl driver
by Daniel P. Berrangé 05 May '20

05 May '20

The virConnectGetType() returns "xenlight" for libxl, not "LIBXL". This prevents users opening a connection to the libxl driver when using the modular daemons. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 5d1c6971c0..a8ac795d71 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, VIR_DEBUG("Primary driver type is '%s'", type); if (STREQ(type, "QEMU") || - STREQ(type, "LIBXL") || + STREQ(type, "xenlight") || STREQ(type, "LXC") || STREQ(type, "VBOX") || STREQ(type, "bhyve") || -- 2.26.2

4 6

[libvirt-python PATCH v2] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Daniel P. Berrangé 05 May '20

05 May '20

With the introduction of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index dced716..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-python PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..3472318 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +============================== +Contributing to libvirt-python +============================== + +The libvirt Python API binding accepts code contributions via merge requests +on the GitLab project: + +https://gitlab.com/libvirt/libvirt-python/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + +https://gitlab.com/libvirt/libvirt-python/pipelines + +CI pipeline results for merge requests will be visible via the contributors' +own private repository fork: + +https://gitlab.com/yourusername/libvirt-python/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 1

[PATCH] Drop needless variable
by Michal Privoznik 05 May '20

05 May '20

Instead of the following pattern: type ret; ... ret = func(); return ret; we can use: return func() directly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 8 +------- src/conf/domain_conf.c | 8 +++----- src/conf/network_conf.c | 5 +---- src/conf/virnetworkportdef.c | 5 +---- src/qemu/qemu_capabilities.c | 5 +---- src/qemu/qemu_command.c | 8 ++------ src/qemu/qemu_conf.c | 9 ++------- src/qemu/qemu_domain.c | 12 +++--------- src/qemu/qemu_driver.c | 18 ++++++------------ src/qemu/qemu_tpm.c | 11 ++--------- src/security/security_apparmor.c | 5 +---- src/security/security_util.c | 9 +++------ src/storage/storage_driver.c | 7 ++----- src/util/vircgroup.c | 5 +---- src/util/virmdev.c | 10 ++-------- src/util/virresctrl.c | 6 +----- src/util/virsocketaddr.c | 5 +---- src/util/virutil.c | 8 +++----- tests/qemuxml2argvtest.c | 6 +----- 19 files changed, 37 insertions(+), 113 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5652bc9a33..8623e79daf 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1392,13 +1392,7 @@ virDomainPCIAddressSetAllMulti(virDomainDefPtr def) static char* virDomainCCWAddressAsString(virDomainDeviceCCWAddressPtr addr) { - char *addrstr = NULL; - - addrstr = g_strdup_printf("%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno); - return addrstr; + return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->devno); } static int diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8a87586936..83748354b0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31316,54 +31316,52 @@ char * virDomainDefGetShortName(const virDomainDef *def) { wchar_t wshortname[VIR_DOMAIN_SHORT_NAME_MAX + 1] = {0}; size_t len = 0; - char *ret = NULL; g_autofree char *shortname = NULL; /* No need to do the whole conversion thing when there are no multibyte * characters. The same applies for illegal sequences as they can occur * with incompatible locales. */ len = mbstowcs(NULL, def->name, 0); if ((len == (size_t) -1 && errno == EILSEQ) || len == strlen(def->name)) { - ret = g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, def->name); - return ret; + return g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, + def->name); } if (len == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } if (mbstowcs(wshortname, def->name, VIR_DOMAIN_SHORT_NAME_MAX) == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } len = wcstombs(NULL, wshortname, 0); if (len == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } if (VIR_ALLOC_N(shortname, len + 1) < 0) return NULL; if (wcstombs(shortname, wshortname, len) == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } - ret = g_strdup_printf("%d-%s", def->id, shortname); - return ret; + return g_strdup_printf("%d-%s", def->id, shortname); } #undef VIR_DOMAIN_SHORT_NAME_MAX diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index a7c177f8db..dc64ce6959 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2892,10 +2892,7 @@ char * virNetworkConfigFile(const char *dir, const char *name) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a4cffea8b6..2013e11dff 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -432,10 +432,7 @@ static char * virNetworkPortDefConfigFile(const char *dir, const char *name) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47f88481c8..c7e58f92ae 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4467,79 +4467,76 @@ char * virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; - char *ret = NULL; size_t i; virBufferAddLit(&buf, "<qemuCaps>\n"); virBufferAdjustIndent(&buf, 2); virBufferEscapeString(&buf, "<emulator>%s</emulator>\n", qemuCaps->binary); virBufferAsprintf(&buf, "<qemuctime>%llu</qemuctime>\n", (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "<selfctime>%llu</selfctime>\n", (long long)qemuCaps->libvirtCtime); virBufferAsprintf(&buf, "<selfvers>%lu</selfvers>\n", (unsigned long)qemuCaps->libvirtVersion); for (i = 0; i < QEMU_CAPS_LAST; i++) { if (virQEMUCapsGet(qemuCaps, i)) { virBufferAsprintf(&buf, "<flag name='%s'/>\n", virQEMUCapsTypeToString(i)); } } virBufferAsprintf(&buf, "<version>%d</version>\n", qemuCaps->version); virBufferAsprintf(&buf, "<kvmVersion>%d</kvmVersion>\n", qemuCaps->kvmVersion); virBufferAsprintf(&buf, "<microcodeVersion>%u</microcodeVersion>\n", qemuCaps->microcodeVersion); if (qemuCaps->package) virBufferAsprintf(&buf, "<package>%s</package>\n", qemuCaps->package); if (qemuCaps->kernelVersion) virBufferAsprintf(&buf, "<kernelVersion>%s</kernelVersion>\n", qemuCaps->kernelVersion); virBufferAsprintf(&buf, "<arch>%s</arch>\n", virArchToString(qemuCaps->arch)); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU); for (i = 0; i < qemuCaps->ngicCapabilities; i++) { virGICCapabilityPtr cap; bool kernel; bool emulated; cap = &qemuCaps->gicCapabilities[i]; kernel = (cap->implementation & VIR_GIC_IMPLEMENTATION_KERNEL); emulated = (cap->implementation & VIR_GIC_IMPLEMENTATION_EMULATED); virBufferAsprintf(&buf, "<gic version='%d' kernel='%s' emulated='%s'/>\n", cap->version, kernel ? "yes" : "no", emulated ? "yes" : "no"); } if (qemuCaps->sevCapabilities) virQEMUCapsFormatSEVInfo(qemuCaps, &buf); if (qemuCaps->kvmSupportsNesting) virBufferAddLit(&buf, "<kvmSupportsNesting/>\n"); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</qemuCaps>\n"); - ret = virBufferContentAndReset(&buf); - - return ret; + return virBufferContentAndReset(&buf); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6acfc0b19d..269bdbaf56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -251,44 +251,40 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, static char * qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) { - char *result = NULL; int idx = virCommandPassFDGetFDIndex(cmd, fd); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), fd); return NULL; } - result = g_strdup_printf("set=%d,fd=%d", idx, fd); - return result; + return g_strdup_printf("set=%d,fd=%d", idx, fd); } /** * qemuVirCommandGetDevSet: * @cmd: the command to modify * @fd: fd to reassign to the child * * Get the parameters for the QEMU path= parameter where a file * descriptor is accessed via a file descriptor set, for example * /dev/fdset/10. The file descriptor must previously have been * 'transferred' in a virCommandPassFD() call. */ static char * qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) { - char *result = NULL; int idx = virCommandPassFDGetFDIndex(cmd, fd); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), fd); return NULL; } - result = g_strdup_printf("/dev/fdset/%d", idx); - return result; + return g_strdup_printf("/dev/fdset/%d", idx); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c59824006c..2d5e527b47 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1429,29 +1429,26 @@ char * qemuGetSharedDeviceKey(const char *device_path) { int maj, min; - char *key = NULL; int rc; if ((rc = virGetDeviceID(device_path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get minor number of device '%s'"), device_path); return NULL; } - key = g_strdup_printf("%d:%d", maj, min); - - return key; + return g_strdup_printf("%d:%d", maj, min); } /* * Make necessary checks for the need to check and for the current setting * of the 'unpriv_sgio' value for the device_path passed. * * Returns: * 0 - Success * -1 - Some failure which would already have been messaged * -2 - Mismatch with the "shared" sgio setting - needs to be messaged * by caller since it has context of which type of disk resource is * being used and in the future the hostdev information. */ @@ -1704,19 +1701,17 @@ static char * qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; g_autofree char *dev_name = NULL; - char *dev_path = NULL; if (!(dev_name = virSCSIDeviceGetDevName(NULL, scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit))) return NULL; - dev_path = g_strdup_printf("/dev/%s", dev_name); - return dev_path; + return g_strdup_printf("/dev/%s", dev_name); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d63ec2313b..9c629c31a3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6835,17 +6835,14 @@ virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, virDomainDefPtr src, unsigned int flags) { - virDomainDefPtr ret = NULL; g_autofree char *xml = NULL; if (!(xml = qemuDomainDefFormatXML(driver, qemuCaps, src, flags))) return NULL; - ret = qemuDomainDefFromXML(driver, qemuCaps, xml); - - return ret; + return qemuDomainDefFromXML(driver, qemuCaps, xml); } @@ -13364,17 +13361,14 @@ qemuProcessEventFree(struct qemuProcessEvent *event) char * qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAlias()); - - return ret; + return g_strdup_printf("%s/%s.sock", priv->libDir, + qemuDomainGetManagedPRAlias()); } /** * qemuDomainStorageIdNew: * @priv: qemu VM private data object. * * Generate a new unique id for a storage object. Useful for node name generation. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d5aeeac66d..1c7c87128d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7439,31 +7439,25 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, static int qemuConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, - conn); - - return ret; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - - return ret; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 58dfdf689a..fe567f440c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -171,19 +171,15 @@ static char * qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, const char *shortName) { - char *path = NULL; - - path = g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); - - return path; + return g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); } /* * qemuTPMEmulatorInitPaths: * * @tpm: TPM definition for an emulator type * @swtpmStorageDir: the general swtpm storage dir which is used as a base * directory for creating VM specific directories * @uuid: the UUID of the VM */ @@ -213,25 +209,22 @@ static char * qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, const char *shortName) { - char *pidfile = NULL; g_autofree char *devicename = NULL; devicename = g_strdup_printf("%s-swtpm", shortName); - pidfile = virPidFileBuildPath(swtpmStateDir, devicename); - - return pidfile; + return virPidFileBuildPath(swtpmStateDir, devicename); } /* * qemuTPMEmulatorGetPid * * @swtpmStateDir: the directory where swtpm writes the pidfile into * @shortName: short name of the domain * @pid: pointer to pid * * Return -1 upon error, or zero on successful reading of the pidfile. * If the PID was not still alive, zero will be returned, and @pid will be * set to -1; */ diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 3bc200ffb3..7c8fd39584 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -213,15 +213,12 @@ static char * get_profile_name(virDomainDefPtr def) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *name = NULL; virUUIDFormat(def->uuid, uuidstr); - name = g_strdup_printf("%s%s", AA_PREFIX, uuidstr); - - return name; + return g_strdup_printf("%s%s", AA_PREFIX, uuidstr); } /* returns -1 on error or profile for libvirtd is unconfined, 0 if complain * mode and 1 if enforcing. This is required because at present you cannot * aa_change_profile() from a process that is unconfined. */ diff --git a/src/security/security_util.c b/src/security/security_util.c index 4f661fd75e..7fa5163fe4 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -92,9 +92,8 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UNUSED) static char * virSecurityGetTimestampAttrName(const char *name) { - char *ret = NULL; - ret = g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s", name); - return ret; + return g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s", + name); } #else /* !XATTR_NAMESPACE */ static char * @@ -112,49 +111,47 @@ static char * virSecurityGetTimestamp(void) { unsigned long long boottime = 0; - char *ret = NULL; if (virHostGetBootTime(&boottime) < 0) { virReportSystemError(errno, "%s", _("Unable to get host boot time")); return NULL; } - ret = g_strdup_printf("%llu", boottime); - return ret; + return g_strdup_printf("%llu", boottime); } /** * virSecurityValidateTimestamp: * @name: security driver name * @path: file name * * Check if remembered label on @path for security driver @name * is valid, i.e. the label has been set since the last boot. If * the label was set in previous runs, all XATTRs related to * @name are removed so that clean slate is restored. * * This is done having extra attribute timestamp_$SECDRIVER which * contains the host boot time. Its value is then compared to * actual host boot time. If these two values don't match then * XATTRs are considered as stale and thus invalid. * * In ideal world, where there network file systems have XATTRs * using plain host boot time is not enough as it may lead to a * situation where a freshly started host sees XATTRs, sees the * timestamp put there by some longer running host and considers * the XATTRs invalid. Well, there is not an easy way out. We * would need to somehow check if the longer running host is * still there and uses the @path (how?). * Fortunately, there is only one network file system which * supports XATTRs currently (GlusterFS via FUSE) and it is used * so rarely that it's almost a corner case. * The worst thing that happens there is that we remove XATTRs * and thus return @path to the default label for $SECDRIVER. * * Returns: 0 if remembered label is valid, * 1 if remembered label was not valid, * -2 if underlying file system doesn't support XATTRs, * -1 otherwise. */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2db763caa5..7e82c09be5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2837,13 +2837,10 @@ char * virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStorageVolDefPtr voldef) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); - char *tmp = NULL; - - tmp = g_strdup_printf("%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name); - return tmp; + return g_strdup_printf("%s/%s.%s.secret.XXXXXX", driver->stateDir, + def->name, voldef->name); } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 70d85200cb..bb535df4f2 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -423,28 +423,25 @@ virCgroupDetect(virCgroupPtr group, char * virCgroupGetBlockDevString(const char *path) { - char *ret = NULL; struct stat sb; if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Path '%s' is not accessible"), path); return NULL; } if (!S_ISBLK(sb.st_mode)) { virReportSystemError(EINVAL, _("Path '%s' must be a block device"), path); return NULL; } /* Automatically append space after the string since all callers * use it anyway */ - ret = g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); - - return ret; + return g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c2499c0a20..51a88a91d7 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -206,31 +206,28 @@ char * virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) { g_autofree char *result_path = NULL; g_autofree char *result_file = NULL; g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); - char *vfio_path = NULL; if (!dev_path) return NULL; iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path); return NULL; } if (virFileResolveLink(iommu_path, &result_path) < 0) { virReportSystemError(errno, _("failed to resolve '%s'"), iommu_path); return NULL; } result_file = g_path_get_basename(result_path); - vfio_path = g_strdup_printf("/dev/vfio/%s", result_file); - - return vfio_path; + return g_strdup_printf("/dev/vfio/%s", result_file); } @@ -422,10 +419,7 @@ virMediatedDeviceIsUsed(virMediatedDevicePtr dev, char * virMediatedDeviceGetSysfsPath(const char *uuidstr) { - char *ret = NULL; - - ret = g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); - return ret; + return g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index c537d606cc..e17f6bd1bd 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2307,19 +2307,15 @@ static char * virResctrlDeterminePath(const char *parentpath, const char *prefix, const char *id) { - char *path = NULL; - if (!id) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Resctrl ID must be set before determining resctrl " "parentpath='%s' prefix='%s'"), parentpath, prefix); return NULL; } - path = g_strdup_printf("%s/%s-%s", parentpath, prefix, id); - - return path; + return g_strdup_printf("%s/%s-%s", parentpath, prefix, id); } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4c9f124e88..a858a69204 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -578,35 +578,32 @@ char * virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUSED) { #ifndef WIN32 - char *path = NULL; if (addr == NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("No socket address provided")); return NULL; } if (addr->data.sa.sa_family != AF_UNIX) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; } - path = g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_path)); - - return path; + return g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_path)); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("UNIX sockets not supported on this platform")); return NULL; #endif } /** * virSocketAddrIsNetmask: * @netmask: the netmask address * * Check that @netmask is a proper network mask * * Returns 0 in case of success and -1 in case of error */ diff --git a/src/util/virutil.c b/src/util/virutil.c index 5b52e4e6d4..fb46501142 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1419,21 +1419,19 @@ char * virGetUnprivSGIOSysfsPath(const char *path, const char *sysfs_dir) { int maj, min; - char *sysfs_path = NULL; int rc; if ((rc = virGetDeviceID(path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get device ID '%s'"), path); return NULL; } - sysfs_path = g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min); - return sysfs_path; + return g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, maj, + min); } int diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4a303c0185..04febd1b0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -185,11 +185,7 @@ fakeStorageVolGetInfo(virStorageVolPtr vol, static char * fakeStorageVolGetPath(virStorageVolPtr vol) { - char *ret = NULL; - - ret = g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); - - return ret; + return g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); } -- 2.26.2

3 3

libvirt-devaddr: a new library for device address assignment
by Daniel P. Berrangé 05 May '20

05 May '20

We've been doing alot of refactoring of code in recent times, and also have plans for significant infrastructure changes. We still need to spend time delivering interesting features to users / applications. This mail is to introduce an idea for a solution to an specific area applications have had long term pain with libvirt's current "mechanism, not policy" approach - device addressing. This is a way for us to show brand new ideas & approaches for what the libvirt project can deliver in terms of management APIs. To set expectations straight: I have written no code for this yet, merely identified the gap & conceptual solution. The device addressing problem ============================= One of the key jobs libvirt does when processing a new domain XML configuration is to assign addresses to all devices that are present. This involves adding various device controllers (PCI bridges, PCI root ports, IDE/SCSI buses, USB controllers, etc) if they are not already present, and then assigning PCI, USB, IDE, SCSI, etc, addresses to each device so they are associated with controllers. When libvirt spawns a QEMU guest, it will pass full address information to QEMU. Libvirt, as a general rule, aims to avoid defining and implementing policy around expansion of guest configuration / defaults, however, it is inescapable in the case of device addressing due to the need to guarantee a stable hardware ABI to make live migration and save/restore to disk work. The policy that libvirt has implemented for device addressing is, as much as possible, the same as the addressing scheme QEMU would apply itself. While libvirt succeeds in its goal of providing a stable hardware API, the addressing scheme used is not well suited to all deployment scenarios of QEMU. This is an inevitable result of having a specific assignment policy implemented in libvirt which has to trade off mutually incompatible use cases/goals. When the libvirt addressing policy is not been sufficient, management applications are forced to take on address assignment themselves, which is a massive non-trivial job with many subtle problems to consider. Places where libvirt's addressing is insufficient for PCI include * Setting up multiple guest NUMA nodes and associating devices to specific nodes * Pre-emptive creation of extra PCIe root ports, to allow for later device hotplug on PCIe topologies * Determining whether to place a device on a PCI or PCIe bridge * Controlling whether a device is placed into a hotpluggable slot * Controlling whether a PCIe root port supports hotplug or not * Determining whether to places all devices on distinct slots or buses, vs grouping them all into functions on the same slot * Ability to expand the device addressing without being on the hypervisor host Libvirt wishes to avoid implementing many different address assignment policies. It also wishes to keep the domain XML as a representation of the virtual hardware, not add a bunch of properties to it which merely serve as tunable input parameters for device addressing algorithms. There is thus a dilemma here. Management applications increasingly need fine grained control over device addressing, while libvirt doesn't want to expose fine grained policy controls via the XML. The new libvirt-devaddr API =========================== The way out of this is to define a brand new virt management API which tackles this specific problem in a way that addresses all the problems mgmt apps have with device addressing and explicitly provides a variety of policy impls with tunable behaviour. By "new API", I actually mean an entirely new library, completely distinct from libvirt.so, or anything else we've delivered so far. The closest we've come to delivering something at this kind of conceptual level, would be the abortive attempt we made with "libvirt-builder" to deliver a policy-driven API instead of mechanism based. This proposal is still quite different from that attempt. At a high level * The new API is "libvirt-devaddr" - short for "libvirt device addressing" * As input it will take 1. The guest CPU architecture and machine type 2. A list of global tunables specifying desired behaviour of the address assignment policy 3. A minimal list of devices needed in the virtual machine, with optional addresses and optional per-device tunables to override the global tunables * As output it will emit 1. fully expanded list of devices needed in the virtual machine, with addressing information sufficient to ensure stable hardware ABI Initially the API would implement something that behaves the same way as libvirt's current address assignment API. The intended usage would be * Mgmt application makes a minimal list of devices they want in their guest * List of devices is fed into libvirt-devaddr API * Mgmt application gets back a full list of devices & addresses * Mgmt application writes a libvirt XML doc using this full list & addresses * Mgmt application creates the guest in libvirt IOW, this new "libvirt-devaddr" API is intended to be used prior to creating the XML that is used by libvirt. The API could also be used prior to needing to hotplug a new device to an existing guest. This API is intended to be a deliverable of the libvirt project, but it would be completely independent of the current libvirt API. Most especially note that it would NOT use the domain XML in any way. This gives applications maximum flexibility in how they consume this functionality, not trying to force a way to build domain XML. It would have greater freedom in its API design, making different choices from libvirt.so on topics such as programming language (C vs Go vs Python etc), API stability timeframe (forever stable vs sometimes changing API), data formats (structs, vs YAML/JSON vs XML etc), and of course the conceptual approach (policy vs mechanism) The expectation is that this new API would be most likely to be consumed by KubeVirt, OpenStack, Kata, as the list of problems shown earlier is directly based on issues seen working with KubeVirt & OpenStack in particular. It is not limited to these applications and is broadly useful as conceptual thing. It would be a goal that this API should also be used by libvirt itself to replace its current internal device addressing impl. Essentially the new API should be seen as a way to expose/extract the current libvirt internal algorithm, making it available to applications in a flexible manner. I don't anticipate actually copying the current addressing code in libvirt as-is, but it would certainly serve as reference for the kind of logic we need to implement, so you might consider it a "port" or "rewrite" in some very rough sense. I think this new API concept is a good way for the project make a start in using Go for libvirt. The functionality covered has a clearly defined scope limit, making it practical to deliver a real impl in a reasonably short time frame. Extracting this will provide a real world benefit to our application consumers, solving many long standing problems they have with libvirt, and thus justify the effort in doing this work in libvirt in a non-C language. The main question mark would be about how we might make this functionality available to Python apps if we chose Go. It is possible to expose a C API from Go, and we would need this to consume it from libvirt. There is then the need to manually write a Python API binding which is tedious work. 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 :|

7 14

[PATCH 0/3] Xen: Improve the naming mess
by Jim Fehlig 05 May '20

05 May '20

Let's hope it's an improvement :-). See individual patches for details. Jim Fehlig (3): libxl: Use the name 'Xen' in driver tables libxl: Clarify that 'xenlight' should only be used internally docs: Xen improvements docs/aclpolkit.html.in | 4 ++-- docs/formatdomain.html.in | 6 +++--- src/libxl/libxl_conf.h | 8 +++++++- src/libxl/libxl_domain.c | 4 ++-- src/libxl/libxl_driver.c | 20 ++++++++++---------- 5 files changed, 24 insertions(+), 18 deletions(-) -- 2.26.0

2 4

[libvirt PATCH v2] remote: fix driver name check for libxl driver
by Daniel P. Berrangé 04 May '20

04 May '20

The virConnectGetType() returns "Xen" for libxl, not "LIBXL". This prevents users opening a connection to the libxl driver when using the modular daemons. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 5d1c6971c0..6f67d2fb30 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, VIR_DEBUG("Primary driver type is '%s'", type); if (STREQ(type, "QEMU") || - STREQ(type, "LIBXL") || + STREQ(type, "Xen") || STREQ(type, "LXC") || STREQ(type, "VBOX") || STREQ(type, "bhyve") || -- 2.26.2

2 1

[libvirt-python PATCH] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Daniel P. Berrangé 04 May '20

04 May '20

With the introduce of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ This CONTRIBUTING.rst is intentionally fairly generic, as I intend to reuse it for most other projects too (libvirt.git being the exception which has far more details). 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index dced716..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-python PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..11e3c41 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +============================== +Contributing to libvirt-python +============================== + +The libvirt Python API binding accepts code contributions via merge requests +on the GitLab project: + + https://gitlab.com/libvirt/libvirt-python/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + + https://gitlab.com/libvirt/libvirt-python/pipelines + +CI pipline results for merge requests will be visible via the contributors' +own private repository fork: + + https://gitlab.com/::YOUR-USER-NAME::/libvirt-python/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + + https://developercertificate.org/ + +In indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submittor's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 2

[libvirt PATCH 0/2] CONTRIBUTING: Clean up and improve
by Andrea Bolognani 04 May '20

04 May '20

Andrea Bolognani (2): CONTRIBUTING: Indent command by three spaces CONTRIBUTING: Include note about build system tools CONTRIBUTING.rst | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -- 2.25.4

3 12

[libvirt PATCH] gitlab: update list of distros used to use latest versions
by Daniel P. Berrangé 04 May '20

04 May '20

Replace Fedora 30 with Fedora 32 Replace Ubuntu 16.04 with Ubuntu 20.04 Switch generic jobs from Fedora 31 to Fedora 32 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99e7b510c7..d4df2a02cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,14 +85,14 @@ x64-centos-8: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-centos-8:latest -x64-fedora-30: - <<: *native_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30:latest - x64-fedora-31: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest +x64-fedora-32: + <<: *native_build_default_job_definition + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest + x64-fedora-rawhide: <<: *native_build_default_job_definition image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide:latest @@ -101,14 +101,14 @@ x64-opensuse-151: <<: *native_build_default_job_definition image: quay.io/libvirt/buildenv-libvirt-opensuse-151:latest -x64-ubuntu-1604: - <<: *native_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-ubuntu-1604:latest - x64-ubuntu-1804: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-ubuntu-1804:latest +x64-ubuntu-2004: + <<: *native_build_default_job_definition + image: quay.io/libvirt/buildenv-libvirt-ubuntu-2004:latest + # Cross compiled build jobs @@ -148,13 +148,13 @@ mipsel-debian-sid: <<: *cross_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-mipsel:latest -mingw32-fedora-30: +mingw32-fedora-rawhide: <<: *cross_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30-cross-mingw32:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide-cross-mingw32:latest -mingw64-fedora-30: +mingw64-fedora-rawhide: <<: *cross_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30-cross-mingw64:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide-cross-mingw64:latest # This artifact published by this job is downloaded by libvirt.org to @@ -172,7 +172,7 @@ website: - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest artifacts: expose_as: 'Website' name: 'website' @@ -191,7 +191,7 @@ codestyle: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE syntax-check - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest # This artifact published by this job is downloaded to push to Weblate @@ -211,7 +211,7 @@ potfile: - $MAKE -C po libvirt.pot - cd .. - mv build/po/libvirt.pot libvirt.pot - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest artifacts: expose_as: 'Potfile' name: 'potfile' @@ -226,7 +226,7 @@ potfile: # to test developer's personal branches. dco: stage: prebuild - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest before_script: - *script_variables script: -- 2.26.2

2 1

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

04 May '20

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

4 4

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

04 May '20

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

2 3

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

04 May '20

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

4 3

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

04 May '20

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

2 1

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

04 May '20

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

2 1

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

01 May '20

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

2 1

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

01 May '20

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

3 6

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

01 May '20

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

3 3