- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] tools: Introduce virshNodedevCapabilityNameCompleter
by Michal Privoznik 18 Jul '19

18 Jul '19

Yet again, couple of patches I have on my local branch for the feature I'm working on and which can go separately. Michal Prívozník (2): virsh-completer: Separate comma list construction into a function tools: Introduce virshNodedevCapabilityNameCompleter tools/virsh-completer.c | 147 ++++++++++++++++++++++++++++------------ tools/virsh-completer.h | 4 ++ tools/virsh-nodedev.c | 1 + 3 files changed, 109 insertions(+), 43 deletions(-) -- 2.21.0

4 10

[libvirt] [PATCH] util: command: Ignore bitmap errors when enumerating file descriptors to close
by Peter Krempa 18 Jul '19

18 Jul '19

virCommandMassCloseGetFDsLinux fails when running libvird on valgrind with the following message: libvirt: error : internal error: unable to set FD as open: 1024 This is because valgrind opens few file descriptors beyond the limit: 65701125 lr-x------. 1 root root 64 Jul 18 14:48 1024 -> /home/pipo/build/libvirt/gcc/src/.libs/libvirtd 65701126 lrwx------. 1 root root 64 Jul 18 14:48 1025 -> '/tmp/valgrind_proc_3849_cmdline_186612e3 (deleted)' 65701127 lrwx------. 1 root root 64 Jul 18 14:48 1026 -> '/tmp/valgrind_proc_3849_auxv_186612e3 (deleted)' 65701128 lrwx------. 1 root root 64 Jul 18 14:48 1027 -> /dev/pts/11 65701129 lr-x------. 1 root root 64 Jul 18 14:48 1028 -> 'pipe:[65689522]' 65701130 l-wx------. 1 root root 64 Jul 18 14:48 1029 -> 'pipe:[65689522]' 65701131 lr-x------. 1 root root 64 Jul 18 14:48 1030 -> /tmp/vgdb-pipe-from-vgdb-to-3849-by-root-on-angien Ignore bitmap errors in this case since we'd leak those FD's anyways in the previous scenario. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/vircommand.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 5141611ca4..4501c96bbf 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -446,12 +446,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED, goto cleanup; } - if (virBitmapSetBit(fds, fd) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to set FD as open: %d"), - fd); - goto cleanup; - } + ignore_value(virBitmapSetBit(fds, fd)); } if (rc < 0) -- 2.21.0

2 1

[libvirt] [PATCH] libvirt_private.syms: Properly expose virPCI* function from virpci.h
by Michal Privoznik 18 Jul '19

18 Jul '19

There are couple of functions that are meant to be exposed but are missing syms file adjustment. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/libvirt_private.syms | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9640e91eaa..1d9eb17a86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2614,6 +2614,7 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressAsString; virPCIDeviceAddressEqual; +virPCIDeviceAddressFree; virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetSysfsFile; @@ -2625,6 +2626,7 @@ virPCIDeviceCopy; virPCIDeviceDetach; virPCIDeviceFileIterate; virPCIDeviceFree; +virPCIDeviceGetAddress; virPCIDeviceGetConfigPath; virPCIDeviceGetDriverPathAndName; virPCIDeviceGetIOMMUGroupDev; @@ -2664,11 +2666,14 @@ virPCIDeviceSetUsedBy; virPCIDeviceUnbind; virPCIDeviceWaitForCleanup; virPCIEDeviceInfoFree; +virPCIELinkSpeedTypeFromString; +virPCIELinkSpeedTypeToString; virPCIGetDeviceAddressFromSysfsLink; virPCIGetHeaderType; virPCIGetMdevTypes; virPCIGetNetName; virPCIGetPhysicalFunction; +virPCIGetSysfsFile; virPCIGetVirtualFunctionIndex; virPCIGetVirtualFunctionInfo; virPCIGetVirtualFunctions; -- 2.21.0

1 0

[libvirt] [dockerfiles PATCH 0/3] Add libosinfo-related projects
by Andrea Bolognani 18 Jul '19

18 Jul '19

See patch 2/3 for more information. Andrea Bolognani (3): refresh: Store projects in a more convenient format refresh: Add libosinfo-related projects Refresh after adding libosinfo-related projects buildenv-centos-7.Dockerfile | 11 +++++++++ buildenv-debian-10-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-i686.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-10.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-9.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-i686.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-sid.Dockerfile | 15 ++++++++++++ buildenv-fedora-29.Dockerfile | 15 ++++++++++++ buildenv-fedora-30.Dockerfile | 15 ++++++++++++ buildenv-fedora-rawhide.Dockerfile | 24 +++++++++++++++++++ buildenv-ubuntu-16.Dockerfile | 15 ++++++++++++ buildenv-ubuntu-18.Dockerfile | 15 ++++++++++++ refresh | 17 +++++++++---- 36 files changed, 543 insertions(+), 4 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH 0/2] virSecurityManagerMetadataLock: Skip over duplicate paths
by Michal Privoznik 18 Jul '19

