- Devel - libvirt List Archives

[libvirt] [PATCH v7 00/23] Incremental backups
by Eric Blake 27 Mar '19

27 Mar '19

I've finished rebasing my earlier v4/v5 patches on top of cleanups earlier in the series (v6 didn't include the second half of the series). I've pushed a tag backup-v7 to both my libvirt.git and libvirt-python.git repos to match: https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/backup-v7 https://repo.or.cz/libvirt-python/ericb.git/shortlog/refs/tags/backup-v7 Here's hoping we're happy enough with the API, including the fact that rudimentary operation of pull mode backups work with qemu 4.0-rc1, for this to make it into the 5.2 release. Diffs from v6 - couple more early easy cleanups - add Dan's R-b where appropriate - drop any attempt at virDomainGetJobIds(), instead: - document that job id 0 always works for the current backup job (if there is just one), which is just fine for now because qemu 4.0 doesn't permit parallel jobs (and we can do full job id support for a later release) - split some more patches; finish moving backup code to a new backup_conf.c and not piggybacked onto checkpoint_conf.c Eric Blake (23): snapshot: Drop pointless function virDomainMomentIsCurrentName snapshot: Allow NULL to virDomainSnapshotObjGetDef snapshot: Refactor qemu to utilize virDomainMoment more backup: Document new XML for checkpoints backup: Document new XML for backups backup: Introduce virDomainCheckpoint APIs backup: Introduce virDomainBackup APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects squash to checkpoint list backup: Add new domain:checkpoint access control backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for checkpoints backup: Implement virsh support for backup backup: Add new qemu monitor interactions backup: qemu: Implement metadata tracking for checkpoint APIs backup: Wire up qemu checkpoint commands over QMP backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: qemu: Wire up qemu full push backup commands over QMP backup: implement qemu incremental pull backup include/libvirt/libvirt-domain-checkpoint.h | 161 ++ include/libvirt/libvirt-domain-snapshot.h | 8 +- include/libvirt/libvirt-domain.h | 47 +- include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 8 +- src/conf/backup_conf.h | 96 + src/conf/checkpoint_conf.h | 103 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 12 + src/conf/virdomaincheckpointobjlist.h | 74 + src/conf/virdomainmomentobjlist.h | 9 +- src/conf/virdomainobjlist.h | 9 +- src/conf/virdomainsnapshotobjlist.h | 4 +- src/driver-hypervisor.h | 81 +- src/qemu/qemu_block.h | 3 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 39 +- src/qemu/qemu_monitor.h | 21 +- src/qemu/qemu_monitor_json.h | 21 +- tools/virsh-checkpoint.h | 29 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 10 +- docs/domainstatecapture.html.in | 315 ++++ docs/format.html.in | 2 + docs/formatbackup.html.in | 184 ++ docs/formatcheckpoint.html.in | 204 +++ docs/formatsnapshot.html.in | 2 + docs/index.html.in | 4 +- docs/schemas/domainbackup.rng | 219 +++ docs/schemas/domaincheckpoint.rng | 87 + examples/object-events/event-test.c | 3 + libvirt.spec.in | 3 + mingw-libvirt.spec.in | 6 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 5 +- src/conf/Makefile.inc.am | 6 + src/conf/backup_conf.c | 544 ++++++ src/conf/checkpoint_conf.c | 639 +++++++ src/conf/domain_conf.c | 8 +- src/conf/snapshot_conf.c | 2 +- src/conf/virdomaincheckpointobjlist.c | 222 +++ src/conf/virdomainmomentobjlist.c | 49 +- src/conf/virdomainobjlist.c | 13 +- src/conf/virdomainsnapshotobjlist.c | 11 +- src/libvirt-domain-checkpoint.c | 750 ++++++++ src/libvirt-domain-snapshot.c | 89 + src/libvirt-domain.c | 239 ++- src/libvirt_private.syms | 33 +- src/libvirt_public.syms | 20 + src/qemu/qemu_block.c | 12 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 249 ++- src/qemu/qemu_driver.c | 1609 ++++++++++++++++- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 65 +- src/qemu/qemu_monitor_json.c | 201 +- src/qemu/qemu_process.c | 7 + src/remote/remote_daemon_dispatch.c | 22 +- src/remote/remote_driver.c | 34 +- src/remote/remote_protocol.x | 259 ++- src/remote_protocol-structs | 139 ++ src/rpc/gendispatch.pl | 34 +- src/test/test_driver.c | 7 +- tests/Makefile.am | 13 +- tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/redefine.xml | 63 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlin/size.xml | 4 + tests/domaincheckpointxml2xmlout/empty.xml | 7 + tests/domaincheckpointxml2xmlout/sample.xml | 12 + tests/domaincheckpointxml2xmlout/size.xml | 11 + tests/domaincheckpointxml2xmltest.c | 212 +++ .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.xml | 2 + .../caps_4.0.0.x86_64.xml | 2 + tests/qemumonitorjsontest.c | 2 +- tests/virschematest.c | 4 + tools/Makefile.am | 3 +- tools/virsh-checkpoint.c | 1370 ++++++++++++++ tools/virsh-completer.c | 53 +- tools/virsh-domain-monitor.c | 25 +- tools/virsh-domain.c | 270 ++- tools/virsh-snapshot.c | 37 +- tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 302 +++- 100 files changed, 9373 insertions(+), 163 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/backup_conf.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/redefine.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlin/size.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/size.xml create mode 100644 tests/domaincheckpointxml2xmltest.c create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

4 63

[libvirt] [PATCH] tests: don't abort in fopen(/proc/mounts)
by Daniel P. Berrangé 27 Mar '19

27 Mar '19

