- Devel - libvirt List Archives

[libvirt] [PATCH] spec: fix indentation fix
by Ján Tomko 11 Dec '19

11 Dec '19

The RPM tags must not be indented. Fixes: 6b8ab20f9b9b1a9383bd2cb9a075f57beb196c1c Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- libvirt.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Pushed as a build breaker fix. diff --git a/libvirt.spec.in b/libvirt.spec.in index 4d75fbecaf..bd08222527 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -336,11 +336,11 @@ BuildRequires: device-mapper-devel BuildRequires: xfsprogs-devel %if %{with_storage_rbd} %if 0%{?fedora} || 0%{?rhel} > 7 - BuildRequires: librados-devel - BuildRequires: librbd-devel +BuildRequires: librados-devel +BuildRequires: librbd-devel %else - BuildRequires: librados2-devel - BuildRequires: librbd1-devel +BuildRequires: librados2-devel +BuildRequires: librbd1-devel %endif %endif %if %{with_storage_gluster} -- 2.21.0

1 0

[libvirt] [PATCH] spec: fix indentation
by Ján Tomko 11 Dec '19

11 Dec '19

The recent specfile addition broke syntax-check: cppi: ../libvirt.spec.in: line 338: not properly indented cppi: ../libvirt.spec.in: line 341: not properly indented cppi: ../libvirt.spec.in: line 344: not properly indented Fixes: ac063cb2e76d64a907f96bf0b6a29da4eb484ebc Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Push under the 'are we still doing syntax-check?' rule libvirt.spec.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 01f28e62d6..4d75fbecaf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -335,13 +335,13 @@ BuildRequires: device-mapper-devel # For XFS reflink clone support BuildRequires: xfsprogs-devel %if %{with_storage_rbd} -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: librados-devel -BuildRequires: librbd-devel -%else -BuildRequires: librados2-devel -BuildRequires: librbd1-devel -%endif + %if 0%{?fedora} || 0%{?rhel} > 7 + BuildRequires: librados-devel + BuildRequires: librbd-devel + %else + BuildRequires: librados2-devel + BuildRequires: librbd1-devel + %endif %endif %if %{with_storage_gluster} BuildRequires: glusterfs-api-devel >= 3.4.1 -- 2.19.2

2 1

[libvirt] [jenkins-ci PATCH 0/1] jenkins: Start building on Ubuntu
by Andrea Bolognani 11 Dec '19

11 Dec '19

This patch is intended to start a slightly larger discussion about our plans for the CentOS CI environment going forward. At the moment, we have active builders for CentOS 7 Debian 9 Debian 10 Fedora 30 Fedora 31 Fedora Rawhide FreeBSD 11 FreeBSD 12 but we don't have builder for Debian sid FreeBSD -CURRENT Ubuntu 16.04 Ubuntu 18.04 despite them being fully supported in the libvirt-jenkins-ci repository. This makes sense for sid and -CURRENT, since the former covers the same "freshest Linux packages" angle that Rawhide already takes care of and the latter is often broken and not trivial to keep updated; both Ubuntu targets, however, should IMHO be part of the CentOS CI environment. Hence this series :) Moreover, we're in the process of adding CentOS 8 openSUSE Leap 15.1 openSUSE Tumbleweed as targets, of which the first two should also IMHO be added as they would provide useful additional coverage. The only reason why I'm even questioning whether this should be done is capacity for the hypervisor host: the machine we're running all builders on has CPUs: 8 Memory: 32 GiB Storage: 450 GiB and each of the guests is configured to use CPUs: 2 Memory: 2 GiB Storage: 20 GiB So while we're good, and actually have plenty of room to grow, on the memory and storage front, we're already overcommitting our CPUs pretty significantly, which I guess is at least part of the reason why builds take so long. Can we afford to add 50% more load on the machine without making it unusable? I don't know. But I think it would be worthwhile to at least try and see how it handles an additional 25%, which is exactly what this series does. In my opinion, as long as the machine can keep up with demand and not end up in a situation where it starts accumulating backlog jobs, it's fine if builds take longer: developers who want to run a relatively quick smoke test before posting patches can use Travis CI or 'make ci-check@...' locally for the purpose, whereas the role of CentOS CI in my eyes is to try and catch as many issues as possible after merge so that they don't end up in a release. But I realize others might see it differently, hence this lenghty cover letter :) Andrea Bolognani (1): jenkins: Start building on Ubuntu jenkins/jobs/defaults.yaml | 2 ++ jenkins/projects/libvirt-dbus.yaml | 1 + jenkins/projects/libvirt-sandbox.yaml | 2 ++ jenkins/projects/libvirt-tck.yaml | 2 ++ jenkins/projects/libvirt.yaml | 2 ++ jenkins/projects/virt-manager.yaml | 2 ++ 6 files changed, 11 insertions(+) -- 2.23.0

2 4

[libvirt] [jenkins-ci PATCH v2 0/8] Add CentOS 8 to libvirt-jenkins-ci
by Fabiano Fidêncio 11 Dec '19

11 Dec '19

In order to add CentOS 8 to jenkins-ci, we had to: - Adjust lcitool to generate unattended scripts based on templates instead of using the templates themselves, as a new parameter is expected on kickstart files for RHEL / CentOS 8 (or newer); - Enable the EPEL and PowerTools repos; Then, the following projects have been added: - libvirt - Some adjustments had to be done as some dependencies got removed from CentOS 8; - libvirt-glib - libvirt-dbus - Some adjustments had to be done as flake8 doesn't pull all the needed dependencies when installed on CentOS 8; - libvirt-go - libvirt-go-xml - libvirt-ocaml - libvirt-perl - libvirt-python - virt-viewer - Some adjustments had to be done as libgovirt-devel and gtk-vnc2-devel are not present anymore on CentOS 8; - osinfo-db-tools - oisnfo-db - libosinfo - virt-manager The projects which were not added due to missing dependencies are: - libvirt-cim - libvirt-sandbox - libvirt-tck Fabiano Fidêncio (8): lcitool: Generate the unattended script file lcitool: Use install_url in the unattended install files guests: Add CentOS 8 mappings: Adjustments for CentOS 8 guests: Install EPEL repo on all CentOS guests guests: Enable PowerTools repo on CentOS 8 guests guests: Add projects to CentOS 8 guests: Build projects on CentOS 8 guests/configs/kickstart.cfg | 6 +++++ guests/host_vars/libvirt-centos-8/docker.yml | 2 ++ guests/host_vars/libvirt-centos-8/install.yml | 2 ++ guests/host_vars/libvirt-centos-8/main.yml | 22 ++++++++++++++++ guests/inventory | 1 + guests/lcitool | 26 ++++++++++++++++++- guests/playbooks/build/jobs/defaults.yml | 2 ++ guests/playbooks/build/projects/libosinfo.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 2 ++ guests/playbooks/build/projects/libvirt.yml | 1 + .../build/projects/osinfo-db-tools.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 3 +++ guests/playbooks/update/tasks/base.yml | 9 ++++++- guests/vars/mappings.yml | 4 +++ jenkins/jobs/defaults.yaml | 2 ++ jenkins/projects/libosinfo.yaml | 1 + jenkins/projects/libvirt-dbus.yaml | 2 ++ jenkins/projects/libvirt.yaml | 1 + jenkins/projects/osinfo-db-tools.yaml | 1 + jenkins/projects/virt-manager.yaml | 3 +++ 20 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 guests/host_vars/libvirt-centos-8/docker.yml create mode 100644 guests/host_vars/libvirt-centos-8/install.yml create mode 100644 guests/host_vars/libvirt-centos-8/main.yml -- 2.23.0

2 20

[libvirt] [PATCH] docs: prefer to use rst2html5 instead of rst2html
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

Our website is written assuming HTML5 standard & doctype: commit b1c81567c7172bc9dcd701cf46ea3f87725d62c7 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Wed Jul 26 18:01:25 2017 +0100 docs: switch to using HTML5 doctype declaration so we want the RST conversion to also use HTML5. Ubuntu 16.04 still only has the HTML4 generating tools though, so we have that as a fallback. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- m4/virt-external-programs.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index ed634a4c73..aad21c81bf 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -33,10 +33,13 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ then AC_MSG_ERROR("xsltproc is required to build libvirt") fi - AC_PATH_PROGS([RST2HTML], [rst2html rst2html.py rst2html-3], []) + + dnl Drop the rst2html (aka HTML4) variants once we + dnl stop supporting Ubuntu 16.04 (Xenial) + AC_PATH_PROGS([RST2HTML], [rst2html5 rst2html5.py rst2html5-3 rst2html rst2html.py rst2html-3], []) if test -z "$RST2HTML" then - AC_MSG_ERROR("rst2html is required to build libvirt") + AC_MSG_ERROR("rst2html5/rst2html is required to build libvirt") fi AC_PATH_PROG([AUGPARSE], [augparse], [/usr/bin/augparse]) AC_PROG_MKDIR_P -- 2.23.0

2 1

[libvirt] [PATCH] scripts: ignore remote protocol checks if pdwtags crashes
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

On Debian 10, pdwtags reliably segfaults when parsing the libvirt remote protocol files. This crash was previously ignored by 'make check' because of the way we piped the pdwtags output to the perl post-processing scripts. When this was converted to use python it mistakenly started being a fatal error. We need to explicitly ignore pdwtags output if it exited with non-zero return code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/check-remote-protocol.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protocol.py index 201166fd9e..25caa19563 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -86,8 +86,12 @@ out, err = pdwtagsproc.communicate() out = out.decode("utf-8") err = err.decode("utf-8") -if out == "" and err != "": - print("WARNING: no output, pdwtags appears broken:", file=sys.stderr) +if out == "" or pdwtagsproc.returncode != 0: + if out == "": + print("WARNING: no output, pdwtags appears broken:", file=sys.stderr) + else: + print("WARNING: exit code %d, pdwtags appears broken:" % + pdwtagsproc.returncode, file=sys.stderr) for l in err.strip().split("\n"): print("WARNING: %s" % l, file=sys.stderr) print("WARNING: skipping the remote protocol test", file=sys.stderr) -- 2.23.0

2 3

[libvirt] [PATCH] docs: switch to use rst2html5 instead of rst2html
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

Now that we don't have to support CentOS 7's python2-docutils, we can use the rst2html5 tool instead, which generates HTML5 output instead of HTML4 output. This matches what we used for the original HTML docs since commit b1c81567c7172bc9dcd701cf46ea3f87725d62c7 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Wed Jul 26 18:01:25 2017 +0100 docs: switch to using HTML5 doctype declaration Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- m4/virt-external-programs.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index ed634a4c73..a23c69d54b 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -33,7 +33,7 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ then AC_MSG_ERROR("xsltproc is required to build libvirt") fi - AC_PATH_PROGS([RST2HTML], [rst2html rst2html.py rst2html-3], []) + AC_PATH_PROGS([RST2HTML], [rst2html5 rst2html5.py rst2html5-3], []) if test -z "$RST2HTML" then AC_MSG_ERROR("rst2html is required to build libvirt") -- 2.23.0

2 2

[libvirt] [PATCH 00/17] docs: remove all use of POD for man pages in favour of RST
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