18 Jul '19

See 2/2 for explanation. Michal Prívozník (2): virSecurityManagerMetadataLock: Expand the comment on deadlocks virSecurityManagerMetadataLock: Skip over duplicate paths src/security/security_manager.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -- 2.21.0

3 7

[libvirt] [dockerfiles PATCH] Add git-publish configuration file
by Andrea Bolognani 18 Jul '19

18 Jul '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitpublish diff --git a/.gitpublish b/.gitpublish new file mode 100644 index 0000000..a56a6d0 --- /dev/null +++ b/.gitpublish @@ -0,0 +1,4 @@ +[gitpublishprofile "default"] +base = master +to = libvir-list(a)redhat.com +prefix = dockerfiles PATCH -- 2.20.1

1 1

[libvirt] [PATCH 1/1] Revert "Revert "qemu: Temporary disable owner remembering""
by Daniel Henrique Barboza 18 Jul '19

18 Jul '19

After this commit, QEMU domains with PCI hostdevs running with managed=true started to fail to launch with the following error: error : virProcessRunInFork:1170 : internal error: child reported (status=125): unable to open /dev/vfio/1: Device or resource busy One way to avoid this issue is to disable this new feature in qemu.conf, setting remember_owner=0. However, given that this feature is enabled by default and it is breaking domains that were running before it, it is best to revert the change until it is fixed for this scenario as well. This reverts commit 8695793d726e37e31498f9fcbf0bce0adc56dc91. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/news.xml | 13 ------------- src/qemu/libvirtd_qemu.aug | 1 - src/qemu/qemu.conf | 5 ----- src/qemu/qemu_conf.c | 4 ---- src/qemu/test_libvirtd_qemu.aug.in | 1 - 5 files changed, 24 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 07d4575a65..8931f74bb9 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -25,19 +25,6 @@ <section title="New features"> </section> <section title="Improvements"> - <change> - <summary> - Remember original owners and SELinux labels of files - </summary> - <description> - When a domain is starting up libvirt changes DAC and - SELinux labels so that domain can access it. However, - it never remembered the original labels and therefore - the file was returned back to <code>root:root</code>. - With this release, the original labels are remembered - and restored properly. - </description> - </change> </section> <section title="Bug fixes"> </section> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index eea9094d39..6821cc4a29 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -72,7 +72,6 @@ module Libvirtd_qemu = | str_entry "user" | str_entry "group" | bool_entry "dynamic_ownership" - | bool_entry "remember_owner" | str_array_entry "cgroup_controllers" | str_array_entry "cgroup_device_acl" | int_entry "seccomp_sandbox" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index fd2ed9dc21..1969b3f0a1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -456,11 +456,6 @@ # Set to 0 to disable file ownership changes. #dynamic_ownership = 1 -# Whether libvirt should remember and restore the original -# ownership over files it is relabeling. Defaults to 1, set -# to 0 to disable the feature. -#remember_owner = 1 - # What cgroup controllers to make use of with QEMU guests # # - 'cpu' - use for scheduler tunables diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e0195dac29..8312f99f80 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -125,7 +125,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->group = (gid_t)-1; } cfg->dynamicOwnership = privileged; - cfg->rememberOwner = privileged; cfg->cgroupControllers = -1; /* -1 == auto-detect */ @@ -891,9 +890,6 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg, if (virConfGetValueBool(conf, "dynamic_ownership", &cfg->dynamicOwnership) < 0) return -1; - if (virConfGetValueBool(conf, "remember_owner", &cfg->rememberOwner) < 0) - return -1; - if (virConfGetValueStringList(conf, "cgroup_controllers", false, &controllers) < 0) return -1; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 388ba24b8b..50b728ad22 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -44,7 +44,6 @@ module Test_libvirtd_qemu = { "user" = "root" } { "group" = "root" } { "dynamic_ownership" = "1" } -{ "remember_owner" = "1" } { "cgroup_controllers" { "1" = "cpu" } { "2" = "devices" } -- 2.21.0

2 3