The mock fopen() function will abort if "/proc/mounts" is requested with "r" permissions and VIR_CGROUP_MOCK_FILENAME env var is not set. Unfortunately this is triggering by the libselinux library constructor when it tries to read /proc/mounts to find out if selinuxfs is mounted in an unusual place. This, however, only affects libselinux in Debian as that opens with "r", while in Fedora / RHEL it opens "re" and thus luckily never triggered the abort(), instead getting an EACCESS. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/vircgroupmock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 06bd0a5f29..9c67a44b0d 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -460,8 +460,10 @@ FILE *fopen(const char *path, const char *mode) } if (type) { - if (!filename) - abort(); + if (!filename) { + errno = EACCES; + return NULL; + } if (virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", abs_srcdir, filename, type) < 0) { abort(); -- 2.20.1

2 3

[libvirt] [PATCH v6 0/9] Incremental backups, focus on API
by Eric Blake 27 Mar '19

27 Mar '19

I'm fairly confident that these API are ready to go (that is, I've got qemu code in the wings to implement these API for the qemu driver, as demonstrated at last KVM forum, and it shouldn't be too hard to add support in the test driver to get some 'make check' coverage similar to what I recently added for snapshots). I'm hoping the APIs make it in for 5.2, even if I'm still dealing with review churn on the later parts of my v5 series (there has been a lot of rebasing from earlier review comments, so v5 is currently still the most recent version that I was able to run demos with, although I hope to post the rest of v6 soon). The biggest diffs compared to v4/v5 are addressing many of John Ferlan's grammar suggestions, removing some TODO items from the public API (although implementing those changes, such as the new VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE, is still on my todo list), splitting some large patches (checkpoints and backups are now separated), moving the backup APIs into libvirt-domain.c instead of piggybacking on libvirt-domain-checkpoint.c, and adding 2 more API (virDomainSnapshotCreateXML2 to create a checkpoint at the same time as a snapshot; virDomainListJobIds to learn the job ids of all currently running backup jobs [the initial implementation will only ever have job id 1 due to qemu 4.0 limitations, but the API was designed with future expansion in mind]). I've also got some preliminary patches to snapshot in this posting based on things noticed while working checkpoints. 001/9:[down] 'Revert "snapshot: Add virDomainSnapshotObjListParse"' 002/9:[down] 'Revert "snapshot: Add virDomainSnapshotObjListFormat"' 003/9:[down] 'snapshot: Various doc tweaks' 004/9:[0005] [FC] 'backup: Introduce virDomainCheckpointPtr' 005/9:[down] 'backup: Document new XML for checkpoints' 006/9:[0562] [FC] 'backup: Document new XML for backups' 007/9:[0173] [FC] 'backup: Introduce virDomainCheckpoint APIs' 008/9:[0296] [FC] 'backup: Introduce virDomainBackup APIs' 009/9:[0039] [FC] 'backup: Document nuances between different state capture APIs' Eric Blake (9): Revert "snapshot: Add virDomainSnapshotObjListParse" Revert "snapshot: Add virDomainSnapshotObjListFormat" snapshot: Various doc tweaks backup: Introduce virDomainCheckpointPtr backup: Document new XML for checkpoints backup: Document new XML for backups backup: Introduce virDomainCheckpoint APIs backup: Introduce virDomainBackup APIs backup: Document nuances between different state capture APIs include/libvirt/virterror.h | 7 +- src/util/virerror.c | 12 +- include/libvirt/libvirt-domain-checkpoint.h | 161 ++++ include/libvirt/libvirt-domain-snapshot.h | 7 +- include/libvirt/libvirt-domain.h | 59 +- include/libvirt/libvirt.h | 3 +- src/conf/snapshot_conf.h | 7 - src/conf/virdomainmomentobjlist.h | 5 +- src/conf/virdomainsnapshotobjlist.h | 13 - src/datatypes.h | 33 +- src/driver-hypervisor.h | 87 ++- src/qemu/qemu_blockjob.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 10 +- docs/domainstatecapture.html.in | 313 ++++++++ docs/format.html.in | 2 + docs/formatbackup.html.in | 181 +++++ docs/formatcheckpoint.html.in | 204 +++++ docs/formatsnapshot.html.in | 82 +- docs/index.html.in | 4 +- docs/schemas/domainbackup.rng | 219 ++++++ docs/schemas/domaincheckpoint.rng | 94 +++ examples/object-events/event-test.c | 3 + libvirt.spec.in | 3 + mingw-libvirt.spec.in | 6 + po/POTFILES | 1 + src/Makefile.am | 2 + src/conf/domain_conf.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/virdomainsnapshotobjlist.c | 166 ---- src/datatypes.c | 63 +- src/libvirt-domain-checkpoint.c | 749 +++++++++++++++++++ src/libvirt-domain-snapshot.c | 311 ++++---- src/libvirt-domain.c | 289 ++++++- src/libvirt_private.syms | 4 +- src/libvirt_public.syms | 21 + tests/Makefile.am | 4 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlout/empty.xml | 10 + tests/domaincheckpointxml2xmlout/sample.xml | 16 + tests/virschematest.c | 4 + tools/virsh-domain.c | 8 +- 50 files changed, 2794 insertions(+), 431 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml -- 2.20.1

5 28

[libvirt] [PATCH 1/2] qemu: Fix "boolen" typo in API doc
by Christophe Fergeau 27 Mar '19

27 Mar '19

This also adjusts the argument name which should be 'isListen' in both cases rather than 'listen'. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f81d20e5f7..bfa7211894 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -876,7 +876,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, /* qemuBuildTLSx509BackendProps: * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @isListen: boolen listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @alias: alias for the TLS credentials object * @secalias: if one exists, the alias of the security object for passwordid @@ -917,7 +917,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, /* qemuBuildTLSx509CommandLine: * @cmd: Pointer to command * @tlspath: path to the TLS credentials - * @listen: boolen listen for client or server setting + * @isListen: boolean listen for client or server setting * @verifypeer: boolean to enable peer verification (form of authorization) * @certEncSecretAlias: alias of a 'secret' object for decrypting TLS private key * (optional) -- 2.21.0

2 3

[libvirt] [PATCH] news: Document parallel migration
by Jiri Denemark 27 Mar '19

27 Mar '19

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 83e965e0f3..2067830848 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -104,6 +104,18 @@ E.g. <code><controller type='xenbus' maxGrantFrames='64'/></code> </description> </change> + <change> + <summary> + qemu: Add support for parallel migration + </summary> + <description> + With QEMU 4.0.0 libvirt can enable parallel migration which causes + the memory pages to be processed in parallel by several threads and + sent to the destination host using several connections at the same + time. This may increase migration speed in case a single thread is + unable to saturate the network link. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.21.0

2 1

[libvirt] [dockerfiles PATCH] Add Dockerfile for i686 cross-compilation
by Andrea Bolognani 27 Mar '19

27 Mar '19

We didn't add this until now because i686 cross-compilation requires special care and lcitool was known to produce broken Dockerfiles, but that's been fixed as of libvirt-jenkins-ci commit f72d09153905 so we can finally go ahead and complete our coverage of non-x86_64 architectures. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- buildenv-debian-sid-cross-i686.Dockerfile | 93 +++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 buildenv-debian-sid-cross-i686.Dockerfile diff --git a/buildenv-debian-sid-cross-i686.Dockerfile b/buildenv-debian-sid-cross-i686.Dockerfile new file mode 100644 index 0000000..0ac238b --- /dev/null +++ b/buildenv-debian-sid-cross-i686.Dockerfile @@ -0,0 +1,93 @@ +FROM debian:sid + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + iproute2 \ + kmod \ + libc-dev-bin \ + libtool \ + libtool-bin \ + libxml2-utils \ + lvm2 \ + make \ + nfs-common \ + numad \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sudo \ + vim \ + xsltproc \ + zfs-fuse && \ + apt-get autoremove -y && \ + apt-get autoclean -y + +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture i386 && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + gcc-i686-linux-gnu \ + libacl1-dev:i386 \ + libapparmor-dev:i386 \ + libattr1-dev:i386 \ + libaudit-dev:i386 \ + libavahi-client-dev:i386 \ + libblkid-dev:i386 \ + libc6-dev:i386 \ + libcap-ng-dev:i386 \ + libcurl4-gnutls-dev:i386 \ + libdbus-1-dev:i386 \ + libdevmapper-dev:i386 \ + libfuse-dev:i386 \ + libglusterfs-dev:i386 \ + libgnutls28-dev:i386 \ + libiscsi-dev:i386 \ + libnl-3-dev:i386 \ + libnl-route-3-dev:i386 \ + libnuma-dev:i386 \ + libparted-dev:i386 \ + libpcap0.8-dev:i386 \ + libpciaccess-dev:i386 \ + librbd-dev:i386 \ + libreadline-dev:i386 \ + libsanlock-dev:i386 \ + libsasl2-dev:i386 \ + libselinux1-dev:i386 \ + libssh-gcrypt-dev:i386 \ + libssh2-1-dev:i386 \ + libtirpc-dev:i386 \ + libudev-dev:i386 \ + libxml2-dev:i386 \ + libyajl-dev:i386 \ + xfslibs-dev:i386 && \ + apt-get autoremove -y && \ + apt-get autoclean -y + +ENV ABI "i686-linux-gnu" +ENV CONFIGURE_OPTS "--host=i686-linux-gnu \ + --target=i686-linux-gnu" +ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig" -- 2.20.1

2 3

[libvirt] [PATCH] spec: Move ldconfig calls from -client to -libs
by Andrea Bolognani 27 Mar '19

27 Mar '19

ldconfig needs to be called after installing or uninstalling shared libraries. For a very long time, libvirt didn't have a separate package containing just the shared libraries, and so it shipped them in the same one as the clients. Since commit 70b4f0e719cd, however, shared libraries have been moved from -client to their own -libs package; unfortunately, the corresponding ldconfig calls were not moved at the same time, which is what this commit takes care of. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b7a35a0fb1..8ea27c91a3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1328,6 +1328,16 @@ then exit 1 fi +%post libs +%if 0%{?rhel} == 7 +/sbin/ldconfig +%endif + +%postun libs +%if 0%{?rhel} == 7 +/sbin/ldconfig +%endif + %pre daemon # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation @@ -1469,17 +1479,9 @@ exit 0 %systemd_preun libvirt-guests.service %post client - -%if 0%{?rhel} == 7 -/sbin/ldconfig -%endif %systemd_post libvirt-guests.service %postun client - -%if 0%{?rhel} == 7 -/sbin/ldconfig -%endif %systemd_postun libvirt-guests.service %if %{with_sanlock} -- 2.20.1

2 1

[libvirt] [PATCH v2 0/3] qemu: Add support for parallel migration
by Jiri Denemark 27 Mar '19

27 Mar '19

This series adds a new VIR_MIGRATE_PARALLEL flag for migration APIs which will ask the hypervisor to use multiple parallel connections for migrating a domain. The number of parallel connections can be set using VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS typed parameter. Version 2: - rebased Jiri Denemark (3): Public API for parallel migration qemu: Add support for parallel migration virsh: Add options for parallel migration include/libvirt/libvirt-domain.h | 14 ++++++++++++++ src/qemu/qemu_migration.c | 9 ++++++--- src/qemu/qemu_migration.h | 5 ++++- src/qemu/qemu_migration_params.c | 18 ++++++++++++++++++ src/qemu/qemu_migration_params.h | 2 ++ tools/virsh-domain.c | 19 +++++++++++++++++++ tools/virsh.pod | 7 +++++++ 7 files changed, 70 insertions(+), 4 deletions(-) -- 2.20.1

2 8

[libvirt] [PATCH v5 00/20] Incremental Backup API additions
by Eric Blake 27 Mar '19

27 Mar '19

The following is the latest version of my API proposal for incremental backups, and follows along from the demo I presented as part of my KVM Forum 2018 talk: https://kvmforum2018.sched.com/event/FzuB/facilitating-incremental-backup-e… The patches are also available via https://repo.or.cz/libvirt/ericb.git at the tag backup-v5. Depends on my earlier bulk redefine for snapshots, which is pending review at v3: https://www.redhat.com/archives/libvir-list/2019-March/msg00144.html I haven't finished addressing all of John Ferlan's review comments from v4 (including the fact that several of these larger patches need to be split for easier reviews, and the fact that I want virDomainSnapshotObj and virDomainCheckpointObj to share a common base class); but I'm posting this now because I _have_ completed: - push mode backups mostly work (event notification is still not polished, but the fact that I can now do both push and pull modes is nice) - bulk mode list/redefine, accessible via 'virsh dumpxml --checkpoints' and 'virsh snapshot-create --redefine-list' - move virDomainBackup() into libvirt-domain.h (libvirt-domain-checkpoint.h is now JUST about standalone checkpoint objects; then both virDomainBackup() and virDomainSnapshotCreateXML() will be able to create a checkpoint in parallel) - rebase to master (5.2 now instead of 5.1, start using VIR_AUTOFREE in more places, ...) I'm still debating about making <domaincheckpoint> a sub-element of <domainbackup> (in which case I can reuse virDomainSnapshotCreateXML() to create a backup) or keeping it as a separate XML argument (in which case I need to add an API for virDomainSnapshotCreateXMLWithSnapshot()). I also need to work out an API for listing all currently running jobs (even if the current backup code can only run one job at a time, we know we want support in the future for parallel backup jobs). So there WILL be a v6. Hopefully, though, we can start trimming off the front of the series, and at least now the tail of the series currently compiles (John gave up review on v4 when he ran into rebase issues - although with our current rate of VIR_AUTOFREE conversions, there may again be rebase issues soon...) since v4: 001/20:[----] [-C] 'domain_conf: Expose virDomainStorageNetworkParseHost' 002/20:[down] 'qemu: clean up qemuDomainRemoveInactiveCommon' 003/20:[----] [--] 'backup: Document nuances between different state capture APIs' 004/20:[0020] [FC] 'backup: Introduce virDomainCheckpointPtr' 005/20:[down] 'wip: backup: Document new XML for backups' 006/20:[0054] [FC] 'backup: Introduce virDomainCheckpoint APIs' 007/20:[0053] [FC] 'backup: Introduce virDomainBackup APIs' 008/20:[0002] [FC] 'backup: Add new domain:checkpoint access control' 009/20:[0093] [FC] 'backup: Implement backup APIs for remote driver' 010/20:[0381] [FC] 'wip: backup: Parse and output checkpoint XML' 011/20:[0001] [FC] 'wip: backup: Parse and output backup XML' 012/20:[0393] [FC] 'backup: Implement virsh support for checkpoints' 013/20:[0058] [FC] 'wip: backup: virsh support for backup' 014/20:[0019] [FC] 'backup: Add new qemu monitor interactions' 015/20:[0161] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 016/20:[----] [-C] 'wip: backup: Wire up qemu checkpoint commands over QMP' 017/20:[0006] [FC] 'wip: backup: qemu: Implement framework for backup job APIs' 018/20:[0046] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 019/20:[down] 'wip: backup: qemu: Wire up qemu full push backup commands over QMP' 020/20:[0022] [FC] 'backup: implement qemu incremental pull backup' Eric Blake (20): domain_conf: Expose virDomainStorageNetworkParseHost qemu: clean up qemuDomainRemoveInactiveCommon backup: Document nuances between different state capture APIs backup: Introduce virDomainCheckpointPtr wip: backup: Document new XML for backups backup: Introduce virDomainCheckpoint APIs backup: Introduce virDomainBackup APIs backup: Add new domain:checkpoint access control backup: Implement backup APIs for remote driver wip: backup: Parse and output checkpoint XML wip: backup: Parse and output backup XML backup: Implement virsh support for checkpoints wip: backup: virsh support for backup backup: Add new qemu monitor interactions backup: qemu: Implement metadata tracking for checkpoint APIs wip: backup: Wire up qemu checkpoint commands over QMP wip: backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP wip: backup: qemu: Wire up qemu full push backup commands over QMP backup: implement qemu incremental pull backup include/libvirt/virterror.h | 6 +- src/util/virerror.c | 12 +- include/libvirt/libvirt-domain-checkpoint.h | 161 ++ include/libvirt/libvirt-domain.h | 48 +- include/libvirt/libvirt.h | 3 +- src/access/viraccessperm.h | 8 +- src/conf/checkpoint_conf.h | 237 +++ src/conf/domain_conf.h | 17 + src/conf/virdomainobjlist.h | 9 +- src/datatypes.h | 31 +- src/driver-hypervisor.h | 74 +- src/qemu/qemu_block.h | 3 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 32 +- src/qemu/qemu_monitor.h | 21 +- src/qemu/qemu_monitor_json.h | 19 +- tools/virsh-checkpoint.h | 29 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 10 +- docs/domainstatecapture.html.in | 314 +++ docs/format.html.in | 2 + docs/formatbackup.html.in | 123 ++ docs/formatcheckpoint.html.in | 188 ++ docs/formatsnapshot.html.in | 2 + docs/index.html.in | 4 +- docs/schemas/domainbackup.rng | 185 ++ docs/schemas/domaincheckpoint.rng | 94 + examples/object-events/event-test.c | 3 + libvirt.spec.in | 3 + mingw-libvirt.spec.in | 6 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 5 +- src/conf/Makefile.inc.am | 2 + src/conf/checkpoint_conf.c | 1743 +++++++++++++++++ src/conf/domain_conf.c | 73 +- src/conf/virdomainobjlist.c | 12 +- src/datatypes.c | 63 +- src/libvirt-domain-checkpoint.c | 741 +++++++ src/libvirt-domain.c | 217 +- src/libvirt_private.syms | 33 + src/libvirt_public.syms | 19 + src/qemu/qemu_block.c | 12 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 276 ++- src/qemu/qemu_driver.c | 1661 +++++++++++++++- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 65 +- src/qemu/qemu_monitor_json.c | 199 +- src/qemu/qemu_process.c | 7 + src/remote/remote_daemon_dispatch.c | 22 +- src/remote/remote_driver.c | 33 +- src/remote/remote_protocol.x | 239 ++- src/remote_protocol-structs | 129 ++ src/rpc/gendispatch.pl | 32 +- tests/Makefile.am | 15 +- tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlout/empty.xml | 10 + tests/domaincheckpointxml2xmlout/sample.xml | 16 + tests/domaincheckpointxml2xmltest.c | 233 +++ .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.xml | 2 + tests/qemumonitorjsontest.c | 2 +- tests/virschematest.c | 4 + tools/Makefile.am | 3 +- tools/virsh-checkpoint.c | 1377 +++++++++++++ tools/virsh-completer.c | 52 +- tools/virsh-domain-monitor.c | 25 +- tools/virsh-domain.c | 277 ++- tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 272 ++- 86 files changed, 9510 insertions(+), 110 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml create mode 100644 tests/domaincheckpointxml2xmltest.c create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

2 29

[libvirt] [PATCH v2 00/14] qemu_hotplug: refactor device detach functions to fix one serious and other minor bugs
by Laine Stump 26 Mar '19

26 Mar '19

V1: https://www.redhat.com/archives/libvir-list/2019-March/msg01455.html I pushed patches 01-12, since they were acked, and pushing them leaves the code in no worse state than it was before (all tests still pass). There are 4 new patches in V2, created as a result of Peter asking for patches to be split, or for further refactoring. Still to be done: Peter pointed out that qemuDomainUpdateDeviceLlist() really shouldn't be called until after qemu has sent the DEVICE_DELETED event. That is on my list of followups, but the patches here are still a valid improvement even without that (After his comment, I noticed that we are also calling virDomainSaveStatus too soon - it also shouldn't be called until after DEVICE_DELETED). Laine Stump (14): qemu_hotplug: move qemuDomainDetachDeviceLive() to qemu_hotplug.c qemu_hotplug: remove extra function in middle of DetachController call chain qemu_hotplug: pull qemuDomainUpdateDeviceList out of qemuDomainDetachDeviceLive test: replace calls to individual detach functions with one call to main detach qemu_hotplug: make Detach functions called only from qemu_hotplug.c static qemu_hotplug: rename dev to match in qemuDomainDetachDeviceLive qemu_hotplug: separate Chr|Lease from other devices in DetachDevice switch qemu_hotplug: standardize the names/args/calling of qemuDomainDetach*() qemu_hotplug: rename Chr and Lease Detach functions qemu_hotplug: new function qemuDomainRemoveAuditDevice() qemu_hotplug: audit *all* auditable device types in qemuDomainRemoveAuditDevice qemu_hotplug: consolidate all common detach code in qemuDomainDetachDeviceLive qemu_hotplug: delay sending DEVICE_REMOVED event until after *all* teardown qemu_hotplug: don't shutdown net device until the guest has released it src/qemu/qemu_driver.c | 109 +---- src/qemu/qemu_hotplug.c | 919 +++++++++++++++++++--------------------- src/qemu/qemu_hotplug.h | 56 +-- tests/qemuhotplugtest.c | 8 +- 4 files changed, 465 insertions(+), 627 deletions(-) -- 2.20.1

3 34

[libvirt] [PATCH v3 0/2] m4: Run QEMU under a distro-specific user when possible
by Andrea Bolognani 26 Mar '19

26 Mar '19

Changes from [v2]: * add explicit fallback to root:root for unrecognized operating systems; * provide logging to help users understand why they ended up with root:root in the first place. Changes from [v1]: * use distro-specific user and group; * warn the user if they are going to be running QEMU as root. [v2] https://www.redhat.com/archives/libvir-list/2019-March/msg01737.html [v1] https://www.redhat.com/archives/libvir-list/2019-March/msg01707.html Andrea Bolognani (2): m4: Run QEMU under a distro-specific user when possible m4: Add warning when running QEMU as root m4/virt-driver-qemu.m4 | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH v2 0/2] m4: Run QEMU under a distro-specific user when possible
by Andrea Bolognani 26 Mar '19

26 Mar '19

Changes from [v1]: * use distro-specific user and group; * warn the user if they are going to be running QEMU as root. [v1] https://www.redhat.com/archives/libvir-list/2019-March/msg01707.html Andrea Bolognani (2): m4: Run QEMU under a distro-specific user when possible m4: Add warning when running QEMU as root m4/virt-driver-qemu.m4 | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) -- 2.20.1

3 6

[libvirt] [PATCH] m4: Change default QEMU credentials to qemu:qemu
by Andrea Bolognani 26 Mar '19

26 Mar '19

Our current defaults are root:wheel on FreeBSD and macOS, root:root everywhere else. Looking at what downstream distributions actually do, we can see that these defaults are overriden the vast majority of the time, with a number of variations showing up in the wild: * qemu:qemu -> Used by CentOS, Fedora, Gentoo, OpenSUSE, RHEL and... As it turns out, our very own spec file :) * libvirt-qemu:libvirt-qemu -> Used by Debian. * libvirt-qemu:kvm -> Used by Ubuntu. * nobody:nobody -> Used by Arch Linux. Based on the above, we can conclude that qemu:qemu are the preferred credentials to be used when spawning a QEMU process, while our current defaults get very little love. Changing our defaults aligns with what most downstreams are actually doing, promotes running QEMU under a non-root user - which is a very good idea anyway - and shields random people building libvirt from source from unwittingly running their guests as root. Note that there are a very small number of downstreams that don't override our defaults: Alpine Linux, FreeBSD and macOS. Of those, only Alpine Linux is affected by this change; all three should arguably have been setting --with-qemu-user and --with-qemu-group explicitly regardless of this change. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Proof that I'm not making any of this up ;) * Alpine Linux https://github.com/alpinelinux/aports/blob/master/main/libvirt/APKBUILD * Arch Linux https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=libvirt-git#n113 * CentOS https://git.centos.org/blob/rpms!libvirt.git/8d86411e5109d791edf49c7f43c08a… * Debian https://salsa.debian.org/libvirt-team/libvirt/blob/debian/sid/debian/rules#… * Fedora https://src.fedoraproject.org/rpms/libvirt/blob/f29/f/libvirt.spec#_204 * FreeBSD https://github.com/freebsd/freebsd-ports/blob/master/devel/libvirt/Makefile * Gentoo https://github.com/gentoo/gentoo/blob/master/app-emulation/libvirt/libvirt-… * macOS (Homebrew) https://github.com/Homebrew/homebrew-core/blob/master/Formula/libvirt.rb * OpenSUSE https://build.opensuse.org/package/view_file/openSUSE:Leap:15.0:Update/libv… * Ubuntu https://git.launchpad.net/ubuntu/+source/libvirt/tree/debian/rules?h=ubuntu… * Upstream https://libvirt.org/git/?p=libvirt.git;a=blob;f=libvirt.spec.in;h=b7a35a0fb… m4/virt-driver-qemu.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4 index cb05c34265..2a1b86e891 100644 --- a/m4/virt-driver-qemu.m4 +++ b/m4/virt-driver-qemu.m4 @@ -44,8 +44,8 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [ default_qemu_user=root default_qemu_group=wheel else - default_qemu_user=root - default_qemu_group=root + default_qemu_user=qemu + default_qemu_group=qemu fi if test "x$with_qemu_user" = "xplatform dependent" ; then -- 2.20.1

3 8

[libvirt] [PATCH] virQEMUDriverPtr parameters clean up in function qemuExtTPMStart() in /src/qemu/qemu_tpm.c
by Humaid 26 Mar '19

26 Mar '19

--- src/qemu/qemu_tpm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 835a9caf46..b60e443f14 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -834,16 +834,16 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, int -qemuExtTPMStart(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuExtTPMStart(virDomainObjPtr vm, qemuDomainLogContextPtr logCtxt) { int ret = 0; + qemuDomainObjPrivatePtr priv = vm->privateData; virDomainTPMDefPtr tpm = vm->def->tpm; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: - ret = qemuExtTPMStartEmulator(driver, vm, logCtxt); + ret = qemuExtTPMStartEmulator(priv->driver, vm, logCtxt); break; case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: -- 2.17.1

6 8

[libvirt] [PATCH 0/2] qemu: Assume presence of 'set_password' and 'expire_password'
by Peter Krempa 26 Mar '19

26 Mar '19

Remove some dead code. Peter Krempa (2): qemu: Assume that 'set_password' and 'expire_password' are supported qemu: monitor: Remove unused qemuMonitor(JSON)SetVNCPassword src/qemu/qemu_hotplug.c | 20 ------------------- src/qemu/qemu_monitor.c | 16 ---------------- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 37 ------------------------------------ src/qemu/qemu_monitor_json.h | 2 -- tests/qemumonitorjsontest.c | 2 -- 6 files changed, 79 deletions(-) -- 2.20.1

3 5

[libvirt] [jenkins-ci PATCH] Stop building osinfo-db on CentOS 7
by Fabiano Fidêncio 26 Mar '19

26 Mar '19

osinfo-db tests are Python3 only. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- jenkins/projects/osinfo-db.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jenkins/projects/osinfo-db.yaml b/jenkins/projects/osinfo-db.yaml index 87b6748..25a6621 100644 --- a/jenkins/projects/osinfo-db.yaml +++ b/jenkins/projects/osinfo-db.yaml @@ -1,7 +1,16 @@ --- - project: name: osinfo-db - machines: '{all_machines}' + # osinfo-db tests are Python 3 only, so they can't be built on + # CentOS 7; + machines: + - libvirt-debian-8 + - libvirt-debian-9 + - libvirt-fedora-28 + - libvirt-fedora-29 + - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 title: osinfo database archive_format: xz git_url: '{git_urls[osinfo-db][default]}' -- 2.20.1

2 1

[libvirt] [jenkins-ci PATCH] guests: Update test dependencies for osinfo-db
by Fabiano Fidêncio 26 Mar '19

26 Mar '19

The new dependencies are: - python3 - python3-libxml2 - python3-pytest - python3-requests xmllint has been removed in favour of a own crafted test using python3-libmlx2 Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/vars/projects/osinfo-db.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guests/vars/projects/osinfo-db.yml b/guests/vars/projects/osinfo-db.yml index d9320a4..2c8a333 100644 --- a/guests/vars/projects/osinfo-db.yml +++ b/guests/vars/projects/osinfo-db.yml @@ -1,4 +1,7 @@ --- packages: - intltool - - xmllint + - python3 + - python3-libxml2 + - python3-pytest + - python3-requests -- 2.20.1

2 1

[libvirt] [PATCH] qemufirmwaretest: Produce better message on error
by Michal Privoznik 26 Mar '19

26 Mar '19

If qemuFirmwareFetchConfigs() returned more or less paths than expected all that we see is the following error message: Expected 5 paths, got 7 While it is technically correct (the best kind of correct), we can do better: Unexpected path (i=0). Expected /some/path got /some/other/path Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemufirmwaretest.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 340344ebba..2b5cbf649b 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -66,6 +66,7 @@ testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED) PREFIX "/share/qemu/firmware/61-ovmf.json", PREFIX "/share/qemu/firmware/70-aavmf.json", }; + const size_t nexpected = ARRAY_CARDINALITY(expected); if (VIR_STRDUP(fakehome, abs_srcdir "/qemufirmwaredata/home/user/.config") < 0) return -1; @@ -81,17 +82,15 @@ testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED) } nfwList = virStringListLength((const char **)fwList); - if (nfwList != ARRAY_CARDINALITY(expected)) { - fprintf(stderr, "Expected %zu paths, got %zu\n", - ARRAY_CARDINALITY(expected), nfwList); - return -1; - } - for (i = 0; i < ARRAY_CARDINALITY(expected); i++) { - if (STRNEQ_NULLABLE(expected[i], fwList[i])) { + for (i = 0; i < MAX(nfwList, nexpected); i++) { + const char *e = i < nexpected ? expected[i] : NULL; + const char *f = i < nfwList ? fwList[i] : NULL; + + if (STRNEQ_NULLABLE(e, f)) { fprintf(stderr, "Unexpected path (i=%zu). Expected %s got %s \n", - i, expected[i], NULLSTR(fwList[i])); + i, NULLSTR(e), NULLSTR(f)); return -1; } } -- 2.19.2

2 1

[libvirt] [PATCH v2] news: Document kernel requirements for virtual networks
by Michal Privoznik 25 Mar '19

25 Mar '19

After 7431b3eb9a05068e4b libvirt requires "filter", "nat" and "mangle" tables to exist for both IPv4 and IPv6. This fact was missed in the news.xml and since we don't have any better place to advertise that let's update old news. This was refined in 686803a1a2e and since that is not released yet create a new entry documenting the refinement. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Even though the v1 was ACKed, I'm sending v2 because things have changed since then. The difference to v1 then is that I've introduced a new news entry for the current release mentioning the refinement. IMO this reflects the reality the best: 5.1.0, which is released and doesn't contain the fix does require all 6 tables (even though Dan created v5.1.0-maint branch where he backported the fix). docs/news.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 5c3028e10b..83e965e0f3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -124,6 +124,18 @@ Report class information for PCI node device capability. </summary> </change> + <change> + <summary> + Split setup of IPv4 and IPv6 top level chain + </summary> + <description> + The requirement resulting from private chains improvement done + in <code>v5.1.0</code> was refined so that only tables from + corresponding IP version are required. This means that if a + network doesn't have <code>IPv6</code> enabled then those + tables are not required. + </description> + </change> </section> <section title="Bug fixes"> </section> @@ -202,7 +214,9 @@ Historically firewall rules for virtual networks were added straight into the base chains. This works but has a number of bugs and design limitations. To address them, libvirt now puts - firewall rules into its own chains. + firewall rules into its own chains. Note that with this change the + <code>filter</code>, <code>nat</code> and <code>mangle</code> tables + are required for both <code>IPv4</code> and <code>IPv6</code>. </description> </change> <change> -- 2.19.2

2 1

[libvirt] [PATCH] news: Document kernel requirements for virtual networks
by Michal Privoznik 25 Mar '19

25 Mar '19

After 7431b3eb9a05068e4b libvirt requires "filter", "nat" and "mangle" tables to exist for both IPv4 and IPv6. This fact was missed in the news.xml and since we don't have any better place to advertise that let's update old news. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 81466c3d55..8321ed8c43 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -146,7 +146,9 @@ Historically firewall rules for virtual networks were added straight into the base chains. This works but has a number of bugs and design limitations. To address them, libvirt now puts - firewall rules into its own chains. + firewall rules into its own chains. Note that with this change the + <code>filter</code>, <code>nat</code> and <code>mangle</code> tables + are required for both <code>IPv4</code> and <code>IPv6</code>. </description> </change> <change> -- 2.19.2

4 3

[libvirt] [PATCH v3 0/1] domain_conf: check device address before attach
by Daniel Henrique Barboza 25 Mar '19

25 Mar '19

v3: - changed to a simpler and more generic approach - v2 can be found here: https://www.redhat.com/archives/libvir-list/2019-January/msg00673.html Daniel Henrique Barboza (1): domain_conf: check device address before attach src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1

2 2

[libvirt] [PATCH libvirt-python v2] Implement virDomainGetStateParams API
by Bjoern Walk 25 Mar '19

25 Mar '19

From: Marc Hartmayer <mhartmay(a)linux.ibm.com> This patch adds the Python binding for the virDomainGetStateParams API. The Python side can be generated automatically, the C side cannot. Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- Patch series for libvirt is here: https://www.redhat.com/archives/libvir-list/2019-March/msg01648.html generator.py | 1 + libvirt-override-api.xml | 6 +++++ libvirt-override.c | 48 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/generator.py b/generator.py index ffa3ce56..005be502 100755 --- a/generator.py +++ b/generator.py @@ -496,6 +496,7 @@ skip_impl = ( 'virConnectBaselineHypervisorCPU', 'virDomainGetLaunchSecurityInfo', 'virNodeGetSEVInfo', + 'virDomainGetStateParams', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 7f578e01..fab62447 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -754,5 +754,11 @@ <arg name='conn' type='virConnectPtr' info='pointer to hypervisor connection'/> <arg name='flags' type='int' info='unused, always pass 0'/> </function> + <function name='virDomainGetStateParams' file='python'> + <info>Extract domain state and additional information (if available).</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> + <return type='char *' info="dictionary of state data"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index c5e2908c..7ae10874 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9946,6 +9946,51 @@ libvirt_virNodeGetSEVInfo(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 2, 0) +static PyObject * +libvirt_virDomainGetStateParams(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + PyObject *pyobj_domain; + virDomainPtr domain; + int state; + int reason; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int flags; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetStateParams", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetStateParams(domain, &state, &reason, &params, + &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + goto error; + + if ((py_retval = PyTuple_New(3)) == NULL) + goto error; + + VIR_PY_TUPLE_SET_GOTO(py_retval, 0, libvirt_intWrap(state), error); + VIR_PY_TUPLE_SET_GOTO(py_retval, 1, libvirt_intWrap(reason), error); + VIR_PY_TUPLE_SET_GOTO(py_retval, 2, getPyVirTypedParameter(params, nparams), error); + + return py_retval; + +error: + Py_XDECREF(py_retval); + virTypedParamsFree(params, nparams); + return VIR_PY_NONE; +} +#endif /* LIBVIR_CHECK_VERSION(5, 2, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -10192,6 +10237,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetLaunchSecurityInfo", libvirt_virDomainGetLaunchSecurityInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetSEVInfo", libvirt_virNodeGetSEVInfo, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 2, 0) + {(char *) "virDomainGetStateParams", libvirt_virDomainGetStateParams, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(5, 2, 0) */ {NULL, NULL, 0, NULL} }; -- 2.17.0

1 0

[libvirt] [PATCH] test: Avoid use-after-free on virDomainSnapshotDelete
by Eric Blake 22 Mar '19

22 Mar '19

The following virsh command was triggering a use-after-free: $ virsh -c test:///default ' snapshot-create-as test s1 snapshot-create-as test s2 snapshot-delete --children-only test s1 snapshot-current --name test' Domain snapshot s1 created Domain snapshot s2 created Domain snapshot s1 children deleted error: name in virGetDomainSnapshot must not be NULL I got lucky on that run - although the error message is quite unexpected. On other runs, I was able to get a core dump, and valgrind confirms there is a definitive problem. The culprit? We were inconsistent about whether we set vm->current_snapshot, snap->def->current, or both when updating how the current snapshot was being tracked. As a result, deletion did not see that snapshot s2 was previously current, and failed to update vm->current_snapshot, so that the next API using the current snapshot failed because it referenced stale memory for the now-gone s2 (instead of the intended s1). The test driver code was copied from the qemu code (which DOES track both pieces of state everywhere), but was purposefully simplified because the test driver does not have to write persistent snapshot state to the file system. But when you realize that the only reason snap->def->current needs to exist is when writing out one file per snapshot for qemu, it's just as easy to state that the test driver never has to mess with the field (rather than chasing down which places forgot to set the field), and have vm->current_snapshot be the sole source of truth in the test driver. Ideally, I'd get rid of the 'current' member in virDomainSnapshotDef, as well as the 'current_snapshot' member in virDomainDef, and instead track the current member in virDomainSnapshotObjList, coupled with writing ALL snapshot state for qemu in a single file (where I can use <snapshots current='...'> as a wrapper, rather than VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL to output <current>1</current> XML on a per-snapshot file basis). But that's a bigger change, so for now I'm just patching things to avoid the test driver segfault. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/test/test_driver.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 0bb48b4364..8e2a9dcff6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test_driver.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2019 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -6441,7 +6441,7 @@ testDomainSnapshotDiscardAll(void *payload, virDomainSnapshotObjPtr snap = payload; testSnapRemoveDataPtr curr = data; - if (snap->def->current) + if (curr->vm->current_snapshot == snap) curr->current = true; virDomainSnapshotObjListRemove(curr->vm->snapshots, snap); return 0; @@ -6508,8 +6508,6 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, testDomainSnapshotDiscardAll, &rem); if (rem.current) { - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) - snap->def->current = true; vm->current_snapshot = snap; } } else if (snap->nchildren) { @@ -6542,8 +6540,6 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (!parentsnap) { VIR_WARN("missing parent snapshot matching name '%s'", snap->def->parent); - } else { - parentsnap->def->current = true; } } vm->current_snapshot = parentsnap; @@ -6623,12 +6619,9 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } - if (vm->current_snapshot) { - vm->current_snapshot->def->current = false; + if (vm->current_snapshot) vm->current_snapshot = NULL; - } - snap->def->current = true; config = virDomainDefCopy(snap->def->dom, privconn->caps, privconn->xmlopt, NULL, true); if (!config) -- 2.20.1

3 4

[libvirt] [PATCH 0/2] tests: qemuxml2argv updates and tweaks
by Andrea Bolognani 22 Mar '19

22 Mar '19

Andrea Bolognani (2): tests: Update aarch64-virt-graphics for virtio-blk tests: Add s390x-ccw-graphics test case .../aarch64-virt-graphics.aarch64-latest.args | 9 ++-- .../aarch64-virt-graphics.xml | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 49 +++++++++++++++++++ ...rt-graphics.xml => s390x-ccw-graphics.xml} | 21 +++----- tests/qemuxml2argvtest.c | 1 + 5 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args copy tests/qemuxml2argvdata/{aarch64-virt-graphics.xml => s390x-ccw-graphics.xml} (61%) -- 2.20.1