As part of the goal to eliminate Perl from libvirt, this gets rid of the use of POD format for man pages. There's nothing especially bad about POD as a markup language compared to other lightweight markup languages like RST or Markdown. It hasn't found widespread usage outside of the Perl world though, and so switching from POD to RST brings a language which likely has more familiarity to contributors. This also nicely aligns with our use of RST of web pages, and indeed in this series things are setup so that all the man pages get published on the main libvirt.org website. Over time this will hopefuly draw search engines traffic to libvirt.org instead of random 3rd party websites hosting various out of date copies of the man pages. Reviewing the individual RST files is likely a very unpleasant task, especially the enourmous virsh man page. Most of the conversion work was automated with pod2rst, followed by lots of editting to cleanup its output. virsh had some further automated processing done to create headers for each command. It is probably more useful to review the rendered man page output and/or websites to see that it looks sane when read. Daniel P. Berrangé (17): src: update keycodemapdb submodule rpm: move pod2man & rst2html deps outside the autotools conditional rpm: use python3-docutils as the direct dep docs: introduce rst2man as a mandatory tool for building docs docs: describe the basic RST structure for a man page docs: convert libvirtd man page from pod to rst docs: convert virtlockd man page from pod to rst docs: convert virtlogd man page from pod to rst docs: convert virt-host-validate man page from pod to rst docs: convert virt-pki-validate man page from pod to rst docs: convert virt-xml-validate man page from pod to rst docs: convert virt-sanlock-cleanup man page from pod to rst docs: convert virt-login-shell man page from pod to rst docs: convert virt-admin man page from pod to rst docs: convert virsh man page from pod to rst docs: convert virkeycode*/virkeyname* man pages from pod to rst docs: remove build recipes related to pod2man usage docs/Makefile.am | 118 + docs/docs.html.in | 3 + docs/manpages/index.rst | 37 + docs/manpages/libvirtd.rst | 259 + docs/manpages/virsh.rst | 7096 +++++++++++++++++ docs/manpages/virt-admin.rst | 610 ++ docs/manpages/virt-host-validate.rst | 95 + docs/manpages/virt-login-shell.rst | 144 + docs/manpages/virt-pki-validate.rst | 89 + docs/manpages/virt-sanlock-cleanup.rst | 79 + .../manpages/virt-xml-validate.rst | 107 +- docs/manpages/virtlockd.rst | 177 + docs/manpages/virtlogd.rst | 179 + docs/styleguide.rst | 86 + libvirt.spec.in | 7 +- m4/virt-external-programs.m4 | 5 + src/Makefile.am | 18 - src/keycodemapdb | 2 +- src/locking/Makefile.inc.am | 18 - src/locking/virtlockd.pod | 165 - src/logging/Makefile.inc.am | 13 - src/logging/virtlogd.pod | 165 - src/remote/Makefile.inc.am | 15 - src/remote/libvirtd.pod | 235 - src/util/Makefile.inc.am | 47 +- tools/Makefile.am | 68 - tools/virsh.pod | 5526 ------------- tools/virt-admin.pod | 497 -- tools/virt-host-validate.pod | 68 - tools/virt-login-shell.pod | 112 - tools/virt-pki-validate.pod | 61 - tools/virt-sanlock-cleanup.pod | 49 - 32 files changed, 9052 insertions(+), 7098 deletions(-) create mode 100644 docs/manpages/index.rst create mode 100644 docs/manpages/libvirtd.rst create mode 100644 docs/manpages/virsh.rst create mode 100644 docs/manpages/virt-admin.rst create mode 100644 docs/manpages/virt-host-validate.rst create mode 100644 docs/manpages/virt-login-shell.rst create mode 100644 docs/manpages/virt-pki-validate.rst create mode 100644 docs/manpages/virt-sanlock-cleanup.rst rename tools/virt-xml-validate.pod => docs/manpages/virt-xml-validate.rst (53%) create mode 100644 docs/manpages/virtlockd.rst create mode 100644 docs/manpages/virtlogd.rst delete mode 100644 src/locking/virtlockd.pod delete mode 100644 src/logging/virtlogd.pod delete mode 100644 src/remote/libvirtd.pod delete mode 100644 tools/virsh.pod delete mode 100644 tools/virt-admin.pod delete mode 100644 tools/virt-host-validate.pod delete mode 100644 tools/virt-login-shell.pod delete mode 100644 tools/virt-pki-validate.pod delete mode 100644 tools/virt-sanlock-cleanup.pod -- 2.23.0

2 19

[libvirt] [PATCH 0/2] spec: Update Fedora minimum version & librbd / librados development package names
by Fabiano Fidêncio 11 Dec '19

11 Dec '19

Fedora 29 has reached its EOL on November 26th 2019; librbd1-devel has been replaced by librbd-devel; librados2-devel has been replaced by librados; Fabiano Fidêncio (2): spec: Update Fedora minimum supported version spec: Adjust librbd / librados dependency names libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.23.0

2 6

[libvirt] [jenkins-ci PATCH] Update comment for virt-manager
by Andrea Bolognani 11 Dec '19

11 Dec '19

We have Python 3 on CentOS 7 now, so the existing comment is no longer accurate. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/playbooks/build/projects/virt-manager.yml | 4 +--- jenkins/projects/virt-manager.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index c0d4294..9184a74 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -1,9 +1,7 @@ --- - set_fact: name: virt-manager - # virt-manager is Python 3 only, so it can't be built on CentOS 7; - # Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't - # build the project either + # CentOS 7 and Ubuntu 16.04 have Python 3 but not the libxml2 bindings machines: - libvirt-debian-9 - libvirt-debian-10 diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml index 3dc8e2e..4524831 100644 --- a/jenkins/projects/virt-manager.yaml +++ b/jenkins/projects/virt-manager.yaml @@ -1,9 +1,7 @@ --- - project: name: virt-manager - # virt-manager is Python 3 only, so it can't be built on CentOS 7; - # Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't - # build the project either + # CentOS 7 and Ubuntu 16.04 have Python 3 but not the libxml2 bindings machines: - libvirt-debian-9 - libvirt-debian-10 -- 2.23.0

1 0

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

11 Dec '19

This version incorporates Peter's feedback to v3. Pavel Mores (4): qemu: block: propagate the delete flag to where it can actually be used qemu: block: use the delete flag to delete snapshot images if requested qemu: block: store the delete flag in libvirtd's status XML qemu: block: enable the snapshot image deletion feature src/qemu/qemu_blockjob.c | 50 ++++++++++++++++++- src/qemu/qemu_blockjob.h | 4 +- src/qemu/qemu_domain.c | 4 ++ src/qemu/qemu_driver.c | 12 ++++- .../blockjob-blockdev-in.xml | 1 + 5 files changed, 67 insertions(+), 4 deletions(-) -- 2.21.0

2 9

[libvirt] [PATCH] docs: fix duplication variable name for rst files
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5f5dce28eb..9462f77458 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -173,10 +173,10 @@ gif = \ internals_html_in = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) -kbase_rst = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.rst)) -kbase_rst_html_in = \ - $(kbase_rst:%.rst=%.html.in) +internals_rst = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.rst)) +internals_rst_html_in = \ + $(internals_rst:%.rst=%.html.in) internals_html = \ $(internals_html_in:%.html.in=%.html) \ $(internals_rst_html_in:%.html.in=%.html) -- 2.23.0

2 1

[libvirt] [PATCH] Revert "qemu: directly create virResctrlInfo ignoring capabilities"
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