[libvirt] [PATCH] util: Fix uninitalized variable to avoid garbage value.
by Julio Faracco 18 Jul '19

18 Jul '19

This commit is similar with 596aa144. It fixes an uninitialized variable to avoid garbage value. This case, it uses time 't' 0 if an error occurs with virTimeMillisNowRaw. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index d1187726ee..86993e4e8d 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -422,7 +422,7 @@ virTimeBackOffStart(virTimeBackOffVar *var, bool virTimeBackOffWait(virTimeBackOffVar *var) { - unsigned long long t, next; + unsigned long long next, t = 0; ignore_value(virTimeMillisNowRaw(&t)); -- 2.20.1

2 1

[libvirt] [jenkins-ci PATCH v2 00/20] quayadmin: Introduce Quay API client
by Andrea Bolognani 18 Jul '19

18 Jul '19

Changes from [v1]: * add Dan's R-b to the patch importing the initial implementation; * don't break quiet mode for show-repo, and make sure it works for all other show-* commands as well; * fix typos. [v1] https://www.redhat.com/archives/libvir-list/2019-July/msg01018.html Andrea Bolognani (20): quayadmin: Import initial implementation quayadmin: Fix argument parsing for delete-repo quayadmin: Tweak quiet logic quayadmin: Tweak show-repo output format quayadmin: Tweak list-repos output format quayadmin: Build endpoint, params and payload separately quayadmin: Implement debug mode quayadmin: Remove clientid and clientsecret quayadmin: Introduce configuration object quayadmin: Read configuration from file quayadmin: Add support for the PUT method quayadmin: Add list-triggers command quayadmin: Add show-trigger command quayadmin: Add activate-trigger command quayadmin: Add list-builds command quayadmin: Add show-build command quayadmin: Add list-tags command quayadmin: Add show-tag command quayadmin: Add create-tag command quayadmin: Add delete-tag command guests/quayadmin | 585 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 585 insertions(+) create mode 100755 guests/quayadmin -- 2.21.0

2 40

[libvirt] [PATCH 0/2] docs: news: add per-release links
by Ján Tomko 17 Jul '19

17 Jul '19

Ján Tomko (2): docs: news: remove sed sorcery docs: news: add per-release links docs/Makefile.am | 8 +------- docs/news-html.xsl | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) -- 2.20.1

4 8

[libvirt] [PATCH 0/7] docs: assorted cleanups (virtio-fs epopee)
by Ján Tomko 17 Jul '19

17 Jul '19

Got a bit lost while navigating around the <filesystem> element documentation. Ján Tomko (7): docs: link to networkportformat.html in format.html docs: drvqemu: fix a typo docs: drvqemu: remove relative time reference docs: formatdomain: remove stray nbsp docs: formatdomain: tsc is supported by QEMU docs: formatdomain: remove "Since" references older than 1.1.1 docs: remove "Since" references older than 1.1.1 docs/drvnodedev.html.in | 8 +- docs/drvqemu.html.in | 15 +- docs/format.html.in | 1 + docs/formatcaps.html.in | 22 ++- docs/formatdomain.html.in | 340 +++++++++++++------------------------- docs/storage.html.in | 5 - 6 files changed, 138 insertions(+), 253 deletions(-) -- 2.20.1

2 10

[libvirt] [PATCH 0/2] qemu: blockjob: Tweak config saving in legacy block job handling (blockdev-add saga)
by Peter Krempa 17 Jul '19

17 Jul '19

This is based on quite a lot of patches that were ACK'd but I didn't push them yet, so feel free to fetch this at: git fetch https://gitlab.com/pipo.sk/libvirt.git legacy-job-refactor Peter Krempa (2): qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted qemu: blockjob: Update new job state earlier in qemuBlockJobEventProcessLegacy src/qemu/qemu_blockjob.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) -- 2.21.0

2 4

[libvirt] [jenkins-ci PATCH 00/20] quayadmin: Introduce Quay API client
by Andrea Bolognani 17 Jul '19

17 Jul '19

Dan started building this a while ago, and I finally managed to find some time to take it from a PoC to something that's actually useful for our day to day operations. There's still plenty of work to be done for sure, but it's already at the point where I can at least partially script the process of refreshing container images, which is something that up until now had to be done slowly and painfully through the Web interface. I will probably spend some more time on it in a couple of weeks, after I've used it to refresh images right before the 5.6.0 release and inevitably spotted a bunch of issues while doing so O:-) Andrea Bolognani (20): quayadmin: Import initial implementation quayadmin: Fix argument parsing for delete-repo quayadmin: Fix quiet mode for show-repo quayadmin: Tweak show-repo output format quayadmin: Tweak list-repos output format quayadmin: Build endpoint, params and payload separately quayadmin: Implement debug mode quayadmin: Remove clientid and clientsecret quayamdin: Introduce configuration object quayadmin: Read configuration from file quayadmin: Add support for the PUT method quayadmin: Add list-triggers command quayadmin: Add show-trigger command quayadmin: Add activate-trigger command quayadmin: Add list-builds command quayadmin: Add show-build command quayadmin: Add list-tags command quayadmin: Add show-tag command quayadmin: Add create-tag command quayadmin: Add delete-tag command guests/quayadmin | 563 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 563 insertions(+) create mode 100755 guests/quayadmin -- 2.21.0