2 3

[libvirt] [PATCH 00/21] qemu_hotplug: refactor device detach functions to fix one serious and other minor bugs
by Laine Stump 22 Mar '19

22 Mar '19

This all started with the observation that we were sending the DEVICE_REMOVED events for unplugged devices too soon (reported in https://bugzilla.redhat.com/1658198 ). While noticing that *all* of the device types send their DEVICE_REMOVED event too early, I also noticed how eerily similar all the different detach functions are (they have converged over time, as legacy code supporting old qemus with different methods of deleting different types of devices has been removed - pkrempa and mprivozn committed patches just in the last week that contributed to this convergence and removed some duplicated code). I also saw a few other definite bugs, as well as a couple that I think are bugs, but am not enough informed about zPCI to be certain (I've Cc'ed the author and reviewers of the original patch adding that code to the patches so that they can verify, or negate, my suspicions). Many/most of these patches are either very simple / easily verifiable code movement / removal / renaming of variables. Patch 20 is a bit more involved; viewing the new versions of the functions along with the patch would probably help it go much quicker. The first two patches in the series eliminate what I'm 99% certain is erroneous calling of the qemuDomainDetachExtensionDevice() when detaching a PCI device on S390. The commit log details my reasons for believing this code should be removed. The rest of the series eliminates small differences iteratively, arriving at a set of detach functions which are completely identical at the end (and only called from one place), and then replaces all those duplicates with a single block of common code in a higher level function that calls all of the individual functions (it was their only caller anyway). This eliminated the inconsistent application of checking for multifunction PCI devices and for the existence of a device alias. It also eliminated individual calls to qemuDomainRemove*Device() calls, and replaced them with a single call to qemuDomainRemoveDevice(). Eliminating all the calls (except one) to the individual qemuDomainRemove*Device() functions in turn made it possible to move the code that builds and queues the DEVICE_REMOVED event into a single place in the one remaining higher level caller - qemuDomainRemoveDevice() - thus eliminating the "premature event" for *all* device types at once. Laine Stump (21): qemu_hotplug: remove erroneous call to qemuDomainDetachExtensionDevice() qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call qemu_hotplug: remove unnecessary check for valid PCI address qemu_hotplug: rename a virDomainDeviceInfoPtr to avoid confusion qemu_hotplug: eliminate multiple identical qemuDomainDetachHost*Device() functions qemu_hotplug: eliminate unnecessary call to qemuDomainDetachNetDevice() qemu_hotplug: refactor qemuDomainDetachDiskLive and qemuDomainDetachDiskDevice qemu_hotplug: don't call DetachThisHostDevice for hostdev network devices qemu_hotplug: merge qemuDomainDetachThisHostDevice into qemuDomainDetachHostDevice qemu_hotplug: move qemuDomainChangeGraphicsPasswords() qemu_hotplug: move (almost) all qemuDomainDetach*() functions together qemu_hotplug: move (Attach|Detach)Lease functions with others of same type qemu_hotplug: move qemuDomainDetachDeviceLive() to qemu_hotplug.c qemu_hotplug: remove extra function in middle of DetachController call chain qemu_hotplug: pull qemuDomainUpdateDeviceList out of qemuDomainDetachDeviceLive test: replace calls to individual detach functions with one call to main detach qemu_hotplug: rename dev to match in qemuDomainDetachDeviceLive qemu_hotplug: standardize the names/args/calling of qemuDomainDetach*() qemu_hotplug: new function qemuDomainRemoveAuditDevice() qemu_hotplug: consolidate all common detach code in qemuDomainDetachDeviceLive qemu_hotplug: delay sending DEVICE_REMOVED event until after *all* teardown src/qemu/qemu_driver.c | 102 +-- src/qemu/qemu_hotplug.c | 1407 ++++++++++++++++++--------------------- src/qemu/qemu_hotplug.h | 56 +- tests/qemuhotplugtest.c | 8 +- 4 files changed, 655 insertions(+), 918 deletions(-) Yay! jtomko would be proud - more deletions than insertions!!! -- 2.20.1

4 63

[libvirt] Bite sized task: #pragma once
by Daniel P. Berrangé 22 Mar '19

22 Mar '19

A heads up that I added a trivial bite sized task to convert header files to use #pragma once https://wiki.libvirt.org/page/BiteSizedTasks#Switch_headers_to_use_.23pragm… Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] virDomainMomentAssignDef: Don't dereference a NULL pointer
by Michal Privoznik 22 Mar '19

22 Mar '19

This functions tries to add a domain moment (love the name!) onto a list of domain moments. Firstly, it checks if another moment with the same name already exists. Then, it creates an empty moment (without initializing its definition) and tries to add the moment onto the list dereferencing moment definition in that process. If it succeeds (which it never can), only after that it sets moment->def. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virdomainmomentobjlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index b2122e7292..01e50ae1d4 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -227,7 +227,7 @@ virDomainMomentAssignDef(virDomainMomentObjListPtr moments, if (!(moment = virDomainMomentObjNew())) return NULL; - if (virHashAddEntry(moments->objs, moment->def->name, moment) < 0) { + if (virHashAddEntry(moments->objs, def->name, moment) < 0) { VIR_FREE(moment); return NULL; } -- 2.19.2

3 2

[libvirt] [PATCH] nwfilter: fix adding std MAC and IP values to filter binding
by Nikolay Shirokovskiy 22 Mar '19

22 Mar '19

Commit d1a7c08eb changed filter instantiation code to ignore MAC and IP variables explicitly specified for filter binding. It just replaces explicit values with values associated with the binding. Before the commit virNWFilterCreateVarsFrom was used so that explicit value take precedence. Let's bring old behavior back. This is useful. For example if domain has two interfaces it makes sense to list both mac adresses in MAC var of every interface filterref. So that if guest make a bond of these interfaces and start sending frames with one of the mac adresses from both interfaces we can pass outgress traffic from both interfaces too. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/nwfilter/nwfilter_gentech_driver.c | 92 ++++++++++++---------------------- 1 file changed, 32 insertions(+), 60 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 655f088..6d68189 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -127,60 +127,6 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst) /** - * virNWFilterVarHashmapAddStdValues: - * @tables: pointer to hash tabel to add values to - * @macaddr: The string of the MAC address to add to the hash table, - * may be NULL - * @ipaddr: The string of the IP address to add to the hash table; - * may be NULL - * - * Returns 0 in case of success, -1 in case an error happened with - * error having been reported. - * - * Adds a couple of standard keys (MAC, IP) to the hash table. - */ -static int -virNWFilterVarHashmapAddStdValues(virHashTablePtr table, - const char *macaddr, - const virNWFilterVarValue *ipaddr) -{ - virNWFilterVarValue *val; - - if (macaddr) { - val = virNWFilterVarValueCreateSimpleCopyValue(macaddr); - if (!val) - return -1; - - if (virHashUpdateEntry(table, - NWFILTER_STD_VAR_MAC, - val) < 0) { - virNWFilterVarValueFree(val); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Could not add variable 'MAC' to hashmap")); - return -1; - } - } - - if (ipaddr) { - val = virNWFilterVarValueCopy(ipaddr); - if (!val) - return -1; - - if (virHashUpdateEntry(table, - NWFILTER_STD_VAR_IP, - val) < 0) { - virNWFilterVarValueFree(val); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Could not add variable 'IP' to hashmap")); - return -1; - } - } - - return 0; -} - - -/** * Convert a virHashTable into a string of comma-separated * variable names. */ @@ -705,6 +651,28 @@ virNWFilterDoInstantiate(virNWFilterTechDriverPtr techdriver, } +static int +virNWFilterVarHashmapAddStdValue(virHashTablePtr table, + const char *var, + const char *value) +{ + virNWFilterVarValue *val; + + if (virHashLookup(table, var)) + return 0; + + if (!(val = virNWFilterVarValueCreateSimpleCopyValue(value))) + return -1; + + if (virHashAddEntry(table, var, val) < 0) { + virNWFilterVarValueFree(val); + return -1; + } + + return 0; +} + + /* * Call this function while holding the NWFilter filter update lock */ @@ -717,7 +685,7 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver, bool forceWithPendingReq, bool *foundNewFilter) { - int rc; + int rc = -1; const char *drvname = EBIPTABLES_DRIVER_ID; virNWFilterTechDriverPtr techdriver; virNWFilterObjPtr obj; @@ -743,14 +711,18 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver, return -1; virMacAddrFormat(&binding->mac, vmmacaddr); + if (virNWFilterVarHashmapAddStdValue(binding->filterparams, + NWFILTER_STD_VAR_MAC, + vmmacaddr) < 0) + goto err_exit; ipaddr = virNWFilterIPAddrMapGetIPAddr(binding->portdevname); - - if (virNWFilterVarHashmapAddStdValues(binding->filterparams, - vmmacaddr, ipaddr) < 0) { - rc = -1; + if (ipaddr && + virNWFilterVarHashmapAddStdValue(binding->filterparams, + NWFILTER_STD_VAR_IP, + virNWFilterVarValueGetSimple(ipaddr)) < 0) goto err_exit; - } + filter = virNWFilterObjGetDef(obj); -- 1.8.3.1

2 4

[libvirt] [PATCH] xml: nodedev: make pci capability class element optional
by Nikolay Shirokovskiy 22 Mar '19

22 Mar '19

Commit 3bd4ed46 introduced this element as required which breaks backcompat for test driver. Let's make the element optional. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- docs/formatnode.html.in | 2 +- docs/schemas/nodedev.rng | 12 ++++++----- src/conf/node_device_conf.c | 23 +++++++++++----------- src/conf/node_device_conf.h | 2 +- src/node_device/node_device_udev.c | 2 +- .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 1 - 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 5095b97..c2a8f8f 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -71,7 +71,7 @@ include: <dl> <dt><code>class</code></dt> - <dd>Combined class, subclass and + <dd>Optional element for combined class, subclass and programming interface codes as 6-digit hexadecimal number. <span class="since">Since 5.2.0</span></dd> <dt><code>domain</code></dt> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 0f45d79..fe6ffa0 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -133,11 +133,13 @@ <value>pci</value> </attribute> - <element name='class'> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{6}</param> - </data> - </element> + <optional> + <element name='class'> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{6}</param> + </data> + </element> + </optional> <element name='domain'> <ref name='unsignedLong'/> </element> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 19c601a..b96d10c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -208,7 +208,8 @@ virNodeDeviceCapPCIDefFormat(virBufferPtr buf, { size_t i; - virBufferAsprintf(buf, "<class>0x%.6x</class>\n", data->pci_dev.klass); + if (data->pci_dev.klass >= 0) + virBufferAsprintf(buf, "<class>0x%.6x</class>\n", data->pci_dev.klass); virBufferAsprintf(buf, "<domain>%d</domain>\n", data->pci_dev.domain); virBufferAsprintf(buf, "<bus>%d</bus>\n", data->pci_dev.bus); @@ -1645,16 +1646,16 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseHexId("string(./class[1])", ctxt, - &pci_dev->klass, def, - _("no PCI class supplied for '%s'"), - _("invalid PCI class supplied for '%s'")) < 0) - goto out; - - if (pci_dev->klass > 0xffffff) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI class supplied for '%s'"), def->name); - goto out; + if ((tmp = virXPathString("string(./class[1])", ctxt))) { + if (virStrToLong_i(tmp, NULL, 16, &pci_dev->klass) < 0 || + pci_dev->klass > 0xffffff) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid PCI class supplied for '%s'"), def->name); + goto out; + } + VIR_FREE(tmp); + } else { + pci_dev->klass = -1; } if (virNodeDevCapsDefParseULong("number(./domain[1])", ctxt, diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index b13bc13..e8cb315 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -153,7 +153,7 @@ struct _virNodeDevCapPCIDev { unsigned int function; unsigned int product; unsigned int vendor; - unsigned int klass; + int klass; char *product_name; char *vendor_name; virPCIDeviceAddressPtr physical_function; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index f0e61e4..5ed3463 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -402,7 +402,7 @@ udevProcessPCI(struct udev_device *device, privileged = driver->privileged; nodeDeviceUnlock(); - if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0) + if (udevGetIntProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0) goto cleanup; if ((p = strrchr(def->sysfs_path, '/')) == NULL || diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml index 74036a6..9e8dace 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml @@ -2,7 +2,6 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> - <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> -- 1.8.3.1

2 6

[libvirt] [PATCH v2 0/4] tests: qemuxml2argv: support optional arguments
by Cole Robinson 22 Mar '19

22 Mar '19

Small/completion follow up to v1 here, which is mostly pushed: https://www.redhat.com/archives/libvir-list/2019-March/msg00943.html Patch 1 and 3 are new additions based on Andrea's reviews. Rest of the review comments should be addressed Cole Robinson (4): tests: qemuxml2argv: Tweak TEST_CAPS_PATH tests: qemuxml2argv: move DO_CAPS_TEST* qemuCaps init tests: qemuxml2argv: report error on ARG_* collisions tests: qemuxml2argv: add DO_TEST_INTERNAL tests/qemuxml2argvtest.c | 102 +++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 36 deletions(-) -- 2.21.0

2 8

[libvirt] [PATCH 00/21] tests: qemuxml2argv: support optional arguments
by Cole Robinson 21 Mar '19

21 Mar '19

Right now in qemuxml2argv we have a proliferation of DO_*TEST* macros. They essentially fill in data in the testInfo struct and invoke the test function. There's several bits of data that we want to specify for a small subset of tests: flags, parseFlags, migrateFrom/migrateFd, gic. The base macros need to handle these in their argument lists, and we provide many convenience macros that fill in default values for the less common parameters. Any time we want to add a new bit of data though, the base macros are extended, and every caller of those needs to be adjusted, and we are faced with the question of whether to extend the combinatorial explosion of convenience macros which have only a subset of options exposed. This series adds a testInfoSetArgs which uses va_args to make these mandatory parameters optional. The general format is: DO_TEST_FULL(... ARG_FOO, foovalue, ARG_BAR, barvalue, ...) Specifically, one of the migrate tests went from: DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE); to: DO_TEST_FULL("restore-v2", ARG_MIGRATE_FROM, "exec:cat", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, NONE); Which may not seem directly compelling, but adding new testInfo fields will be much easier. This will also be a base for a later series to share the VIR_TEST_CAPS infrastructure with qemuxml2xmltest Cole Robinson (21): qemu: add virQEMUCapsSetVList tests: qemuxml2argv: add testInfoSetArgs tests: qemuxml2argv: add va_arg enum handling tests: qemuxml2argv: push ARG_QEMU_CAPS to callers tests: qemuxml2argv: break apart testInitQEMUCaps tests: qemuxml2argv: handle gic with vaargs tests: qemuxml2argv: handle migrate* with varargs tests: qemuxml2argv: handle flags with varargs tests: qemuxml2argv: handle parseFlags with varargs tests: qemuxml2argv: remove DO_TEST_PARSE_FLAGS_ERROR tests: qemuxml2argv: remove unused DO_TEST_CAPS* macros tests: qemuxml2argv: add a comment separating DO_TEST* macros tests: qemuxml2argv: remove unused CAPS migrateFrom tests: qemuxml2argv: use varargs for CAPS flags tests: qemuxml2argv: remove full testInfo initialization tests: qemuxml2argv: centralize CAPS suffix building tests: qemuxml2argv: build capsfile in DO_TEST_CAPS_INTERNAL tests: qemuxml2argv: add testInfoClear tests: qemuxml2argv: move DO_TEST qemuCaps init tests: qemuxml2argv: move DO_CAPS_TEST* qemuCaps init tests: qemuxml2argv: add TEST_INTERNAL src/qemu/qemu_capabilities.c | 14 +- src/qemu/qemu_capabilities.h | 2 + tests/qemuxml2argvtest.c | 273 +++++++++++++++++++++++------------ 3 files changed, 193 insertions(+), 96 deletions(-) -- 2.20.1

4 56

Re: [libvirt] [Qemu-devel] [PULL v3 00/54] Kconfig conversion, excluding ARM and MIPS
by Laszlo Ersek 21 Mar '19

21 Mar '19

Hi Paolo, (+libvir-list) I'd like to report a regression introduced by this patch set: On 03/07/19 21:58, Paolo Bonzini wrote: > The following changes since commit > 6cb4f6db4f4367faa33da85b15f75bbbd2bed2a6: > > Merge remote-tracking branch > 'remotes/cleber/tags/python-next-pull-request' into staging > (2019-03-07 16:16:02 +0000) > > are available in the Git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream-kconfig > > for you to fetch changes up to > 576c3f2f16e7392e28cc9fe10d9a920d67d3645b: > > kconfig: add documentation (2019-03-07 21:54:22 +0100) > > ---------------------------------------------------------------- > Initial Kconfig work, excluding ARM and MIPS > > ---------------------------------------------------------------- I use "libvirt-daemon-4.5.0-10.el7.x86_64" at the moment. Here are the symptoms: (1) the output of the following command changes across this series: virsh domcapabilities qemu /opt/qemu-installed-optimized/bin/qemu-system-aarch64 aarch64 virt-4.0 as shown by the diff > @@ -92,6 +92,8 @@ > <video supported='yes'> > <enum name='modelType'> > <value>vga</value> > + <value>cirrus</value> > + <value>vmvga</value> > <value>virtio</value> > </enum> > </video> > @@ -111,10 +113,7 @@ > <value>scsi</value> > </enum> > <enum name='capsType'/> > - <enum name='pciBackend'> > - <value>default</value> > - <value>vfio</value> > - </enum> > + <enum name='pciBackend'/> > </hostdev> > </devices> > <features> (2) given the following domain XML snippet, in a qemu (not KVM) aarch64 guest that I have, > <video> > <model type='virtio' heads='1' primary='yes'/> > <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> > </video> the QEMU command line generated by libvirt changes: > - -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.4,addr=0x0 \ > + -device virtio-vga,id=video0,max_outputs=1,bus=pci.4,addr=0x0 \ Perhaps this series causes (1), which in turn causes (2), or else this series causes both (1) and (2) independently of each other. I'm not sure about that. Either way, (2) is a problem, because virtio-vga is inappropriate for aarch64 guests (and the ArmVirtQemu platform firmware in edk2 won't even try to drive it -- a blank screen is the result). Now, I can't pinpoint an exact commit, because (after a *brutal* bisection) I get: > There are only 'skip'ped commits left to test. > The first bad commit could be any of: > a02c0edb35662de38d400f42b68845540669ca3d > 03b348bdcbd1eda4ce097b2b84527dec774d80c4 > d6e9c470fc91f75db1785f17a9d3567d5a27953d > a7e23159074c9d774fb1e88357b778994a0c9365 > bcb129b3154ba743f8e52c21c331a0dfcaee7c38 > 02017ee385ef574133c4a978d368640772978178 > 7c28b925b7e176b4e44ed05d23cf883561000546 > 1550b0e6bfe3ab6985e5ad75df1c528a0ca39468 > e9947d18df97e6c6584f020cf9cc995404cc8061 > 8f01b41e1098d8cb9491fa3ea7bd59cf187a5bd7 > 9533dcdd416530a0d72140c122bf90517b6c81eb > 32690c8bed5762518272876dcb6dd39a54f54fd1 > c3a98aa54c734dcb7a36d193c6330d8f04d4bf8e > ccf222a816d59af1318a7efb59c6b9c5578d1abf > f349474920d80838ecea3d421531fdb0660b8740 > 2ac041c2c3d89691cda1657981c41fe4bc20244b > e0e312f3525ad6ac18ba6633af29190dd9620cbc > b42075bb77672616127c9452c0f836e757e9ce1a > We cannot bisect more! Here's how I built each step of the bisection: - "git clean -ffdx" and "git submodule deinit --all --force" on the source directory - create a new, pristine build directory - configure QEMU for out-of-tree build, in that directory - select the i386, x86_64, arm, and aarch64 targets (all softmmu) - report "skip" to git-bisect iff the build breaks, otherwise test the aarch64 emulator through libvirt, and report good/bad dependent on the test result. The bisection log is attached -- "git bisect replay" and "git bisect visualize" should tell the story better than the above dump of commit hashes. Basically: - The tree builds up to and including commit 82f5181777eb ("kconfig: introduce kconfig files", 2019-03-07), and that commit works fine as well. - Then the build breaks (starting with commit e0e312f3525a, "build: switch to Kconfig", 2019-03-07). - The tree becomes buildable again at commit b42075bb7767 ("virtio: express virtio dependencies with Kconfig", 2019-03-07), but at that point, the functionality has been regressed. Thanks, Laszlo

4 8

[libvirt] [PATCH v2] numa: warn if numa 'mem' option or default RAM splitting between nodes is used.
by Igor Mammedov 20 Mar '19

20 Mar '19

Amend -numa option docs and print warnings if 'mem' option or default RAM splitting between nodes is used. It's intended to discourage users from using configuration that allows only to fake NUMA on guest side while leading to reduced performance of the guest due to inability to properly configure VM's RAM on the host. In NUMA case, it's recommended to always explicitly configure guest RAM using -numa node,memdev={backend-id} option. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- numa.c | 5 +++++ qemu-options.hx | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/numa.c b/numa.c index 3875e1e..42838f9 100644 --- a/numa.c +++ b/numa.c @@ -121,6 +121,8 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, if (node->has_mem) { numa_info[nodenr].node_mem = node->mem; + warn_report("Parameter -numa node,mem is obsolete," + " use -numa node,memdev instead"); } if (node->has_memdev) { Object *o; @@ -407,6 +409,9 @@ void numa_complete_configuration(MachineState *ms) if (i == nb_numa_nodes) { assert(mc->numa_auto_assign_ram); mc->numa_auto_assign_ram(mc, numa_info, nb_numa_nodes, ram_size); + warn_report("Default splitting of RAM between nodes is obsolete," + " Use '-numa node,memdev' to explicitly define RAM" + " allocation per node"); } numa_total = 0; diff --git a/qemu-options.hx b/qemu-options.hx index 1cf9aac..61035cb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -206,10 +206,14 @@ For example: -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 @end example -@samp{mem} assigns a given RAM amount to a node. @samp{memdev} -assigns RAM from a given memory backend device to a node. If -@samp{mem} and @samp{memdev} are omitted in all nodes, RAM is -split equally between them. +@samp{memdev} assigns RAM from a given memory backend device to a node. + +Legacy options/behaviour: @samp{mem} assigns a given RAM amount to a node. +If @samp{mem} and @samp{memdev} are omitted in all nodes, RAM is split equally +between them. Option @samp{mem} and default RAM splitting are obsolete as they +do not provide means to manage RAM on the host side and only allow QEMU to fake +NUMA support which in practice could degrade VM performance. +It's advised to always explicitly configure NUMA RAM by using the @samp{memdev} option. @samp{mem} and @samp{memdev} are mutually exclusive. Furthermore, if one node uses @samp{memdev}, all of them have to use it. -- 2.7.4

5 19

[libvirt] [PATCH 1/2] snapshots: allow create --redefine to force a new configuration
by Christian Ehrhardt 20 Mar '19

20 Mar '19

Currently there is no means to permanently modify the metadata stored within a snapshot if it does not pass the ABI compat checker. That is pretty much intentional but there are use cases where users verified that the change will work according to their needs and don't want to: snapshot-revert -> edit -> start, but instead store the modified domain definition within the metadata. To achive that this adds a --force argument to snapshot-create --redefine which will make it skip the check. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- include/libvirt/libvirt-domain-snapshot.h | 3 +++ src/conf/snapshot_conf.c | 3 ++- src/qemu/qemu_driver.c | 7 ++++++- tools/virsh-snapshot.c | 6 ++++++ tools/virsh.pod | 8 +++++++- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 602e5def59..dc8ba2b4a9 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -71,6 +71,9 @@ typedef enum { VIR_DOMAIN_SNAPSHOT_CREATE_LIVE = (1 << 8), /* create the snapshot while the guest is running */ + VIR_DOMAIN_SNAPSHOT_CREATE_NOCHECK = (1 << 9), /* take definition as + provided without + ABI compat check */ } virDomainSnapshotCreateFlags; /* Take a snapshot of the current VM state */ diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index ffb1313c89..f95b104ad5 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -474,7 +474,8 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDefPtr def, if (other->def->dom) { if (def->dom) { - if (!virDomainDefCheckABIStability(other->def->dom, + if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NOCHECK) && + !virDomainDefCheckABIStability(other->def->dom, def->dom, xmlopt)) return -1; } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a16eab5467..f3d032f633 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15680,7 +15680,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT | VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE | VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC | - VIR_DOMAIN_SNAPSHOT_CREATE_LIVE, NULL); + VIR_DOMAIN_SNAPSHOT_CREATE_LIVE | + VIR_DOMAIN_SNAPSHOT_CREATE_NOCHECK, NULL); VIR_REQUIRE_FLAG_RET(VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE, VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY, @@ -15689,6 +15690,10 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE, NULL); + VIR_REQUIRE_FLAG_RET(VIR_DOMAIN_SNAPSHOT_CREATE_NOCHECK, + VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE, + NULL); + if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) || (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) update_current = false; diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6ea6e2744a..a680d2b410 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -146,6 +146,10 @@ static const vshCmdOptDef opts_snapshot_create[] = { .type = VSH_OT_BOOL, .help = N_("require atomic operation") }, + {.name = "force", + .type = VSH_OT_BOOL, + .help = N_("do not check XML for ABI compatibility") + }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), {.name = NULL} }; @@ -177,6 +181,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "force")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_NOCHECK; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index db72343159..a8cd15bad2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4570,7 +4570,7 @@ used to represent properties of snapshots. =item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] | [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external>] -[I<--quiesce>] [I<--atomic>] [I<--live>]} +[I<--quiesce>] [I<--atomic>] [I<--live>] [I<--force>]} Create a snapshot for domain I<domain> with the properties specified in I<xmlfile>. Normally, the only properties settable for a domain snapshot @@ -4629,6 +4629,12 @@ the guest is running. Both disk snapshot and domain memory snapshot are taken. This increases the size of the memory image of the external snapshot. This is currently supported only for full system external snapshots. +If I<--force> is specified, then the usual ABI compatibility check that +would be done on I<--redefine> will be skipped allowing to update the +domain definition stored in the snapshot metadata arbitrarily. +Note: this obviously involves extra risk, supplying I<--force> assures +libvirt that the snapshot will be compatible with the new configuration. + Existence of snapshot metadata will prevent attempts to B<undefine> a persistent domain. However, for transient domains, snapshot metadata is silently lost when the domain quits running (whether -- 2.17.1

3 7

[libvirt] [jenkins-ci] defaults.yaml: Only spam libvirt-ci@redhat.com
by Yash Mankad 20 Mar '19

20 Mar '19

The libvirt CI maintainers/contributors have agreed to update the default spam e-mail to include only the libvirt-ci mailing list and remove my e-mail from the spam list in the defaults.yaml Signed-off-by: Yash Mankad <ymankad(a)redhat.com> --- jenkins/jobs/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index 230eaf0..b0deb0d 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -71,4 +71,4 @@ default: https://github.com/virt-manager/virt-manager.git virt-viewer: default: https://pagure.io/virt-viewer.git - spam: ymankad(a)redhat.com libvirt-ci(a)redhat.com + spam: libvirt-ci(a)redhat.com -- 2.20.1

3 2

[libvirt] [PATCH] virnwfilterbindingobj: Introduce and use virNWFilterBindingObjStealDef
by Michal Privoznik 20 Mar '19

20 Mar '19

https://bugzilla.redhat.com/show_bug.cgi?id=1686927 When trying to create a nwfilter binding via nwfilterBindingCreateXML() we may encounter a crash. The sequence of functions called is as follows: 1) nwfilterBindingCreateXML() parses the XML and calls virNWFilterBindingObjListAdd() which calls virNWFilterBindingObjListAddLocked() 2) Here, @binding is not found because binding->remove is set. 3) Therefore, controls continue with creating new @binding, setting its def to the one from 1) and adding it to the hash table. 4) This fails, because the binding is still in the hash table (duplicate key is detected). 5) The control jumps to 'error' label where virNWFilterBindingObjEndAPI() is called which frees the binding definition passed. 6) Error is propagated to the caller, which calls virNWFilterBindingDefFree() over the definition again. The solution is to unset binding->def in case of failure so it's not freed in step 5). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is a v2 of: https://www.redhat.com/archives/libvir-list/2019-March/msg01209.html But since this one implements different approach than v1 I'm not marking it as such. src/conf/virnwfilterbindingobj.c | 10 ++++++++++ src/conf/virnwfilterbindingobj.h | 3 +++ src/conf/virnwfilterbindingobjlist.c | 4 ++++ src/libvirt_private.syms | 1 + 4 files changed, 18 insertions(+) diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 23978d4207..68afb9c434 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -88,6 +88,16 @@ virNWFilterBindingObjSetDef(virNWFilterBindingObjPtr obj, } +virNWFilterBindingDefPtr +virNWFilterBindingObjStealDef(virNWFilterBindingObjPtr obj) +{ + virNWFilterBindingDefPtr def; + + VIR_STEAL_PTR(def, obj->def); + return def; +} + + bool virNWFilterBindingObjGetRemoving(virNWFilterBindingObjPtr obj) { diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbindingobj.h index 8e5fbee35f..b26bb3c8ec 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -39,6 +39,9 @@ void virNWFilterBindingObjSetDef(virNWFilterBindingObjPtr obj, virNWFilterBindingDefPtr def); +virNWFilterBindingDefPtr +virNWFilterBindingObjStealDef(virNWFilterBindingObjPtr obj); + bool virNWFilterBindingObjGetRemoving(virNWFilterBindingObjPtr obj); diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 06ccbf53af..4ee2c1b194 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -167,6 +167,7 @@ virNWFilterBindingObjListAddLocked(virNWFilterBindingObjListPtr bindings, virNWFilterBindingDefPtr def) { virNWFilterBindingObjPtr binding; + bool stealDef = false; /* See if a binding with matching portdev already exists */ if ((binding = virNWFilterBindingObjListFindByPortDevLocked( @@ -181,6 +182,7 @@ virNWFilterBindingObjListAddLocked(virNWFilterBindingObjListPtr bindings, goto error; virNWFilterBindingObjSetDef(binding, def); + stealDef = true; if (virNWFilterBindingObjListAddObjLocked(bindings, binding) < 0) goto error; @@ -188,6 +190,8 @@ virNWFilterBindingObjListAddLocked(virNWFilterBindingObjListPtr bindings, return binding; error: + if (stealDef) + virNWFilterBindingObjStealDef(binding); virNWFilterBindingObjEndAPI(&binding); return NULL; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26f10bd47f..a33f9e61b1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1101,6 +1101,7 @@ virNWFilterBindingObjParseFile; virNWFilterBindingObjSave; virNWFilterBindingObjSetDef; virNWFilterBindingObjSetRemoving; +virNWFilterBindingObjStealDef; # conf/virnwfilterbindingobjlist.h -- 2.19.2

3 4

[libvirt] [PATCH] rpm: fix upgrades when RBD is disabled in a new version
by Daniel P. Berrangé 20 Mar '19

20 Mar '19

We previously had to disable RBD on 32-bit platforms since Ceph has dropped all support for 32-bit. Unfortunately anyone with the RPM libvirt-daemon-driver-storage-rbd installed on 32-bit now has a broken upgrade path. To fix this we must make libvirt-daemon-driver-storage-common have an Obsoletes: libvirt-daemon-driver-storage-rbd < $VER-$REL Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..79f3d31d19 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -550,6 +550,9 @@ Requires: util-linux # From QEMU RPMs Requires: /usr/bin/qemu-img %endif +%if !%{with_storage_rbd} +Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release} +%endif %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing -- 2.20.1

2 2

[libvirt] [PATCH v2 0/3] nodedev: add class info for pci capability
by Nikolay Shirokovskiy 20 Mar '19

20 Mar '19

Diff from v1 [1] =============== - add patch to use/restrict name "klass" in headers instead of class, _class - add news patch [1] https://www.redhat.com/archives/libvir-list/2019-February/msg01036.html Nikolay Shirokovskiy (3): conf: don't use "class" as name in _virNodeDevCapPCIDev xml: nodedev: add class info for pci capability news: update for new class element of PCI nodedev capability cfg.mk | 8 ++++++++ docs/formatnode.html.in | 5 +++++ docs/news.xml | 5 +++++ docs/schemas/nodedev.rng | 5 +++++ src/conf/node_device_conf.c | 17 +++++++++++++++-- src/conf/node_device_conf.h | 4 ++-- src/node_device/node_device_udev.c | 4 ++-- .../nodedevschemadata/pci_0000_00_02_0_header_type.xml | 1 + .../nodedevschemadata/pci_0000_00_1c_0_header_type.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 1 + .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 1 + .../pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml | 1 + .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 1 + tests/nodedevschemadata/pci_1002_71c4.xml | 1 + tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml | 1 + tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 1 + tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml | 1 + tests/nodedevschemadata/pci_82579LM_network_adapter.xml | 1 + 20 files changed, 55 insertions(+), 6 deletions(-) -- 2.16.5

3 9

[libvirt] [PATCH] virStoragePoolDefParseSource: Don't leak @port
by Michal Privoznik 19 Mar '19

19 Mar '19

In a1c453dc088, during VIR_AUTOFREE() rewrite this wasn't done properly. @port might be leaked because it's allocated in a for() loop. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/conf/storage_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 7dff566641..3ae0d7ab77 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -588,6 +588,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; } } + VIR_FREE(port); } } -- 2.19.2