This reverts commit 7be5fe66cd024b9ffba7c52cdbf5effedeac2c0d. This commit broke resctrl, because it missed the fact that the virResctrlInfoGetCache() has side-effects causing it to actually change the virResctrlInfo parameter, not merely get data from it. This code will need some refactoring before we can try separating it from virCapabilities again. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 24 ++++++++++++++++-------- src/util/virresctrl.h | 2 -- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 10259027c9..23cc528817 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2724,24 +2724,29 @@ qemuProcessSetupEmulator(virDomainObjPtr vm) static int -qemuProcessResctrlCreate(virDomainObjPtr vm) +qemuProcessResctrlCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm) { + int ret = -1; size_t i = 0; + virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - g_autoptr(virResctrlInfo) resctrl = NULL; if (!vm->def->nresctrls) return 0; - if (!(resctrl = virResctrlInfoNew())) + /* Force capability refresh since resctrl info can change + * XXX: move cache info into virresctrl so caps are not needed */ + caps = virQEMUDriverGetCapabilities(driver, true); + if (!caps) return -1; for (i = 0; i < vm->def->nresctrls; i++) { size_t j = 0; - if (virResctrlAllocCreate(resctrl, + if (virResctrlAllocCreate(caps->host.resctrl, vm->def->resctrls[i]->alloc, priv->machineName) < 0) - return -1; + goto cleanup; for (j = 0; j < vm->def->resctrls[i]->nmonitors; j++) { virDomainResctrlMonDefPtr mon = NULL; @@ -2749,11 +2754,14 @@ qemuProcessResctrlCreate(virDomainObjPtr vm) mon = vm->def->resctrls[i]->monitors[j]; if (virResctrlMonitorCreate(mon->instance, priv->machineName) < 0) - return -1; + goto cleanup; } } - return 0; + ret = 0; + cleanup: + virObjectUnref(caps); + return ret; } @@ -6881,7 +6889,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; VIR_DEBUG("Setting up resctrl"); - if (qemuProcessResctrlCreate(vm) < 0) + if (qemuProcessResctrlCreate(driver, vm) < 0) goto cleanup; VIR_DEBUG("Setting up managed PR daemon"); diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 759320d0fd..3dd7c96348 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -100,8 +100,6 @@ typedef virResctrlInfo *virResctrlInfoPtr; virResctrlInfoPtr virResctrlInfoNew(void); -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virResctrlInfo, virObjectUnref); - int virResctrlInfoGetCache(virResctrlInfoPtr resctrl, unsigned int level, -- 2.23.0

2 1

[libvirt] [PATCH 00/30] conf: eliminate use of virCapsPtr for parsing/formatting XML
by Daniel P. Berrangé 10 Dec '19

10 Dec '19

The virCapsPtr object is a serious source of performance problems for the QEMU driver, because populating it means probing every QEMU system emulator binary installed on the host. This is is crazy because parsing any single XML document only ever needs information about a single QEMU binary. We've already done a great job of untangling stuff with the post-parse and validation functions, but the job was never quite finished. This series tackles the last pieces so that parsing & formatting XML will never use the virCapsPtr object directly. Some of the virt drivers will still use virCapsPtr in their private callbacks, but the QEMU driver will instead use the QEMU emulator capabilities cache directly. The first ten patches are the key bits of work to remove use of the virCapsPtr parameter from domain XML APIs. The next thirteen patches remove the (now unused) virCapsPtr parameter from the domain XML APIs & their callers. The final six patches help various QEMU driver APIs stop relying on the virCapsPtr, so that it is no longer even created at startup. This has a nice benefit on libvirtd startup tie when all 30 QEMU emulators are installed, reducing it from 4 seconds down to a fraction of a second. More work is still needed to follow on from this... A couple of places in the QEMU driver still use virCapsPtr - The virConnectGetVersion API. - The virNodeGetSecurityModel API. - virDomainGetResctrlMonData API. In all cases we just need to move to store the relevant data directly in virQEMUDriverPtr, and not use the virCaps. next, apps can use virDomainGetCapabilities to fetch info about a specific QEMU binary they care about to avoid the cost of the virConnectGetCapabilities API. There are still times when apps need info in virConnectGetCapabilities and this will annoyingly probe all QEMU binaries, even though the app doesn't want the guest info. virConnectGetCapabilities is one of our very early APIs which now flags parameter, so this problem is unfixable in that API. I'm thus included to introduce a new virNodeGetCapabilities that is specifically only returning information about the host hypervisor. Essentially the <capabilities> schema, but only the <host> sub-tree. I do, however, wonder if even this is overkill & we should aim for a much more fine grained way for reporting host capabilities. eg if an app wants the host CPU, do they really want to pay the penality to probe host cache nformation, or NUMA topology and vica-verca. I'm not sure what the right kind of tradeoff here is, whether we should try individual APIs, or have one API and a set of flags to control what info is filled in. Daniel P. Berrangé (30): qemu: cache host arch separately from virCapsPtr qemu: add machines & arch to fake test capabilities cache conf: sanitize virDomainSaveStatus & virDomainSaveConfig APIs conf: sanitize virDomainObjFormat & virDomainDefFormat* APIs conf: pass in default architecture via domain XML options conf: move virt type / os type / arch validation to post-parse conf: don't use passed in caps in post parse method conf: pass netprefix in the domain parser config struct conf: move seclabel validation into post-parse phase conf: pass default sec model in parser config conf: drop virCapsPtr param from assign addresses callback conf: drop virCapsPtr param from basic post parse callback conf: drop virCapsPtr param from post parse data alloc callback conf: drop virCapsPtr param from post parse callback conf: drop virCapsPtr param from device post parse callback conf: drop virCapsPtr param from domain validate callback conf: drop virCapsPtr param from domain formatting APIs conf: drop virCapsPtr param from domain post parse & validate APIs conf: drop virCapsPtr param from domain parse APIs conf: drop virCapsPtr param from domain APIs for copying config conf: drop virCapsPtr param from APIs for saving domains conf: drop virCapsPtr param from domain obj list APIs conf: drop virCapsPtr param from snapshot & checkpoint APIs qemu: drop virCapsPtr param & vars from many APIs conf: move NUMA capabilities into self contained object qemu: use NUMA capabilities object directly conf: make virCPUDef into a ref counted struct qemu: use host CPU object directly qemu: directly create virResctrlInfo ignoring capabilities qemu: stop creating capabilities at driver startup docs/formatdomain.html.in | 6 +- src/bhyve/bhyve_domain.c | 16 +- src/bhyve/bhyve_driver.c | 46 +- src/bhyve/bhyve_process.c | 22 +- src/conf/capabilities.c | 217 +++++--- src/conf/capabilities.h | 34 +- src/conf/checkpoint_conf.c | 21 +- src/conf/checkpoint_conf.h | 2 - src/conf/cpu_conf.c | 29 +- src/conf/cpu_conf.h | 4 + src/conf/domain_conf.c | 404 ++++++-------- src/conf/domain_conf.h | 84 ++- src/conf/snapshot_conf.c | 28 +- src/conf/snapshot_conf.h | 3 - src/conf/virconftypes.h | 3 + src/conf/virdomainobjlist.c | 9 +- src/conf/virdomainobjlist.h | 1 - src/cpu/cpu.c | 3 +- src/cpu/cpu_arm.c | 5 +- src/cpu/cpu_ppc64.c | 3 +- src/cpu/cpu_x86.c | 6 +- src/esx/esx_driver.c | 14 +- src/hyperv/hyperv_driver.c | 1 + src/libvirt_private.syms | 18 +- src/libxl/libxl_capabilities.c | 23 +- src/libxl/libxl_conf.c | 3 +- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 37 +- src/libxl/libxl_driver.c | 83 ++- src/libxl/libxl_migration.c | 20 +- src/libxl/xen_xl.c | 13 +- src/libxl/xen_xm.c | 2 +- src/lxc/lxc_conf.c | 9 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_controller.c | 44 +- src/lxc/lxc_domain.c | 13 +- src/lxc/lxc_driver.c | 98 ++-- src/lxc/lxc_native.c | 4 +- src/lxc/lxc_process.c | 20 +- src/openvz/openvz_conf.c | 62 ++- src/openvz/openvz_conf.h | 1 + src/openvz/openvz_driver.c | 64 +-- src/phyp/phyp_driver.c | 26 +- src/qemu/qemu_capabilities.c | 176 ++++--- src/qemu/qemu_capabilities.h | 12 +- src/qemu/qemu_capspriv.h | 10 + src/qemu/qemu_checkpoint.c | 32 +- src/qemu/qemu_checkpoint.h | 1 - src/qemu/qemu_command.c | 6 +- src/qemu/qemu_conf.c | 57 +- src/qemu/qemu_conf.h | 18 +- src/qemu/qemu_domain.c | 108 ++-- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_driver.c | 293 ++++------- src/qemu/qemu_hotplug.c | 8 +- src/qemu/qemu_migration.c | 36 +- src/qemu/qemu_migration_cookie.c | 8 +- src/qemu/qemu_process.c | 196 +++---- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 45 +- src/util/virresctrl.h | 2 + src/vbox/vbox_common.c | 16 +- src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 25 +- src/vmx/vmx.c | 23 +- src/vmx/vmx.h | 2 +- src/vz/vz_driver.c | 29 +- tests/Makefile.am | 17 +- tests/bhyveargv2xmltest.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/cputest.c | 11 +- tests/domaincapstest.c | 14 +- tests/domainconftest.c | 2 +- tests/libxlxml2domconfigtest.c | 22 +- tests/lxcconf2xmltest.c | 17 +- tests/lxcxml2xmltest.c | 13 +- tests/openvzutilstest.c | 8 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 2 +- tests/qemucapabilitiestest.c | 9 +- tests/qemudomaincheckpointxml2xmltest.c | 4 +- tests/qemudomainsnapshotxml2xmltest.c | 4 +- tests/qemuhotplugtest.c | 11 +- tests/qemumemlocktest.c | 6 +- tests/qemusecuritytest.c | 1 - tests/qemuxml2argvtest.c | 35 +- tests/qemuxml2xmltest.c | 4 +- tests/securityselinuxlabeltest.c | 2 +- tests/testutils.c | 39 +- tests/testutils.h | 5 +- tests/testutilslxc.c | 34 +- tests/testutilslxc.h | 4 + tests/testutilsqemu.c | 670 +++++++----------------- tests/testutilsqemu.h | 9 +- tests/testutilsxen.c | 34 +- tests/testutilsxen.h | 9 +- tests/vircaps2xmltest.c | 6 +- tests/vircapstest.c | 11 +- tests/vmx2xmltest.c | 4 +- tests/xlconfigtest.c | 27 +- tests/xmconfigtest.c | 23 +- tests/xml2vmxtest.c | 4 +- 102 files changed, 1687 insertions(+), 1993 deletions(-) -- 2.23.0

3 36

[libvirt] [PATCH] qemu: honour parseOpaque instead of refetching caps
by Daniel P. Berrangé 10 Dec '19

10 Dec '19

The use of the parseOpaque parameter was mistakenly removed in commit 4a4132b4625778cf80acb9c92d06351b44468ac3 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Tue Dec 3 10:49:49 2019 +0000 conf: don't use passed in caps in post parse method causing the method to re-fetch qemuCaps that were already just fetched and put into parseOpaque. This is inefficient when parsing incoming XML, but for live XML this is more serious as it means we use the capabilities for the current QEMU binary on disk, rather than the running QEMU. That commit, however, did have a useful side effect of fixing a crasher bug in the qemu post parse callback introduced by commit 5e939cea896fb3373a6f68f86e325c657429ed3d Author: Jiri Denemark <jdenemar(a)redhat.com> Date: Thu Sep 26 18:42:02 2019 +0200 qemu: Store default CPU in domain XML The qemuDomainDefSetDefaultCPU() method in that patch did not allow for the possibility that qemuCaps would be NULL and thus resulted in a SEGV. This shows a risk in letting each check in the post parse callback look for qemuCaps == NULL. The safer option is to check once upfront and immediately stop (postpone) further validation. Honouring the cached caps for the live status XML, highlights a second flaw, which is that it shouldn't check the virt type or arch for running guests. The info needed to check this is not in the cache caps, only the list of flags are populated. Thus some of the post parse logic is made to only run for inactive guests. This showed a bug in one test data file which lacked an ID attribute for the live guest. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 52 +++++++++++-------- .../qemustatusxml2xmldata/vcpus-multi-in.xml | 2 +- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6f53e17b6a..2abe93c829 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4703,16 +4703,17 @@ static int qemuDomainDefPostParse(virDomainDefPtr def, unsigned int parseFlags, void *opaque, - void *parseOpaque G_GNUC_UNUSED) + void *parseOpaque) { virQEMUDriverPtr driver = opaque; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - g_autoptr(virQEMUCaps) qemuCaps = NULL; + /* Note that qemuCaps may be NULL when this function is called. This + * function shall not fail in that case. It will be re-run on VM startup + * with the capabilities populated. */ + virQEMUCapsPtr qemuCaps = parseOpaque; - if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, - def->emulator))) { + if (!qemuCaps) return 1; - } if (def->os.type != VIR_DOMAIN_OSTYPE_HVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -4721,18 +4722,31 @@ qemuDomainDefPostParse(virDomainDefPtr def, return -1; } - if (!virQEMUCapsIsArchSupported(qemuCaps, def->os.arch)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Emulator '%s' does not support arch '%s'"), - def->emulator, virArchToString(def->os.arch)); - return -1; - } + if (def->id == -1) { + if (!virQEMUCapsIsArchSupported(qemuCaps, def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Emulator '%s' does not support arch '%s'"), + def->emulator, virArchToString(def->os.arch)); + return -1; + } - if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, def->virtType)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Emulator '%s' does not support virt type '%s'"), - def->emulator, virDomainVirtTypeToString(def->virtType)); - return -1; + if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, def->virtType)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Emulator '%s' does not support virt type '%s'"), + def->emulator, virDomainVirtTypeToString(def->virtType)); + return -1; + } + if (!def->os.machine) { + const char *machine = virQEMUCapsGetPreferredMachine(qemuCaps, + def->virtType); + def->os.machine = g_strdup(machine); + } + } else { + if (!def->os.machine) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing machine type")); + return -1; + } } if (def->os.bootloader || def->os.bootloaderArgs) { @@ -4741,12 +4755,6 @@ qemuDomainDefPostParse(virDomainDefPtr def, return -1; } - if (!def->os.machine) { - const char *machine = virQEMUCapsGetPreferredMachine(qemuCaps, - def->virtType); - def->os.machine = g_strdup(machine); - } - qemuDomainNVRAMPathGenerate(cfg, def); if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml index 11ec74ecf8..be48c55fe0 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -310,7 +310,7 @@ <allowReboot value='yes'/> <blockjobs active='no'/> <agentTimeout>-2</agentTimeout> - <domain type='kvm'> + <domain type='kvm' id='1729'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> -- 2.23.0

2 1

[libvirt] [PATCH] virkeyfile: fix compilation error with clang
by Pavel Hrdina 10 Dec '19

10 Dec '19

Clang complains about condition being always true: src/util/virkeyfile.c:113:23: error: result of comparison of constant 128 with expression of type 'const char' is always true [-Werror,-Wtautological-constant-out-of-range-compare] while (!IS_EOF && IS_ASCII(CUR) && CUR != ']') ^~~~~~~~~~~~~ src/util/virkeyfile.c:80:26: note: expanded from macro 'IS_ASCII' ~~~ ^ ~~~ Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virkeyfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 816bfae96d..ee29bd7aa6 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -77,7 +77,7 @@ struct _virKeyFileParserCtxt { #define IS_EOF (ctxt->cur >= ctxt->end) #define IS_EOL(c) (((c) == '\n') || ((c) == '\r')) #define IS_BLANK(c) (((c) == ' ') || ((c) == '\t')) -#define IS_ASCII(c) ((c) < 128) +#define IS_ASCII(c) (((unsigned char) c) < 128) #define CUR (*ctxt->cur) #define NEXT if (!IS_EOF) ctxt->cur++; -- 2.23.0

5 6

[libvirt] [perl PATCH 0/6] Misc fixes to perl APIs and new migrate constant
by Daniel P. Berrangé 10 Dec '19

10 Dec '19

Daniel P. Berrangé (6): Fix typo breaking some migrate parameter handling Add handling for VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS Add support for VIR_MIGRATE_PARAM_TLS_DESTINATION constant Add missing create_checkpoint method Remove docs for has_metadata method which doesn't exist Fix data type for VIR_CONNECT_IDENTITY_SASL_USER_NAME Changes | 9 +++++++++ lib/Sys/Virt.xs | 25 +++++++++++++++++++++---- lib/Sys/Virt/Domain.pm | 26 ++++++++++++++++++++++++++ lib/Sys/Virt/DomainCheckpoint.pm | 5 ----- 4 files changed, 56 insertions(+), 9 deletions(-) -- 2.23.0

2 7

[libvirt] [perl][PATCH] Add VIR_MIGRATE_PARAM_TLS_DESTINATION constant
by Michal Privoznik 10 Dec '19

10 Dec '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + lib/Sys/Virt.xs | 1 + lib/Sys/Virt/Domain.pm | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/Changes b/Changes index 37529ac..cf5d8cc 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,7 @@ Revision history for perl module Sys::Virt - Add VIR_DOMAIN_JOB_SUCCESS and VIR_DOMAIN_JOB_STATS_KEEP_COMPLETED constants + - Add VIR_MIGRATE_PARAM_TLS_DESTINATION constant 5.10.0 2019-12-03 diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index 98a12d7..a729a52 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -9246,6 +9246,7 @@ BOOT: REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT, MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_BANDWIDTH_POSTCOPY, MIGRATE_PARAM_BANDWIDTH_POSTCOPY); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, MIGRATE_PARAM_PARALLEL_CONNECTIONS); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_TLS_DESTINATION, MIGRATE_PARAM_TLS_DESTINATION); REGISTER_CONSTANT(VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY, MIGRATE_MAX_SPEED_POSTCOPY); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 2caec51..ae909de 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -1141,6 +1141,15 @@ progress is not made The number of connections used during parallel migration. +=item C<Sys::Virt::Domain::MIGRATE_PARAM_TLS_DESTINATION> + +Override the destination host name used for TLS verification. +Normally the TLS certificate from the destination host must match +the host's name for TLS verification to succeed. When the +certificate does not match the destination hostname and the +expected cetificate's hostname is known, this parameter can be +used to pass this expected hostname when starting the migration. + =back =item $ddom = $dom->migrate(destcon, flags=0, dname=undef, uri=undef, bandwidth=0) -- 2.23.0

2 1

Re: [libvirt] [PATCH 2/2] Add -mem-shared option
by Thomas Huth 10 Dec '19

10 Dec '19

On 02/12/2019 22.00, Eduardo Habkost wrote: > On Mon, Dec 02, 2019 at 08:39:48AM +0100, Igor Mammedov wrote: >> On Fri, 29 Nov 2019 18:46:12 +0100 >> Paolo Bonzini <pbonzini(a)redhat.com> wrote: >> >>> On 29/11/19 13:16, Igor Mammedov wrote: >>>> As for "-m", I'd make it just an alias that translates >>>> -m/mem-path/mem-prealloc >>> >>> I think we should just deprecate -mem-path/-mem-prealloc in 5.0. CCing >>> Thomas as mister deprecation. :) >> >> I'll add that to my series > > Considering that the plan is to eventually reimplement those > options as syntactic sugar for memory backend options (hopefully > in less than 2 QEMU releases), what's the point of deprecating > them? Well, it depends on the "classification" [1] of the parameter... Let's ask: What's the main purpose of the option? Is it easier to use than the "full" option, and thus likely to be used by a lot of people who run QEMU directly from the CLI? In that case it should stay as "convenience option" and not be deprecated. Or is the option merely there to give the upper layers like libvirt or some few users and their scripts some more grace period to adapt their code, but we all agree that the options are rather ugly and should finally go away? Then it's rather a "legacy option" and the deprecation process is the right way to go. Our QEMU interface is still way to overcrowded, we should try to keep it as clean as possible. Thomas [1] Using the terms from: https://www.youtube.com/watch?v=Oscjpkns7tM&t=8m

4 5

[libvirt] [PATCH v2 00/14] drop usage of c-type gnulib module
by Pavel Hrdina 10 Dec '19

10 Dec '19

Changes in v2: - fixed missing parentheses in patch 01 - added patch 02 to cover c_isascii Pavel Hrdina (14): util: define IS_BLANK instead of using c_isblank from gnulib virkeyfile: define IS_ASCII instead c_isascii from gnulib use g_ascii_isalnum instead of c_isalnum from gnulib use g_ascii_isalpha instead of c_isalpha from gnulib use g_ascii_iscntrl instead of c_iscntrl from gnulib use g_ascii_isdigit instead of c_isdigit frum gnulib use g_ascii_islower instead of c_islower from gnulib use g_ascii_isprint instead of c_isprint from gnulib use g_ascii_isspace instead of c_isspace from gnulib use g_ascii_isxdigit instead of c_isxdigit from gnulib use g_ascii_tolower instead of c_tolower from gnulib use g_ascii_toupper instead of c_toupper from gnulib syntax-check: update c-type checks to refer to Glib bootstrap.conf: drop usage of c-type gnulib module bootstrap.conf | 1 - build-aux/syntax-check.mk | 11 ++--------- src/bhyve/bhyve_parse_command.c | 3 +-- src/conf/network_conf.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/interface/interface_backend_udev.c | 5 ++--- src/libxl/libxl_conf.c | 3 +-- src/node_device/node_device_udev.c | 3 +-- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_monitor.c | 3 +-- src/qemu/qemu_qapi.c | 4 +--- src/remote/remote_driver.c | 3 +-- src/rpc/virnetsocket.c | 3 +-- src/storage/parthelper.c | 5 ++--- src/util/virbitmap.c | 5 ++--- src/util/virconf.c | 18 +++++++++--------- src/util/virfile.c | 8 +++----- src/util/virhostcpu.c | 7 +++---- src/util/virkeyfile.c | 13 +++++++------ src/util/virmacaddr.c | 11 +++++------ src/util/virnetdevvportprofile.c | 3 +-- src/util/virpidfile.c | 3 +-- src/util/virstoragefile.c | 3 +-- src/util/virstring.c | 13 ++++++------- src/util/virutil.c | 11 +++++------ src/util/viruuid.c | 9 ++++----- src/vmx/vmx.c | 8 +++----- tools/virsh-console.c | 3 +-- tools/virsh-domain.c | 3 +-- tools/vsh-table.c | 5 ++--- tools/vsh.c | 5 ++--- 32 files changed, 73 insertions(+), 111 deletions(-) -- 2.23.0

2 18

[libvirt] libvirt-guests.sh without or with failing ACPI support
by Henning Schild 10 Dec '19

10 Dec '19

Hi all, the systemd shutdown scripts work sequentially with a 300s timeout (seen on Debian). If a VM does not have ACPI support, or the ACPI support failed for some reason, you are looking at a 300s timeout per instance for a host shutdown/reboot. i.e. 10 instances without working ACPI = 3000s to shut down I think the systemd scripting should be parallel instead of sequentially. So if you have many VMs without working ACPI you just have to wait 300s in total for the host to shut down. Steps to reproduce: - star a VM that does not support ACPI - reboot the host and wait 300s for the VM to be shut down - now start it multiple times - wait multiples of 300s for the shutdown Expected behaviour: - no matter how many instances do not support ACPI, make it 300s max because we shut them down in parallel regards, Henning

2 3

[libvirt] [jenkins-ci PATCH 0/2] Build Go projects on CentOS 7 once again
by Andrea Bolognani 10 Dec '19

10 Dec '19

Andrea Bolognani (2): guests: Enable Go projects on CentOS 7 once again Build Go projects on CentOS 7 once again guests/host_vars/libvirt-centos-7/main.yml | 2 ++ guests/playbooks/build/projects/libvirt-go-xml.yml | 13 +------------ guests/playbooks/build/projects/libvirt-go.yml | 13 +------------ jenkins/projects/libvirt-go-xml.yaml | 9 +-------- jenkins/projects/libvirt-go.yaml | 9 +-------- 5 files changed, 6 insertions(+), 40 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH 0/2] net: Drop legacy "name" from -net and remove NetLegacy
by Thomas Huth 10 Dec '19

10 Dec '19

It's time to remove the deprecated "name" parameter from -net. Please have a closer look at the second patch ... I think it should be fine, but I'm not 100% sure whether it's ok for all cases to drop NetLegacy, so please double-check. Thomas Huth (2): net: Drop the legacy "name" parameter from the -net option net: Drop the NetLegacy structure, always use Netdev instead net/net.c | 84 +++++++------------------------------------- qapi/net.json | 53 +--------------------------- qemu-deprecated.texi | 12 ++++--- 3 files changed, 20 insertions(+), 129 deletions(-) -- 2.18.1

3 8

[libvirt] [jenkins-ci PATCH] Sync comments
by Andrea Bolognani 10 Dec '19

10 Dec '19

Some comments were only present in the Ansible part and not in the Jenkins part and vice versa. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/playbooks/build/projects/libvirt-tck.yml | 2 ++ jenkins/projects/libosinfo.yaml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml index ef88cd3..b8d848c 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -1,5 +1,7 @@ --- - set_fact: + # CentOS 7 doesn't include perl-generators, which is necessary to + # build libvirt-tck name: libvirt-tck machines: - libvirt-debian-9 diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml index cde10ec..819c5ac 100644 --- a/jenkins/projects/libosinfo.yaml +++ b/jenkins/projects/libosinfo.yaml @@ -1,8 +1,6 @@ --- - project: name: libosinfo - # libosinfo depends on meson 0.49.0, which is not available on - # CentOS 7, Debian 9, Ubuntu 18; machines: '{all_machines}' title: libosinfo archive_format: xz -- 2.23.0

1 0

[libvirt] libvirt mdev migration, mdevctl integration
by Alex Williamson 10 Dec '19

10 Dec '19

Hey folks, We had some discussions at KVM Forum around mdev live migration and what that might mean for libvirt handling of mdev devices and potential libvirt/mdevctl[1] flows. I believe the current situation is that libvirt knows nothing about an mdev beyond the UUID in the XML. It expects the mdev to exist on the system prior to starting the VM. The intention is for mdevctl to step in here by providing persistence for mdev devices such that these pre-defined mdevs are potentially not just ephemeral, for example, we can tag specific mdevs for automatic startup on each boot. It seems the next step in this journey is to figure out if libvirt can interact with mdevctl to "manage" a device. I believe we've avoided defining managed='yes' behavior for mdev hostdevs up to this point because creating an mdev device involves policy decisions. For example, which parent device hosts the mdev, are there optimal NUMA considerations, are there performance versus power considerations, what is the nature of the mdev, etc. mdevctl doesn't necessarily want to make placement decisions either, but it does understand how to create and remove an mdev, what it's type is, associate it to a fixed parent, apply attributes, etc. So would it be reasonable that for a manage='yes' mdev hostdev device, libvirt might attempt to use mdevctl to start an mdev by UUID and stop it when the VM is shutdown? This assumes the mdev referenced by the UUID is already defined and known to mdevct. I'd expect semantics much like managed='yes' around vfio-pci binding, ex. start/stop if it doesn't exist, leave it alone if it already exists. If that much seems reasonable, and someone is willing to invest some development time to support it, what are then the next steps to enable migration? AIUI, libvirt blindly assumes hostdev devices cannot be migrated. This may already be getting some work due to Jens' network failover support where the attached hostdev doesn't really migrate, but it allows the migration to proceed in a partially detached state so that it can jump back into action should the migration fail. Long term we expect that not only some mdev hostdevs might be migratable, but possibly some regular vfio-pci hostdevs as well. I think libvirt will need to remove any assumptions around hostdev migration and rather rely on introspection of the QEMU process to determine if any devices hold migration blockers (or simply try the migration and let QEMU fail quickly if there are blockers). So assuming we now have a VM with a managed='yes' mdev hostdev device, what do we need to do to reproduce that device at the migration target? mdevctl can dump a device in a json format, where libvirt could use this to define and start an equivalent device on the migration target (potentially this json is extended by mdevctl to include the migration compatibility vendor string). Part of our discussion at the Forum was around the extent to which libvirt would want to consider this json opaque. For instance, while libvirt doesn't currently support localhost migration, libvirt might want to use an alternate UUID for the mdev device on the migration target so as not to introduce additional barriers to such migrations. Potentially mdevctl could accept the json from the source system as a template and allow parameters such as UUID to be overwritten by commandline options. This might allow libvirt to consider the json as opaque. An issue here though is that the json will also include the parent device, which we obviously cannot assume is the same (particularly the bus address) on the migration target. We can allow commandline overrides for the parent just as we do above for the UUID when defining the mdev device from json, but it's an open issue who is going to be smart enough (perhaps dumb enough) to claim this responsibility. It would be interesting to understand how libvirt handles other host specific information during migration, for instance if node or processor affinities are part of the VM XML, how is that translated to the target? I could imagine that we could introduce a simple "first available" placement in mdevctl, but maybe there should minimally be a node allocation preference with optional enforcement (similar to numactl), or maybe something above libvirt needs to take this responsibility to prepare the target before we get ourselves into trouble. Anyway, I hope this captures some of what was discussed at KVM Forum and that we can continue that discussion here to map out the design and tasks to enable vfio/mdev hostdev migration in libvirt. Thanks, Alex [1] https://github.com/mdevctl/mdevctl

5 13

Re: [libvirt] qemu: directly create virResctrlInfo ignoring capabilities
by Wang Huaqiang 10 Dec '19

10 Dec '19

This patch introduced a bug and broke the 'resctrl' feature. It introduced a 'divide by zero' error if you defined any 'resctrl' allocation group through <cputune/cachetune/cache>. Reason is 'caps->resctrl' is fully initialized through two steps, 'virResctrlInfoNew' invokes 'virResctrlGetInfo' completes the first step, later, 'virResctrlInfoGetCache' accomplishes the filling of 'caps->resctrl->levels->types->control.granularity'. The simplest way to fix the bug is drawback this patch, but still have the undesirable overhead. Another way to fix but not that simple is moving the 'caps->host.cache' object into 'virresctrl'. If no one takes this task, I can do it and need some days for it. Br Huaqiang > [libvirt] [PATCH 29/30] qemu: directly create virResctrlInfo ignoring > capabilities > From: Daniel P. Berrangé <berrange redhat com> > To: libvir-list redhat com > Subject: [libvirt] [PATCH 29/30] qemu: directly create virResctrlInfo > ignoring capabilities > Date: Wed, 4 Dec 2019 14:21:12 +0000 > We always refresh the capabilities object when using virResctrlInfo > during process startup. This is undesirable overhead, because we can > just directly create a virResctrlInfo instead. > > Signed-off-by: Daniel P. Berrangé <berrange redhat com> > --- > src/qemu/qemu_process.c | 24 ++++++++---------------- > src/util/virresctrl.h | 2 ++ > 2 files changed, 10 insertions(+), 16 deletions(-) > > diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c > index 3a3860b1a3..2b35680abc 100644 > --- a/src/qemu/qemu_process.c > +++ b/src/qemu/qemu_process.c > @@ -2724,29 +2724,24 @@ qemuProcessSetupEmulator(virDomainObjPtr vm) > > > static int > -qemuProcessResctrlCreate(virQEMUDriverPtr driver, > - virDomainObjPtr vm) > +qemuProcessResctrlCreate(virDomainObjPtr vm) > { > - int ret = -1; > size_t i = 0; > - virCapsPtr caps = NULL; > qemuDomainObjPrivatePtr priv = vm->privateData; > + g_autoptr(virResctrlInfo) resctrl = NULL; > > if (!vm->def->nresctrls) > return 0; > > - /* Force capability refresh since resctrl info can change > - * XXX: move cache info into virresctrl so caps are not needed */ > - caps = virQEMUDriverGetCapabilities(driver, true); > - if (!caps) > + if (!(resctrl = virResctrlInfoNew())) > return -1; > > for (i = 0; i < vm->def->nresctrls; i++) { > size_t j = 0; > - if (virResctrlAllocCreate(caps->host.resctrl, > + if (virResctrlAllocCreate(resctrl, > vm->def->resctrls[i]->alloc, > priv->machineName) < 0) > - goto cleanup; > + return -1; > > for (j = 0; j < vm->def->resctrls[i]->nmonitors; j++) { > virDomainResctrlMonDefPtr mon = NULL; > @@ -2754,14 +2749,11 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, > mon = vm->def->resctrls[i]->monitors[j]; > if (virResctrlMonitorCreate(mon->instance, > priv->machineName) < 0) > - goto cleanup; > + return -1; > } > } > > - ret = 0; > - cleanup: > - virObjectUnref(caps); > - return ret; > + return 0; > } > > > @@ -6882,7 +6874,7 @@ qemuProcessLaunch(virConnectPtr conn, > goto cleanup; > > VIR_DEBUG("Setting up resctrl"); > - if (qemuProcessResctrlCreate(driver, vm) < 0) > + if (qemuProcessResctrlCreate(vm) < 0) > goto cleanup; > > VIR_DEBUG("Setting up managed PR daemon"); > diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h > index 3dd7c96348..759320d0fd 100644 > --- a/src/util/virresctrl.h > +++ b/src/util/virresctrl.h > @@ -100,6 +100,8 @@ typedef virResctrlInfo *virResctrlInfoPtr; > virResctrlInfoPtr > virResctrlInfoNew(void); > > +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virResctrlInfo, virObjectUnref); > + > int > virResctrlInfoGetCache(virResctrlInfoPtr resctrl, > unsigned int level,

2 1

[libvirt] [PATCH] Fix src/ pkg-config API XML paths
by Cole Robinson 10 Dec '19

10 Dec '19

The .pc files in src/ are intended for use with the ./run script, to ease building bindings against an uninstalled libvirt build. The pointer to the API XML files is incorrect though, it needs to point into the build tree. This fixes use of the run script for building libvirt-python, ex: /path/to/libvirt.git/run ./setup.py build Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 27e3de4244..9243bcf903 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index 3eb9ad4bc1..a4f9e65c03 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index 6ff1ce6272..a16e455210 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -9,12 +9,12 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_api=@datadir@/docs/libvirt-api.xml +libvirt_api=@abs_top_builddir@/docs/libvirt-api.xml # For compat with older versions - also present # in libvirt-qemu.pc / libvirt-lxc.pc -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@ -- 2.23.0

2 4

[libvirt] [PATCH v2] lxc: Refresh capabilities if they have never been initalized
by Cole Robinson 10 Dec '19

10 Dec '19

Adjust virLXCDriverGetCapabilities to fill in driver->caps if it is empty, regardless of the passed 'refresh' value. This matches the pattern used in virQEMUDriverGetCapabilities This fixes LXC XML startup parsing for me Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Use the virQEMUDriverGetCapabilities like danpb suggested src/lxc/lxc_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 2df1537b22..adf7a0b66c 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -196,6 +196,14 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver, driver->caps = caps; } else { lxcDriverLock(driver); + + if (driver->caps == NULL || + driver->caps->nguests == 0) { + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a " + "refresh."); + lxcDriverUnlock(driver); + return virLXCDriverGetCapabilities(driver, true); + } } ret = virObjectRef(driver->caps); -- 2.23.0

2 1

[libvirt] [PATCH 0/2] tests: VIR_TEST_REGENERATE_OUTPUT fixes
by Cole Robinson 10 Dec '19

10 Dec '19

First fix is straightforward, the test-wrap-argv.py path needs to be adjusted. Second bit fixes an issue I hit with: VIR_TEST_REGENERATE_OUTPUT=1 ./build/tests/qemuxml2argvtest Where it reported not finding a python binary. I assume this is due to some preload PATH alteration, like the comment suggests, but I didn't investigate it. The patch sidesteps the issue and seems worth doing anyways Cole Robinson (2): tests: fix REGENERATE test-wrap-argv.py usage tests: use PYTHON detected from configure configure.ac | 1 + tests/testutils.c | 14 ++------------ 2 files changed, 3 insertions(+), 12 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH v2 00/25] Incremental backup support for qemu
by Peter Krempa 10 Dec '19

10 Dec '19

Next version which includes feedback from V1: https://www.redhat.com/archives/libvir-list/2019-November/msg01315.html and also few features and bugs fixed based on offline requests: - The flag VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL was added to facilitate users who wish to provide their own files. - The schema was fixed as many legitimate uses were not described: - format for the scratch file was not supported - security labels for the scratch file were not supported - tests were insufficient - backup XML 2 XML testing was added - scratch files created by libvirt are now removed after the job finishes - domain capability feature entry was added - the code for determining bitmaps for incremental backup was slightly optimized - documentation now documents our behaviour towards the scratch file and the relationship to the new flag. I might have forgotten to apply some reviewed-by tags though. I'm sorry for that. Most patches changed though (including the API patches which add the flag) so a review is welcome even there. You can fetch the new version at: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-backup-v2 Note that the branch also contains commit to enable block commit for easier testing. With the posted code the following approach can be used to enable it (new qemu required): <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> ... <qemu:capabilities> <qemu:add capability='incremental-backup'/> </qemu:capabilities> </domain> Eric Blake (5): backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup Peter Krempa (20): qemu: domain: Export qemuDomainGetImageIds API: Introduce field for reporting temporary disk space usage of a domain job virsh: Implement VIR_DOMAIN_JOB_DISK_TEMP_(USED|TOTAL) in cmdDomjobinfo API: Add domain job operation for backups tests: genericxml2xml: Add testing of backup XML files qemu: Add infrastructure for statistics of a backup job qemu: domain: Introduce QEMU_ASYNC_JOB_BACKUP async job type Add 'backup' block job type qemu: monitor: Add support for blockdev-backup via 'transaction' qemu: domain: Track backup job data in the status XML qemu: blockjob: Track internal data for 'backup' blockjob tests: qemustatusxml2xml: Add test for 'pull' type backup job conf: backup: Add fields for tracking stats of completed sub-jobs doc: Document quirk of getting block job info for a 'backup' blockjob qemu: Implement backup job APIs and qemu handling qemu: backup: Implement stats gathering while the job is running qemu: driver: Allow cancellation of the backup job qemu: blockjob: Implement concluded blockjob handler for backup blockjobs conf: domaincaps: Add 'backup' feature flag qemu: Add support for VIR_DOMAIN_CAPS_FEATURE_BACKUP docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 175 +++ docs/formatcheckpoint.html.in | 12 +- docs/formatdomaincaps.html.in | 8 + docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 223 ++++ docs/schemas/domaincaps.rng | 9 + examples/c/misc/event-test.c | 3 + include/libvirt/libvirt-domain.h | 37 +- libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + po/POTFILES.in | 3 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 499 ++++++++ src/conf/backup_conf.h | 108 ++ src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 2 +- src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 12 + src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 147 +++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 6 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_backup.c | 1039 +++++++++++++++++ src/qemu/qemu_backup.h | 46 + src/qemu/qemu_blockjob.c | 111 +- src/qemu/qemu_blockjob.h | 19 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_domain.c | 150 ++- src/qemu/qemu_domain.h | 21 + src/qemu/qemu_driver.c | 68 +- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 15 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 8 + src/qemu/qemu_process.c | 25 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 33 +- src/remote_protocol-structs | 15 + tests/Makefile.am | 2 + .../backup-pull-seclabel.xml | 18 + tests/domainbackupxml2xmlin/backup-pull.xml | 10 + .../backup-push-seclabel.xml | 17 + tests/domainbackupxml2xmlin/backup-push.xml | 10 + tests/domainbackupxml2xmlin/empty.xml | 1 + .../backup-pull-seclabel.xml | 18 + tests/domainbackupxml2xmlout/backup-pull.xml | 10 + .../backup-push-seclabel.xml | 17 + tests/domainbackupxml2xmlout/backup-push.xml | 10 + tests/domainbackupxml2xmlout/empty.xml | 1 + .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 + .../qemu_2.10.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + tests/genericxml2xmltest.c | 46 + tests/qemumonitorjsontest.c | 8 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 608 ++++++++++ .../qemustatusxml2xmldata/backup-pull-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + tests/virschematest.c | 2 + tools/Makefile.am | 1 + tools/virsh-backup.c | 151 +++ tools/virsh-backup.h | 21 + tools/virsh-domain.c | 26 +- tools/virsh.c | 2 + tools/virsh.h | 1 + tools/virsh.pod | 35 + 148 files changed, 3952 insertions(+), 26 deletions(-) create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/qemu/qemu_backup.c create mode 100644 src/qemu/qemu_backup.h create mode 100644 tests/domainbackupxml2xmlin/backup-pull-seclabel.xml create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push-seclabel.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull-seclabel.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push-seclabel.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/qemustatusxml2xmldata/backup-pull-in.xml create mode 120000 tests/qemustatusxml2xmldata/backup-pull-out.xml create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 2.23.0

6 97

[libvirt] [jenkins-ci PATCH 00/22] Add CentOS 8 to libvirt-jenkins-ci
by Fabiano Fidêncio 10 Dec '19

10 Dec '19

In order to add CentOS 8 to jenkins-ci, we had to: - Adjust lcitool to generate unattended scripts based on templates instead of using the templates themselves, as a new parameter is expected on kickstart files for RHEL / CentOS 8 (or newer); - Enable the EPEL and PowerTools repos; Then, the following projects have been added: - libvirt - Some adjustments had to be done as some dependencies got removed from CentOS 8; - libvirt-glib - libvirt-dbus - Some adjustments had to be done as flake8 doesn't pull all the needed dependencies when installed on CentOS 8; - libvirt-go - libvirt-go-xml - libvirt-ocaml - libvirt-perl - libvirt-python - virt-viewer - Some adjustments had to be done as libgovirt-devel and gtk-vnc2-devel are not present anymore on CentOS 8; - osinfo-db-tools - oisnfo-db - libosinfo - virt-manager The projects which were not added due to missing dependencies are: - libvirt-cim - libvirt-sandbox - libvirt-tck This series is written atop of: https://www.redhat.com/archives/libvir-list/2019-December/msg00461.html Fabiano Fidêncio (22): lcitool: Generate the unattended script file guests,lcitool: Use install_url in the unattended install files guests,jenkins: Add CentOS 8 guests: Install EPEL repo on all CentOS guests guests: Enable PowerTools repo on CentOS 8 guests guests,jenkins: Build libvirt on CentOS 8 guests guests,jenkins: Build libvirt-glib on CentOS guests guests,libvirt-dbus: Add python3-entrypoints dependency guests,libvirt-dbus: Add python3-mccabe dependency guests,libvirt-dbus: Add python3-pycodestile dependency guests,libvirt-dbus: Add python3-pyflakes dependency guests,jenkins: Build libvirt-dbus on CentOS 8 guests guests,jenkins: Build libvirt-go on CentOS 8 guests guests,jenkins: Build libvirt-go-xml on CentOS 8 guests guests,jenkins: Build libvirt-ocaml on CentOS 8 guests guests,jenkins: Build libvirt-perl on CentOS 8 guests guests,jenkins: Build libvirt-python on CentOS 8 guests guests,jenkins: Build virt-viewer on CentOS 8 guests guests,jenkins: Build osinfo-db-tools on CentOS 8 guests guests,jenkins: Build osinfo-db on CentOS 8 guests guests,jenkins: Build libosinfo on CentOS 8 guests guests,jenkins: Build virt-manager on CentOS 8 guests guests/configs/kickstart.cfg | 4 ++++ guests/host_vars/libvirt-centos-8/docker.yml | 2 ++ guests/host_vars/libvirt-centos-8/install.yml | 2 ++ guests/host_vars/libvirt-centos-8/main.yml | 22 ++++++++++++++++++ guests/inventory | 1 + guests/lcitool | 23 ++++++++++++++++++- guests/playbooks/build/jobs/defaults.yml | 2 ++ guests/playbooks/build/projects/libosinfo.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 2 ++ .../build/projects/libvirt-go-xml.yml | 1 + .../playbooks/build/projects/libvirt-go.yml | 1 + .../build/projects/osinfo-db-tools.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 3 +++ guests/playbooks/update/tasks/base.yml | 9 +++++++- guests/vars/mappings.yml | 16 +++++++++++++ guests/vars/projects/libvirt-dbus.yml | 4 ++++ jenkins/jobs/defaults.yaml | 2 ++ jenkins/projects/libosinfo.yaml | 1 + jenkins/projects/libvirt-dbus.yaml | 2 ++ jenkins/projects/libvirt-go-xml.yaml | 1 + jenkins/projects/libvirt-go.yaml | 1 + jenkins/projects/libvirt.yaml | 1 + jenkins/projects/osinfo-db-tools.yaml | 1 + jenkins/projects/virt-manager.yaml | 3 +++ 24 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 guests/host_vars/libvirt-centos-8/docker.yml create mode 100644 guests/host_vars/libvirt-centos-8/install.yml create mode 100644 guests/host_vars/libvirt-centos-8/main.yml -- 2.23.0

3 33

[libvirt] [PATCH v2] security: apparmor: Label externalDataStore
by Cole Robinson 10 Dec '19

10 Dec '19

Teach virt-aa-helper how to label a qcow2 data_file, tracked internally as externalDataStore. It should be treated the same as its sibling disk image Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: s/src/tmp/ src/security/virt-aa-helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c93dddb228..f623ff965f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -918,6 +918,10 @@ storage_source_add_files(virStorageSourcePtr src, if (add_file_path(tmp, depth, buf) < 0) return -1; + if (tmp->externalDataStore && + storage_source_add_files(tmp->externalDataStore, buf, depth) < 0) + return -1; + depth++; } -- 2.23.0

2 1

[libvirt] [PATCH] security: apparmor: Label externalDataStore
by Cole Robinson 10 Dec '19

10 Dec '19

Teach virt-aa-helper how to label a qcow2 data_file, tracked internally as externalDataStore. It should be treated the same as its sibling disk image Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Compiled but not runtime tested, I don't have an apparmor setup src/security/virt-aa-helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 509187ac36..fe6fa12550 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -949,6 +949,10 @@ storage_source_add_files(virStorageSourcePtr src, if (add_file_path(tmp, depth, buf) < 0) return -1; + if (src->externalDataStore && + storage_source_add_files(src->externalDataStore, buf, depth) < 0) + return -1; + depth++; } -- 2.23.0

3 4

[libvirt] [PATCH V3 jenkins-ci 0/2] Add support for openSUSE
by Jim Fehlig 09 Dec '19

09 Dec '19

Jim Fehlig (2): guests: Add support for openSUSE guests: Add lci build support for openSUSE guests/configs/autoinst.xml | 77 +++++++++++++++++++ .../host_vars/libvirt-opensuse-151/docker.yml | 2 + .../libvirt-opensuse-151/install.yml | 2 + .../host_vars/libvirt-opensuse-151/main.yml | 10 +++ guests/inventory | 1 + guests/lcitool | 2 + guests/playbooks/build/jobs/defaults.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + guests/playbooks/update/tasks/base.yml | 15 ++++ guests/vars/mappings.yml | 38 ++++++++- 10 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 guests/configs/autoinst.xml create mode 100644 guests/host_vars/libvirt-opensuse-151/docker.yml create mode 100644 guests/host_vars/libvirt-opensuse-151/install.yml create mode 100644 guests/host_vars/libvirt-opensuse-151/main.yml -- 2.24.0

3 9

[libvirt] libvirt-guests.sh stop
by Henning Schild 09 Dec '19

09 Dec '19

Hi all, the shellscript causing VMs to eventually stop when the host shuts down/reboots has a window where it can loose ACPI shutdown events. I have seen VMs not shutting down before they become ACPI aware, causing the systemd magic to time out for a couple of minutes and eventually killing the VM. Steps to reproduce: - start a new VM - reboot the host while the VM is still booting up What happens: - the ACPI power-button event will get lost - the systemd loop on the host will go and wait - the VM will get killed hard eventually What should happen (probably): - the retry loop should inject an ACPI power-button-event with every retry (5s?) - the VM will eventually have ACPI support and pick up any of the many button-events - the VM will shut down on any of the many power-button events, if there was enough time I could try to come up with a patch, but i hope the description of the problem is clear enough so someone else will try. regards, Henning

1 0

[libvirt] [PATCH] qemu: domain: raise an error when no emulator is found
by Cole Robinson 09 Dec '19

09 Dec '19

$ cat f | grep -e arch -e emulator <type arch='mipsel'>hvm</type> $ sudo virsh define f error: Failed to define domain from f error: An error occurred, but the cause is unknown After: $ sudo virsh define f error: Failed to define domain from f error: unsupported configuration: No emulator found for arch 'mipsel' Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a15364a71e..6f53e17b6a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4687,8 +4687,12 @@ qemuDomainDefPostParseBasic(virDomainDefPtr def, /* check for emulator and create a default one if needed */ if (!def->emulator) { if (!(def->emulator = virQEMUCapsGetDefaultEmulator( - driver->hostarch, def->os.arch))) + driver->hostarch, def->os.arch))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("No emulator found for arch '%s'"), + virArchToString(def->os.arch)); return 1; + } } return 0; -- 2.23.0

2 1

[libvirt] [PATCH] lxc: Refresh capabilities if they have never been initalized
by Cole Robinson 09 Dec '19

09 Dec '19

Adjust virLXCDriverGetCapabilities to fill in driver->caps if it has never been set, regardless of the passed 'refresh' boolean. This fixes LXC XML startup parsing for me Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/lxc/lxc_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 2df1537b22..803176f52b 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -186,7 +186,7 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver, bool refresh) { virCapsPtr ret; - if (refresh) { + if (refresh || !driver->caps) { virCapsPtr caps = NULL; if ((caps = virLXCDriverCapsInit(driver)) == NULL) return NULL; -- 2.23.0

2 2

[libvirt] [PATCH v2 0/4] Remove deprecated pc-0.x machine types and related hacks
by Thomas Huth 09 Dec '19

09 Dec '19

These have been on the deprecation list since a year now, so it's time to finally remove the pc-0.x machine types. We then can also remove some compatibility hacks in the devices, i.e. the "use_broken_id" in ac97, the "command_serr_enable" in PCI devices and the "rombar" stuff in VGA devices. v2: - Minor updates to the first patch (fix comment, add deprecation_reason message for the pc-1.x machines) - Keep the QEMU_PCI_CAP_SERR enum in the third patch - Added fourth patch to remove the "rombar" hacks from the VGA devices Thomas Huth (4): hw/i386: Remove the deprecated machines 0.12 up to 0.15 hw/audio: Remove the "use_broken_id" hack from the AC97 device hw/pci: Remove the "command_serr_enable" property hw/display: Remove "rombar" hack from vga-pci and vmware_vga hw/audio/ac97.c | 9 ----- hw/display/vga-pci.c | 5 --- hw/display/vga.c | 4 +- hw/display/vmware_vga.c | 5 --- hw/i386/pc_piix.c | 85 +---------------------------------------- hw/pci/pci.c | 6 +-- include/hw/pci/pci.h | 2 +- qemu-deprecated.texi | 2 +- tests/cpu-plug-test.c | 6 +-- 9 files changed, 7 insertions(+), 117 deletions(-) -- 2.18.1

5 11

[libvirt] [PATCH 0/5] Misc build fixes for RHEL-7
by Daniel P. Berrangé 09 Dec '19

09 Dec '19

This fixes some problems from my series related to RHEL-7 and VZ, and also one that seems to have hit VZ for a long while before. I'm pushing all as trivial/build fixes. Daniel P. Berrangé (5): tests: fix warning with old GCC about missing struct initializer vz: pass virDomainXMLOptionPtr to virDomainVideoDefNew vz: pass pointer to vz capabilities vz: declare missing driver variable vz: drop virCapsPtr param from many API domain parse calls src/vz/vz_driver.c | 12 ++++++------ src/vz/vz_sdk.c | 14 +++++++++----- tests/openvzutilstest.c | 8 ++++---- 3 files changed, 19 insertions(+), 15 deletions(-) -- 2.23.0

1 5

[libvirt] [jenkins-ci PATCH] guests: Rename Ubuntu targets
by Andrea Bolognani 09 Dec '19

09 Dec '19

Back when they were introduced, we chose to only include the part of the version number preceding the dot with the rationale that doing so introduced no ambiguity since, while there are two Ubuntu releases per year, we only support LTS releases and those happen once every two years. When introducing openSUSE support, however, we could not adopt the same strategy because openSUSE Leap 15.0 and openSUSe Leap 15.1 are, at least in some regards, just as distinct as Ubuntu 16.04 and Ubuntu 18.04 are, despite sharing the same major version number; we've thus decided to encode the full version number, dropping the dot to avoid issues connected to the fact that we use the target name as host name for guests. Let's retroactively apply this new convention to existing Ubuntu targets in order to maintain consistency. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../docker.yml | 0 .../install.yml | 0 .../main.yml | 2 +- .../docker.yml | 0 .../install.yml | 0 .../main.yml | 2 +- guests/inventory | 4 ++-- guests/playbooks/build/jobs/defaults.yml | 4 ++-- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 4 ++-- .../playbooks/build/projects/libvirt-go.yml | 4 ++-- .../build/projects/libvirt-sandbox.yml | 4 ++-- .../playbooks/build/projects/libvirt-tck.yml | 4 ++-- guests/playbooks/build/projects/libvirt.yml | 4 ++-- .../playbooks/build/projects/virt-manager.yml | 4 ++-- guests/vars/mappings.yml | 22 +++++++++---------- 16 files changed, 30 insertions(+), 30 deletions(-) rename guests/host_vars/{libvirt-ubuntu-16 => libvirt-ubuntu-1604}/docker.yml (100%) rename guests/host_vars/{libvirt-ubuntu-16 => libvirt-ubuntu-1604}/install.yml (100%) rename guests/host_vars/{libvirt-ubuntu-16 => libvirt-ubuntu-1604}/main.yml (95%) rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/docker.yml (100%) rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/install.yml (100%) rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/main.yml (95%) diff --git a/guests/host_vars/libvirt-ubuntu-16/docker.yml b/guests/host_vars/libvirt-ubuntu-1604/docker.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-16/docker.yml rename to guests/host_vars/libvirt-ubuntu-1604/docker.yml diff --git a/guests/host_vars/libvirt-ubuntu-16/install.yml b/guests/host_vars/libvirt-ubuntu-1604/install.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-16/install.yml rename to guests/host_vars/libvirt-ubuntu-1604/install.yml diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-1604/main.yml similarity index 95% rename from guests/host_vars/libvirt-ubuntu-16/main.yml rename to guests/host_vars/libvirt-ubuntu-1604/main.yml index 179dd03..4f803a5 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1604/main.yml @@ -18,6 +18,6 @@ projects: package_format: 'deb' package_manager: 'apt-get' os_name: 'Ubuntu' -os_version: '16' +os_version: '1604' ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/host_vars/libvirt-ubuntu-18/docker.yml b/guests/host_vars/libvirt-ubuntu-1804/docker.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-18/docker.yml rename to guests/host_vars/libvirt-ubuntu-1804/docker.yml diff --git a/guests/host_vars/libvirt-ubuntu-18/install.yml b/guests/host_vars/libvirt-ubuntu-1804/install.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-18/install.yml rename to guests/host_vars/libvirt-ubuntu-1804/install.yml diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-1804/main.yml similarity index 95% rename from guests/host_vars/libvirt-ubuntu-18/main.yml rename to guests/host_vars/libvirt-ubuntu-1804/main.yml index 5b5bf0c..9070157 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1804/main.yml @@ -19,6 +19,6 @@ projects: package_format: 'deb' package_manager: 'apt-get' os_name: 'Ubuntu' -os_version: '18' +os_version: '1804' ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/inventory b/guests/inventory index f1f7708..ecdcc34 100644 --- a/guests/inventory +++ b/guests/inventory @@ -9,5 +9,5 @@ libvirt-freebsd-11 libvirt-freebsd-12 libvirt-freebsd-current libvirt-opensuse-151 -libvirt-ubuntu-16 -libvirt-ubuntu-18 +libvirt-ubuntu-1604 +libvirt-ubuntu-1804 diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index 43ab882..0175a05 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -11,8 +11,8 @@ all_machines: - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-opensuse-151 - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 rpm_machines: - libvirt-centos-7 - libvirt-fedora-30 diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index fac1d8f..8c946af 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -19,7 +19,7 @@ - libvirt-debian-sid - libvirt-fedora-30 - libvirt-fedora-rawhide - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml' vars: # RPM build is still not possible on CentOS7 as it does not diff --git a/guests/playbooks/build/projects/libvirt-go-xml.yml b/guests/playbooks/build/projects/libvirt-go-xml.yml index f96df60..5cacb7c 100644 --- a/guests/playbooks/build/projects/libvirt-go-xml.yml +++ b/guests/playbooks/build/projects/libvirt-go-xml.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-go-xml"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-go.yml b/guests/playbooks/build/projects/libvirt-go.yml index 654190c..36322b1 100644 --- a/guests/playbooks/build/projects/libvirt-go.yml +++ b/guests/playbooks/build/projects/libvirt-go.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-go"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/playbooks/build/projects/libvirt-sandbox.yml index ec72051..0b4fe50 100644 --- a/guests/playbooks/build/projects/libvirt-sandbox.yml +++ b/guests/playbooks/build/projects/libvirt-sandbox.yml @@ -11,8 +11,8 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-sandbox"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml index 9d885c1..ef88cd3 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-tck"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks/build/projects/libvirt.yml index 66ea851..e0f2f7c 100644 --- a/guests/playbooks/build/projects/libvirt.yml +++ b/guests/playbooks/build/projects/libvirt.yml @@ -20,8 +20,8 @@ - libvirt-fedora-31 - libvirt-fedora-rawhide - libvirt-opensuse-151 - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' vars: local_env: | diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index a30718c..c0d4294 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -14,7 +14,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["virt-manager"][git_remote] }}' @@ -35,7 +35,7 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: machines: diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index d4016fb..56310f0 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -22,7 +22,7 @@ # - CentOS, Debian, Fedora, FreeBSD, OpenSUSE, Ubuntu # # Valid OS versions are: -# - CentOS7, Debian9, FedoraRawhide, OpenSUSE151, Ubuntu18 and so on +# - CentOS7, Debian9, FedoraRawhide, OpenSUSE151, Ubuntu1804 and so on # # The arch specific rules use a prefix "$ARCH-" where $ARCH # is a libvirt arch name. @@ -199,8 +199,8 @@ mappings: rpm: glusterfs-api-devel Debian9: glusterfs-common OpenSUSE: glusterfs-devel - Ubuntu16: glusterfs-common - Ubuntu18: glusterfs-common + Ubuntu1604: glusterfs-common + Ubuntu1804: glusterfs-common cross-policy-deb: foreign gnutls: @@ -232,7 +232,7 @@ mappings: gtk-update-icon-cache: default: gtk-update-icon-cache - Ubuntu16: libgtk2.0-bin + Ubuntu1604: libgtk2.0-bin gtk-vnc2: deb: libgtk-vnc-2.0-dev @@ -268,7 +268,7 @@ mappings: pkg: openjdk11 rpm: java-11-openjdk-headless Debian9: openjdk-8-jre-headless - Ubuntu16: openjdk-8-jre-headless + Ubuntu1604: openjdk-8-jre-headless json-glib: deb: libjson-glib-dev @@ -463,8 +463,8 @@ mappings: default: meson CentOS7: Debian9: - Ubuntu16: - Ubuntu18: + Ubuntu1604: + Ubuntu1804: ninja: default: ninja-build @@ -645,7 +645,7 @@ mappings: pkg: ncurses rpm: ncurses-devel Debian9: libncurses5-dev - Ubuntu18: libncurses5-dev + Ubuntu1804: libncurses5-dev cross-policy-deb: foreign netcf: @@ -838,7 +838,7 @@ mappings: default: python3-libxml2 FreeBSD: py36-libxml2 CentOS7: - Ubuntu16: + Ubuntu1604: python3-lxml: default: python3-lxml @@ -853,8 +853,8 @@ mappings: python3-pip: CentOS7: python3-pip Debian9: python3-pip - Ubuntu16: python3-pip - Ubuntu18: python3-pip + Ubuntu1604: python3-pip + Ubuntu1804: python3-pip python3-pytest: default: python3-pytest -- 2.23.0

2 1

[libvirt] [python PATCH] setup: Accept 'nosetests3' as nosetests binary
by Andrea Bolognani 09 Dec '19

09 Dec '19

This is the name used on Ubuntu. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ea25dc0..2831595 100755 --- a/setup.py +++ b/setup.py @@ -297,6 +297,7 @@ class my_test(Command): "nosetests-%d.%d" % (sys.version_info[0], sys.version_info[1]), "nosetests-%d" % (sys.version_info[0]), + "nosetests%d" % (sys.version_info[0]), "nosetests", ] -- 2.23.0

2 1

[libvirt] [PATCH] xen: Remove unused 'cfg'
by Peter Krempa 09 Dec '19

09 Dec '19

Refactoring of the XML parser left few instances of the libxlDriverConfig object unused. Remove them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule as it makes clang unhappy. src/libxl/libxl_domain.c | 1 - tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ff9502d3bb..915aaeb8b0 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1547,7 +1547,6 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver, { virDomainDefPtr migratableDefSrc = NULL; virDomainDefPtr migratableDefDst = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); bool ret = false; if (!(migratableDefSrc = virDomainDefCopy(src, driver->xmlopt, NULL, true)) || diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 3c0469be85..4e4b28cd34 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -72,7 +72,6 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) int ret = -1; virDomainDefPtr def = NULL; char *replacedXML = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); if (VIR_ALLOC_N(gotxlcfgData, wrote) < 0) goto fail; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 7e324eb5d2..6bd18d0fe1 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -45,7 +45,6 @@ testCompareParseXML(const char *xmcfg, const char *xml) virConnectPtr conn = NULL; int wrote = 4096; virDomainDefPtr def = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0) goto fail; -- 2.23.0

