- Devel - libvirt List Archives

[PATCH] qemu: Remove unnecessary variables and labels
by Kristina Hanicova 23 Nov '21

23 Nov '21

This patch removes variables such as 'ret', 'rc' and others which are easily replaced. Therefore, making the code look cleaner and easier to understand. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/driver.c | 4 +-- src/qemu/qemu_agent.c | 4 +-- src/qemu/qemu_alias.c | 14 +++----- src/qemu/qemu_capabilities.c | 21 +++++------ src/qemu/qemu_cgroup.c | 7 ++-- src/qemu/qemu_conf.c | 15 ++++---- src/qemu/qemu_domain_address.c | 9 ++--- src/qemu/qemu_driver.c | 64 ++++++++++++---------------------- 8 files changed, 48 insertions(+), 90 deletions(-) diff --git a/src/driver.c b/src/driver.c index 329d493a50..9ae95cb4c3 100644 --- a/src/driver.c +++ b/src/driver.c @@ -52,7 +52,6 @@ virDriverLoadModule(const char *name, bool required) { g_autofree char *modfile = NULL; - int ret; VIR_DEBUG("Module load %s", name); @@ -64,8 +63,7 @@ virDriverLoadModule(const char *name, "LIBVIRT_DRIVER_DIR"))) return -1; - ret = virModuleLoad(modfile, regfunc, required); - return ret; + return virModuleLoad(modfile, regfunc, required); } diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c3b02569cd..08436a9705 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -176,7 +176,6 @@ qemuAgentOpenUnix(const char *socketpath) { struct sockaddr_un addr; int agentfd; - int ret = -1; if ((agentfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, @@ -199,8 +198,7 @@ qemuAgentOpenUnix(const char *socketpath) goto error; } - ret = connect(agentfd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret < 0) { + if (connect(agentfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { virReportSystemError(errno, "%s", _("failed to connect to agent socket")); goto error; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a36f346592..5e35f43614 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -744,16 +744,13 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps) char * qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) { - char *ret; - if (!disk->info.alias) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("disk does not have an alias")); return NULL; } - ret = g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); - return ret; + return g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); } @@ -780,18 +777,15 @@ qemuAliasDiskDriveSkipPrefix(const char *dev_name) char * qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) { - char *ret; - if (!hostdev->info->alias) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("hostdev does not have an alias")); return NULL; } - ret = g_strdup_printf("%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias); - return ret; + return g_strdup_printf("%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info->type), + hostdev->info->alias); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a4c492dde2..33797469a6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3070,7 +3070,6 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, g_auto(GStrv) list = NULL; size_t i; size_t n; - int ret = -1; *features = NULL; modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, virtType); @@ -3091,12 +3090,10 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, } *features = g_steal_pointer(&list); - if (migratable && !modelInfo->migratability) - ret = 1; - else - ret = 0; - return ret; + if (migratable && !modelInfo->migratability) + return 1; + return 0; } @@ -5237,15 +5234,13 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps, virDomainVirtType virQEMUCapsGetVirtType(virQEMUCaps *qemuCaps) { - virDomainVirtType type; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) - type = VIR_DOMAIN_VIRT_KVM; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) - type = VIR_DOMAIN_VIRT_QEMU; - else - type = VIR_DOMAIN_VIRT_NONE; + return VIR_DOMAIN_VIRT_KVM; + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) + return VIR_DOMAIN_VIRT_QEMU; - return type; + return VIR_DOMAIN_VIRT_NONE; } int diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1e7b562b33..c07058d2f8 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -336,18 +336,15 @@ static int qemuSetupTPMCgroup(virDomainObj *vm, virDomainTPMDef *dev) { - int ret = 0; - switch (dev->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - ret = qemuSetupChrSourceCgroup(vm, dev->data.passthrough.source); - break; + return qemuSetupChrSourceCgroup(vm, dev->data.passthrough.source); case VIR_DOMAIN_TPM_TYPE_EMULATOR: case VIR_DOMAIN_TPM_TYPE_LAST: break; } - return ret; + return 0; } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0451bc70ac..d31cd05ab4 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1915,16 +1915,13 @@ qemuGetBaseHugepagePath(virQEMUDriver *driver, virHugeTLBFS *hugepage) { const char *root = driver->embeddedRoot; - char *ret; if (root && !STRPREFIX(hugepage->mnt_dir, root)) { g_autofree char * hash = virDomainDriverGenerateRootHash("qemu", root); - ret = g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash); - } else { - ret = g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); + return g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash); } - return ret; + return g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); } @@ -1935,11 +1932,11 @@ qemuGetDomainHugepagePath(virQEMUDriver *driver, { g_autofree char *base = qemuGetBaseHugepagePath(driver, hugepage); g_autofree char *domPath = virDomainDefGetShortName(def); - char *ret = NULL; - if (base && domPath) - ret = g_strdup_printf("%s/%s", base, domPath); - return ret; + if (!base || !domPath) + return NULL; + + return g_strdup_printf("%s/%s", base, domPath); } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9abe2b84c8..22bf5d3b54 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2465,7 +2465,6 @@ static int qemuDomainAddressFindNewTargetIndex(virDomainDef *def) { int targetIndex; - int ret = -1; /* Try all indexes between 1 and 31 - QEMU only supports 32 * PHBs, and 0 is reserved for the default, implicit one */ @@ -2490,13 +2489,11 @@ qemuDomainAddressFindNewTargetIndex(virDomainDef *def) /* If no existing PCI controller uses this index, great, * it means it's free and we can return it to the caller */ - if (!found) { - ret = targetIndex; - break; - } + if (!found) + return targetIndex; } - return ret; + return -1; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d954635dde..860c5b70a8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1332,7 +1332,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, g_autofree char *data = NULL; g_auto(GStrv) lines = NULL; size_t i; - int ret = -1; double val; *cpuWait = 0; @@ -1344,21 +1343,19 @@ qemuGetSchedInfo(unsigned long long *cpuWait, else proc = g_strdup_printf("/proc/%d/sched", (int)pid); if (!proc) - goto cleanup; - ret = -1; + return -1; /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */ if (access(proc, R_OK) < 0) { - ret = 0; - goto cleanup; + return 0; } if (virFileReadAll(proc, (1<<16), &data) < 0) - goto cleanup; + return -1; lines = g_strsplit(data, "\n", 0); if (!lines) - goto cleanup; + return -1; for (i = 0; lines[i] != NULL; i++) { const char *line = lines[i]; @@ -1372,7 +1369,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing separator in sched info '%s'"), lines[i]); - goto cleanup; + return -1; } line++; while (*line == ' ') @@ -1382,7 +1379,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse sched info value '%s'"), line); - goto cleanup; + return -1; } *cpuWait = (unsigned long long)(val * 1000000); @@ -1390,10 +1387,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, } } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -3178,7 +3172,6 @@ doCoreDump(virQEMUDriver *driver, { int fd = -1; int ret = -1; - int rc = -1; virFileWrapperFd *wrapperFd = NULL; int directFlag = 0; bool needUnlink = false; @@ -3224,8 +3217,9 @@ doCoreDump(virQEMUDriver *driver, if (STREQ(memory_dump_format, "elf")) memory_dump_format = NULL; - rc = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, - memory_dump_format); + if (qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, + memory_dump_format) < 0) + goto cleanup; } else { if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", @@ -3237,13 +3231,11 @@ doCoreDump(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; - rc = qemuMigrationSrcToFile(driver, vm, fd, compressor, - QEMU_ASYNC_JOB_DUMP); + if (qemuMigrationSrcToFile(driver, vm, fd, compressor, + QEMU_ASYNC_JOB_DUMP) < 0) + goto cleanup; } - if (rc < 0) - goto cleanup; - if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("unable to close file %s"), @@ -7225,14 +7217,12 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, { virQEMUDriver *driver = dom->conn->privateData; virDomainDeviceDef oldDev = { .type = dev->type }; - int ret = -1; int idx; switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); - ret = qemuDomainChangeDiskLive(vm, dev, driver, force); - break; + return qemuDomainChangeDiskLive(vm, dev, driver, force); case VIR_DOMAIN_DEVICE_GRAPHICS: if ((idx = qemuDomainFindGraphicsIndex(vm->def, dev->data.graphics)) >= 0) { @@ -7243,8 +7233,7 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, return -1; } - ret = qemuDomainChangeGraphics(driver, vm, dev->data.graphics); - break; + return qemuDomainChangeGraphics(driver, vm, dev->data.graphics); case VIR_DOMAIN_DEVICE_NET: if ((idx = virDomainNetFindIdx(vm->def, dev->data.net)) >= 0) { @@ -7255,12 +7244,10 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, return -1; } - ret = qemuDomainChangeNet(driver, vm, dev); - break; + return qemuDomainChangeNet(driver, vm, dev); case VIR_DOMAIN_DEVICE_MEMORY: - ret = qemuDomainChangeMemoryLive(driver, vm, dev); - break; + return qemuDomainChangeMemoryLive(driver, vm, dev); case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -7288,10 +7275,10 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("live update of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); - break; + return -1; } - return ret; + return -1; } @@ -9681,13 +9668,11 @@ qemuGetVcpusBWLive(virDomainObj *vm, { g_autoptr(virCgroup) cgroup_vcpu = NULL; qemuDomainObjPrivate *priv = NULL; - int rc; priv = vm->privateData; if (!qemuDomainHasVcpuPids(vm)) { /* We do not create sub dir for each vcpu */ - rc = qemuGetVcpuBWLive(priv->cgroup, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(priv->cgroup, period, quota) < 0) return -1; if (*quota > 0) @@ -9700,8 +9685,7 @@ qemuGetVcpusBWLive(virDomainObj *vm, false, &cgroup_vcpu) < 0) return -1; - rc = qemuGetVcpuBWLive(cgroup_vcpu, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(cgroup_vcpu, period, quota) < 0) return -1; return 0; @@ -9731,12 +9715,11 @@ qemuGetIOThreadsBWLive(virDomainObj *vm, { g_autoptr(virCgroup) cgroup_iothread = NULL; qemuDomainObjPrivate *priv = NULL; - int rc; priv = vm->privateData; if (!vm->def->niothreadids) { /* We do not create sub dir for each iothread */ - if ((rc = qemuGetVcpuBWLive(priv->cgroup, period, quota)) < 0) + if (qemuGetVcpuBWLive(priv->cgroup, period, quota) < 0) return -1; return 0; @@ -9748,8 +9731,7 @@ qemuGetIOThreadsBWLive(virDomainObj *vm, false, &cgroup_iothread) < 0) return -1; - rc = qemuGetVcpuBWLive(cgroup_iothread, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(cgroup_iothread, period, quota) < 0) return -1; return 0; -- 2.31.1

2 1

[libvirt PATCH] ci: display installed packages at start of build
by Daniel P. Berrangé 23 Nov '21

23 Nov '21

When a build fails it is helpful to know what packages were installed, because by the time we look at the build job output, the original container image might have changed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d486faca58..6ba11a0431 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ include: '/ci/gitlab.yml' key: "$CI_JOB_NAME" before_script: - *script_variables + - cat /packages.txt script: - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meson-log.txt && exit 1) - meson dist -C build --no-tests @@ -43,6 +44,7 @@ include: '/ci/gitlab.yml' key: "$CI_JOB_NAME" before_script: - *script_variables + - cat /packages.txt script: - meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1) - meson compile -C build -- 2.33.1

2 1

[libvirt PATCH 0/4] Coverity fixes
by Ján Tomko 23 Nov '21

23 Nov '21

Ján Tomko (4): tools: virt-host-validate: fix memory leak vbox: fix vboxCapsInit ch: fix logic in virCHMonitorBuildPtyJson tests: pcivpdtest: check return value of virCreateAnonymousFile src/ch/ch_monitor.c | 4 +--- src/vbox/vbox_common.c | 1 - tests/virpcivpdtest.c | 20 ++++++++++++++++++++ tools/virt-host-validate-ch.c | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) -- 2.31.1

3 9

[libvirt PATCH 0/3] ci: improve mingw coverage
by Daniel P. Berrangé 23 Nov '21

23 Nov '21

This ensures at least one mingw job is gating for pipelines Daniel P. Berrangé (3): ci: replace Fedora 33 with Fedora 35 ci: refresh variables/dockerfiles with latest content ci: run a mingw64 job on stable Fedora ci/cirrus/freebsd-12.vars | 7 +- ci/cirrus/freebsd-13.vars | 7 +- ci/cirrus/freebsd-current.vars | 7 +- ci/cirrus/macos-11.vars | 7 +- ci/containers/centos-8.Dockerfile | 7 +- ci/containers/centos-stream-8.Dockerfile | 7 +- .../fedora-35-cross-mingw32.Dockerfile | 92 +++++++++++++++++++ .../fedora-35-cross-mingw64.Dockerfile | 92 +++++++++++++++++++ ...ora-33.Dockerfile => fedora-35.Dockerfile} | 2 +- .../fedora-rawhide-cross-mingw32.Dockerfile | 2 +- .../fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- ci/gitlab.yml | 50 ++++++---- ci/manifest.yml | 13 ++- 15 files changed, 254 insertions(+), 45 deletions(-) create mode 100644 ci/containers/fedora-35-cross-mingw32.Dockerfile create mode 100644 ci/containers/fedora-35-cross-mingw64.Dockerfile rename ci/containers/{fedora-33.Dockerfile => fedora-35.Dockerfile} (98%) -- 2.33.1