1 0

[libvirt] [PATCH] virStoragePoolDefFree: Free @def->refresh
by Michal Privoznik 19 Mar '19

19 Mar '19

In 669018bc9cb I've introduced def->refresh which might be allocated by virStoragePoolDefRefreshParse() but is never freed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/conf/storage_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index b797a405f7..7dff566641 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -509,6 +509,7 @@ virStoragePoolDefFree(virStoragePoolDefPtr def) VIR_FREE(def->target.path); VIR_FREE(def->target.perms.label); + VIR_FREE(def->refresh); if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); VIR_FREE(def); -- 2.19.2

1 0

[libvirt] [PATCH] nwfilter: Don't crash when trying to add an nwfilter that's already being removed
by Michal Privoznik 19 Mar '19

19 Mar '19

https://bugzilla.redhat.com/show_bug.cgi?id=1686927 When trying to create a nwfilter binding via nwfilterBindingCreateXML() we may encounter a crash. The sequence of functions called is as follows: 1) nwfilterBindingCreateXML() parses the XML and calls virNWFilterBindingObjListAdd() which calls virNWFilterBindingObjListAddLocked() 2) Here, @binding is not found because binding->remove is set. 3) Therefore, controls continue with creating new @binding, setting its def to the one from 1) and adding it to the hash table. 4) This fails, because the binding is still in the hash table (duplicate key is detected). 5) The control jumps to 'error' label where virNWFilterBindingObjEndAPI() is called which frees the binding definition passed. 6) Error is propagated to the caller, which calls virNWFilterBindingDefFree() over the definition again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnwfilterbindingobjlist.c | 11 ++++++----- src/conf/virnwfilterbindingobjlist.h | 2 +- src/nwfilter/nwfilter_driver.c | 5 ++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 06ccbf53af..87189da642 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -164,23 +164,24 @@ virNWFilterBindingObjListAddObjLocked(virNWFilterBindingObjListPtr bindings, */ static virNWFilterBindingObjPtr virNWFilterBindingObjListAddLocked(virNWFilterBindingObjListPtr bindings, - virNWFilterBindingDefPtr def) + virNWFilterBindingDefPtr *def) { virNWFilterBindingObjPtr binding; /* See if a binding with matching portdev already exists */ if ((binding = virNWFilterBindingObjListFindByPortDevLocked( - bindings, def->portdevname))) { + bindings, (*def)->portdevname))) { virReportError(VIR_ERR_OPERATION_FAILED, _("binding '%s' already exists"), - def->portdevname); + (*def)->portdevname); goto error; } if (!(binding = virNWFilterBindingObjNew())) goto error; - virNWFilterBindingObjSetDef(binding, def); + virNWFilterBindingObjSetDef(binding, *def); + *def = NULL; if (virNWFilterBindingObjListAddObjLocked(bindings, binding) < 0) goto error; @@ -195,7 +196,7 @@ virNWFilterBindingObjListAddLocked(virNWFilterBindingObjListPtr bindings, virNWFilterBindingObjPtr virNWFilterBindingObjListAdd(virNWFilterBindingObjListPtr bindings, - virNWFilterBindingDefPtr def) + virNWFilterBindingDefPtr *def) { virNWFilterBindingObjPtr ret; diff --git a/src/conf/virnwfilterbindingobjlist.h b/src/conf/virnwfilterbindingobjlist.h index b0fb90f667..4047453634 100644 --- a/src/conf/virnwfilterbindingobjlist.h +++ b/src/conf/virnwfilterbindingobjlist.h @@ -35,7 +35,7 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBindingObjListPtr bindings, virNWFilterBindingObjPtr virNWFilterBindingObjListAdd(virNWFilterBindingObjListPtr bindings, - virNWFilterBindingDefPtr def); + virNWFilterBindingDefPtr *def); void virNWFilterBindingObjListRemove(virNWFilterBindingObjListPtr bindings, diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fdfc6f48fa..8c2e987b5d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -759,7 +759,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, goto cleanup; obj = virNWFilterBindingObjListAdd(driver->bindings, - def); + &def); if (!obj) goto cleanup; @@ -775,8 +775,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, virNWFilterBindingObjSave(obj, driver->bindingDir); cleanup: - if (!obj) - virNWFilterBindingDefFree(def); + virNWFilterBindingDefFree(def); virNWFilterBindingObjEndAPI(&obj); return ret; -- 2.19.2