3 29

[libvirt] [PATCH 00/29] Split the libvirtd daemon into per-driver daemons
by Daniel P. Berrangé 17 Jul '19

17 Jul '19

This is what all the driver refactoring I've done has been about enabling. We gain new daemons for each driver, for the primary virt drivers: virtlibxld virtlxcd virtqemud virtvboxd virtvzd And again for the secondary drivers virtinterfaced virtnetworkd virtnodedevd virtnwfilterd virtsecretd virtstoraged Finally to support IP connectivity, and also the legacy lbivirtd UNIX domain socket (for the old libvirt remote driver SSH tunnelling): virtproxyd The the sake of facilitating upgrades, the existing libvirtd still exists and works the same way it always has. You either run libvirtd, or you run the per-driver daemons, never both. The remote driver will look to see whether libvirtd is running to figure out whether to connect to libvirtd or the new per-driver daemons. When auto-spawning daemons for nonroot users, we default to spawning the per-driver daemons. This can be controlled with a UR parameter "?mode=direct|legacy|auto", where 'direct' means per-driver and 'legacy' means libvirtd (or indirect via virtproxyd if that's running). Still todo - Add systemd unit files for the new daemons - Make it possible to disable build of libvirtd, or of the per-driver daemons so downstream vendors can decide which to ship - Tuning of the daemon defaults for worker threads to better suit the fact that we have per-driver daemons - More work on RPM packaging to allow install of per-driver daemosn without pulling in libvirtd too - A bunch of stuff that doesn't occurr to me right now - Identify & fix more bugs I've created here Daniel P. Berrangé (29): rpc: add API for checking whether an auth scheme is in use on a server remote: simplify libvirtd code for deciding if SASL auth is needed logging: pass binary name not logfile name when enabling logging remote: conditionalize socket names in libvirtd daemon remote: conditionalize daemon name in libvirtd daemon remote: conditionalize driver loading in libvirtd daemon remote: conditionalize IP socket usage in libvirtd daemon remote: conditionalize IP socket config in libvirtd.conf remote: conditionalize IP socket config in augeas definitions remote: refactor & rename variables for building libvirtd secret: introduce virtsecretd daemon network: introduce virtnetworkd daemon interface: introduce virtinterfaced daemon storage: introduce virtstoraged daemon nodedev: introduce virtnodedevd daemon nwfilter: introduce virtnwfilterd daemon libxl: introduce virtlibxld daemon qemu: introduce virtqemud daemon lxc: introduce virtlxcd daemon vbox: introduce virtvboxd daemon bhyve: introduce virtbhyved daemon vz: introduce virtvzd daemon remote: introduce virtproxyd daemon to handle IP connectivity remote: open secondary drivers via remote driver if needed remote: use enum helpers for parsing remote driver transport remote: refactor the code for choosing the UNIX socket path remote: switch to connect to per-driver daemons by default all: don't wait for driver lock during startup interface: fix driver name in state directory path .gitignore | 12 + build-aux/augeas-gentest.pl | 2 +- libvirt.spec.in | 10 + src/bhyve/Makefile.inc.am | 14 + src/bhyve/bhyve_driver.c | 2 +- src/driver.h | 2 + src/interface/Makefile.inc.am | 14 + src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 6 +- src/libvirt.c | 24 ++ src/libvirt_remote.syms | 1 + src/libxl/Makefile.inc.am | 14 + src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/lxc/Makefile.inc.am | 15 + src/lxc/lxc_driver.c | 2 +- src/network/Makefile.inc.am | 14 + src/network/leaseshelper.c | 2 +- src/node_device/Makefile.inc.am | 14 + src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/Makefile.inc.am | 14 + src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/Makefile.inc.am | 14 + src/qemu/qemu_driver.c | 2 +- src/remote/Makefile.inc.am | 153 ++++--- src/remote/{libvirtd.aug => libvirtd.aug.in} | 24 +- .../{libvirtd.conf => libvirtd.conf.in} | 42 +- src/remote/remote_daemon.c | 221 +++++++--- src/remote/remote_daemon_config.c | 41 +- src/remote/remote_daemon_config.h | 9 +- src/remote/remote_daemon_dispatch.c | 82 +++- src/remote/remote_driver.c | 391 ++++++++++++------ src/remote/remote_driver.h | 4 - src/remote/test_libvirtd.aug.in | 16 +- src/rpc/virnetserver.c | 17 + src/rpc/virnetserver.h | 3 + src/secret/Makefile.inc.am | 14 + src/secret/secret_driver.c | 2 +- src/storage/Makefile.inc.am | 14 + src/util/virlog.c | 20 +- src/vbox/Makefile.inc.am | 14 + src/vz/Makefile.inc.am | 14 + src/vz/vz_driver.c | 2 +- 45 files changed, 938 insertions(+), 341 deletions(-) rename src/remote/{libvirtd.aug => libvirtd.aug.in} (88%) rename src/remote/{libvirtd.conf => libvirtd.conf.in} (95%) -- 2.21.0