1 0

[libvirt] [PATCH] qemu: snapshot: Mark file becoming backingStore as read-only
by Peter Krempa 09 Dec '19

09 Dec '19

For any backing file we set 'read-only' to true, but didn't do this when modifying the recorded backing store when creating external snapshots. This meant that qemu would attempt to open the backing-file read-write. This would fail for example when selinux is used as qemu doesn't have write permission for the backing file. https://bugzilla.redhat.com/show_bug.cgi?id=1781079 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 738e8832cc..96e811a893 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14659,6 +14659,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, goto cleanup; if (virStorageSourceHasBacking(defdisk->src)) { + defdisk->src->readonly = true; newsrc->backingStore = g_steal_pointer(&defdisk->src); } else { virObjectUnref(defdisk->src); @@ -15510,6 +15511,7 @@ qemuDomainSnapshotDiskUpdateSource(virQEMUDriverPtr driver, qemuDomainSnapshotDiskUpdateSourceRenumber(dd->disk->src); if (dd->persistdisk) { + dd->persistdisk->src->readonly = true; dd->persistsrc->backingStore = g_steal_pointer(&dd->persistdisk->src); dd->persistdisk->src = g_steal_pointer(&dd->persistsrc); } -- 2.23.0

2 1

[libvirt] [python PATCH] Remove 'Makefile'
by Peter Krempa 09 Dec '19