3 4

[libvirt] [PATCH] conf: Drop unused variable
by Andrea Bolognani 19 Mar '19

19 Mar '19

The refresh_volume_allocation variable in virStoragePoolDefParseXML() has been unused since its introduction in commit 669018bc9cb1, and Clang rightfully complains about this fact. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. src/conf/storage_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 653602f7be..b797a405f7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -849,7 +849,6 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) VIR_AUTOFREE(char *) type = NULL; VIR_AUTOFREE(char *) uuid = NULL; VIR_AUTOFREE(char *) target_path = NULL; - VIR_AUTOFREE(char *) refresh_volume_allocation = NULL; if (VIR_ALLOC(def) < 0) return NULL; -- 2.20.1

1 0

[libvirt] [PATCH] spec: Only call ldconfig on RHEL7
by Cole Robinson 19 Mar '19

19 Mar '19

Since Fedora 28 (our minimum supported build), ldconfig is called automatically for us: https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets These changes appear to be implemented for rhel > 7 as well, so only run ldconfig on rhel7 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..445fddc801 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1477,12 +1477,16 @@ exit 0 %post client +%if 0%{?rhel} == 7 /sbin/ldconfig +%endif %systemd_post libvirt-guests.service %postun client +%if 0%{?rhel} == 7 /sbin/ldconfig +%endif %systemd_postun libvirt-guests.service %triggerun client -- libvirt < 0.9.4 -- 2.21.0