2 4

[PATCH v3 0/2] Fix /proc/*/stat parsing
by Martin Kletzander 23 Nov '21

23 Nov '21

While working on some polkit stuff I found out that we are inconsistent with the way we parse /proc/*/stat files, so I added a new helper instead along with some tests. Unfortunately using it for the thing I wanted is not really viable in the end, so it "violates" the Rule of three, but at least it does something correctly. v3: - Added an enum with names for the fields of the file - Made this not limited to linux as that was the way it worked in qemu before v2: - https://listman.redhat.com/archives/libvir-list/2021-November/msg00606.html - Fixed open64 by just using virFileReadAllQuiet instead of g_file_get_contents - Removed some leftover unused variables - Still do not know why my cirrus builds fail v1: - https://listman.redhat.com/archives/libvir-list/2021-November/msg00580.html Martin Kletzander (2): util: Add virProcessGetStat Use virProcessGetStat src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 34 ++----- src/util/virprocess.c | 125 +++++++++++++++++--------- src/util/virprocess.h | 66 ++++++++++++++ tests/meson.build | 1 + tests/virprocessstatdata/complex/stat | 2 + tests/virprocessstatdata/simple/stat | 1 + tests/virprocessstattest.c | 88 ++++++++++++++++++ 8 files changed, 249 insertions(+), 69 deletions(-) create mode 100644 tests/virprocessstatdata/complex/stat create mode 100644 tests/virprocessstatdata/simple/stat create mode 100644 tests/virprocessstattest.c -- 2.34.0