09 Dec '19

Python world uses setup.py for everything so our Makefile is just a "convenience" wrapper for people using to type 'make'. Remove it as it doesn't add that much value and would need to be updated for python 3. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Makefile | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 6c8da0a..0000000 --- a/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Shim wrapper around setup.py to allow for familiar build targets - -PYTHON ?= python - -all: - $(PYTHON) setup.py build - -install: all - $(PYTHON) setup.py install - -clean: - $(PYTHON) setup.py clean - -check: all - $(PYTHON) setup.py test - -rpm: - $(PYTHON) setup.py rpm -- 2.23.0

2 1

[libvirt] [PATCH v2] qemu: cold-unplug of sound
by Jidong Xia 09 Dec '19

09 Dec '19

With this patch users can cold unplug some sound devices. use "virsh detach-device vm sound.xml --config" command. Signed-off-by: Jidong Xia <xiajidong(a)cmss.chinamobile.com> --- src/conf/domain_conf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 9 ++++++++- 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9580884..4b28502 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2753,6 +2753,14 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) VIR_FREE(def); } +virDomainSoundDefPtr +virDomainSoundDefRemove(virDomainDefPtr def, size_t idx) +{ + virDomainSoundDefPtr ret = def->sounds[idx]; + VIR_DELETE_ELEMENT(def->sounds, idx, def->nsounds); + return ret; +} + void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) { if (!def) @@ -14554,6 +14562,46 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, } +static bool +virDomainSoundDefEquals(const virDomainSoundDef *a, + const virDomainSoundDef *b) +{ + size_t i; + + if (a->model != b->model) + return false; + + if (a->ncodecs != b->ncodecs) + return false; + + for (i = 0; i < a->ncodecs; i++) { + if (a->codecs[i]->type != b->codecs[i]->type) + return false; + } + + if (a->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info)) + return false; + + return true; +} + + +ssize_t +virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound) +{ + size_t i; + + for (i = 0; i < def->nsounds; i++) { + if (virDomainSoundDefEquals(sound, def->sounds[i])) + return i; + } + + return -1; +} + + static virDomainWatchdogDefPtr virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 49cb697..cdb7b92 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2883,7 +2883,10 @@ void virDomainChrDefFree(virDomainChrDefPtr def); int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, virDomainChrSourceDefPtr src); void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); +ssize_t virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound); void virDomainSoundDefFree(virDomainSoundDefPtr def); +virDomainSoundDefPtr virDomainSoundDefRemove(virDomainDefPtr def, size_t idx); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9..cdbd64f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -578,7 +578,9 @@ virDomainSmartcardTypeFromString; virDomainSmartcardTypeToString; virDomainSmbiosModeTypeFromString; virDomainSmbiosModeTypeToString; +virDomainSoundDefFind; virDomainSoundDefFree; +virDomainSoundDefRemove; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; virDomainStartupPolicyTypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 18bd010..8d91bb2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8302,6 +8302,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, { virDomainDiskDefPtr disk, det_disk; virDomainNetDefPtr net; + virDomainSoundDefPtr sound; virDomainHostdevDefPtr hostdev, det_hostdev; virDomainLeaseDefPtr lease, det_lease; virDomainControllerDefPtr cont, det_cont; @@ -8330,6 +8331,13 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); break; + case VIR_DOMAIN_DEVICE_SOUND: + sound = dev->data.sound; + if ((idx = virDomainSoundDefFind(vmdef, sound)) < 0) + return -1; + virDomainSoundDefFree(virDomainSoundDefRemove(vmdef, idx)); + break; + case VIR_DOMAIN_DEVICE_HOSTDEV: { hostdev = dev->data.hostdev; if ((idx = virDomainHostdevFind(vmdef, hostdev, &det_hostdev)) < 0) { @@ -8460,7 +8468,6 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, vmdef->vsock = NULL; break; - case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: checkpoint: fix NULL dereference at create time
by Cole Robinson 09 Dec '19

09 Dec '19

'cfg' is never initialized here, which causes a crash later in qemuCheckpointCreateFinalize Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_checkpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index d5af6b99bf..58cf337833 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -468,7 +468,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, bool update_current = true; bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags = 0; - g_autoptr(virQEMUDriverConfig) cfg = NULL; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virCaps) caps = NULL; g_autoptr(virDomainCheckpointDef) def = NULL; -- 2.23.0

2 1

[libvirt] [PATCH 0/4] drop usage of c-strcase gnulib module
by Pavel Hrdina 09 Dec '19

09 Dec '19

Pavel Hrdina (4): use g_ascii_strcasecmp instead of c_strcasecmp from gnulib use g_ascii_strncasecmp instead of c_strncasecmp from gnulib syntax-check: update strcase check to refer to GLib bootstrap.conf: drop usage of c-strcase gnulib module bootstrap.conf | 1 - build-aux/syntax-check.mk | 2 +- src/internal.h | 11 +++++------ tests/virhashtest.c | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH 0/8] qemu: Fix non-shared storage migration over NBD (blockdev-add sequels)
by Peter Krempa 07 Dec '19