2 5

[libvirt] [PATCH v3 0/3] rbd: improvements to actual disk-usage calculation
by jdillama＠redhat.com 19 Mar '19

19 Mar '19

From: Jason Dillaman <dillaman(a)redhat.com> The RBD fast-diff feature can vastly reduce the amount of time needed to calculate actual disk usage of volumes, but it might still be a slow operation for large RBD pools or pools with large RBD images. Therefore, this feature should be able to be optionally disabled if needed. Additionally, the fast-diff feature can only be used if the fast-diff map isn't flagged as invalid. Otherwise, librbd will silently perform a costly block-by-block scan to calculate the disk usage. since v1: - Moved RBD-unique refresh volume allocation override to shared storage pool attribute sice v2: - Moved attribute under new "<refresh><volume allocation='...'/></refresh>" elements. Jason Dillaman (3): rbd: do not attempt to use fast-diff if it's marked invalid storage: optional 'refresh' elemement on pool rbd: optionally compute volume allocation from capacity docs/formatstorage.html.in | 27 ++++++++++++ docs/schemas/storagecommon.rng | 7 ++++ docs/schemas/storagepool.rng | 23 ++++++++++ src/conf/storage_conf.c | 27 ++++++++++++ src/conf/storage_conf.h | 9 ++++ src/storage/storage_backend_rbd.c | 42 +++++++++++++++++-- .../pool-rbd-refresh-volume-allocation.xml | 15 +++++++ .../pool-rbd-refresh-volume-allocation.xml | 18 ++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-refresh-volume-allocation.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-refresh-volume-allocation.xml -- 2.20.1