2 4

[libvirt PATCH 0/2] snapshot revert fix followup
by Pavel Hrdina 23 Nov '21

23 Nov '21

Pavel Hrdina (2): qemu_monitor: remove unused load snapshot code virsh: man: update snapshot-revert description docs/manpages/virsh.rst | 4 ++++ src/qemu/qemu_monitor.c | 11 ----------- src/qemu/qemu_monitor.h | 1 - src/qemu/qemu_monitor_text.c | 36 ------------------------------------ src/qemu/qemu_monitor_text.h | 1 - 5 files changed, 4 insertions(+), 49 deletions(-) -- 2.31.1

2 3

[PATCH 00/12] Remove virXMLPropStringLimit and virXPathStringLimit
by Peter Krempa 23 Nov '21

23 Nov '21

The functions have API which is impossible to be use correctly by callers. Refactor callers and remove the functions. Note that this patchset preserves semantics of the callers (except for removing duplicate or ignored errors). Some of the callers look fishy, but that is not addressed here. Peter Krempa (12): util: seclabel: Define autoptr cleanup func for virSecurityLabelDef and virSecurityDeviceLabelDef virSecurityLabelDef: Declare 'type' as 'virDomainSeclabelType' virSecurityLabelDefParseXML: Directly assign strings into appropriate variables virSecurityLabelDefParseXML: Don't reuse temporary string 'p' virSecurityLabelDefParseXML: Use automatic freeing for 'seclabel' virSecurityLabelDefParseXML: Remove pointless 'error' label virNodeDeviceCapVPDParseCustomFields: Don't use 'virXPathStringLimit' virSecurityLabelDefParseXML: Don't use 'virXPathStringLimit' virSecurityDeviceLabelDefParseXML: Use automatic memory clearing for temp strings virSecurityDeviceLabelDefParseXML: Don't use 'virXPathStringLimit' virSecurityLabelDefParseXML: Don't use virXMLPropStringLimit util: xml: Remove virXMLPropStringLimit and virXPathStringLimit src/conf/domain_conf.c | 104 +++++++++++++++----------------- src/conf/node_device_conf.c | 6 +- src/libvirt_private.syms | 2 - src/security/security_selinux.c | 3 +- src/util/virseclabel.h | 6 +- src/util/virxml.c | 62 ------------------- src/util/virxml.h | 8 --- 7 files changed, 59 insertions(+), 132 deletions(-) -- 2.31.1

3 30

[PATCH 0/1] tools/bash-completion: fix variable leaks of "IFS" and "word"
by Koichi Murase 23 Nov '21

23 Nov '21

Description: The bash-completion function for virsh, which is defined in /usr/share/bash-completion/completions/virsh (generated from libvirt tools/bash-completion/vsh.in), overwrites the shell variables "IFS" and "word" on query for completions. Repeat-By: I am testing it with Fedora 35 Workstation where the completion script is provided by the package: libvirt-client-7.6.0-3.fc35.x86_64 With a Bash session with bash-completion loaded, one can observe the change of Bash behavior after the attempt of the completion for "virsh" command as follows: $ declare -p IFS | cat -A declare -- IFS=" ^I$ "$ $ virsh a[TAB][TAB] allocpages attach-device attach-disk attach-interface autostart $ virsh a[C-c] $ declare -p IFS | cat -A declare -- IFS="$ "$ Originally the value of IFS is IFS=$' \t\n', but it becomes IFS=$'\n' after the attempt of the completion. After that, word splitting of the shell will not be processed as normal: $ a='a b c' $ printf '<%s>\n' $a <a> <b> <c> $ virsh a[TAB][TAB][C-c] $ printf '<%s>\n' $a <a b c> The shell variable "word" is also affected by the virsh completion. Fix: The completion function "_virsh_complete" should declare "IFS" and "word" as local variables before changing them. Reference: I initially received the related issue in my project at https://github.com/akinomyoga/ble.sh/issues/147 -- Koichi Koichi Murase (1): bash-completion: fix variable leaks of "IFS" and "word" tools/bash-completion/vsh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.21.3

2 4

[PATCH] meson: fix cpuset_getaffinity() detection
by Roman Bogorodskiy 23 Nov '21

23 Nov '21