6 43

[libvirt] [PATCH 0/9] qemu: refactor fsdev formatting (virtio-fs epopee)
by Ján Tomko 16 Jul '19

16 Jul '19

Ján Tomko (9): tests: qemu: minimize fs9p.xml qemu: add CAPS_LATEST tests for 9pfs qemu: address: remove useless comment qemu: command: rename qemuBuildFSDevCommandLine qemu: command: re-introduce qemuBuildFSDevCommandLine qemu: command: use VIR_AUTOFREE in qemuBuildFSDevCommandLine qemu: introduce qemuDomainDeviceDefValidateFS qemu: command: use VIR_AUTOCLEAN in qemuBuildFS* qemu: command: remove qemuDomainFSDriver src/qemu/qemu_command.c | 111 ++++++------------ src/qemu/qemu_domain.c | 46 +++++++- src/qemu/qemu_domain_address.c | 3 +- .../fs9p-ccw.s390x-latest.args | 44 +++++++ tests/qemuxml2argvdata/fs9p.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 41 +++++++ tests/qemuxml2argvdata/fs9p.xml | 9 +- tests/qemuxml2argvtest.c | 2 + 8 files changed, 175 insertions(+), 87 deletions(-) create mode 100644 tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/fs9p.x86_64-latest.args -- 2.19.2

2 11

[libvirt] [PATCH v2 0/4] Optimize mass closing of FDs on child spwaning
by Michal Privoznik 16 Jul '19

16 Jul '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-July/msg00089.html diff to v1: - Added a test for stats parsing, - Added big fat warning as requested by Eric that malloc() in between fork() and exec() is okay with glibc (I guess we don't care about other libc-s like musl or uclibc). Michal Prívozník (4): virNetDevOpenvswitchInterfaceStats: Optimize for speed test: Introduce virnetdevopenvswitchtest vircommand: Separate mass FD closing into a function virCommand: use procfs to learn opened FDs src/libvirt_private.syms | 1 + src/util/vircommand.c | 122 +++++++++++++++--- src/util/virnetdevopenvswitch.c | 136 +++++++++++++++------ src/util/virnetdevopenvswitch.h | 4 + tests/Makefile.am | 13 +- tests/virnetdevopenvswitchdata/stats1.json | 1 + tests/virnetdevopenvswitchdata/stats2.json | 1 + tests/virnetdevopenvswitchtest.c | 101 +++++++++++++++ 8 files changed, 321 insertions(+), 58 deletions(-) create mode 100644 tests/virnetdevopenvswitchdata/stats1.json create mode 100644 tests/virnetdevopenvswitchdata/stats2.json create mode 100644 tests/virnetdevopenvswitchtest.c -- 2.21.0

2 7

[libvirt] [PATCH v2] qapi: add dirty-bitmaps to query-named-block-nodes result
by John Snow 16 Jul '19

16 Jul '19