2 7

[libvirt] [PATCH 00/34] conf: refactor virStorageSource parsing and formatting (blockdev-add saga)
by Peter Krempa 19 Mar '19

19 Mar '19

Simplify parsing and formatting of virStorageSource into/from XML. This series contains the refactors which unify the various parsers into one with a neat cleanup. The plan is to reuse the parser for parsing job backing chains when the disk frontend will be unplugged by the guest so that we don't lose track of the backing chain members. This series adds support for backing chain of the <mirror> subelement which has a similar reason. If we open a user-formatted file (--reuse-external) and do a shallow copy into it we will need to keep around the backing chain for that as well. It feels fitting to format the backing chain under <mirror> as it might become the disk source later. Peter Krempa (34): conf: Invert 'skipSeclabels' argument of virDomainDiskSourceFormatInternal conf: Move formatting of 'index' and 'startupPolicy' for virStorageSource conf: Introduce virDomainStorageSourceFormatFull qemu: domain: Replace qemuDomainObjPrivateXMLFormatNBDMigrationSource conf: Unexport virDomainStorageSourceFormat conf: domain: Merge virDomainDiskSourceFormatInternal into the wrapper conf: Simplify control flow in virDomainDiskSourceFormat conf: Avoid temporary variable in virDomainDiskBackingStoreFormat conf: Use virXMLFormatElement in virDomainDiskBackingStoreFormat conf: Move virDomainDiskBackingStoreFormat up to avoid forward declarations conf: Move backingStore formating into virDomainDiskSourceFormat conf: Add possibility to format full chain with virDomainStorageSourceFormatFull conf: Simplify error paths in storage source component parsers cleanup error path in virDomainStorageSourceParse util: xml: Introduce VIR_AUTOPTR functions for xmlDoc and xmlXPathContext tests: Use full force of our VIR_AUTO* machinery in testBackingXMLjsonXML tests: Refactor control flow in testBackingXMLjsonXML conf: Refactor control flow in virDomainDiskBackingStoreParse conf: Fold private data parsing into virDomainStorageSourceParse conf: Introduce modular parser for virStorageSource qemu: Use virDomainStorageSourceParseFull when parsing NBD migration data conf: Unexport virDomainStorageSourceParse tests: qemublock: Use new source formatter and parser in testBackingXMLjsonXML conf: snapshot: Use virDomainStorageSourceParseFull for snapshots conf: Replace virDomainDiskSourceParse by virDomainStorageSourceParse conf: Use virDomainStorageSourceParseFull in virDomainDiskBackingStoreParse conf: Use virDomainStorageSourceParseFull to parse disk source in virDomainDiskDefParseXML conf: Use virDomainStorageSourceParseFull in virDomainDiskDefMirrorParse conf: Parse <backingStore> in virDomainStorageSourceParseFull conf: Parse and format 'backingStore' for disk <mirror> conf: Add 'index' attribute for <disk><mirror><source> conf: Format seclabels for <backingStore> conf: Remove @seclabels from virDomainDiskSourceFormat conf: Remove @seclabels from virDomainStorageSourceFormat docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 494 ++++++++++-------- src/conf/domain_conf.h | 32 +- src/conf/snapshot_conf.c | 40 +- src/libvirt_private.syms | 4 +- src/qemu/qemu_domain.c | 104 +--- src/util/virxml.h | 3 + tests/qemublocktest.c | 179 +++---- .../blockjob-mirror-in.xml | 13 + .../qemuxml2argvdata/disk-backing-chains.xml | 6 +- tests/qemuxml2argvdata/disk-mirror.xml | 8 +- .../disk-backing-chains-active.xml | 6 +- .../disk-backing-chains-inactive.xml | 6 +- .../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +- tests/virstoragetest.c | 2 +- 15 files changed, 443 insertions(+), 463 deletions(-) -- 2.20.1

