- Devel - libvirt List Archives

[libvirt] [PATCH] Remove ignore_value or void from unlink calls
by John Ferlan 20 Sep '18

20 Sep '18

There seems to be no need to add the ignore_value wrapper or caste with (void) to the unlink() calls, so let's just remove them. I assume at one point in time Coverity complained. So, let's just be consistent - those that care to check the return status can and those that don't can just have the naked unlink. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- As a result of Michal's review comment on my recent storage driver error path series... src/conf/virsecretobj.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/storage/storage_driver.c | 4 ++-- src/util/virfilecache.c | 2 +- src/util/virnetdev.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 2ff2998c15..78911c0908 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -666,7 +666,7 @@ virSecretObjDeleteData(virSecretObjPtr obj) { /* The configFile will already be removed, so secret won't be * loaded again if this fails */ - (void)unlink(obj->base64File); + unlink(obj->base64File); } diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 2330ba0479..6d114557c7 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1923,7 +1923,7 @@ virNWFilterSnoopLeaseFileRefresh(void) if (rename(TMPLEASEFILE, LEASEFILE) < 0) { virReportSystemError(errno, _("rename(\"%s\", \"%s\")"), TMPLEASEFILE, LEASEFILE); - ignore_value(unlink(TMPLEASEFILE)); + unlink(TMPLEASEFILE); } virAtomicIntSet(&virNWFilterSnoopState.wLeases, 0); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 04c2adcfb5..394202942f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4304,7 +4304,7 @@ virQEMUCapsInitQMPCommandAbort(virQEMUCapsInitQMPCommandPtr cmd) cmd->cmd = NULL; if (cmd->monpath) - ignore_value(unlink(cmd->monpath)); + unlink(cmd->monpath); virDomainObjEndAPI(&cmd->vm); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index bf43d77c8b..7c22c43584 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -84,7 +84,7 @@ storagePoolRefreshFailCleanup(virStorageBackendPtr backend, virErrorPtr orig_err = virSaveLastError(); if (stateFile) - ignore_value(unlink(stateFile)); + unlink(stateFile); if (backend->stopPool) backend->stopPool(obj); if (orig_err) { @@ -142,7 +142,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to initialize storage pool '%s': %s"), def->name, virGetLastErrorMessage()); - ignore_value(unlink(stateFile)); + unlink(stateFile); active = false; } diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index 2927c68358..15c0d99fd9 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -161,7 +161,7 @@ virFileCacheLoad(virFileCachePtr cache, if (!cache->handlers.isValid(loadData, cache->priv)) { VIR_DEBUG("Outdated cached capabilities '%s' for '%s'", file, name); - ignore_value(unlink(file)); + unlink(file); ret = 0; goto cleanup; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 39c91313de..e94960c9da 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2161,7 +2161,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } /* we won't need the file again */ - ignore_value(unlink(filePath)); + unlink(filePath); ret = 0; cleanup: -- 2.17.1

2 1

[libvirt] [PATCH 0/5] Cleanup some storage driver paths
by John Ferlan 20 Sep '18

20 Sep '18

See the patches for details - everything leads to the last one. John Ferlan (5): storage: Clean up stateFile if refreshPool fails storage: Clean up storagePoolUpdateStateCallback processing storage: Create error label path for storagePoolCreateXML storage: Introduce storagePoolRefreshFailCleanup storage: Save error during refresh failure processing src/storage/storage_driver.c | 73 ++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 33 deletions(-) -- 2.17.1

2 9

[libvirt] [libvirt PATCH v6 00/15] Finish the conversion to virConfGetValue* functions libvirt
by Fabiano Fidêncio 20 Sep '18

20 Sep '18

This patchset finishes the conversion to virConfGetValue* functions, started by Daniel Berrange a few months ago. Please, mind that although we could make virConfGetValue* functions more generic in order to support numbers and booleans as strings, that doesn't seem the safest path to take. The side-effect of this is that we will have to live with some specific code doing that as part of vmx and xen_common. Once this patchset gets merged, https://wiki.libvirt.org/page/BiteSizedTasks#Finish_conversion_to_virConfGe… can be removed. - Changes since v1: All the "values" from virConfGetValueString() are freed - Changes since v2: All comments from Ján Tomko have been addressed; A few leaks were (possibly) found and they're addressed in the last patch of the series; - Changes since v3: All comments from Ján Tomko have been addressed in order to lower the non-whitespace changes in the first patch; - Changes since v4: All comments from Ján Tomko have been addressed (hopefully, they actually were this time :-)); - Changes since v5: All comments from John Ferlan have been addressed, including splitting the patches per "function" touched. Some new patches were also needed due to a behaviour change introduced by the "xen_common: Change xenParsePCIList to using virConfGetValueStringList" patch. Fabiano Fidêncio (15): xen_common: Change xenConfigCopyStringInternal to using virConfGetValueString xen_common: Change xenConfigGetUUID to using virConfGetValueString xen_common: Change xenConfigGetString to using virConfGetValueString xen_xl: Adapt xenParseCmdline due to changes in xenConfigGetString xen_xl: Adapt xenParseXLOS due to changes in xenConfigGetString xen_xl: adapt xenParseXLCPUID due to changes in xenConfigGetString xen_common: Adapt xenParseEventsActions due to changes in xenConfigGetString xen_common: Adapt xenParseCPUFeatures due to changes in xenConfigGetString xen_common: Adapt xenParseEmulatedDevices due to changes in xenConfigGetString xen_common: Adapt xenParseGeneralMeta due to changes in xenConfigGetString xen_xm: Adapt xenParseXMOS due to changes in xenConfigGetString xen_xm: Adapt xenParseXMInputDevs due to changes in xenConfigGetString xen_common: Change xenParsePCIList to using virConfGetValueStringList xen_common: Change xenParseVfbs to using virConfGetValueStringList xen_common: Change xenParseCharDev to using virConfGetValueStringList src/xenconfig/xen_common.c | 223 +++++++++++++++++++------------------ src/xenconfig/xen_xl.c | 71 +++++++----- src/xenconfig/xen_xm.c | 48 ++++---- 3 files changed, 186 insertions(+), 156 deletions(-) -- 2.17.1

2 22

[libvirt] [PATCH 0/2] Tiny system header cleanup
by Erik Skultety 19 Sep '18

19 Sep '18

2 6

[libvirt] [PATCH v3] qemu: Ignore nwfilter binding instantiation issues during reconnect
by John Ferlan 19 Sep '18

19 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607202 It's essentially stated in the nwfilterBindingDelete that we will allow the admin to shoot themselves in the foot by deleting the nwfilter binding which then allows them to undefine the nwfilter that is in use for the running guest... However, by allowing this we cause a problem for libvirtd restart reconnect processing which would then try to recreate the missing binding attempting to use the deleted filter resulting in an error and thus shutting the guest down. So rather than keep adding virDomainConfNWFilterInstantiate flags to "ignore" specific error conditions, modify the logic to ignore, but VIR_WARN errors other than ignoreExists. This will at least allow the guest to not shutdown for only nwfilter binding errors that we can now perhaps recover from since we have the binding create/delete capability. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v2: https://www.redhat.com/archives/libvir-list/2018-August/msg01567.html Differences to v2. Leave the ignoreExists bool, but just allow and VIR_WARN other errors from virDomainConfNWFilterInstantiate. Continue processing all filters from error point too. src/qemu/qemu_process.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab749389ee..61a277f468 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3160,20 +3160,29 @@ qemuProcessNotifyNets(virDomainDefPtr def) } } -static int -qemuProcessFiltersInstantiate(virDomainDefPtr def, bool ignoreExists) +/* Attempt to instantiate the filters. Ignore failures because it's + * possible that someone deleted a filter binding and the associated + * filter while the guest was running and we don't want that action + * to cause failure to keep the guest running during the reconnection + * processing. Nor do we necessarily want other failures to do the + * same. We'll just log the error conditions other than of course + * ignoreExists possibility (e.g. the true flag) */ +static void +qemuProcessFiltersInstantiate(virDomainDefPtr def) { size_t i; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; if ((net->filter) && (net->ifname)) { - if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, ignoreExists) < 0) - return 1; + if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, + true) < 0) { + VIR_WARN("filter '%s' instantiation for '%s' failed '%s'", + net->filter, net->ifname, virGetLastErrorMessage()); + virResetLastError(); + } } } - - return 0; } static int @@ -7892,8 +7901,7 @@ qemuProcessReconnect(void *opaque) qemuProcessNotifyNets(obj->def); - if (qemuProcessFiltersInstantiate(obj->def, true)) - goto error; + qemuProcessFiltersInstantiate(obj->def); if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; -- 2.17.1