From: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> Let's add a possibility to query dirty-bitmaps not only on root nodes. It is useful when dealing both with snapshots and incremental backups. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> [Added deprecation and feature flag information. --js] Signed-off-by: John Snow <jsnow(a)redhat.com> --- block/qapi.c | 5 +++++ qapi/block-core.json | 14 +++++++++++++- qemu-deprecated.texi | 12 ++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/block/qapi.c b/block/qapi.c index 917435f022..15f1030264 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -79,6 +79,11 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, info->backing_file = g_strdup(bs->backing_file); } + if (!QLIST_EMPTY(&bs->dirty_bitmaps)) { + info->has_dirty_bitmaps = true; + info->dirty_bitmaps = bdrv_query_dirty_bitmaps(bs); + } + info->detect_zeroes = bs->detect_zeroes; if (blk && blk_get_public(blk)->throttle_group_member.throttle_state) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 0d43d4f37c..0d67dd245c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -360,6 +360,16 @@ # @write_threshold: configured write threshold for the device. # 0 if disabled. (Since 2.3) # +# @dirty-bitmaps: dirty bitmaps information (only present if node +# has one or more dirty bitmaps) (Since 4.2) +# +# Features: +# @node-dirty-bitmaps: Signals the capability to return dirty bitmap information +# per-node instead of per-drive. If this flag is present, +# dirty-bitmaps should not be read from the BlockInfo +# structure, the top-level data for query-block. +# (Since 4.2) +# # Since: 0.14.0 # ## @@ -378,7 +388,8 @@ '*bps_wr_max_length': 'int', '*iops_max_length': 'int', '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int', '*iops_size': 'int', '*group': 'str', 'cache': 'BlockdevCacheInfo', - 'write_threshold': 'int' } } + 'write_threshold': 'int', '*dirty-bitmaps': ['BlockDirtyInfo'] }, + 'features': [ { 'name': 'node-dirty-bitmaps' } ] } ## # @BlockDeviceIoStatus: @@ -656,6 +667,7 @@ # # @dirty-bitmaps: dirty bitmaps information (only present if the # driver has one or more dirty bitmaps) (Since 2.0) +# Deprecated in 4.2; see BlockDirtyInfo instead. # # @io-status: @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index c90b08d553..bc4e5ac1d7 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -134,6 +134,18 @@ The ``status'' field of the ``BlockDirtyInfo'' structure, returned by the query-block command is deprecated. Two new boolean fields, ``recording'' and ``busy'' effectively replace it. +@subsection query-block result field dirty-bitmaps (Since 4.2) + +The ``dirty-bitmaps`` field of the ``BlockInfo`` structure, returned by +the query-block command is itself now deprecated. The ``dirty-bitmaps`` +field of the ``BlockDeviceInfo`` struct should be used instead, which is the +type of the ``inserted`` field in query-block replies, as well as the +type of array items in query-named-block-nodes. + +In the absence of bitmaps on either structure, management APIs may use the +presence of the ``node-dirty-bitmaps`` feature flag on the ``BlockDeviceInfo`` +structure to know where to anticipate bitmap data when present. + @subsection query-cpus (since 2.12.0) The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. -- 2.21.0

1 0

[libvirt] [PATCH 0/3] Optimize mass closing of FDs on child spwaning
by Michal Privoznik 15 Jul '19

15 Jul '19

If the limit for max opened files is way bigger than the default (1024), say 3 orders bigger then spawning a child through virCommand can be expensive because we iterate over ALL FDs within the limit and close them. There's no need to that since we can learn the list of opened FDs from /proc/self/fd/. Michal Prívozník (3): virNetDevOpenvswitchInterfaceStats: Optimize for speed vircommand: Separate mass FD closing into a function virCommand: use procfs to learn opened FDs src/util/vircommand.c | 114 +++++++++++++++++++++++++++----- src/util/virnetdevopenvswitch.c | 111 ++++++++++++++++++++----------- 2 files changed, 170 insertions(+), 55 deletions(-) -- 2.21.0

7 20

[libvirt] [PATCH] tests: don't assume "localhost" only resolves to 1/2 IPs
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