2 68

[libvirt] [PATCH 0/2] numa: deprecate -numa node, mem and default memory distribution
by Igor Mammedov 19 Mar '19

19 Mar '19

1) "I'm considering to deprecating -mem-path/prealloc CLI options and replacing them with a single memdev Machine property to allow interested users to pick used backend for initial RAM (fixes mixed -mem-path+hostmem backends issues) and as a transition step to modeling initial as a Device instead of (ab)using MemoryRegion APIs." (for more details see: https://www.mail-archive.com/qemu-devel@nongnu.org/msg596314.html) However there is a couple of roadblocks on the way (s390x and numa memory handling). I think I finally thought out a way to hack s390x in migration compatible manner, but I don't see a way to do it for -numa node,mem and default RAM assignement to nodes. Considering both numa usecases aren't meaningfully using NUMA (aside guest side testing), and could be replaced with explicitly used memdev parameter, I'd like to propose removing these fake NUMA friends, hence this deprecation. As result of removing deprecated options and replacing initial RAM allocation with 'memdev's (1), QEMU will allocate guest RAM in consistent way, fixing mixed use-case and allowing boards to move towards modelling initial RAM as Device(s). Which in its own turn should allow to cleanup NUMA/HMP/memory accounting code more by dropping ad-hoc node_mem tracking and reusing device enumeration instead. Igor Mammedov (2): numa: deprecate 'mem' parameter of '-numa node' option numa: deprecate implict memory distribution between nodes numa.c | 5 +++++ qemu-deprecated.texi | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) -- 2.7.4

6 39

[libvirt] [PATCH v2 0/3] rbd: improvements to actual disk-usage calculation
by jdillama＠redhat.com 19 Mar '19

19 Mar '19

From: Jason Dillaman <dillaman(a)redhat.com> The RBD fast-diff feature can vastly reduce the amount of time needed to calculate actual disk usage of volumes, but it might still be a slow operation for large RBD pools or pools with large RBD images. Therefore, this feature should be able to be optionally disabled if needed. Additionally, the fast-diff feature can only be used if the fast-diff map isn't flagged as invalid. Otherwise, librbd will silently perform a costly block-by-block scan to calculate the disk usage. since v1: - Moved RBD-unique refresh volume allocation override to shared storage pool attribute Jason Dillaman (3): rbd: do not attempt to use fast-diff if it's marked invalid storage: optional 'refresh_volume_allocation' attribute on pool rbd: optionally compute volume allocation from capacity docs/formatstorage.html.in | 15 +++++-- docs/schemas/storagecommon.rng | 7 ++++ docs/schemas/storagepool.rng | 5 +++ src/conf/storage_conf.c | 23 ++++++++++ src/conf/storage_conf.h | 9 ++++ src/storage/storage_backend_rbd.c | 42 +++++++++++++++++-- .../pool-rbd-refresh-volume-allocation.xml | 12 ++++++ .../pool-rbd-refresh-volume-allocation.xml | 15 +++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-refresh-volume-allocation.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-refresh-volume-allocation.xml -- 2.20.1

3 7

[libvirt] [PATCH] network: avoid trying to create global firewall rules if unprivileged
by Daniel P. Berrangé 19 Mar '19

19 Mar '19

The unprivileged libvirtd does not have permission to create firewall rules, or bridge devices, or do anything to the host network in general. Historically we still activate the network driver though and let the network start API call fail. The startup code path which reloads firewall rules on active networks would thus effectively be a no-op when unprivileged as it is impossible for there to be any active networks With the change to use a global set of firewall chains, however, we now have code that is run unconditionally. Ideally we would not register the network driver at all when unprivileged, but the entanglement with the virt drivers currently makes that impractical. As a temporary hack, we just make the firewall reload into a no-op. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/network/bridge_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c3e1381124..7d95675623 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2095,6 +2095,10 @@ static void networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup) { VIR_INFO("Reloading iptables rules"); + /* Ideally we'd not even register the driver when unprivilegd + * but until we untangle the virt driver that's not viable */ + if (!driver->privileged) + return; if (networkPreReloadFirewallRules(startup) < 0) return; virNetworkObjListForEach(driver->networks, -- 2.20.1

2 2

[libvirt] [PATCH 0/2] network: improve firewall rule creation error handling
by Daniel P. Berrangé 19 Mar '19

19 Mar '19

This is a different approach to solving the problem describd in: https://www.redhat.com/archives/libvir-list/2019-March/msg00584.html That patch would treat each chain creation attempt as non-fatal. This means ipv4 chains still get created if ipv6 is missing, or if a subset of ip[6]tables modules are missing (eg "mangle" chain). This series takes a different approach of splitting IPv4 and IPv6 chain creation. Setup for either address family can succeed/fail independently, however, within an address family everything must still succeed. Improved error reporting means that users will see the root cause error when trying to start an error. So with this series, 'mangle' support is still compulsory for any address family, but if IPv6 lacks mangle support, this won't break IPv4 support. This is good for the default network which only does IPv4 out of the box. Daniel P. Berrangé (2): network: improve error report when firewall chain creation fails network: split setup of ipv4 and ipv6 top level chains src/network/bridge_driver.c | 3 +- src/network/bridge_driver_linux.c | 51 ++++++++++++++++++++++++---- src/network/bridge_driver_nop.c | 3 +- src/network/bridge_driver_platform.h | 2 +- src/util/viriptables.c | 14 +++----- src/util/viriptables.h | 2 +- 6 files changed, 53 insertions(+), 22 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] spec: Remove libvirt < 0.9.4 upgrade compat
by Cole Robinson 19 Mar '19

19 Mar '19

These blocks are only triggered when updating from a libvirt version less than 0.9.4, which was released in august 2011. I think it's been long enough that we can say this upgrade path is unsupported without an intermediate step Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..dd725baf24 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1444,16 +1444,6 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : -%triggerun -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || : -/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - %if %{with_qemu} %pre daemon-driver-qemu # We want soft static allocation of well-known ids, as disk images @@ -1485,15 +1475,6 @@ exit 0 /sbin/ldconfig %systemd_postun libvirt-guests.service -%triggerun client -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||: - -# Run this because the SysV package being removed won't do them -/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || : - %if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then -- 2.21.0

2 1