The cpuset_getaffinity() function is checked in sys/cpuset.h to see if BSD CPU affinity APIs are available. This check requires including sys/param.h to work properly, otherwise the test program fails with unrelated errors like: /usr/include/sys/cpuset.h:155:1: error: unknown type name '__BEGIN_DECLS' __BEGIN_DECLS ^ /usr/include/sys/cpuset.h:156:12: error: unknown type name 'cpusetid_t'; did you mean 'cpuset_t'? int cpuset(cpusetid_t *); and so forth. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e4f36e8574..ad0cd44aca 100644 --- a/meson.build +++ b/meson.build @@ -709,7 +709,7 @@ if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD', prefix: brd_required_h endif # Check for BSD CPU affinity availability -if cc.has_header_symbol('sys/cpuset.h', 'cpuset_getaffinity') +if cc.has_header_symbol('sys/cpuset.h', 'cpuset_getaffinity', prefix: '#include <sys/param.h>') conf.set('WITH_BSD_CPU_AFFINITY', 1) endif -- 2.33.1

3 2

[PATCH] meson: improve CPU affinity routines check
by Roman Bogorodskiy 23 Nov '21

23 Nov '21

Recently, FreeBSD has got sched_get/setaffinity(3) implementations and the sched.h header as well [1]. To make these routines visible, users have to define _WITH_CPU_SET_T. This breaks current detection. Specifically, meson sees the sched_getaffinity() symbol and defines WITH_SCHED_GETAFFINITY. This define unlocks Linux implementation of virProcessSetAffinity() and other functions, which fails to build on FreeBSD because cpu_set_t is not visible as _WITH_CPU_SET_T is not defined. For now, change detection to the following: - Instead of checking sched_getaffinity(), check if 'cpu_set_t' is available through sched.h - Explicitly check the sched.h header instead of assuming its presence if WITH_SCHED_SETSCHEDULER is defined 1: https://cgit.freebsd.org/src/commit/?id=43736b71dd051212d5c55be9fa21c459930… https://cgit.freebsd.org/src/commit/?id=160b4b922b6021848b6b48afc894d16b879… https://cgit.freebsd.org/src/commit/?id=90fa9705d5cd29cf11c5dc7319299788dec… Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- meson.build | 4 +++- src/util/virprocess.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 9022bcfdc9..e4f36e8574 100644 --- a/meson.build +++ b/meson.build @@ -553,7 +553,6 @@ functions = [ 'posix_fallocate', 'posix_memalign', 'prlimit', - 'sched_getaffinity', 'sched_setscheduler', 'setgroups', 'setns', @@ -602,6 +601,7 @@ headers = [ 'net/if.h', 'pty.h', 'pwd.h', + 'sched.h', 'sys/auxv.h', 'sys/ioctl.h', 'sys/mount.h', @@ -671,6 +671,8 @@ symbols = [ # Check for BSD approach for setting MAC addr [ 'net/if_dl.h', 'link_addr', '#include <sys/types.h>\n#include <sys/socket.h>' ], + + [ 'sched.h', 'cpu_set_t' ], ] if host_machine.system() == 'linux' diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 6de3f36f52..81de90200e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -35,7 +35,7 @@ # include <sys/time.h> # include <sys/resource.h> #endif -#if WITH_SCHED_SETSCHEDULER +#if WITH_SCHED_H # include <sched.h> #endif @@ -480,7 +480,7 @@ int virProcessKillPainfully(pid_t pid, bool force) return virProcessKillPainfullyDelay(pid, force, 0, false); } -#if WITH_SCHED_GETAFFINITY +#if WITH_DECL_CPU_SET_T int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) { @@ -626,7 +626,7 @@ virProcessGetAffinity(pid_t pid) return ret; } -#else /* WITH_SCHED_GETAFFINITY */ +#else /* WITH_DECL_CPU_SET_T */ int virProcessSetAffinity(pid_t pid G_GNUC_UNUSED, virBitmap *map G_GNUC_UNUSED, @@ -646,7 +646,7 @@ virProcessGetAffinity(pid_t pid G_GNUC_UNUSED) _("Process CPU affinity is not supported on this platform")); return NULL; } -#endif /* WITH_SCHED_GETAFFINITY */ +#endif /* WITH_DECL_CPU_SET_T */ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) -- 2.33.1

2 4

[PATCH v2 0/2] Fix /proc/*/stat parsing
by Martin Kletzander 23 Nov '21

23 Nov '21

While working on some polkit stuff I found out that we are inconsistent with the way we parse /proc/*/stat files, so I added a new helper instead along with some tests. Unfortunately using it for the thing I wanted is not really viable in the end, so it "violates" the Rule of three, but at least it does something correctly. v2: - Fixed open64 by just using virFileReadAllQuiet instead of g_file_get_contents - Removed some leftover unused variables - Still do not know why my cirrus builds fail v1: - https://listman.redhat.com/archives/libvir-list/2021-November/msg00580.html Martin Kletzander (2): util: Add virProcessGetStat Use virProcessGetStat src/libvirt_linux.syms | 3 + src/qemu/qemu_driver.c | 33 ++----- src/util/virprocess.c | 126 +++++++++++++++++--------- src/util/virprocess.h | 4 + tests/meson.build | 1 + tests/virprocessstatdata/complex/stat | 2 + tests/virprocessstatdata/simple/stat | 1 + tests/virprocessstattest.c | 84 +++++++++++++++++ 8 files changed, 185 insertions(+), 69 deletions(-) create mode 100644 tests/virprocessstatdata/complex/stat create mode 100644 tests/virprocessstatdata/simple/stat create mode 100644 tests/virprocessstattest.c -- 2.34.0

2 7

[libvirt PATCH 00/11] improve and cleanup internal snapshot revert
by Pavel Hrdina 23 Nov '21

23 Nov '21

This fixes few issues with reverting internal snapshot where the VM was modified and our compatibility check code failed to detect it, for example changing one of the VM disks. It also cleanups the code significantly as a preparation for other cleanups and future external snapshot implementation. Pavel Hrdina (11): qemu_snapshot: revert: always error out if VM XML is missing qemu_snapshot: revert: always restart QEMU process for running VM qemu_snapshot: revert: drop unused loadvm code qemu_snapshot: revert: fix emitting events qemu_snapshot: revert: drop error that QEMU process must be restarted test: snapshot revert: always error out if VM XML is missing test: snapshot revert: always emulate VM process stop test: snapshot revert: drop unused code test: snapshot revert: fix emitting events test: snapshot revert: drop error the VM must be restarted domain_snapshot: update virDomainRevertToSnapshot description src/libvirt-domain-snapshot.c | 5 + src/qemu/qemu_snapshot.c | 244 +++++++++------------------------- src/test/test_driver.c | 121 ++++------------- 3 files changed, 93 insertions(+), 277 deletions(-) -- 2.31.1