On Debian derived distros "localhost" can resolve to the normal "127.0.0.1" and "::1", but it can also resolve to "127.0.1.1" Rewrite the code so that it doesn't assume a fixed number of IPs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virsystemdtest.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index cd031914ab..dd87caeebf 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -548,22 +548,21 @@ testActivation(bool useNames) size_t nsockIP; int ret = -1; size_t i; - const char *names2 = "demo-unix.socket:demo-ip.socket"; - const char *names3 = "demo-unix.socket:demo-ip.socket:demo-ip.socket"; char nfdstr[INT_BUFSIZE_BOUND(size_t)]; char pidstr[INT_BUFSIZE_BOUND(pid_t)]; virSystemdActivationMap map[2]; int *fds = NULL; size_t nfds = 0; VIR_AUTOPTR(virSystemdActivation) act = NULL; + virBuffer names = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&names, "demo-unix.socket"); if (testActivationCreateFDs(&sockUNIX, &sockIP, &nsockIP) < 0) return -1; - if (nsockIP != 1 && nsockIP != 2) { - fprintf(stderr, "Got %zu IP sockets but expected only 1 or 2\n", nsockIP); - goto cleanup; - } + for (i = 0; i < nsockIP; i++) + virBufferAddLit(&names, ":demo-ip.socket"); snprintf(nfdstr, sizeof(nfdstr), "%zu", 1 + nsockIP); snprintf(pidstr, sizeof(pidstr), "%lld", (long long)getpid()); @@ -571,8 +570,11 @@ testActivation(bool useNames) setenv("LISTEN_FDS", nfdstr, 1); setenv("LISTEN_PID", pidstr, 1); + if (virBufferError(&names)) + goto cleanup; + if (useNames) - setenv("LISTEN_FDNAMES", nsockIP == 1 ? names2 : names3, 1); + setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), 1); else unsetenv("LISTEN_FDNAMES"); @@ -627,6 +629,7 @@ testActivation(bool useNames) ret = 0; cleanup: + virBufferFreeAndReset(&names); virObjectUnref(sockUNIX); for (i = 0; i < nsockIP; i++) virObjectUnref(sockIP[i]); -- 2.21.0

2 1

[libvirt] [libvirt-php PATCH 0/2] Add binding for virDomainInterfaceAddresses
by Dawid Zamirski 15 Jul '19

15 Jul '19

Hello, The following two patches add a new bingding for virDomainInterfaceAddresses. While working on it I have found that the PHP7 version of the VIRT_ARRAY_INIT macro was causing segfaults which I have fixed in the first patch wheread the actual implementation of the binding is in the second one. Details are included in the commit messages of each patch. Regards, Dawid Dawid Zamirski (2): Fix PHP7 VIRT_ARRAY_INIT macro implementation. Add binding for virDomainInterfaceAddresses. src/libvirt-domain.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt-domain.h | 2 ++ src/libvirt-php.c | 9 ++++++++ src/util.h | 7 +++--- 4 files changed, 70 insertions(+), 3 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH] test_driver: implement virDomainSetMemoryParameters
by Ilias Stamatis 15 Jul '19