07 Dec '19

I put some blockdev awareness into the non-shared storage migration NBD code but it was not complete. Seeing it there mislead me thinking that it's done. Fix it now. Peter Krempa (8): qemu: migration: Simplify handling of 'diskAlias' when adding NBD exports qemu: migration: Properly export backend for NBD storage migration qemu: migration: Access job name from job struct qemu: migration: Simplify cleanup in qemuMigrationSrcNBDCopyCancelOne qemu: blockjob: Allow NULL 'mirror' for block copy jobs due to migration qemu: migration: Split out setup of the migration target qemu: migration: Mention disk target rather than the drive name in debug msg qemu: migration: Properly setup mirror for blockdev configurations src/qemu/qemu_blockjob.c | 11 +++- src/qemu/qemu_migration.c | 115 ++++++++++++++++++++++++-------------- 2 files changed, 80 insertions(+), 46 deletions(-) -- 2.23.0

2 16

Re: [libvirt] [PATCH for-4.2?] block/qcow2-bitmap: fix crash bug in qcow2_co_remove_persistent_dirty_bitmap
by Eric Blake 06 Dec '19

06 Dec '19

On 12/5/19 1:30 PM, Vladimir Sementsov-Ogievskiy wrote: > Here is double bug: > > First, return error but not set errp. This may lead to: > qmp block-dirty-bitmap-remove may report success when actually failed > > block-dirty-bitmap-remove used in a transaction will crash, as > qmp_transaction will think that it returned success and will cal call > block_dirty_bitmap_remove_commit which will crash, as state->bitmap is > NULL > > Second (like in anecdote), this case is not an error at all. As it is > documented in the comment above bdrv_co_remove_persistent_dirty_bitmap > definition, absence of bitmap is not an error, and similar case handled > at start of qcow2_co_remove_persistent_dirty_bitmap, it returns 0 when > there is no bitmaps at all.. double . > > But when there are some bitmaps, but not the requested one, it return > error with errp unset. > > Fix that. > > Fixes: b56a1e31759b750 > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> > --- > > Hi all! > > Ohm, suddenly we faced this bug. It's a regression in 4.2. I'm very > sorry for introducing it, and it sad that it's found so late.. > > Personally, I think that this one worth rc5, as it makes new bitmap > interfaces unusable. But the decision is yours. > > Last minute edit: hmm, actually, transaction action introduced in > 4.2, so crash is not a regression, only broken block-dirty-bitmap-remove > command is a regression... Maybe it's OK for stable. Libvirt REALLY wants to use transaction bitmap management (and require qemu 4.2) for its incremental backup patches that Peter is almost ready to merge in. I'm trying to ascertain: When exactly can this bug hit? Can you give a sequence of QMP commands that will trigger it for easy reproduction? Are there workarounds (such as checking that a bitmap exists prior to attempting to remove it)? If it does NOT get fixed in rc5, how will libvirt be able to probe whether the fix is in place? > > block/qcow2-bitmap.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c > index 8abaf632fc..c6c8ebbe89 100644 > --- a/block/qcow2-bitmap.c > +++ b/block/qcow2-bitmap.c > @@ -1469,8 +1469,10 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, > Qcow2BitmapList *bm_list; > > if (s->nb_bitmaps == 0) { > - /* Absence of the bitmap is not an error: see explanation above > - * bdrv_remove_persistent_dirty_bitmap() definition. */ > + /* > + * Absence of the bitmap is not an error: see explanation above > + * bdrv_co_remove_persistent_dirty_bitmap() definition. > + */ > return 0; > } > > @@ -1485,7 +1487,8 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, > > bm = find_bitmap_by_name(bm_list, name); > if (bm == NULL) { > - ret = -EINVAL; > + /* Absence of the bitmap is not an error, see above. */ > + ret = 0; > goto out; > } > > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org