2 29

[PATCH v6 0/4] Dirty Ring support (Libvirt)
by huangy81＠chinatelecom.cn 22 Nov '21

22 Nov '21

From: "Hyman Huang(黄勇)" <huangy81(a)chinatelecom.cn> Ping for this series. I still keep thinking the dirty ring feature is something good to have for libvirt. qemu-6.1 has supported dirty ring feature and followed up with the commit 0e21bf24 "support dirtyrate at the granualrity of vcpu", which is a typical usage scenario of dirty ring. another usage scenario may be the implementation of per-vcpu auto-converge during live migration which is already being reviewed. so we can make full use of dirty ring feature if libvirt supports. and any corrections and comments about this series would be very appreciated. Please review, Thanks! Hyman v6 - rebase on master v5,v4: blank, just make v6 be the the latest version. v3 - rebase master and fix the confilict when apply "conf: introduce dirty_ring_size in struct "_virDomainDef" to current master. v2 - split patchset into 4 patches - leave out the tcg case when building commandline. - handle the VIR_DOMAIN_KVM_DIRTY_RING case independently in , virDomainFeatureDefParse and virDomainDefFeaturesCheckABIStability, do not integrate it with other cases... - add dirty ring size check in virDomainDefFeaturesCheckABIStability - modify zero checks on integers of dirty ring size in a explicit way. - set the default value of dirty ring size in a post-parser callback. - check the absence of kvm_feature in a explicit way. - code clean of virTristateSwitchTypeToString function. this version's modification base on Peter's advices mostly, thanks a lot, please review ! v1 since qemu has introduced a dirty ring feature in 6.1.0, may be it's the right time to introduce dirty ring in libvirt meanwhile. this patch add feature named 'dirty-ring', which enable dirty ring feature when starting vm. to try this out, three things has done in this patchset: - introduce QEMU_CAPS_ACCEL so the the libvirt can use it to select the right option when specifying the accelerator type. - switch the option "-machine accel=xxx" to "-accel xxx" when specifying accelerator type once libvirt build QEMU command line, so that dirty-ring-size property can be passed to qemu when start vm. - introduce dirty_ring_size to hold the ring size configured by user and pass dirty_ring_size when building qemu commandline if dirty ring feature enabled. though dirty ring is per-cpu logically, the size of dirty ring is registered by 'struct kvm' in QEMU. so we would like to place the dirty_ring_size as a property of vm in Libvirt as the QEMU do. the dirty ring feature is disabled by default, and if enabled, the default value of ring size if 4096 if size not configured. for more details about dirty ring and "-accel" option, please refer to: https://lore.kernel.org/qemu-devel/20210108165050.406906-10-peterx@redhat.c… https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… please review, Thanks! Best Regards ! Hyman Huang(黄勇) (4): qemu_capabilities: introduce QEMU_CAPS_ACCEL qemu_command: switch accelerator option to new style conf: introduce dirty_ring_size field qemu: support dirty ring feature docs/formatdomain.rst | 18 +++-- docs/schemas/domaincommon.rng | 10 +++ src/conf/domain_conf.c | 76 ++++++++++++++++++- src/conf/domain_conf.h | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 40 +++++++++- .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model.x86_64-2.11.0.args | 3 +- .../cpu-host-model.x86_64-2.12.0.args | 3 +- .../cpu-host-model.x86_64-3.0.0.args | 3 +- .../cpu-host-model.x86_64-3.1.0.args | 3 +- .../cpu-host-model.x86_64-4.0.0.args | 3 +- .../cpu-host-model.x86_64-4.1.0.args | 3 +- .../cpu-host-model.x86_64-4.2.0.args | 3 +- .../cpu-host-model.x86_64-5.0.0.args | 3 +- .../cpu-host-model.x86_64-5.1.0.args | 3 +- .../cpu-host-model.x86_64-5.2.0.args | 3 +- .../cpu-host-model.x86_64-6.0.0.args | 3 +- .../cpu-host-model.x86_64-6.1.0.args | 3 +- .../cpu-host-model.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-serial.x86_64-latest.args | 3 +- .../graphics-spice-timeout.x86_64-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../launch-security-s390-pv.s390x-latest.args | 3 +- ...v-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-6.0.0.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 3 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 3 +- ...os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- 111 files changed, 307 insertions(+), 72 deletions(-) -- 2.27.0

4 15

[libvirt PATCH 00/13] cgroup and thread management in ch driver.
by Praveen K Paladugu 22 Nov '21

22 Nov '21

This patchset adds support for cgroup management of ch threads. This version correctly manages cgroups for vcpu and emulator threads created by ch. cgroup management for iothreads is not yet supported. Along with cgroup management, this patchset also enables support for pinning vcpu and emulator threads to selected host cpus. Praveen K Paladugu (2): ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (11): util: Helper functions to get process info ch: Explicitly link to virt_util_lib ch_domain: add virCHDomainGetMonitor helper method ch_domain: add methods to manage private vcpu data ch_driver,ch_domain: vcpu info getter callbacks ch_driver: domainGetVcpuPinInfo and nodeGetCPUMap ch_monitor: Get nicindexes in prep for cgroup mgmt ch_cgroup: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver po/POTFILES.in | 1 + src/ch/ch_cgroup.c | 457 ++++++++++++++++++++++++ src/ch/ch_cgroup.h | 45 +++ src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 9 +- src/ch/ch_domain.c | 170 ++++++++- src/ch/ch_domain.h | 32 +- src/ch/ch_driver.c | 810 +++++++++++++++++++++++++++++++++++++++++- src/ch/ch_monitor.c | 254 ++++++++++++- src/ch/ch_monitor.h | 60 +++- src/ch/ch_process.c | 368 ++++++++++++++++++- src/ch/ch_process.h | 3 + src/ch/meson.build | 6 + src/util/virprocess.c | 136 +++++++ src/util/virprocess.h | 5 + 15 files changed, 2329 insertions(+), 29 deletions(-) create mode 100644 src/ch/ch_cgroup.c create mode 100644 src/ch/ch_cgroup.h -- 2.27.0

4 32

[libvirt PATCH] util: fix various ATTRIBUTE_NONNULL calls
by Pavel Hrdina 22 Nov '21