2 4

[libvirt] [PATCH V3 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 19 Sep '18

19 Sep '18

V2: https://www.redhat.com/archives/libvir-list/2018-September/msg00383.html New in V3: - Change definition of LIBXL_API_VERSION to 0x040500, the API version set when Xen 4.6 was released - Drop the 'true' parameter to LIBVIRT_CHECK_PKG macro so configure fails if libxl is requested but the devel packages are not installed - Remove a now unused variable and a redundant 'if test with_libxl' check - Moved the news file addition to 'Removed features' section Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: Announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 2 +- docs/news.xml | 11 +++++++++++ m4/virt-driver-libxl.m4 | 27 ++------------------------- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- 5 files changed, 16 insertions(+), 28 deletions(-) -- 2.18.0

3 10

[libvirt] [PATCH] secret: Makefile: Fix an EXTRA_DIST typo
by Erik Skultety 19 Sep '18

19 Sep '18

So, when trying to add some secret util sources, we referenced them with a non-existent symbol. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/secret/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 305c4a1ead..79c2b2d74a 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -13,7 +13,7 @@ DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ - $(SECRET_UTIL_SOURCESQ) \ + $(SECRET_UTIL_SOURCES) \ $(NULL) noinst_LTLIBRARIES += libvirt_secret.la -- 2.17.1

1 1

[libvirt] [PATCH 0/9] cgroup cleanups and preparation for v2
by Pavel Hrdina 19 Sep '18

19 Sep '18

Pavel Hrdina (9): vircgroup: cleanup controllers not managed by systemd on error vircgroup: fix bug in virCgroupEnableMissingControllers vircgroup: rename virCgroupAdd.*Task to virCgroupAdd.*Process vircgroup: introduce virCgroupTaskFlags vircgroup: introduce virCgroupAddThread vircgroupmock: cleanup unused cgroup files vircgroupmock: rewrite cgroup fopen mocking vircgrouptest: call virCgroupDetectMounts directly vircgrouptest: call virCgroupNewSelf instead virCgroupDetectMounts src/libvirt-lxc.c | 2 +- src/libvirt_private.syms | 6 +- src/lxc/lxc_controller.c | 4 +- src/qemu/qemu_process.c | 4 +- src/qemu/qemu_tpm.c | 2 +- src/util/vircgroup.c | 135 +++++++----- src/util/vircgroup.h | 5 +- src/util/vircgrouppriv.h | 4 - tests/vircgroupdata/all-in-one.cgroups | 7 + tests/vircgroupdata/all-in-one.mounts | 2 +- tests/vircgroupdata/all-in-one.parsed | 12 +- tests/vircgroupdata/all-in-one.self.cgroup | 1 + tests/vircgroupdata/cgroups1.cgroups | 11 + tests/vircgroupdata/cgroups1.self.cgroup | 11 + tests/vircgroupdata/cgroups2.cgroups | 10 + tests/vircgroupdata/cgroups2.self.cgroup | 10 + tests/vircgroupdata/cgroups3.cgroups | 12 + tests/vircgroupdata/cgroups3.self.cgroup | 12 + tests/vircgroupdata/fedora-18.cgroups | 10 + tests/vircgroupdata/fedora-18.self.cgroup | 9 + tests/vircgroupdata/fedora-21.cgroups | 12 + tests/vircgroupdata/fedora-21.self.cgroup | 10 + tests/vircgroupdata/kubevirt.cgroups | 10 + tests/vircgroupdata/kubevirt.self.cgroup | 10 + tests/vircgroupdata/logind.cgroups | 10 + tests/vircgroupdata/logind.mounts | 2 + tests/vircgroupdata/logind.self.cgroup | 1 + tests/vircgroupdata/ovirt-node-6.6.cgroups | 9 + .../vircgroupdata/ovirt-node-6.6.self.cgroup | 8 + tests/vircgroupdata/ovirt-node-7.1.cgroups | 11 + .../vircgroupdata/ovirt-node-7.1.self.cgroup | 10 + tests/vircgroupdata/rhel-7.1.cgroups | 11 + tests/vircgroupdata/rhel-7.1.self.cgroup | 10 + tests/vircgroupdata/systemd.cgroups | 8 + tests/vircgroupdata/systemd.mounts | 11 + tests/vircgroupdata/systemd.self.cgroup | 6 + tests/vircgroupmock.c | 206 ++---------------- tests/vircgrouptest.c | 24 +- 38 files changed, 362 insertions(+), 276 deletions(-) create mode 100644 tests/vircgroupdata/all-in-one.cgroups create mode 100644 tests/vircgroupdata/all-in-one.self.cgroup create mode 100644 tests/vircgroupdata/cgroups1.cgroups create mode 100644 tests/vircgroupdata/cgroups1.self.cgroup create mode 100644 tests/vircgroupdata/cgroups2.cgroups create mode 100644 tests/vircgroupdata/cgroups2.self.cgroup create mode 100644 tests/vircgroupdata/cgroups3.cgroups create mode 100644 tests/vircgroupdata/cgroups3.self.cgroup create mode 100644 tests/vircgroupdata/fedora-18.cgroups create mode 100644 tests/vircgroupdata/fedora-18.self.cgroup create mode 100644 tests/vircgroupdata/fedora-21.cgroups create mode 100644 tests/vircgroupdata/fedora-21.self.cgroup create mode 100644 tests/vircgroupdata/kubevirt.cgroups create mode 100644 tests/vircgroupdata/kubevirt.self.cgroup create mode 100644 tests/vircgroupdata/logind.cgroups create mode 100644 tests/vircgroupdata/logind.mounts create mode 100644 tests/vircgroupdata/logind.self.cgroup create mode 100644 tests/vircgroupdata/ovirt-node-6.6.cgroups create mode 100644 tests/vircgroupdata/ovirt-node-6.6.self.cgroup create mode 100644 tests/vircgroupdata/ovirt-node-7.1.cgroups create mode 100644 tests/vircgroupdata/ovirt-node-7.1.self.cgroup create mode 100644 tests/vircgroupdata/rhel-7.1.cgroups create mode 100644 tests/vircgroupdata/rhel-7.1.self.cgroup create mode 100644 tests/vircgroupdata/systemd.cgroups create mode 100644 tests/vircgroupdata/systemd.mounts create mode 100644 tests/vircgroupdata/systemd.self.cgroup -- 2.17.1

2 19

[libvirt] [PATCH] virsh: Honour user locale in cmdList
by Michal Privoznik 19 Sep '18

19 Sep '18

In 2e97450425e we've mistakenly removed gettext macro for translating static strings. This results in table header being printed in English regardless of user locale. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index adc5bb1a7a..8962586d76 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1942,9 +1942,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd) /* print table header in legacy mode */ if (optTable) { if (optTitle) - table = vshTableNew("Id", "Name", "State", "Title", NULL); + table = vshTableNew(_("Id"), _("Name"), _("State"), _("Title"), NULL); else - table = vshTableNew("Id", "Name", "State", NULL); + table = vshTableNew(_("Id"), _("Name"), _("State"), NULL); if (!table) goto cleanup; -- 2.16.4

2 1

[libvirt] [PATCH] conf: fix starting a domain with cpuset=""
by Yi Wang 19 Sep '18

19 Sep '18

Domain fails to start when its config xml including: <vcpu cpuset="" current="8">64</vcpu> # virsh create vm.xml error: Failed to create domain from vm.xml error: invalid argument: Failed to parse bitmap '' This patch fixes this. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8619962..bacafb2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18553,7 +18553,7 @@ virDomainVcpuParse(virDomainDefPtr def, if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { tmp = virXMLPropString(vcpuNode, "cpuset"); - if (tmp) { + if (tmp && strlen(tmp) != 0) { if (virBitmapParse(tmp, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; -- 1.8.3.1

3 7