15 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c14603e3af..2f4f94968b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2861,6 +2861,90 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virTypedParameterAssign(&params[index], name, type, value) < 0) \ goto cleanup + +static int +testDomainSetMemoryParameters(virDomainPtr dom, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + unsigned long long swap_hard_limit = 0; + unsigned long long hard_limit = 0; + unsigned long long soft_limit = 0; + bool set_swap_hard_limit = false; + bool set_hard_limit = false; + bool set_soft_limit = false; + int rc; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + +#define VIR_GET_LIMIT_PARAMETER(PARAM, VALUE) \ + if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE)) < 0) \ + goto cleanup; \ + \ + if (rc == 1) \ + set_ ## VALUE = true; + + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, soft_limit) + +#undef VIR_GET_LIMIT_PARAMETER + + if (set_swap_hard_limit || set_hard_limit) { + unsigned long long mem_limit = vm->def->mem.hard_limit; + unsigned long long swap_limit = vm->def->mem.swap_hard_limit; + + if (set_swap_hard_limit) + swap_limit = swap_hard_limit; + + if (set_hard_limit) + mem_limit = hard_limit; + + if (mem_limit > swap_limit) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("memory hard_limit tunable value must be lower " + "than or equal to swap_hard_limit")); + goto cleanup; + } + } + + if (set_soft_limit) + def->mem.soft_limit = soft_limit; + + if (set_hard_limit) + def->mem.hard_limit = hard_limit; + + if (set_swap_hard_limit) + def->mem.swap_hard_limit = swap_hard_limit; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetMemoryParameters(virDomainPtr dom, virTypedParameterPtr params, @@ -7615,6 +7699,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ + .domainSetMemoryParameters = testDomainSetMemoryParameters, /* 5.6.0 */ .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */ .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ -- 2.22.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainSetUserPassword
by Ilias Stamatis 15 Jul '19

15 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 49d7030d21..891a398a92 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2602,6 +2602,31 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, return ret; } + +static int +testDomainSetUserPassword(virDomainPtr dom, + const char *user ATTRIBUTE_UNUSED, + const char *password ATTRIBUTE_UNUSED, + unsigned int flags) +{ + int ret = -1; + virDomainObjPtr vm; + + virCheckFlags(VIR_DOMAIN_PASSWORD_ENCRYPTED, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSetVcpus(virDomainPtr domain, unsigned int nrCpus) { @@ -7628,6 +7653,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSaveImageGetXMLDesc = testDomainSaveImageGetXMLDesc, /* 5.5.0 */ .domainCoreDump = testDomainCoreDump, /* 0.3.2 */ .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */ + .domainSetUserPassword = testDomainSetUserPassword, /* 5.6.0 */ .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */ .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = testDomainGetVcpusFlags, /* 0.8.5 */ -- 2.22.0

2 1

[libvirt] [PATCH] all: don't wait for driver lock during startup
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

When the drivers acquire their pidfile lock we don't want to wait if the lock is already held. We need the driver to immediately report error, causing the daemon to exit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/leaseshelper.c | 2 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/secret/secret_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index cfcf4e1fba..5387ac5570 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1280,7 +1280,7 @@ bhyveStateInitialize(bool privileged, } if ((bhyve_driver->lockFD = - virPidFileAcquire(BHYVE_STATE_DIR, "driver", true, getpid())) < 0) + virPidFileAcquire(BHYVE_STATE_DIR, "driver", false, getpid())) < 0) goto cleanup; if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 868e49c56e..f575768c4c 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -120,7 +120,7 @@ netcfStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; /* open netcf */ diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index fcd7f1c04a..2feaeb95b7 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1199,7 +1199,7 @@ udevStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; driver->udev = udev_new(); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a99c7471bb..492028c487 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -747,7 +747,7 @@ libxlStateInitialize(bool privileged, } if ((libxl_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; if (!(libxl_driver->lockManager = diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3982c24f34..d0b6703101 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1607,7 +1607,7 @@ static int lxcStateInitialize(bool privileged, } if ((lxc_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto cleanup; /* Get all the running persistent or transient configs first */ diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 89d9a003e2..2a10fbf33a 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -164,7 +164,7 @@ main(int argc, char **argv) goto cleanup; /* Try to claim the pidfile, exiting if we can't */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0) + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; /* Since interfaces can be hot plugged, we need to make sure that the diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 1920f4566e..1f3f867599 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -637,7 +637,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto failure; if (!(driver->devs = virNodeDeviceObjListNew())) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index d883462948..8bc63c506c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1848,7 +1848,7 @@ nodeStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; if (!(driver->devs = virNodeDeviceObjListNew()) || diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 43561241f6..530e4f5872 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -215,7 +215,7 @@ nwfilterStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (virNWFilterIPAddrMapInit() < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc0d12c335..d3a144aabd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -677,7 +677,7 @@ qemuStateInitialize(bool privileged, } if ((qemu_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img"); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9344948db4..0af2bcef96 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -504,7 +504,7 @@ secretStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (!(driver->secrets = virSecretObjListNew())) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 75430fb0d9..f5d05a7f43 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4129,7 +4129,7 @@ vzStateInitialize(bool privileged, } if ((vz_driver_lock_fd = - virPidFileAcquire(VZ_STATEDIR, "driver", true, getpid())) < 0) + virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0) return -1; if (prlsdkInit() < 0) { -- 2.21.0

2 1

[libvirt] [PATCH] interface: fix driver name in state directory path
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

Typo meant we use 'nodedev' instead of 'interface'. This doesn't hurt libvirtd because if a process tries to acquire a lock it already holds it will succeed. It fails when nodedev & interface drivers are in separate daemons though. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/interface/interface_backend_netcf.c | 4 ++-- src/interface/interface_backend_udev.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index f575768c4c..0000587cee 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -102,14 +102,14 @@ netcfStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto error; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto error; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 2feaeb95b7..fea5108dbc 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1181,14 +1181,14 @@ udevStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto cleanup; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto cleanup; } -- 2.21.0

2 1

[libvirt] [PATCH 0/5] libvirt_nss: Report newer addresses first
by Michal Privoznik 15 Jul '19

15 Jul '19

See the last patch for explanation. Michal Prívozník (5): libvirt_nss: Use VIR_STEAL_PTR() in findLease() libvirt_nss: Use VIR_AUTOPTR and VIR_AUTOFREE libvirt_nss: Drop some needless cleanup labels libvirt_nss: Pass @name to appendAddr() libvirt_nss: Report newer addresses first tests/nssdata/virbr0.status | 6 +-- tests/nsstest.c | 21 ++++------ tools/nss/libvirt_nss.c | 80 +++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 47 deletions(-) -- 2.21.0

2 11