22 Nov '21

Git bisect took me to commit where incorrect usage of ATTRIBUTE_NONNULL was introduced and caused coverity scan to fail. This patch fixes the issue where the index starts from 1 and not 0 and two other different cases. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/viralloc.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virxml.h | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 3a09af65c5..fe4ecb6620 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -53,7 +53,7 @@ void virAppendElement(void *ptrptr, void *newelem, bool clearOriginal, bool inPlace) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr, size_t toremove, bool inPlace) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 4478f2bb37..e275af59df 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -82,7 +82,7 @@ int virNetDevOpenvswitchInterfaceClearQos(const char *ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevOpenvswitchInterfaceClearRxQos(const char *ifname) -ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname, const unsigned char *vmid) diff --git a/src/util/virxml.h b/src/util/virxml.h index 06fb7aebd8..5e42fc3591 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -109,14 +109,14 @@ virXMLPropTristateBool(xmlNodePtr node, const char *name, virXMLPropFlags flags, virTristateBool *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); int virXMLPropTristateSwitch(xmlNodePtr node, const char *name, virXMLPropFlags flags, virTristateSwitch *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); int virXMLPropInt(xmlNodePtr node, @@ -125,7 +125,7 @@ virXMLPropInt(xmlNodePtr node, virXMLPropFlags flags, int *result, int defaultResult) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); int virXMLPropUInt(xmlNodePtr node, @@ -133,7 +133,7 @@ virXMLPropUInt(xmlNodePtr node, int base, virXMLPropFlags flags, unsigned int *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); int virXMLPropULongLong(xmlNodePtr node, @@ -141,7 +141,7 @@ virXMLPropULongLong(xmlNodePtr node, int base, virXMLPropFlags flags, unsigned long long *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); int virXMLPropEnum(xmlNodePtr node, @@ -149,8 +149,8 @@ virXMLPropEnum(xmlNodePtr node, int (*strToInt)(const char*), virXMLPropFlags flags, unsigned int *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(5); int virXMLPropEnumDefault(xmlNodePtr node, @@ -159,8 +159,8 @@ virXMLPropEnumDefault(xmlNodePtr node, virXMLPropFlags flags, unsigned int *result, unsigned int defaultResult) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(5); /* Internal function; prefer the macros below. */ -- 2.31.1

2 1

[PATCH 0/2] Fix /proc/*/stat parsing
by Martin Kletzander 20 Nov '21

20 Nov '21

While working on some polkit stuff I found out that we are inconsistent with the way we parse /proc/*/stat files, so I added a new helper instead along with some tests. Unfortunately using it for the thing I wanted is not really viable in the end, so it "violates" the Rule of three, but at least it does something correctly. Martin Kletzander (2): util: Add virProcessGetStat Use virProcessGetStat src/libvirt_linux.syms | 3 + src/qemu/qemu_driver.c | 29 ++---- src/util/virprocess.c | 126 +++++++++++++++++--------- src/util/virprocess.h | 4 + tests/meson.build | 1 + tests/virprocessstatdata/complex/stat | 2 + tests/virprocessstatdata/simple/stat | 1 + tests/virprocessstattest.c | 84 +++++++++++++++++ 8 files changed, 185 insertions(+), 65 deletions(-) create mode 100644 tests/virprocessstatdata/complex/stat create mode 100644 tests/virprocessstatdata/simple/stat create mode 100644 tests/virprocessstattest.c -- 2.34.0

1 3

[PATCH v2 0/3] chardev handling cleanups (chardev refactors part 1)
by Peter Krempa 19 Nov '21

19 Nov '21

All patches except for 6/16 are now pushed. Pathces 1 and 2 in this series are new, split of 6/16 as requested in the review. Patch 3 is the rebase of 6/16 on top of the split out stuff and fix to the [B] point in the original review. Peter Krempa (3): qemuMonitorJSONAttachCharDevGetProps: Rename 'backend_type' and 'data' qemuMonitorJSONBuildChrChardevReconnect: Unify with qemuBuildChrChardevReconnectStr qemuMonitorJSONAttachCharDevGetProps: Modernize construction of JSON objects src/qemu/qemu_monitor_json.c | 192 +++++++++++++++++------------------ 1 file changed, 96 insertions(+), 96 deletions(-) -- 2.31.1

2 4

[PATCH] qemu: Fix the check of AMD secure guest support
by Vasiliy Ulyanov 19 Nov '21

19 Nov '21

The content of /sys/module/kvm_amd/parameters/sev may vary depending on the kernel version. Check also for 'Y' and 'y' in addition to '1' to cover several possible variants. The fix is similar to the one introduced in commit 3f9c1a4bb841. Signed-off-by: Vasiliy Ulyanov <vulyanov(a)suse.de> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 67fae46a34..b864f4d7df 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4681,7 +4681,7 @@ virQEMUCapsKVMSupportsSecureGuestAMD(void) if (virFileReadValueString(&modValue, "/sys/module/kvm_amd/parameters/sev") < 0) return false; - if (modValue[0] != '1') + if (modValue[0] != '1' && modValue[0] != 'Y' && modValue[0] != 'y') return false; if (virFileExists(QEMU_DEV_SEV)) -- 2.33.1

2 1

[PATCH v2 0/8] some cleanups around CPU related code
by Daniel Henrique Barboza 19 Nov '21

19 Nov '21

Changes from v1, all suggested by Jano: - helper functions were added to virQEMUCapsLoadCache() to eliminate the cleanup label without mixing automatic and manual freeing - create extra strings with different scopes in virQEMUCapsLoadHostCPUModelInfo() to avoid mixing automatic and manual freeing - v1 link: https://listman.redhat.com/archives/libvir-list/2021-November/msg00497.html Daniel Henrique Barboza (8): qemu_capabilities.c: add virQEMUCapsParseFlags() qemu_capabilities.c: add virQEMUCapsParseGIC() qemu_capabilities.c: del 'nodes' var from virQEMUCapsLoadCache() qemu_capabilities.c: add virQEMUCapsValidateEmulator() qemu_capabilities.c: add virQEMUCapsValidateArch() qemu_capabilities.c: remove cleanup label from virQEMUCapsLoadCache() cpu_ppc64.c: remove 'guest' param from ppc64Compute() qemu_capabilities.c: del 'cleanup' label in virQEMUCapsLoadHostCPUModelInfo() src/cpu/cpu_ppc64.c | 26 +-- src/qemu/qemu_capabilities.c | 356 +++++++++++++++++++---------------- 2 files changed, 198 insertions(+), 184 deletions(-) -- 2.31.1

2 9

[PATCH 00/16] chardev handling cleanups (chardev refactors part 1)
by Peter Krempa 19 Nov '21

19 Nov '21

This is a collection of cleanup patches from my ever-growing branch refactoring handling of chardevs in the qemu driver. Peter Krempa (16): qemuBuildCommandLine: Properly check return value of qemuBuildShmemCommandLine qemu: hotplug: Add wrapper for qemuMonitorAttachCharDev qemuMonitorJSONAddDeviceProps: Simplify construction of the command qemuMonitorJSONAttachCharDevCommand: Format only the properties qemuMonitorJSONAttachCharDevGetProps: Simplify handling of unsupported types qemuMonitorJSONAttachCharDevGetProps: Modernize construction of JSON objects qemu: command: Rename qemuBuildHostNetStr -> qemuBuildHostNetProps qemuBuildChrChardevStr: Use proper type for the switch statement conf: Convert 'chr' in virDomainShmemDef to proper pointer qemuDomainAddChardevTLSObjects: Refactor cleanup qemuDomainEnsurePCIAddress: Don't pass virQEMUDriver explicitly qemuDomainAttachChrDeviceAssignAddr: Simplify return value handling qemuDomainAttachChrDevice: Drop 'dev' variable qemuBuildStorageSourceAttachPrepare(Drive|Chardev): Unexport conf: Properly instantiate virDomainChrSourceDef in virDomainTPMDef qemuxml2argvtest: Fix type for faked chardev backing a TPM src/conf/domain_audit.c | 6 +- src/conf/domain_conf.c | 31 +++-- src/conf/domain_conf.h | 6 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 40 +++--- src/qemu/qemu_command.h | 22 ++- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain_address.c | 13 +- src/qemu/qemu_domain_address.h | 8 +- src/qemu/qemu_hotplug.c | 101 +++++++------- src/qemu/qemu_monitor_json.c | 236 ++++++++++++++++---------------- src/qemu/qemu_namespace.c | 2 +- src/qemu/qemu_tpm.c | 10 +- src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- tests/qemuxml2argvtest.c | 6 +- 16 files changed, 250 insertions(+), 251 deletions(-) -- 2.31.1

2 33

[libvirt PATCH] conf: match by network alias only if aliases are assigned
by Ján Tomko 19 Nov '21

19 Nov '21

Commit 114e3b423210d316b3326816fd2c33335b1167fe added matching by aliases for interfaces with same MAC address. ( https://bugzilla.redhat.com/show_bug.cgi?id=1926190 ) However, unless the domain is using user aliases (prefixed ua-), there are no aliases in the persistent definition. Only match by MAC/PCI/other addresses in that case, to fix update-device with --persistent flag (AFFECT_LIVE | AFFECT_CONFIG). https://bugzilla.redhat.com/show_bug.cgi?id=2024098 Fixes: 114e3b423210d316b3326816fd2c33335b1167fe Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index da0c64b460..0d7489094b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15763,8 +15763,8 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net) &net->info.addr.ccw)) continue; - if (net->info.alias && - STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) { + if (net->info.alias && def->nets[i]->info.alias && + STRNEQ(def->nets[i]->info.alias, net->info.alias)) { continue; } -- 2.31.1

2 1

[PATCH] docs: Use 'live' or 'lively' to describe the device events
by Han Han 19 Nov '21

19 Nov '21

The event of device added or removed only happens at live attachment or detachment. Make the comments more explicit. Signed-off-by: Han Han <hhan(a)redhat.com> --- include/libvirt/libvirt-domain.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 2f017c5b68..25ee06d0d6 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4148,7 +4148,7 @@ typedef void (*virConnectDomainEventPMSuspendDiskCallback)(virConnectPtr conn, * @devAlias: device alias * @opaque: application specified data * - * This callback occurs when a device is removed from the domain. + * This callback occurs when a device is lively removed from the domain. * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED with virConnectDomainEventRegisterAny() @@ -4165,7 +4165,7 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn, * @devAlias: device alias * @opaque: application specified data * - * This callback occurs when a device is added to the domain. + * This callback occurs when a device is lively added to the domain. * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_DEVICE_ADDED with virConnectDomainEventRegisterAny() @@ -4183,7 +4183,7 @@ typedef void (*virConnectDomainEventDeviceAddedCallback)(virConnectPtr conn, * @devAlias: device alias * @opaque: application specified data * - * This callback occurs when it's certain that removal of a device failed. + * This callback occurs when it's certain that live removal of a device failed. * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED with -- 2.33.1

2 2

[libvirt PATCH v5 0/3] Ignore EPERM on implicit clearing of VF VLAN ID
by Dmitrii Shcherbakov 18 Nov '21

18 Nov '21

SmartNIC DPUs may not expose some privileged eswitch operations to the hypervisor hosts. For example, this happens with Bluefield devices running in the ECPF (default) mode [1] for security reasons. While VF MAC address programming is possible via an RTM_SETLINK operation, trying to set a VLAN ID in the same operation will fail with EPERM. In the kernel a relevant call chain may look like do_setlink -> do_setvfinfo -> dev->netdev_ops->set_vf_vlan which calls a driver-specific function like [2] eventually. The equivalent ip link commands below provide an illustration: 1. This works: sudo ip link set enp130s0f0 vf 2 mac de:ad:be:ef:ca:fe 2. Setting (or clearing) a VLAN fails with EPERM: sudo ip link set enp130s0f0 vf 2 vlan 0 RTNETLINK answers: Operation not permitted 3. This is what Libvirt attempts to do today (when trying to clear a VF VLAN at the same time as programming a VF MAC). sudo ip link set enp130s0f0 vf 2 vlan 0 mac de:ad:be:ef:ca:fe RTNETLINK answers: Operation not permitted If setting an explicit VLAN ID results in an EPERM, clearing a VLAN (setting a VLAN ID to 0) can be handled gracefully by ignoring the EPERM error with the rationale being that if we cannot set this state in the first place, we cannot clear it either. Thus, virNetDevSetVfConfig is split into two distinct functions. If clearing a VLAN ID fails with EPERM when clearing is implicit, the error is simply ignored. For explicit clearing EPERM is still a fatal error. Both new functions rely virNetDevSendVfSetLinkRequest that implements common functionality related to formatting a request, sending it and handling error conditions and returns 0 or an error since in both cases the payload is either NLMSG_DONE (no error) or NLMSG_ERROR where an error message is needed by the caller to handle known cases appropriately. This function allows the conditional code to be unit tested. An alternative to this could be providing a higher level control plane mechanism that would provide metadata about a device being remotely managed in which case Libvirt would avoid trying to set or clear a VLAN ID. This would be more complicated since other software (like Nova in the OpenStack case) would have to annotate every guest device with an attribute indicating whether a device is remotely managed or not based on operator provided configuration so that Libvirt can act on this and avoid VLAN programming. https://gitlab.com/dmitriis/libvirt/-/pipelines/411334205 v4 changes: * Split the change into several patches; * Added a missing test case; * Reworked error handling; * Added a way to pass a NULL vlan id to preserve the old behavior when needed. v5 changes: * added the news file entry; * fixed vlan handling in virNetDevSetVfVlan (for an issue introduced in v4). [1] https://docs.mellanox.com/display/BlueFieldSWv35111601/Modes+of+Operation#M… [2] https://github.com/torvalds/linux/blob/v5.15/drivers/net/ethernet/mellanox/… Dmitrii Shcherbakov (3): Set VF MAC and VLAN ID in two different operations Allow VF vlanid to be passed as a pointer Ignore EPERM on implicit clearing of VF VLAN ID NEWS.rst | 15 +++ src/hypervisor/virhostdev.c | 4 +- src/libvirt_private.syms | 7 ++ src/util/virnetdev.c | 218 ++++++++++++++++++++------------ src/util/virnetdevpriv.h | 44 +++++++ tests/virnetdevtest.c | 241 +++++++++++++++++++++++++++++++++++- 6 files changed, 451 insertions(+), 78 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

2 5

[libvirt PATCH v6 0/3] Ignore EPERM on implicit clearing of VF VLAN ID
by Dmitrii Shcherbakov 18 Nov '21

18 Nov '21

SmartNIC DPUs may not expose some privileged eswitch operations to the hypervisor hosts. For example, this happens with Bluefield devices running in the ECPF (default) mode [1] for security reasons. While VF MAC address programming is possible via an RTM_SETLINK operation, trying to set a VLAN ID in the same operation will fail with EPERM. In the kernel a relevant call chain may look like do_setlink -> do_setvfinfo -> dev->netdev_ops->set_vf_vlan which calls a driver-specific function like [2] eventually. The equivalent ip link commands below provide an illustration: 1. This works: sudo ip link set enp130s0f0 vf 2 mac de:ad:be:ef:ca:fe 2. Setting (or clearing) a VLAN fails with EPERM: sudo ip link set enp130s0f0 vf 2 vlan 0 RTNETLINK answers: Operation not permitted 3. This is what Libvirt attempts to do today (when trying to clear a VF VLAN at the same time as programming a VF MAC). sudo ip link set enp130s0f0 vf 2 vlan 0 mac de:ad:be:ef:ca:fe RTNETLINK answers: Operation not permitted If setting an explicit VLAN ID results in an EPERM, clearing a VLAN (setting a VLAN ID to 0) can be handled gracefully by ignoring the EPERM error with the rationale being that if we cannot set this state in the first place, we cannot clear it either. Thus, virNetDevSetVfConfig is split into two distinct functions. If clearing a VLAN ID fails with EPERM when clearing is implicit, the error is simply ignored. For explicit clearing EPERM is still a fatal error. Both new functions rely virNetDevSendVfSetLinkRequest that implements common functionality related to formatting a request, sending it and handling error conditions and returns 0 or an error since in both cases the payload is either NLMSG_DONE (no error) or NLMSG_ERROR where an error message is needed by the caller to handle known cases appropriately. This function allows the conditional code to be unit tested. An alternative to this could be providing a higher level control plane mechanism that would provide metadata about a device being remotely managed in which case Libvirt would avoid trying to set or clear a VLAN ID. This would be more complicated since other software (like Nova in the OpenStack case) would have to annotate every guest device with an attribute indicating whether a device is remotely managed or not based on operator provided configuration so that Libvirt can act on this and avoid VLAN programming. https://gitlab.com/dmitriis/libvirt/-/pipelines/411876081 v4 changes: * Split the change into several patches; * Added a missing test case; * Reworked error handling; * Added a way to pass a NULL vlan id to preserve the old behavior when needed. v5 changes: * added the news file entry; * fixed vlan handling in virNetDevSetVfVlan (for an issue introduced in v4). v6 changes: Refactoring, addressed: https://listman.redhat.com/archives/libvir-list/2021-November/msg00521.html [1] https://docs.mellanox.com/display/BlueFieldSWv35111601/Modes+of+Operation#M… [2] https://github.com/torvalds/linux/blob/v5.15/drivers/net/ethernet/mellanox/… Dmitrii Shcherbakov (3): Set VF MAC and VLAN ID in two different operations Allow VF vlanid to be passed as a pointer Ignore EPERM on implicit clearing of VF VLAN ID NEWS.rst | 15 +++ src/hypervisor/virhostdev.c | 4 +- src/libvirt_private.syms | 7 ++ src/util/virnetdev.c | 217 ++++++++++++++++++++------------ src/util/virnetdevpriv.h | 44 +++++++ tests/virnetdevtest.c | 241 +++++++++++++++++++++++++++++++++++- 6 files changed, 450 insertions(+), 78 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

1 3

[PATCH 0/7] some cleanups around CPU related code
by Daniel Henrique Barboza 18 Nov '21

18 Nov '21

Hi, Here are some cleanups I ended up making while investigating a test issue with ppc64 hosts recently. Daniel Henrique Barboza (7): qemu_capabilities.c: use g_autofree in virQEMUCapsLoadCache() cpu_x86.c: remove 'guest' param from x86Compute() cpu_ppc64.c: remove 'guest' param from ppc64Compute() qemu_capabilities.c: use g_autofree in virQEMUCapsLoadHostCPUModelInfo domain_conf.h: add autoptr cleanup func to virDomainXMLOptionPtr qemu_process.c: use g_autoptr() in qemuProcessQMPInitMonitor qemu_capabilities.c: use g_autoptr() in virQEMUCapsInitHostCPUModel() src/conf/domain_conf.h | 1 + src/cpu/cpu_ppc64.c | 26 +------- src/cpu/cpu_x86.c | 38 +----------- src/qemu/qemu_capabilities.c | 116 +++++++++++++++-------------------- src/qemu/qemu_process.c | 15 ++--- 5 files changed, 57 insertions(+), 139 deletions(-) -- 2.31.1

2 12