3 8

[libvirt] Offline manipulation of Dirty Bitmaps by qemu-img
by John Snow 06 Dec '19

06 Dec '19

This has come up in the past, and I believe we discussed this at KVM Forum, too: There have been requests from oVirt (via Nir Soffer) to add some offline bitmap manipulation functionality. In the past, our stance has generally been "Use QEMU without an accelerator, and use QMP to manipulate the images." We like this for a few reasons: 1. It keeps bitmap management code tightly centralized 2. It allows for the full suite of bitmap manipulations in either offline or online mode with one tool 3. We wouldn't have to write new code. 4. Or design new CLIs and duplicate our existing work. 5. Or write even more tests. However, tools like oVirt may or may not be fully equipped to launch QEMU in this context, and there is always a desire for qemu-img to be able to "do more", so existing management suites could extend functionality more easily. (Or so I am imagining.) I am still leaning heavily against adding any more CLI commands or options to qemu-img right now. Even if we do add some of the fundamental ones like "add" or "remove", it seems only a matter of time before we have to add "clear", "merge", etc. Is this just a race to code duplication? On the other hand, one of the other suggestions is to have qemu-img check --repair optionally delete corrupted bitmaps. I kind of like this idea: it's a buyer beware operation that might make management layers unhappy, but then again ... repair is always something that could make things worse. Plus, if you manage to corrupt bitmaps badly enough that they can't even be parsed, you might need a heavyweight repair operation. Nir, do you think that'd be sufficient for your needs for now, or would you still like to see more granular offline management? --js

3 3