- Devel - libvirt List Archives

[PATCH v2] virnetdevveth: Do report error if creating veth fails
by Michal Privoznik 02 Dec '21

02 Dec '21

For some weird reason we are ignoring errors when creating veth pair that netlink reports. This affects the LXC driver which creates interfaces for container in virLXCProcessSetupInterfaces(). If creating a veth pair fails, no error is reported and the control jumps onto cleanup label where some cryptic error message is reported instead (something about inability to remove veth pair). Let's report error that netlink returned - it's probably the most accurate reason anyways. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/225 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-December/msg00016.html diff to v1: - Report error only if it wasn't already reported (error == 0) src/util/virnetdevveth.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 7133af44a2..b580e105ac 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -38,10 +38,19 @@ VIR_LOG_INIT("util.netdevveth"); static int virNetDevVethCreateInternal(const char *veth1, const char *veth2) { - int status; /* Just ignore it */ + int error = 0; virNetlinkNewLinkData data = { .veth_peer = veth2 }; - return virNetlinkNewLink(veth1, "veth", &data, &status); + if (virNetlinkNewLink(veth1, "veth", &data, &error) < 0) { + if (error != 0) { + virReportSystemError(-error, + _("unable to create %s <-> %s veth pair"), + veth1, veth2); + } + return -1; + } + + return 0; } static int -- 2.32.0

2 1

[libvirt PATCH 0/9] WIP/RFC: add QEMU "-display dbus" support
by marcandre.lureau＠redhat.com 02 Dec '21

02 Dec '21

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This series implements supports for the upcoming QEMU "-display dbus" support. Development is still in progress, but I hope to land the QEMU support early in 6.3 (last version posted: https://patchew.org/QEMU/20211009210838.2219430-1-marcandre.lureau@redhat.c…) By default, libvirt will start a private VM bus (sharing and reusing the existing "vmstate" code). A client will need the address of the bus and access to it. Since D-Bus addresses are not URIs unfortunately, I am not sure yet what should "virsh domdisplay" return. The feature set should cover the needs to replace Spice as local client of choice, including 3daccel/dmabuf, audio, clipboard sharing, usb redirection, and arbitrary chardev/channels (for serial etc). The test Gtk4 client is also in progress, currently in development at https://gitlab.com/marcandre.lureau/qemu-display/. A few dependencies, such as zbus, require an upcoming release. virt-viewer & boxes will need a port to Gtk4 to make use of the shared widget. Comments welcome, as we can still adjust the QEMU side etc. thanks Marc-André Lureau (9): qemu: start the D-Bus daemon as needed qemu: add chardev-vdagent capability check qemu: add -display dbus capability check (to update to 6.3) qemu: add -display dbus support qemu: add audio type 'dbus' qemu: add dbus clipboard sharing qemu: add -chardev dbus qemu: add usbredir type 'dbus' docs: document <graphics> type dbus docs/formatdomain.rst | 24 ++++ docs/schemas/basictypes.rng | 7 ++ docs/schemas/domaincommon.rng | 71 +++++++++++ src/bhyve/bhyve_command.c | 1 + src/conf/domain_conf.c | 116 +++++++++++++++++- src/conf/domain_conf.h | 14 +++ src/conf/domain_validate.c | 32 +++-- src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 94 +++++++++++++- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_monitor_json.c | 1 + src/qemu/qemu_process.c | 15 ++- src/qemu/qemu_validate.c | 33 +++++ src/security/security_dac.c | 2 + src/vmx/vmx.c | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.replies | 10 +- .../caps_6.2.0.x86_64.xml | 2 + .../graphics-dbus-address.args | 31 +++++ .../graphics-dbus-address.xml | 34 +++++ .../qemuxml2argvdata/graphics-dbus-audio.args | 32 +++++ .../qemuxml2argvdata/graphics-dbus-audio.xml | 40 ++++++ .../graphics-dbus-chardev.args | 33 +++++ .../graphics-dbus-chardev.xml | 38 ++++++ .../graphics-dbus-clipboard.args | 32 +++++ .../graphics-dbus-clipboard.xml | 36 ++++++ tests/qemuxml2argvdata/graphics-dbus-p2p.args | 31 +++++ tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 36 ++++++ .../graphics-dbus-usbredir.args | 35 ++++++ .../graphics-dbus-usbredir.xml | 36 ++++++ tests/qemuxml2argvdata/graphics-dbus.args | 31 +++++ tests/qemuxml2argvdata/graphics-dbus.xml | 34 +++++ tests/qemuxml2argvtest.c | 21 ++++ .../graphics-dbus-address.xml | 39 ++++++ .../graphics-dbus-audio.xml | 43 +++++++ .../qemuxml2xmloutdata/graphics-dbus-p2p.xml | 39 ++++++ tests/qemuxml2xmloutdata/graphics-dbus.xml | 39 ++++++ tests/qemuxml2xmltest.c | 14 +++ 47 files changed, 1106 insertions(+), 18 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-audio.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-audio.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-clipboard.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-clipboard.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-address.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-audio.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus.xml -- 2.33.0.721.g106298f7f9

4 16

[PATCH] virnetdevveth: Do report error if creating veth fails
by Michal Privoznik 02 Dec '21

02 Dec '21

For some weird reason we are ignoring errors when creating veth pair that netlink reports. This affects the LXC driver which creates interfaces for container in virLXCProcessSetupInterfaces(). If creating a veth pair fails, no error is reported and the control jumps onto cleanup label where some cryptic error message is reported instead (something about inability to remove veth pair). Let's report error that netlink returned - it's probably the most accurate reason anyways. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/225 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevveth.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 7133af44a2..ddf304036a 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -38,10 +38,17 @@ VIR_LOG_INIT("util.netdevveth"); static int virNetDevVethCreateInternal(const char *veth1, const char *veth2) { - int status; /* Just ignore it */ + int error; virNetlinkNewLinkData data = { .veth_peer = veth2 }; - return virNetlinkNewLink(veth1, "veth", &data, &status); + if (virNetlinkNewLink(veth1, "veth", &data, &error) < 0) { + virReportSystemError(-error, + _("unable to create %s <-> %s veth pair"), + veth1, veth2); + return -1; + } + + return 0; } static int -- 2.32.0

2 1

[libvirt PATCH v7 0/3] Ignore EPERM on implicit clearing of VF VLAN ID
by Dmitrii Shcherbakov 02 Dec '21

02 Dec '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/420603489 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 v7 change: * Rebased on top of the latest changes; * Added stubs for platforms without libnl (fixed Windows builds). [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 | 14 ++ src/hypervisor/virhostdev.c | 4 +- src/libvirt_private.syms | 7 + src/util/virnetdev.c | 256 +++++++++++++++++++++++++----------- src/util/virnetdevpriv.h | 44 +++++++ tests/virnetdevtest.c | 249 ++++++++++++++++++++++++++++++++++- 6 files changed, 496 insertions(+), 78 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

1 3

[PATCH] util: fix erroneous requirement for phys_port_id to get ifname of a VF
by Laine Stump 01 Dec '21

01 Dec '21

Commit 795e9e05c3 (libvirt-7.7.0) refactored the code in virpci.c and virnetdev.c that gathered lists of the Virtual Functions (VF) of an SRIOV Physical Function (PF) to simplify the code. Unfortunately the simplification made the assumption that a VF's netdev interface name should only be retrieved if the PF had a valid phys_port_id. That is an incorrect assumption - only a small handful of (now previous-generation) Mellanox SRIOV cards actually use phys_port_id (this is for an odd design where there are multiple physical network ports on a single PCI address); all other SRIOV cards (including new Mellanox cards) have a file in sysfs called phys_port_id, but it can't be read, and so the pfPhysPortID string is NULL. The result of this logic error is that virtual networks that are a pool of VFs to be used for macvtap connections will be unable to start, giving an errror like this: VF 0 of SRIOV PF enp130s0f0 couldn't be added to the interface pool because it isn't bound to a network driver - possibly in use elsewhere The simple/quick solution to this is to not imply that "pfPhysPortID == NULL" is the same as "don't fill in the VF's netdev ifname". Instead, add a bool getIfName to the args of virNetDevGetVirtualFunctionsFull() so that we can still get the ifname filled in when pfPhysPortID is NULL. Resolves: https://bugzilla.redhat.com/2025432 Fixes: 795e9e05c3b6b9ef3abe6f6078a6373a136ec23b Signed-off-by: Laine Stump <laine(a)redhat.com> --- On one hand this is a regression with an apparently simple fix (that has been tested to solve the problem), and it's always good to fix regressions before a release rather than after. On the other hand it has been broken since August, and nobody complained until last week (and that was a QE tester, not an actual end-user), so it seems the bug is in functionality that isn't used much in the field (or at least no downstream with a used of the functionality has made a release since then that was installed by said user). I've grown increasingly wary of pushing anything just before a release, especially when it modifies the args of a function that has multiple definitions for different platforms (although CI is supposed to be thorough enough to catch those types of problems these days). So I'm all for pushing this right after the release, rather than before. But if anyone sees a reason for doing otherwise, we can talk about it in about 10 hours when I sit down at the keyboard again :-). P.S. I'm planning to make a followup that eliminates the pfPhysPortID arg completely, but wanted the bugfix to be as stripped down as possible. src/util/virnetdev.c | 2 +- src/util/virpci.c | 20 ++++++++++++-------- src/util/virpci.h | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 58f7360a0f..300d7e4f45 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1231,7 +1231,7 @@ virNetDevGetVirtualFunctions(const char *pfname, if (virNetDevSysfsFile(&pf_sysfs_device_link, pfname, "device") < 0) return -1; - if (virPCIGetVirtualFunctionsFull(pf_sysfs_device_link, vfs, pfPhysPortID) < 0) + if (virPCIGetVirtualFunctionsFull(pf_sysfs_device_link, true, vfs, pfPhysPortID) < 0) return -1; return 0; diff --git a/src/util/virpci.c b/src/util/virpci.c index 2d12e28004..b7b987dd63 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2263,7 +2263,7 @@ int virPCIGetVirtualFunctions(const char *sysfs_path, virPCIVirtualFunctionList **vfs) { - return virPCIGetVirtualFunctionsFull(sysfs_path, vfs, NULL); + return virPCIGetVirtualFunctionsFull(sysfs_path, false, vfs, NULL); } @@ -2339,15 +2339,18 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path, /** * virPCIGetVirtualFunctionsFull: * @sysfs_path: path to physical function sysfs entry + * @getIfName: true if the ifname of the VF should also be filled in, + * false to only fill in the PCI address. * @vfs: filled with the virtual function data - * @pfPhysPortID: Optional physical port id. If provided the network interface - * name of the VFs is queried too. + * @pfPhysPortID: Optional physical port id. if non-null it will be used + * when determining the ifname. * * * Returns virtual functions of a physical function. */ int virPCIGetVirtualFunctionsFull(const char *sysfs_path, + bool getIfName, virPCIVirtualFunctionList **vfs, const char *pfPhysPortID) { @@ -2390,11 +2393,10 @@ virPCIGetVirtualFunctionsFull(const char *sysfs_path, return -1; } - if (pfPhysPortID) { - if (virPCIGetNetName(device_link, 0, pfPhysPortID, &fnc.ifname) < 0) { - g_free(fnc.addr); - return -1; - } + if (getIfName && + virPCIGetNetName(device_link, 0, pfPhysPortID, &fnc.ifname) < 0) { + g_free(fnc.addr); + return -1; } VIR_APPEND_ELEMENT(list->functions, list->nfunctions, fnc); @@ -2711,8 +2713,10 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path G_GNUC_UNUSED, int virPCIGetVirtualFunctionsFull(const char *sysfs_path G_GNUC_UNUSED, + bool getIfName G_GNUC_UNUSED, virPCIVirtualFunctionList **vfs G_GNUC_UNUSED, const char *pfPhysPortID G_GNUC_UNUSED) + { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; diff --git a/src/util/virpci.h b/src/util/virpci.h index 3346321ec9..2f64c447cc 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -229,6 +229,7 @@ void virPCIVirtualFunctionListFree(virPCIVirtualFunctionList *list); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVirtualFunctionList, virPCIVirtualFunctionListFree); int virPCIGetVirtualFunctionsFull(const char *sysfs_path, + bool getIfName, virPCIVirtualFunctionList **vfs, const char *pfPhysPortID); int virPCIGetVirtualFunctions(const char *sysfs_path, -- 2.33.1

2 1

[PATCH] qemu_domainjob: move jobs_queued to struct qemuDomainJobObj
by Kristina Hanicova 01 Dec '21

01 Dec '21

I think it makes more sense for the variable about jobs to be in the job object. I also renamed it to be consistent with the rest of the struct. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- Not gonna lie, it will make my planned generalization of jobs much easier as well. src/qemu/qemu_domain.h | 2 -- src/qemu/qemu_domainjob.c | 14 +++++++------- src/qemu/qemu_domainjob.h | 2 ++ src/qemu/qemu_process.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6728ab047e..913c20b941 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -141,8 +141,6 @@ struct _qemuDomainObjPrivate { */ virTristateBool allowReboot; - int jobs_queued; - unsigned long migMaxBandwidth; char *origname; int nbdPort; /* Port used for migration with NBD */ diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index cff8d7bb83..62fa09921b 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -847,13 +847,13 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, if (virTimeMillisNow(&now) < 0) return -1; - priv->jobs_queued++; + priv->job.jobsQueued++; then = now + QEMU_JOB_WAIT_TIME; retry: if ((!async && job != QEMU_JOB_DESTROY) && cfg->maxQueuedJobs && - priv->jobs_queued > cfg->maxQueuedJobs) { + priv->job.jobsQueued > cfg->maxQueuedJobs) { goto error; } @@ -986,7 +986,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } ret = -2; } else if (cfg->maxQueuedJobs && - priv->jobs_queued > cfg->maxQueuedJobs) { + priv->job.jobsQueued > cfg->maxQueuedJobs) { if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, _("cannot acquire state change " @@ -1016,7 +1016,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } cleanup: - priv->jobs_queued--; + priv->job.jobsQueued--; return ret; } @@ -1136,7 +1136,7 @@ qemuDomainObjEndJob(virQEMUDriver *driver, virDomainObj *obj) qemuDomainObjPrivate *priv = obj->privateData; qemuDomainJob job = priv->job.active; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), @@ -1157,7 +1157,7 @@ qemuDomainObjEndAgentJob(virDomainObj *obj) qemuDomainObjPrivate *priv = obj->privateData; qemuDomainAgentJob agentJob = priv->job.agentActive; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping agent job: %s (async=%s vm=%p name=%s)", qemuDomainAgentJobTypeToString(agentJob), @@ -1175,7 +1175,7 @@ qemuDomainObjEndAsyncJob(virQEMUDriver *driver, virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", qemuDomainAsyncJobTypeToString(priv->job.asyncJob), diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 46cbb8a067..cfef1ff462 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -176,6 +176,8 @@ struct _qemuDomainObjPrivateJobCallbacks { struct _qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ + int jobsQueued; + /* The following members are for QEMU_JOB_* */ qemuDomainJob active; /* Currently running job */ unsigned long long owner; /* Thread id which set current job */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c355a39e15..3b07f52954 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3745,7 +3745,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver, ignore_value(virTimeMillisNow(&now)); /* Restore the config of the async job which is not persisted */ - priv->jobs_queued++; + priv->job.jobsQueued++; priv->job.asyncJob = QEMU_ASYNC_JOB_BACKUP; priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now; -- 2.31.1

2 1

[PATCH 1/1] NEWS: document DEVICE_UNPLUG_GUEST_ERROR support
by Daniel Henrique Barboza 30 Nov '21

30 Nov '21

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index a71b84c363..9e990ff93a 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -30,6 +30,11 @@ v7.10.0 (unreleased) Libvirt is now able to report interface information from the guest's perspective (using guest agent). + * qemu: detect guest side errors during device removal + + Libvirt is now able to detect guest side errors during device removal by + using the DEVICE_UNPLUG_GUEST_ERROR event, available in QEMU 6.2.0. + * **Bug fixes** -- 2.31.1

2 1

[PATCH] NEWS: Mention two minor regression fixes and addition to bulk stats
by Peter Krempa 30 Nov '21

30 Nov '21

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index b63a0aa721..006724eafa 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -37,8 +37,24 @@ v7.10.0 (unreleased) The current hardcoded minimum is 56 (single-DES) and will be raised to 112 in the future. Setting a minimum lower than 112 is not supported. + * qemu: Report stats also for block copy destination and backup job scratch + images + + The statistics are available via the bulk domain stats API. + * **Bug fixes** + * qemu: Don't format 'ramfb' attribute when disabled + + Fix a regression caused by the conversion to JSON -device arguments where + 'ramfb' would be put on the commandline of 'vfio-pci' which doesn't have it, + thus breaking VMs with a mediated host device. + + * qemu: Fix block copy and backup to encrypted storage + + An oversight in last release lead to a spurious error being reported when + encrypted storage was requested for disk images which are not directly + backing the disk, which is now fixed. v7.9.0 (2021-11-01) =================== -- 2.31.1

2 2

[PATCH 00/23] virHashFree refactoring and removal
by Peter Krempa 30 Nov '21

30 Nov '21

Peter Krempa (23): virDomainNetDefParseXML: Automatically free GHashTable virDomainDeviceValidateAliasImpl: Automatically free GHashTable and remove cleanup libxlLoggerNew: Avoid virHashFree by rearranging code virNWFilterDoInstantiate: Automatically free temporary GHashTable virNWFilterBuildAll: Automatically free temporary GHashTable qemuDomainUpdateMemoryDeviceInfo: Automatically free temporary GHashTable qemuDomainBlocksStatsGather: Automatically free GHashTable and refactor cleanup qemuDomainGetDiskErrors: Automatically free GHashTable qemuMigrationSrcFetchMirrorStats: Automatically free GHashTable qemuRefreshVirtioChannelState: Automatically free GHashTable and refactor cleanup qemuRefreshPRManagerState: Automatically free GHashTable and refactor cleanup qemuProcessWaitForMonitor: Automatically free GHashTable qemuProcessRefreshDisks: Automatically free GHashTable and refactor cleanup qemuProcessRefreshLegacyBlockjobs: Automatically free GHashTable and refactor cleanup qemuCheckpointGetXMLDescUpdateSize: Don't combine automatic freeing with manual nwfilterxml2firewalltest: virNWFilterIncludeDefToRuleInst: Automatically free GHashTable nwfilterxml2firewalltest: testCompareXMLToArgvFiles: Automatically free GHashTable qemumonitorjsontest: testBlockNodeNameDetect: Automatically free GHashTable qemumonitorjsontest: mymain: Automatically free GHashTable qemuxml2arvtest: Use 'g_hash_table_unref' for clearing the qapi schema cache Switch away from virHashFree util: virhash: Remove 'virHashFree' util: virhash: Replace 'virHashDataFree' by 'GDestroyNotify' src/conf/domain_addr.c | 2 +- src/conf/domain_conf.c | 6 +-- src/conf/domain_validate.c | 13 ++--- src/conf/nwfilter_conf.c | 2 +- src/conf/nwfilter_ipaddrmap.c | 3 +- src/conf/virchrdev.c | 2 +- src/conf/virdomainmomentobjlist.c | 2 +- src/conf/virdomainobjlist.c | 4 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 4 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingdef.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 10 ++-- src/hyperv/hyperv_wmi.c | 2 +- src/hypervisor/virclosecallbacks.c | 2 +- src/libvirt_private.syms | 1 - src/libxl/libxl_logger.c | 9 ++-- src/locking/lock_daemon.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +-- src/nwfilter/nwfilter_gentech_driver.c | 11 ++-- src/nwfilter/nwfilter_learnipaddr.c | 7 +-- src/qemu/qemu_checkpoint.c | 16 +++--- src/qemu/qemu_domain.c | 9 ++-- src/qemu/qemu_driver.c | 26 ++++------ src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 69 ++++++++------------------ src/rpc/virnetdaemon.c | 2 +- src/security/security_selinux.c | 6 +-- src/util/virfilecache.c | 2 +- src/util/virhash.c | 25 ++-------- src/util/virhash.h | 13 +---- src/util/virlockspace.c | 2 +- src/util/virmacmap.c | 2 +- src/util/virobject.c | 4 +- src/util/virsystemd.c | 2 +- tests/nwfilterxml2firewalltest.c | 8 ++- tests/qemumonitorjsontest.c | 32 ++++++------ tests/qemusecuritymock.c | 7 ++- tests/qemuxml2argvtest.c | 2 +- 42 files changed, 123 insertions(+), 207 deletions(-) -- 2.31.1

4 49

[PATCH] qemu_domainjob: remove dead code
by Kristina Hanicova 30 Nov '21

30 Nov '21

Function qemuDomainJobAllowed() is never used -> remove it. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_domainjob.c | 6 ------ src/qemu/qemu_domainjob.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index cff8d7bb83..439a9d10c2 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -771,12 +771,6 @@ qemuDomainNestedJobAllowed(qemuDomainJobObj *jobs, qemuDomainJob newJob) (jobs->mask & JOB_MASK(newJob)) != 0; } -bool -qemuDomainJobAllowed(qemuDomainJobObj *jobs, qemuDomainJob newJob) -{ - return !jobs->active && qemuDomainNestedJobAllowed(jobs, newJob); -} - static bool qemuDomainObjCanSetJob(qemuDomainJobObj *job, qemuDomainJob newJob, diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 46cbb8a067..eaa5cda3eb 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -277,8 +277,6 @@ int qemuDomainObjInitJob(qemuDomainJobObj *job, qemuDomainObjPrivateJobCallbacks *cb); -bool qemuDomainJobAllowed(qemuDomainJobObj *jobs, qemuDomainJob newJob); - int qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, virDomainObj *vm); -- 2.31.1

2 1

[PATCH 0/6] Fix potential deadlock and crash in libxl driver
by Jim Fehlig 30 Nov '21

30 Nov '21

I've been investigating what turns out to be some long-standing issues in the libxl driver. One of them causes libvirtd to deadlock, the other can lead to a segmentation fault. Both can be triggered by repeatedly rebooting a collection of VMs. My reproducer continually reboots 8 VMs on a host where libvirtd runs in a VM (dom0) confined to 4 vcpus. Patches 1-4 contain improvements and preparation for the fixes in patches 5 and 6. Patch 5 fixes the potential deadlock, and patch 6 fixes the potential crash. Both contain more detail on the respective issues. My reprocuder has run for 5 days without issue. Before the patches, it would trigger within 2 days. Jim Fehlig (6): libxl: Disable death events after receiving a shutdown event libxl: Rename libxlShutdownThreadInfo struct libxl: Modify name of shutdown thread libxl: Handle domain death events in a thread libxl: Search for virDomainObj in event handler threads libxl: Protect access to libxlLogger files hash table src/libxl/libxl_domain.c | 115 ++++++++++++++++++++++----------------- src/libxl/libxl_domain.h | 3 - src/libxl/libxl_logger.c | 12 ++++ 3 files changed, 77 insertions(+), 53 deletions(-) -- 2.33.0

3 8

[PATCH 0/3] Add an option to use virDomainGetSecurityLabelList and test it
by Luke Yue 30 Nov '21

30 Nov '21

Luke Yue (3): test_driver: Implement virDomainGetSecurityLabelList virsh: Add '--full-seclabels' option for dominfo tests: Add test for virDomainGetSecurityLabelList docs/manpages/virsh.rst | 5 +- src/test/test_driver.c | 42 +++++++++++++++++ tests/virsh-undefine | 8 ++-- tests/virshtest.c | 74 +++++++++++++++--------------- tools/virsh-domain-monitor.c | 89 ++++++++++++++++++++++++------------ 5 files changed, 146 insertions(+), 72 deletions(-) -- 2.33.0

2 6

[libvirt PATCH] util: canonicalize 'arm64' arch to 'aarch64'
by Daniel P. Berrangé 30 Nov '21

30 Nov '21

macOS on Apple silicon reports 'arm64' as the architecture from uname, which we need to canonicalize to VIR_ARCH_AARCH64 / 'aarch64'. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NB, I suggest we push this during freeze as it is a trivial bugfix src/util/virarch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virarch.c b/src/util/virarch.c index f088b6b676..2134dd6a9d 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -220,6 +220,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { arch = VIR_ARCH_X86_64; + } else if (STREQ(ut.machine, "arm64")) { + arch = VIR_ARCH_AARCH64; } else { /* Otherwise assume the canonical name */ if ((arch = virArchFromString(ut.machine)) == VIR_ARCH_NONE) { -- 2.33.1

2 1

[PATCH v2 0/4] Introduce TCG domain features
by Michal Privoznik 30 Nov '21

30 Nov '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-November/msg00143.html diff to v1: - Patches 1/4 and 2/4 are new, per Dan's suggestion - Patch 4/4 was reworked, since after 2/4 we are using -accel unconditionally Please note that patch 2/4 was trimmed in order to fit the list message limit. You can find all patches applied here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/tcg_tb_size_alt_v2 Michal Prívozník (4): qemu_command: Don't validate accelerator when building cmd line qemu: Switch to -accel conf: Introduce TCG domain features qemu: Generate command line for tb-cache feature docs/formatdomain.rst | 11 +++ docs/schemas/domaincommon.rng | 15 +++- src/conf/domain_conf.c | 90 +++++++++++++++++++ src/conf/domain_conf.h | 7 ++ src/qemu/qemu_command.c | 80 ++++++++++------- src/qemu/qemu_validate.c | 11 +++ .../aarch64-aavmf-virtio-mmio.args | 3 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +- .../aarch64-cpu-passthrough.args | 3 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +- .../aarch64-gic-none-tcg.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +- .../aarch64-kvm-32-on-64.args | 3 +- .../aarch64-noacpi-nouefi.args | 3 +- .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +- ...arch64-os-firmware-efi.aarch64-latest.args | 3 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 3 +- .../aarch64-tpm.aarch64-latest.args | 3 +- .../aarch64-traditional-pci.args | 3 +- .../aarch64-usb-controller-nec-xhci.args | 3 +- .../aarch64-usb-controller-qemu-xhci.args | 3 +- .../aarch64-video-default.args | 3 +- .../aarch64-video-virtio-gpu-pci.args | 3 +- .../aarch64-virt-2.6-virtio-pci-default.args | 3 +- .../aarch64-virt-default-nic.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 3 +- .../aarch64-virtio-pci-default.args | 3 +- .../aarch64-virtio-pci-manual-addresses.args | 3 +- tests/qemuxml2argvdata/acpi-table.args | 3 +- .../arm-vexpressa9-basic.args | 3 +- .../arm-vexpressa9-nodevs.args | 3 +- .../arm-vexpressa9-virtio.args | 3 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +- .../audio-alsa-best.x86_64-4.1.0.args | 3 +- .../audio-alsa-best.x86_64-latest.args | 3 +- .../audio-alsa-full.x86_64-latest.args | 3 +- .../audio-alsa-minimal.x86_64-4.1.0.args | 3 +- .../audio-alsa-minimal.x86_64-latest.args | 3 +- .../audio-coreaudio-best.x86_64-4.1.0.args | 3 +- .../audio-coreaudio-best.x86_64-latest.args | 3 +- .../audio-coreaudio-full.x86_64-latest.args | 3 +- .../audio-coreaudio-minimal.x86_64-4.1.0.args | 3 +- ...audio-coreaudio-minimal.x86_64-latest.args | 3 +- ...audio-default-nographics.x86_64-4.1.0.args | 3 +- ...udio-default-nographics.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/audio-default-sdl.args | 3 +- .../audio-default-sdl.x86_64-latest.args | 3 +- .../qemuxml2argvdata/audio-default-spice.args | 3 +- .../audio-default-spice.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/audio-default-vnc.args | 3 +- .../audio-default-vnc.x86_64-latest.args | 3 +- .../audio-file-best.x86_64-4.1.0.args | 3 +- .../audio-file-best.x86_64-latest.args | 3 +- .../audio-file-full.x86_64-latest.args | 3 +- .../audio-file-minimal.x86_64-4.1.0.args | 3 +- .../audio-file-minimal.x86_64-latest.args | 3 +- .../audio-jack-full.x86_64-latest.args | 3 +- .../audio-jack-minimal.x86_64-latest.args | 3 +- .../audio-many-backends.x86_64-latest.args | 3 +- .../audio-none-best.x86_64-4.1.0.args | 3 +- .../audio-none-best.x86_64-latest.args | 3 +- .../audio-none-full.x86_64-latest.args | 3 +- .../audio-none-minimal.x86_64-4.1.0.args | 3 +- .../audio-none-minimal.x86_64-latest.args | 3 +- .../audio-oss-best.x86_64-4.1.0.args | 3 +- .../audio-oss-best.x86_64-latest.args | 3 +- .../audio-oss-full.x86_64-latest.args | 3 +- .../audio-oss-minimal.x86_64-4.1.0.args | 3 +- .../audio-oss-minimal.x86_64-latest.args | 3 +- .../audio-pulseaudio-best.x86_64-4.1.0.args | 3 +- .../audio-pulseaudio-best.x86_64-latest.args | 3 +- .../audio-pulseaudio-full.x86_64-latest.args | 3 +- ...audio-pulseaudio-minimal.x86_64-4.1.0.args | 3 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 3 +- .../audio-sdl-best.x86_64-4.1.0.args | 3 +- .../audio-sdl-best.x86_64-latest.args | 3 +- .../audio-sdl-full.x86_64-latest.args | 3 +- .../audio-sdl-minimal.x86_64-4.1.0.args | 3 +- .../audio-sdl-minimal.x86_64-latest.args | 3 +- .../audio-spice-best.x86_64-4.1.0.args | 3 +- .../audio-spice-best.x86_64-latest.args | 3 +- .../audio-spice-full.x86_64-latest.args | 3 +- .../audio-spice-minimal.x86_64-4.1.0.args | 3 +- .../audio-spice-minimal.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/autoindex.args | 3 +- .../qemuxml2argvdata/balloon-ccw-deflate.args | 3 +- .../qemuxml2argvdata/balloon-device-auto.args | 3 +- .../balloon-device-deflate-off.args | 3 +- .../balloon-device-deflate.args | 3 +- .../balloon-device-period.args | 3 +- tests/qemuxml2argvdata/balloon-device.args | 3 +- .../balloon-mmio-deflate.args | 3 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 3 +- tests/qemuxml2argvdata/bios-nvram.args | 3 +- tests/qemuxml2argvdata/bios.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- ...blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/blkiotune-device.args | 3 +- tests/qemuxml2argvdata/blkiotune.args | 3 +- tests/qemuxml2argvdata/boot-cdrom.args | 3 +- tests/qemuxml2argvdata/boot-complex.args | 3 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 3 +- tests/qemuxml2argvdata/boot-floppy.args | 3 +- .../boot-menu-disable-drive.args | 3 +- tests/qemuxml2argvdata/boot-menu-disable.args | 3 +- .../boot-menu-enable-with-timeout.args | 3 +- tests/qemuxml2argvdata/boot-menu-enable.args | 3 +- tests/qemuxml2argvdata/boot-multi.args | 3 +- tests/qemuxml2argvdata/boot-network.args | 3 +- tests/qemuxml2argvdata/boot-order.args | 3 +- tests/qemuxml2argvdata/channel-guestfwd.args | 3 +- tests/qemuxml2argvdata/channel-spicevmc.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../qemuxml2argvdata/channel-virtio-auto.args | 3 +- .../channel-virtio-autoadd.args | 3 +- .../channel-virtio-autoassign.args | 3 +- .../channel-virtio-default.args | 3 +- .../channel-virtio-state.args | 3 +- .../qemuxml2argvdata/channel-virtio-unix.args | 3 +- tests/qemuxml2argvdata/channel-virtio.args | 3 +- tests/qemuxml2argvdata/chardev-reconnect.args | 3 +- tests/qemuxml2argvdata/clock-catchup.args | 3 +- tests/qemuxml2argvdata/clock-france.args | 3 +- tests/qemuxml2argvdata/clock-hpet-off.args | 3 +- .../clock-localtime-basis-localtime.args | 3 +- tests/qemuxml2argvdata/clock-localtime.args | 3 +- tests/qemuxml2argvdata/clock-realtime.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../clock-timer-hyperv-rtc.args | 3 +- tests/qemuxml2argvdata/clock-utc.args | 3 +- tests/qemuxml2argvdata/clock-variable.args | 3 +- .../qemuxml2argvdata/console-compat-auto.args | 3 +- .../console-compat-chardev.args | 3 +- tests/qemuxml2argvdata/console-compat.args | 3 +- .../console-sclp.s390x-latest.args | 3 +- .../qemuxml2argvdata/console-virtio-ccw.args | 3 +- .../qemuxml2argvdata/console-virtio-many.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/console-virtio.args | 3 +- tests/qemuxml2argvdata/controller-order.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 3 +- .../qemuxml2argvdata/cpu-cache-disable2.args | 3 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 3 +- .../cpu-cache-emulate-l3.args | 3 +- .../cpu-cache-passthrough.args | 3 +- .../cpu-cache-passthrough2.args | 3 +- .../cpu-check-default-none.args | 3 +- .../cpu-check-default-none2.args | 3 +- .../cpu-check-default-partial.args | 3 +- .../cpu-check-default-partial2.args | 3 +- tests/qemuxml2argvdata/cpu-check-none.args | 3 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 3 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 3 +- tests/qemuxml2argvdata/cpu-exact1.args | 3 +- .../cpu-exact2-nofallback.args | 3 +- tests/qemuxml2argvdata/cpu-exact2.args | 3 +- tests/qemuxml2argvdata/cpu-fallback.args | 3 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 3 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../cpu-host-model-fallback.args | 3 +- .../cpu-host-model-vendor.args | 3 +- tests/qemuxml2argvdata/cpu-host-model.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-host-passthrough-features.args | 3 +- .../cpu-host-passthrough.args | 3 +- .../qemuxml2argvdata/cpu-hotplug-startup.args | 3 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 3 +- tests/qemuxml2argvdata/cpu-minimum1.args | 3 +- tests/qemuxml2argvdata/cpu-minimum2.args | 3 +- .../cpu-no-removed-features.args | 3 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 3 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 3 +- .../cpu-numa-no-memory-element.args | 3 +- tests/qemuxml2argvdata/cpu-numa1.args | 3 +- tests/qemuxml2argvdata/cpu-numa2.args | 3 +- tests/qemuxml2argvdata/cpu-s390-features.args | 3 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 3 +- tests/qemuxml2argvdata/cpu-strict1.args | 3 +- tests/qemuxml2argvdata/cpu-topology1.args | 3 +- tests/qemuxml2argvdata/cpu-topology2.args | 3 +- tests/qemuxml2argvdata/cpu-topology3.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cputune-numatune.args | 3 +- .../qemuxml2argvdata/cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/cputune.args | 3 +- .../default-kvm-host-arch.args | 3 +- .../default-qemu-host-arch.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../devices-acpi-index.x86_64-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- .../disk-aio.x86_64-2.12.0.args | 3 +- .../disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- ...-backing-chains-noindex.x86_64-2.12.0.args | 3 +- ...-backing-chains-noindex.x86_64-latest.args | 3 +- .../disk-blockio.x86_64-latest.args | 3 +- .../disk-boot-cdrom.x86_64-latest.args | 3 +- .../disk-boot-disk.x86_64-latest.args | 3 +- .../disk-cache.x86_64-2.12.0.args | 3 +- .../disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...m-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../disk-cdrom.x86_64-2.12.0.args | 3 +- .../disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- .../disk-floppy-tray.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-fmt-qcow.x86_64-4.1.0.args | 3 +- .../disk-fmt-qcow.x86_64-latest.args | 3 +- .../disk-geometry.x86_64-latest.args | 3 +- .../disk-ide-split.x86_64-latest.args | 3 +- .../disk-ide-wwn.x86_64-latest.args | 3 +- .../disk-ioeventfd.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- ...-network-rbd-encryption.x86_64-latest.args | 3 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 3 +- ...isk-network-source-auth.x86_64-2.12.0.args | 3 +- ...isk-network-source-auth.x86_64-latest.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 3 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-no-boot.x86_64-latest.args | 3 +- .../disk-nvme.x86_64-latest.args | 3 +- .../disk-order.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-rotation.x86_64-latest.args | 3 +- .../disk-sata-device.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../disk-scsi-disk-split.x86_64-latest.args | 3 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 3 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 3 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 3 +- .../disk-scsi.x86_64-latest.args | 3 +- .../disk-serial.x86_64-latest.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-snapshot.x86_64-latest.args | 3 +- .../disk-source-pool-mode.x86_64-4.1.0.args | 3 +- .../disk-source-pool-mode.x86_64-latest.args | 3 +- .../disk-source-pool.x86_64-4.1.0.args | 3 +- .../disk-source-pool.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...sk-usb-device-removable.x86_64-latest.args | 3 +- .../disk-usb-device.x86_64-latest.args | 3 +- .../disk-vhostuser.x86_64-latest.args | 3 +- .../disk-virtio-ccw-many.s390x-latest.args | 3 +- .../disk-virtio-ccw.s390x-latest.args | 3 +- .../disk-virtio-queues.x86_64-latest.args | 3 +- .../disk-virtio-s390-zpci.s390x-latest.args | 3 +- ...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- .../disk-virtio.x86_64-latest.args | 3 +- .../encrypted-disk-usage.x86_64-4.1.0.args | 3 +- .../encrypted-disk-usage.x86_64-latest.args | 3 +- .../encrypted-disk.x86_64-4.1.0.args | 3 +- .../encrypted-disk.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- .../event_idx.x86_64-latest.args | 3 +- .../fd-memory-no-numa-topology.args | 3 +- .../fd-memory-numa-topology.args | 3 +- .../fd-memory-numa-topology2.args | 3 +- .../fd-memory-numa-topology3.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- .../fs9p-ccw.s390x-latest.args | 3 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../genid-auto.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- .../graphics-sdl-fullscreen.args | 3 +- tests/qemuxml2argvdata/graphics-sdl.args | 3 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 3 +- ...aphics-spice-agentmouse.x86_64-latest.args | 3 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 3 +- ...phics-spice-auto-socket.x86_64-latest.args | 3 +- ...phics-spice-compression.x86_64-latest.args | 3 +- ...hics-spice-egl-headless.x86_64-latest.args | 3 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- .../graphics-spice-no-args.x86_64-latest.args | 3 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 3 +- .../graphics-spice-sasl.x86_64-latest.args | 3 +- .../graphics-spice-socket.x86_64-latest.args | 3 +- .../graphics-spice-timeout.x86_64-latest.args | 3 +- ...raphics-spice-usb-redir.x86_64-latest.args | 3 +- .../graphics-spice.x86_64-latest.args | 3 +- ...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 3 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 3 +- ...raphics-vnc-auto-socket.x86_64-2.11.0.args | 3 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 3 +- ...aphics-vnc-egl-headless.x86_64-2.11.0.args | 3 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 3 +- ...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 3 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 3 +- .../graphics-vnc-none.x86_64-2.11.0.args | 3 +- .../graphics-vnc-none.x86_64-latest.args | 3 +- .../graphics-vnc-policy.x86_64-2.11.0.args | 3 +- .../graphics-vnc-policy.x86_64-latest.args | 3 +- .../graphics-vnc-power.x86_64-latest.args | 3 +- ...remove-generated-socket.x86_64-2.11.0.args | 3 +- ...remove-generated-socket.x86_64-latest.args | 3 +- .../graphics-vnc-sasl.x86_64-2.11.0.args | 3 +- .../graphics-vnc-sasl.x86_64-latest.args | 3 +- ...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 3 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 3 +- .../graphics-vnc-socket.x86_64-2.11.0.args | 3 +- .../graphics-vnc-socket.x86_64-latest.args | 3 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 3 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-2.11.0.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- .../graphics-vnc-websocket.x86_64-2.11.0.args | 3 +- .../graphics-vnc-websocket.x86_64-latest.args | 3 +- .../graphics-vnc.x86_64-2.11.0.args | 3 +- .../graphics-vnc.x86_64-latest.args | 3 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...play-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-display-spice-opengl.x86_64-latest.args | 3 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 3 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../hostdev-mdev-precreated.args | 3 +- .../hostdev-pci-address-device.args | 3 +- .../hostdev-pci-address-unassigned.args | 3 +- .../qemuxml2argvdata/hostdev-pci-address.args | 3 +- .../hostdev-pci-multifunction.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- .../hostdev-scsi-vhost-scsi-ccw.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 3 +- .../hostdev-scsi-vhost-scsi-pcie.args | 3 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hostdev-subsys-mdev-vfio-ccw.args | 3 +- .../hostdev-usb-address-device-boot.args | 3 +- .../hostdev-usb-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-usb-address.args | 3 +- .../hostdev-vfio-multidomain.args | 3 +- .../hostdev-vfio-zpci-autogenerate-fids.args | 3 +- .../hostdev-vfio-zpci-autogenerate-uids.args | 3 +- .../hostdev-vfio-zpci-autogenerate.args | 3 +- .../hostdev-vfio-zpci-boundaries.args | 3 +- .../hostdev-vfio-zpci-ccw-memballoon.args | 3 +- .../hostdev-vfio-zpci-multidomain-many.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/hotplug-base.args | 3 +- .../hugepages-default-2M.args | 3 +- .../hugepages-default-system-size.args | 3 +- tests/qemuxml2argvdata/hugepages-default.args | 3 +- .../qemuxml2argvdata/hugepages-memaccess.args | 3 +- .../hugepages-memaccess2.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 3 +- .../hugepages-numa-default-2M.args | 3 +- .../hugepages-numa-default-dimm.args | 3 +- .../hugepages-numa-default.args | 3 +- .../hugepages-numa-nodeset-part.args | 3 +- .../hugepages-numa-nodeset.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 3 +- .../hyperv-off.x86_64-4.0.0.args | 3 +- .../hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- .../hyperv.x86_64-latest.args | 3 +- .../input-linux.x86_64-latest.args | 3 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 3 +- tests/qemuxml2argvdata/input-usbmouse.args | 3 +- tests/qemuxml2argvdata/input-usbtablet.args | 3 +- tests/qemuxml2argvdata/input-virtio-ccw.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 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- .../iothreads-disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 3 +- .../iothreads-ids-partial.args | 3 +- tests/qemuxml2argvdata/iothreads-ids.args | 3 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 3 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/iothreads.args | 3 +- tests/qemuxml2argvdata/kvm-features-off.args | 3 +- tests/qemuxml2argvdata/kvm-features.args | 3 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/kvmclock.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 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 3 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- .../luks-disks-source.x86_64-4.1.0.args | 3 +- .../luks-disks-source.x86_64-latest.args | 3 +- .../luks-disks.x86_64-4.1.0.args | 3 +- .../luks-disks.x86_64-latest.args | 3 +- .../mach-virt-console-virtio.args | 3 +- .../mach-virt-serial-native.args | 3 +- .../mach-virt-serial-pci.args | 3 +- .../mach-virt-serial-usb.args | 3 +- .../machine-aeskeywrap-off-cap.args | 3 +- .../machine-aeskeywrap-off-caps.args | 3 +- .../machine-aeskeywrap-on-cap.args | 3 +- .../machine-aeskeywrap-on-caps.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 3 +- tests/qemuxml2argvdata/machine-aliases2.args | 3 +- tests/qemuxml2argvdata/machine-core-off.args | 3 +- tests/qemuxml2argvdata/machine-core-on.args | 3 +- .../machine-deakeywrap-off-cap.args | 3 +- .../machine-deakeywrap-off-caps.args | 3 +- .../machine-deakeywrap-on-cap.args | 3 +- .../machine-deakeywrap-on-caps.args | 3 +- .../machine-keywrap-none-caps.args | 3 +- .../machine-keywrap-none.args | 3 +- ...ine-loadparm-multiple-disks-nets-s390.args | 3 +- .../machine-loadparm-net-s390.args | 3 +- .../machine-loadparm-s390.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 3 +- .../qemuxml2argvdata/machine-vmport-opt.args | 3 +- tests/qemuxml2argvdata/master-key.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- .../memory-hotplug-dimm-addr.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...emory-hotplug-nvdimm-ppc64-abi-update.args | 3 +- .../memory-hotplug-nvdimm-ppc64.args | 3 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- ...emory-hotplug-ppc64-nonuma-abi-update.args | 3 +- .../memory-hotplug-ppc64-nonuma.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 +- tests/qemuxml2argvdata/memory-hotplug.args | 3 +- tests/qemuxml2argvdata/memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/memtune.args | 3 +- .../migrate-numa-unaligned.args | 3 +- tests/qemuxml2argvdata/migrate.args | 3 +- tests/qemuxml2argvdata/minimal.args | 3 +- tests/qemuxml2argvdata/misc-acpi.args | 3 +- tests/qemuxml2argvdata/misc-disable-s3.args | 3 +- .../misc-disable-suspends.args | 3 +- tests/qemuxml2argvdata/misc-enable-s4.args | 3 +- .../misc-no-reboot.x86_64-5.2.0.args | 3 +- .../misc-no-reboot.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/misc-uuid.args | 3 +- .../mlock-off.x86_64-3.0.0.args | 3 +- .../mlock-off.x86_64-latest.args | 3 +- .../mlock-on.x86_64-3.0.0.args | 3 +- .../mlock-on.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/monitor-json.args | 3 +- .../multifunction-pci-device.args | 3 +- .../name-escape.x86_64-2.11.0.args | 3 +- tests/qemuxml2argvdata/net-client.args | 3 +- tests/qemuxml2argvdata/net-eth-hostip.args | 3 +- tests/qemuxml2argvdata/net-eth-ifname.args | 3 +- tests/qemuxml2argvdata/net-eth-names.args | 3 +- .../net-eth-unmanaged-tap.args | 3 +- tests/qemuxml2argvdata/net-eth.args | 3 +- .../net-hostdev-bootorder.args | 3 +- .../net-hostdev-multidomain.args | 3 +- .../net-hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/net-hostdev.args | 3 +- tests/qemuxml2argvdata/net-many-models.args | 3 +- tests/qemuxml2argvdata/net-mcast.args | 3 +- tests/qemuxml2argvdata/net-server.args | 3 +- tests/qemuxml2argvdata/net-udp.args | 3 +- tests/qemuxml2argvdata/net-user-addr.args | 3 +- tests/qemuxml2argvdata/net-user.args | 3 +- .../net-user.x86_64-4.0.0.args | 3 +- .../net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser-multiq.args | 3 +- tests/qemuxml2argvdata/net-vhostuser.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/net-virtio-device.args | 3 +- .../net-virtio-disable-offloads.args | 3 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +- .../net-virtio-rxtxqueuesize.args | 3 +- .../net-virtio-teaming-hostdev.args | 3 +- .../qemuxml2argvdata/net-virtio-teaming.args | 3 +- tests/qemuxml2argvdata/net-virtio.args | 3 +- tests/qemuxml2argvdata/nosharepages.args | 3 +- .../numad-auto-memory-vcpu-cpuset.args | 3 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 3 +- .../numad-auto-vcpu-static-numatune.args | 3 +- .../numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/numad.args | 3 +- .../numatune-auto-nodeset-invalid.args | 3 +- .../numatune-auto-prefer.args | 3 +- .../qemuxml2argvdata/numatune-distances.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../numatune-memnode-no-memory.args | 3 +- ...emnode-restrictive-mode.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/numatune-memnode.args | 3 +- .../numatune-memnode.x86_64-5.2.0.args | 3 +- .../numatune-memnode.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/numatune-memory.args | 3 +- tests/qemuxml2argvdata/numatune-no-vcpu.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 +- .../qemuxml2argvdata/pages-dimm-discard.args | 3 +- .../pages-discard-hugepages.args | 3 +- tests/qemuxml2argvdata/pages-discard.args | 3 +- .../panic-double.x86_64-latest.args | 3 +- .../panic-no-address.x86_64-latest.args | 3 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 3 +- .../parallel-parport-chardev.args | 3 +- .../parallel-tcp-chardev.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...pi-root-hotplug-disable.x86_64-latest.args | 3 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 3 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 3 +- .../pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/pci-bridge.args | 3 +- tests/qemuxml2argvdata/pci-expander-bus.args | 3 +- tests/qemuxml2argvdata/pci-many.args | 3 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 3 +- tests/qemuxml2argvdata/pci-rom.args | 3 +- .../pci-serial-dev-chardev.args | 3 +- ...e-expander-bus-aarch64.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 3 +- .../pcie-root-port-model-generic.args | 3 +- .../pcie-root-port-model-ioh3420.args | 3 +- ...cie-root-port-nohotplug.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/pcie-root-port.args | 3 +- tests/qemuxml2argvdata/pcie-root.args | 3 +- .../pcie-switch-downstream-port.args | 3 +- .../pcie-switch-upstream-port.args | 3 +- tests/qemuxml2argvdata/pcihole64-q35.args | 3 +- tests/qemuxml2argvdata/pcihole64.args | 3 +- tests/qemuxml2argvdata/pmu-feature-off.args | 3 +- tests/qemuxml2argvdata/pmu-feature.args | 3 +- tests/qemuxml2argvdata/ppc-dtb.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 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../ppc64-usb-controller-legacy.args | 3 +- .../ppc64-usb-controller-qemu-xhci.args | 3 +- .../ppc64-usb-controller.args | 3 +- tests/qemuxml2argvdata/ppce500-serial.args | 3 +- tests/qemuxml2argvdata/pseries-basic.args | 3 +- .../pseries-console-virtio.args | 3 +- .../pseries-cpu-compat-power9.args | 3 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 3 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 3 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 3 +- tests/qemuxml2argvdata/pseries-features.args | 3 +- .../qemuxml2argvdata/pseries-hostdevs-1.args | 3 +- .../qemuxml2argvdata/pseries-hostdevs-2.args | 3 +- .../qemuxml2argvdata/pseries-hostdevs-3.args | 3 +- .../pseries-machine-max-cpu-compat.args | 3 +- .../pseries-many-buses-1.args | 3 +- .../pseries-many-buses-2.args | 3 +- .../pseries-many-devices.args | 3 +- tests/qemuxml2argvdata/pseries-nvram.args | 3 +- .../pseries-panic-missing.args | 3 +- .../pseries-panic-no-address.args | 3 +- .../pseries-phb-default-missing.args | 3 +- .../pseries-phb-numa-node.args | 3 +- .../qemuxml2argvdata/pseries-phb-simple.args | 3 +- .../pseries-serial-native.args | 3 +- .../qemuxml2argvdata/pseries-serial-pci.args | 3 +- .../qemuxml2argvdata/pseries-serial-usb.args | 3 +- .../qemuxml2argvdata/pseries-usb-default.args | 3 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 3 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 3 +- .../pseries-vio-user-assigned.args | 3 +- tests/qemuxml2argvdata/pseries-vio.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 3 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 3 +- .../q35-default-devices-only.args | 3 +- tests/qemuxml2argvdata/q35-multifunction.args | 3 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 3 +- .../q35-pci-force-address.args | 3 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +- tests/qemuxml2argvdata/q35-pcie.args | 3 +- .../q35-pm-disable-fallback.args | 3 +- tests/qemuxml2argvdata/q35-pm-disable.args | 3 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 3 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 3 +- tests/qemuxml2argvdata/q35-usb2.args | 3 +- .../q35-virt-manager-basic.args | 3 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 3 +- tests/qemuxml2argvdata/q35.args | 3 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +- .../qemu-ns-commandline-ns0.args | 3 +- .../qemu-ns-commandline-ns1.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 3 +- .../qemu-ns-domain-commandline-ns0.args | 3 +- .../qemu-ns-domain-commandline.args | 3 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- .../qemu-ns.x86_64-4.0.0.args | 3 +- .../qemu-ns.x86_64-latest.args | 3 +- .../reboot-timeout-disabled.args | 3 +- .../reboot-timeout-enabled.args | 3 +- tests/qemuxml2argvdata/restore-v2-fd.args | 3 +- tests/qemuxml2argvdata/restore-v2.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 3 +- tests/qemuxml2argvdata/riscv64-virt.args | 3 +- ...low-bogus-usb-controller.s390x-latest.args | 3 +- ...390-allow-bogus-usb-none.s390x-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 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- .../qemuxml2argvdata/s390-panic-missing.args | 3 +- .../s390-panic-no-address.args | 3 +- tests/qemuxml2argvdata/s390-serial-2.args | 3 +- .../qemuxml2argvdata/s390-serial-console.args | 3 +- tests/qemuxml2argvdata/s390-serial.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +- .../seclabel-dynamic-baselabel.args | 3 +- .../seclabel-dynamic-labelskip.args | 3 +- .../seclabel-dynamic-override.args | 3 +- .../seclabel-dynamic-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- tests/qemuxml2argvdata/seclabel-none.args | 3 +- .../seclabel-static-labelskip.args | 3 +- .../seclabel-static-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-static.args | 3 +- .../serial-dev-chardev-iobase.args | 3 +- .../qemuxml2argvdata/serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/serial-file-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-log.args | 3 +- .../qemuxml2argvdata/serial-many-chardev.args | 3 +- .../qemuxml2argvdata/serial-pty-chardev.args | 3 +- .../serial-spiceport-nospice.args | 3 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 3 +- .../serial-tcp-telnet-chardev.args | 3 +- .../serial-tcp-tlsx509-chardev-notls.args | 3 +- .../serial-tcp-tlsx509-chardev-verify.args | 3 +- .../serial-tcp-tlsx509-chardev.args | 3 +- .../serial-tcp-tlsx509-secret-chardev.args | 3 +- .../qemuxml2argvdata/serial-udp-chardev.args | 3 +- .../qemuxml2argvdata/serial-unix-chardev.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- .../shmem-plain-doorbell.args | 3 +- tests/qemuxml2argvdata/shmem.args | 3 +- .../smartcard-controller.args | 3 +- .../smartcard-host-certificates-database.args | 3 +- .../smartcard-host-certificates.args | 3 +- tests/qemuxml2argvdata/smartcard-host.args | 3 +- .../smartcard-passthrough-spicevmc.args | 3 +- .../smartcard-passthrough-tcp.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 3 +- tests/qemuxml2argvdata/smbios.args | 3 +- tests/qemuxml2argvdata/smp-dies.args | 3 +- tests/qemuxml2argvdata/smp.args | 3 +- tests/qemuxml2argvdata/sound-device.args | 3 +- tests/qemuxml2argvdata/sound.args | 3 +- tests/qemuxml2argvdata/sparc-minimal.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-controller-default-q35.args | 3 +- .../usb-controller-explicit-q35.args | 3 +- .../usb-controller-qemu-xhci.args | 3 +- .../qemuxml2argvdata/usb-controller-xhci.args | 3 +- tests/qemuxml2argvdata/usb-controller.args | 3 +- .../usb-hub-autoadd-deluxe.args | 3 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 3 +- tests/qemuxml2argvdata/usb-hub.args | 3 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 3 +- .../qemuxml2argvdata/usb-ich9-companion.args | 3 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 3 +- .../qemuxml2argvdata/usb-long-port-path.args | 3 +- tests/qemuxml2argvdata/usb-none.args | 3 +- .../usb-piix3-controller.args | 3 +- .../qemuxml2argvdata/usb-port-autoassign.args | 3 +- tests/qemuxml2argvdata/usb-port-missing.args | 3 +- tests/qemuxml2argvdata/usb-ports.args | 3 +- tests/qemuxml2argvdata/usb-redir-boot.args | 3 +- .../usb-redir-filter-version.args | 3 +- tests/qemuxml2argvdata/usb-redir-filter.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/usb-redir.args | 3 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 3 +- tests/qemuxml2argvdata/usb1-usb2.args | 3 +- tests/qemuxml2argvdata/user-aliases-usb.args | 3 +- tests/qemuxml2argvdata/user-aliases.args | 3 +- .../vcpu-placement-static.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- ...eo-bochs-display-device.x86_64-latest.args | 3 +- .../video-device-pciaddr-default.args | 3 +- tests/qemuxml2argvdata/video-none-device.args | 3 +- .../video-qxl-device-vgamem.args | 3 +- ...video-qxl-device-vram64.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/video-qxl-device.args | 3 +- tests/qemuxml2argvdata/video-qxl-heads.args | 3 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- .../video-qxl-resolution.args | 3 +- .../video-qxl-sec-device-vgamem.args | 3 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- .../video-qxl-sec-device.args | 3 +- ...eo-ramfb-display-device.x86_64-latest.args | 3 +- .../video-vga-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-vga-device.args | 3 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- .../video-virtio-gpu-ccw.args | 3 +- .../video-virtio-gpu-device.args | 3 +- .../video-virtio-gpu-sdl-gl.args | 3 +- .../video-virtio-gpu-secondary.args | 3 +- .../video-virtio-gpu-spice-gl.args | 3 +- .../video-virtio-gpu-virgl.args | 3 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-input-passthrough.args | 3 +- tests/qemuxml2argvdata/virtio-input.args | 3 +- .../virtio-lun.x86_64-latest.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- ...virtio-non-transitional.x86_64-latest.args | 3 +- ...-options-controller-ats.x86_64-latest.args | 3 +- ...ptions-controller-iommu.x86_64-latest.args | 3 +- ...tions-controller-packed.x86_64-latest.args | 3 +- ...virtio-options-disk-ats.x86_64-latest.args | 3 +- ...rtio-options-disk-iommu.x86_64-latest.args | 3 +- ...tio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- ...virtio-options-fs-iommu.x86_64-latest.args | 3 +- ...irtio-options-fs-packed.x86_64-latest.args | 3 +- ...irtio-options-input-ats.x86_64-latest.args | 3 +- ...tio-options-input-iommu.x86_64-latest.args | 3 +- ...io-options-input-packed.x86_64-latest.args | 3 +- ...-options-memballoon-ats.x86_64-latest.args | 3 +- ...loon-freepage-reporting.x86_64-latest.args | 3 +- ...ptions-memballoon-iommu.x86_64-latest.args | 3 +- ...tions-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- ...irtio-options-net-iommu.x86_64-latest.args | 3 +- ...rtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- ...irtio-options-rng-iommu.x86_64-latest.args | 3 +- ...rtio-options-rng-packed.x86_64-latest.args | 3 +- ...irtio-options-video-ats.x86_64-latest.args | 3 +- ...tio-options-video-iommu.x86_64-latest.args | 3 +- ...io-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 3 +- .../qemuxml2argvdata/virtio-rng-default.args | 3 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 3 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 3 +- tests/qemuxml2argvdata/virtio-rng-random.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/vmcoreinfo.args | 3 +- .../watchdog-device.x86_64-latest.args | 3 +- .../watchdog-diag288.s390x-latest.args | 3 +- .../watchdog-dump.x86_64-latest.args | 3 +- .../watchdog-injectnmi.x86_64-latest.args | 3 +- .../watchdog.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...efault-cpu-tcg-features.x86_64-latest.args | 40 +++++++++ .../x86_64-default-cpu-tcg-features.xml | 67 ++++++++++++++ ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- tests/qemuxml2argvtest.c | 1 + ...default-cpu-tcg-features.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 904 files changed, 2075 insertions(+), 928 deletions(-) create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml create mode 120000 tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml -- 2.32.0

4 12

[libvirt PATCH] vz: fix vzCapsAddGuestDomain
by Ján Tomko 29 Nov '21

29 Nov '21

There is a stray 'return -1' executed on all code paths. Fixes: c18d9e23fafabcfbb80481e0705931036b8e7331 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/vz/vz_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index b47266290c..23b7795035 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -85,8 +85,6 @@ vzCapsAddGuestDomain(virCaps *caps, guest = virCapabilitiesAddGuest(caps, ostype, arch, emulator, NULL, 0, NULL); - return -1; - virCapabilitiesAddGuestDomain(guest, virt_type, NULL, NULL, 0, NULL); -- 2.31.1

2 1

[PATCH v2] tools: fix iterating over argv when recovering xattr
by Daniel P. Berrangé 29 Nov '21

29 Nov '21

The libvirt_recover_xattrs.sh tool hangs when run. When not flags are provided OPTIND is 1, so the loop expands to 'shift 0' which has not effect. Rewrite to just loop over $@ instead which involves less cleverness. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/libvirt_recover_xattrs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libvirt_recover_xattrs.sh b/tools/libvirt_recover_xattrs.sh index be6ee84b5f..35c164a9c7 100755 --- a/tools/libvirt_recover_xattrs.sh +++ b/tools/libvirt_recover_xattrs.sh @@ -106,9 +106,9 @@ fix_xattrs() { shift $((OPTIND - 1)) if [ $# -gt 0 ]; then - while [ $# -gt 0 ]; do - fix_xattrs "$1" - shift $((OPTIND - 1)) + for arg in "$@" + do + fix_xattrs "$arg" done else if [ ${UNSAFE} -eq 1 ]; then -- 2.33.1

2 1

[PATCH v3 00/12] Implement detach device related APIs for test driver
by Luke Yue 29 Nov '21

29 Nov '21

v3: - Rebase to current master branch - Split some tests to different functions in PATCH 12/12 and add some tests link to v2: https://listman.redhat.com/archives/libvir-list/2021-August/msg00637.html link to CI: https://gitlab.com/lukedyue/libvirt/-/pipelines/405150749 Luke Yue (12): conf: Introduce virDomainInputDefRemove and fix memory leak domain_driver: extract DetachXXXDeviceConfig related functions and use them test_driver: Implement virDomainDetachDeviceFlags test_driver: Implement virDomainDetachDeviceAlias test_driver: Implement virDomainDetachDevice conf: Add tpm helpers for future use test_driver: add TPM support for testDomainDetachDeviceLiveAndConfig conf: Add a memballoon helper for future use test_driver: add memballoon support for testDomainDetachDeviceLiveAndConfig examples: xml: test: add xml for testing devices related APIs virshtest: add expectError parameter to testCompareOutputLit tests: Test detach-device and detach-device-alias for test driver examples/xml/test/testdevcontroller.xml | 1 + examples/xml/test/testdevdiskcdrom.xml | 5 + examples/xml/test/testdevfs.xml | 6 + examples/xml/test/testdevhostdev.xml | 5 + examples/xml/test/testdevif.xml | 6 + examples/xml/test/testdevinput.xml | 1 + examples/xml/test/testdevlease.xml | 5 + examples/xml/test/testdevmem.xml | 6 + examples/xml/test/testdevmemballoon.xml | 3 + examples/xml/test/testdevrng.xml | 4 + examples/xml/test/testdevshmem.xml | 4 + examples/xml/test/testdevsound.xml | 3 + examples/xml/test/testdevtpm.xml | 5 + examples/xml/test/testdevvsock.xml | 3 + examples/xml/test/testdevwatchdog.xml | 1 + examples/xml/test/testdomfc5.xml | 54 +++++ examples/xml/test/testnodeinline.xml | 54 +++++ src/conf/domain_conf.c | 103 ++++++++ src/conf/domain_conf.h | 12 + src/hypervisor/domain_driver.c | 302 ++++++++++++++++++++++++ src/hypervisor/domain_driver.h | 47 ++++ src/libvirt_private.syms | 20 ++ src/libxl/libxl_driver.c | 41 +--- src/lxc/lxc_driver.c | 37 +-- src/qemu/qemu_driver.c | 124 ++-------- src/test/test_driver.c | 239 +++++++++++++++++++ tests/virshtest.c | 157 +++++++++--- 27 files changed, 1054 insertions(+), 194 deletions(-) create mode 100644 examples/xml/test/testdevcontroller.xml create mode 100644 examples/xml/test/testdevdiskcdrom.xml create mode 100644 examples/xml/test/testdevfs.xml create mode 100644 examples/xml/test/testdevhostdev.xml create mode 100644 examples/xml/test/testdevif.xml create mode 100644 examples/xml/test/testdevinput.xml create mode 100644 examples/xml/test/testdevlease.xml create mode 100644 examples/xml/test/testdevmem.xml create mode 100644 examples/xml/test/testdevmemballoon.xml create mode 100644 examples/xml/test/testdevrng.xml create mode 100644 examples/xml/test/testdevshmem.xml create mode 100644 examples/xml/test/testdevsound.xml create mode 100644 examples/xml/test/testdevtpm.xml create mode 100644 examples/xml/test/testdevvsock.xml create mode 100644 examples/xml/test/testdevwatchdog.xml -- 2.33.1

2 26

[PATCH 0/2] qemu: Fix update of persistent confing on blockcommit
by Peter Krempa 29 Nov '21

29 Nov '21

When commiting a image which is configured via a 'volume' storage source we fail to update the persistent definition. Peter Krempa (2): qemuBlockJobRewriteConfigDiskSource: Add debug statements when skipping disk update virStorageSourceIsSameLocation: Special-case storage sources of type 'volume' src/conf/storage_source_conf.c | 7 +++++++ src/qemu/qemu_blockjob.c | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) -- 2.31.1

2 6

[PATCH 0/2] wireshark: Fix build with newer wireshark
by Michal Privoznik 29 Nov '21

29 Nov '21

I've started seeing a build failure on rawhide because of new wireshark (3.6.0). The problem is that wmem_alloc() function which we use was removed from public symbols starting with the 3.6.0 release in favor of wmem_new(). However, as I was looking at the code I realized that wireshark already has a function for what our code does and decided to drop our implementation in favor of wireshark's. Michal Prívozník (2): wireshark: Switch to tvb_bytes_to_str() wireshark: Drop needless comment in dissect_xdr_bytes() tools/wireshark/src/packet-libvirt.c | 32 +++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-) -- 2.32.0

2 3

Entering freeze for libvirt-7.10.0
by Jiri Denemark 29 Nov '21

29 Nov '21

I have just tagged v7.10.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[libvirt PATCH 0/4] virnetserver: Make pool job name less generic
by Jiri Denemark 27 Nov '21

27 Nov '21

Jiri Denemark (4): virthreadpool: Copy job name virnetserver: Format functions consistently virnetserver: Use autoptr for virNetServer and virNetServerClient virnetserver: Make pool job name less generic src/rpc/virnetserver.c | 247 ++++++++++++++++++++--------------- src/rpc/virnetserverclient.h | 2 + src/util/virthreadpool.c | 5 +- 3 files changed, 145 insertions(+), 109 deletions(-) -- 2.34.0

2 5

[PATCH] tools: fix iterating over argv when recovering xattr
by Daniel P. Berrangé 26 Nov '21

26 Nov '21

The libvirt_recover_xattrs.sh tool hangs when run. It appears that calling 'shift' is not modifying the '$#' value, so the loop never terminates. Rewrite to just loop over $@ instead which involves less cleverness. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/libvirt_recover_xattrs.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/libvirt_recover_xattrs.sh b/tools/libvirt_recover_xattrs.sh index be6ee84b5f..ae9a18bad8 100755 --- a/tools/libvirt_recover_xattrs.sh +++ b/tools/libvirt_recover_xattrs.sh @@ -104,11 +104,10 @@ fix_xattrs() { } -shift $((OPTIND - 1)) if [ $# -gt 0 ]; then - while [ $# -gt 0 ]; do - fix_xattrs "$1" - shift $((OPTIND - 1)) + for arg in "$@" + do + fix_xattrs "$arg" done else if [ ${UNSAFE} -eq 1 ]; then -- 2.33.1

2 1

[libvirt PATCH 00/10] Revert <acpi-hotplug-bridge>
by Laine Stump 26 Nov '21

26 Nov '21

Starting with commit 58ba0f6a3d7342fba29edbbf2bb9cb5497c870e5, support for overriding the default hotplug method for a guest using the <acpi-bridge-hotplug> subelement of <features>/<pci> was added to libvirt. This uses the QEMU global commandline switch: ICH9-LPC.acpi-pci-hotplug-with-bridge-support=<off|on> that was added to QEMU in qemu-6.1 (along with QEMU switching the default hotplug type for new Q35-based machinetypes from "native PCIe" to "ACPI"). Unfortunately, soon after we pushed the <acpi-bridge-hotplug> patches to libvirt (2 days after, to be exact), during a regular weekly meeting I attend with some of the QEMU developers, along with bugs that had been found in ACPI hotplug since it was made the default, they were also discussing issues they'd found with the implementation of the QEMU commandline switch to change back to native PCIe hotplug. Apparently the current method used by acpi-pci-hotplug-with-bridge-support is causing "confusion" in guests, so they were talking about the possibility of changing what the switch does (or replacing it), and suggested that libvirt should "hold off" on supporting it for now. (oops) (they didn't know that we had just pushed Ani's patches that used it) Since the current QEMU option is doomed to either changed behavior (which would result in a guest-visible ABI change) or full deprecation and replacement, it would be better for libvirt to not use it at all, and re-implement based on whatever replacement QEMU comes up with. Once a new XML element has appeared in a libvirt upstream release, we are committed to keeping it there "forever". However, since there has not yet been an upstream release since <acpi-bridge-hotplug> was added, there is still time to revert and avoid the endless support/maintenance burden. Not much time though! And that is the purpose of this patch series. They revert, in reverse order, Ani's 4 original patches adding the feature, along with Peter's 6 followup patches that correct a logic error and streamline/beef up the unit tests. (Note that it is still possible that QEMU would figure out a way out of this without modifying their current flag in any significant way, and in that case we could always "re-apply" the original patches. However, if we don't revert before the next release (Andrea has pointed out the freeze for RC1 is next Tuesday, and it would be best to have it done before then), we will no longer have the option to remove it.) There was some conflict resolution necessary after the "git revert" commands, due to other unrelated patches that changed test case data, and due to a couple of Peter's patches also touching up the i440fx pci-root-hotplug disabling test cases (which are *not* being reverted - they work as advertised!). Note that this series involves *re-adding* some things, just to remove them again in a later revert - this is because Peter's patches effectively reverted the addition of a QEMU capability flag that had been added in Ani's original patches. If anyone would prefer, I can squash those patches together so that the extra dance is eliminated from the diffs; it just seemed more mechanical to do it this way though. A more detailed explanation of the issue: Current Behavior of existing QEMU option ======================================== As far as I understand (and keep in mind that I have misunderstood and misinterpreted this *at least* 4 separate times since it was first explained to me!), the effect of this QEMU setting: -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on is to: 1) enable ACPI hotplug (i.e. expose it to the guest) 2) disable native PCIe hotplug (don't expose it to the guest) By having only one of the two types of hotplug enabled, the intent is to force the guest to use the still-enabled type of hotplug. Unfortunately, after QEMU 6.1 was released with acpi-pci-hotplug=on as the default for new machinetypes, problems were encountered with ACPI hotplug, which caused more attention to be called to the QEMU switch, and the people looking into that found that enabling ACPI and disabling native PCIe hotplug doesn't necessarily have the desired effect of causing the guest to use ACPI for hotplug (or maybe it was the opposite direction). Instead, it "gets confused" (a very technical term, I know. You can ask Julia or Michael for a definition :-)). One possible fix that they talked about was changing the behavior of ICH9-LPC.acpi-pci-hotplug-with-bridge-support: Potential Change to Behavior of QEMU option =========================================== I know it's more complex than this (again, Julia or Michael can explain), but my basic understanding of the way that they're currently thinking of modifying the acpi-pci-hotplug-with-bridge-support option is to have everything the same, *except* that when acpi-hotplug=off, ACPI hotplug will *still be enabled* along with native PCIe hotplug; but because guest OSes prefer native hotplug over ACPI, native PCIe hotplug will be chosen in that case. (Presumably this change prevents the "confusion" that is seen with the existing behavior of the option). So essentially, the choice of whether to use ACPI is controlled by enabling/disabling native PCIe hotplug (which *kind of* goes against the libvirt philosophy of "the XML describes the virtual machine that is presented to the guest"; instead it becomes "the XML describes how the guest will behave"). Another possibility would be to completely scrap (well, deprecate and later remove) the current QEMU commandline switch in favor of one or more switches that behave differently but result in the desired behavior. In either case, I think the best course of action for libvirt is to revert the current <acpi-bridge-hotplug>, wait until QEMU settles down with a new workable set of switches, and then re-do libvirt support based on that. Laine Stump (10): Revert "qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE" Revert "qemuxml2xmltest: Convert all acpi-hotplug control related tests to DO_TEST_CAPS_LATEST" Revert "qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related cases" Revert "qemuxml2argvtest: Use real-caps testing for 'acpi-hotplug-bridge-disable'" Revert "qemuValidateDomainDefPCIFeature: Fix validation logic" Revert "qemuValidateDomainDefPCIFeature: un-break error messages" Revert "NEWS: document new acpi pci hotplug config option" Revert "qemu: command: add support for acpi-bridge-hotplug feature" Revert "conf: introduce support for acpi-bridge-hotplug feature" Revert "qemu: capablities: detect acpi-pci-hotplug-with-bridge-support" NEWS.rst | 8 -- docs/formatdomain.rst | 29 ------ docs/schemas/domaincommon.rng | 15 ---- src/conf/domain_conf.c | 89 +------------------ src/conf/domain_conf.h | 9 -- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_command.c | 19 ---- src/qemu/qemu_validate.c | 41 --------- .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - ...-hotplug-bridge-disable.aarch64-latest.err | 1 - .../aarch64-acpi-hotplug-bridge-disable.xml | 13 --- ...-hotplug-bridge-disable.x86_64-latest.args | 34 ------- .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 33 ------- ...i-hotplug-bridge-enable.x86_64-latest.args | 34 ------- .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 33 ------- ...pi-hotplug-bridge-disable.x86_64-6.0.0.err | 1 - ...-hotplug-bridge-disable.x86_64-latest.args | 37 -------- .../q35-acpi-hotplug-bridge-disable.xml | 47 ---------- ...cpi-hotplug-bridge-enable.x86_64-6.0.0.err | 1 - ...i-hotplug-bridge-enable.x86_64-latest.args | 37 -------- .../q35-acpi-hotplug-bridge-enable.xml | 47 ---------- tests/qemuxml2argvtest.c | 10 --- ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 -------- ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 -------- ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ------- .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 + ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ------- .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 + ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 ----------- ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 ----------- tests/qemuxml2xmltest.c | 10 +-- 33 files changed, 9 insertions(+), 794 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6.0.0.err delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml -- 2.31.1

3 18

[PATCH for 7.10] qemu: Fix validation of PCI option rom settings on hotplug
by Peter Krempa 25 Nov '21

25 Nov '21

Commit 24be92b8e moved the option rom settings validation code to the validation callbacks, but that doesn't work properly with device hotplug as we assign addresses only after parsing the whole XML. The check is too strict for that and caused failures when hotplugging devices such as: <interface type='network'> <source network='default'/> <model type='virtio'/> <rom enabled='no'/> </interface> This patch relaxes the check in the validation callback to accept also _NONE and _UNASSIGNED address types and returns the check to 'qemuBuildRomProps' so that we preserve the full validation as we've used to. Fixes: 24be92b8e38762e9ba13e Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2021437 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 6 ++++++ src/qemu/qemu_validate.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7a185061d8..c47998aabd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1147,6 +1147,12 @@ qemuBuildRomProps(virJSONValue *props, !info->romfile) return 0; + if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("ROM tuning is only supported for PCI devices")); + return -1; + } + if (info->romenabled == VIR_TRISTATE_BOOL_NO) { romfile = ""; } else { diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 397eea5ede..1de6e05101 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1485,7 +1485,9 @@ qemuValidateDomainDeviceInfo(const virDomainDeviceDef *dev, } if (info->romenabled || info->rombar || info->romfile) { - if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ROM tuning is only supported for PCI devices")); return -1; -- 2.31.1

2 1

[PATCH 0/6] virXMLPropStringLimit removal follow-up
by Peter Krempa 25 Nov '21

25 Nov '21

Tim pointed out that some of the code could be simplified a bit more by using virTristateBool parsing functions and also that strnlen could be used instead of strlen. This series does those cleanups as well as one further refactor of character verification in virDomainDeviceLoadparmIsValid. Peter Krempa (6): util: enum: Add helpers for converting virTristate* to a plain bool conf: seclabel: Parse booleans using virXMLPropTristateBool instead of virStringParseYesNo internal: Add STRLIM macro for checking string length using strnlen() virDomainDeviceLoadparmIsValid: Simplify value lenght check virDomainDeviceLoadparmIsValid: Use 'strspn' instead of a loop conf: domain: Convert all string length checks to STRLIM src/conf/domain_conf.c | 83 +++++++------------ src/internal.h | 9 ++ src/libvirt_private.syms | 2 + src/util/virenum.c | 54 ++++++++++++ src/util/virenum.h | 2 + .../machine-loadparm-s390-char-invalid.err | 2 +- .../machine-loadparm-s390-len-invalid.err | 2 +- 7 files changed, 99 insertions(+), 55 deletions(-) -- 2.31.1

2 9

[libvirt PATCH 00/11] qemu snapshot create cleanup and refactor
by Pavel Hrdina 25 Nov '21

25 Nov '21

Pavel Hrdina (11): qemu_snapshot: create: move XML parsing to separate function qemu_snapshot: create: move XML def validation to separate function qemu_snapshot: create: move disk align to separate function qemu_snapshot: create: move virDomainSnapshotAssignDef to both code paths qemu_snapshot: create: virDomainSnapshotGetCurrent is not used with redefine qemu_snapshot: create: drop update_current variable qemu_snapshot: create: refactor endjob in qemuSnapshotCreateXML qemu_snapshot: create: move saving metadata to separate function qemu_snapshot: create: move snapshot redefine to separate function qemu_snapshot: create: move snapshot create to separate function qemu_snapshot: create: drop redefine boolean src/qemu/qemu_snapshot.c | 409 ++++++++++++++++++++++++--------------- 1 file changed, 251 insertions(+), 158 deletions(-) -- 2.31.1

2 13

[PATCH for 7.10] qemu: monitor: Fix usage of 'query-blockstats'
by Peter Krempa 25 Nov '21

25 Nov '21

Commit bc24810c2cab modified code querying blockstats to use the 'query-nodes' parameter so that we can fetch stats also for images which are not attached to a frontend such as block copy and backup scratch images. Unfortunately that broke the old blockstats because if 'query-nodes' is enabled qemu doesn't output the 'qdev' parameter which our code used for matching to the disk and also qemu neglects to populate the frontend stats at all so we can't even switch to using nodenema for matching. To fix this we need to do two calls, one with 'query-nodes' disabled using the old logic to populate everything and then an aditional one which populates all the remaining images. Closes: https://gitlab.com/libvirt/libvirt/-/issues/246 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 52 +++++++++++++++++++++++++++++++++--- tests/qemumonitorjsontest.c | 2 ++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3030cff664..56f0b22b2a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2446,6 +2446,30 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValue *dev, } +static int +qemuMonitorJSONGetOneBlockStatsNodeInfo(virJSONValue *dev, + GHashTable *hash) +{ + qemuBlockStats *bstats = NULL; + int nstats = 0; + const char *nodename = NULL; + + if (!(nodename = virJSONValueObjectGetString(dev, "node-name"))) + return 0; + + /* we already have the stats */ + if (g_hash_table_contains(hash, nodename)) + return 0; + + if (!(bstats = qemuMonitorJSONBlockStatsCollectData(dev, &nstats))) + return -1; + + g_hash_table_insert(hash, g_strdup(nodename), bstats); + + return nstats; +} + + virJSONValue * qemuMonitorJSONQueryBlockstats(qemuMonitor *mon, bool queryNodes) @@ -2475,13 +2499,14 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, int nstats = 0; int rc; size_t i; - g_autoptr(virJSONValue) devices = NULL; + g_autoptr(virJSONValue) blockstatsDevices = NULL; + g_autoptr(virJSONValue) blockstatsNodes = NULL; - if (!(devices = qemuMonitorJSONQueryBlockstats(mon, true))) + if (!(blockstatsDevices = qemuMonitorJSONQueryBlockstats(mon, false))) return -1; - for (i = 0; i < virJSONValueArraySize(devices); i++) { - virJSONValue *dev = virJSONValueArrayGet(devices, i); + for (i = 0; i < virJSONValueArraySize(blockstatsDevices); i++) { + virJSONValue *dev = virJSONValueArrayGet(blockstatsDevices, i); const char *dev_name; if (!dev || virJSONValueGetType(dev) != VIR_JSON_TYPE_OBJECT) { @@ -2505,6 +2530,25 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, nstats = rc; } + if (!(blockstatsNodes = qemuMonitorJSONQueryBlockstats(mon, true))) + return -1; + + for (i = 0; i < virJSONValueArraySize(blockstatsNodes); i++) { + virJSONValue *dev = virJSONValueArrayGet(blockstatsNodes, i); + + if (!dev || virJSONValueGetType(dev) != VIR_JSON_TYPE_OBJECT) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("blockstats device entry was not in expected format")); + return -1; + } + + if ((rc = qemuMonitorJSONGetOneBlockStatsNodeInfo(dev, hash)) < 0) + return -1; + + if (rc > nstats) + nstats = rc; + } + return nstats; } diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 0de523007b..bcf5caa9a4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1615,6 +1615,8 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque) if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0) return -1; + if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0) + return -1; #define CHECK0FULL(var, value, varformat, valformat) \ if (stats->var != value) { \ -- 2.31.1

3 2

[libvirt PATCH v2 00/12] Expose TPM availability in domain capabilities
by Daniel P. Berrangé 25 Nov '21

25 Nov '21

If we can report whuether TPM is available, then mgmt apps can enable it by default for new VMs. This is important because OS like Win11 consider TPM to be mandatory. In v2: - Avoid triggering reporting of errors when querying caps - Only skip reporting of emulator backend when swtpm is missing, not entire tpm suppport - Lots of refactoring to support point 1. Daniel P. Berrangé (12): util: use consistent naming for swtpm global variables util: rename typedef for parsing swtpm capabilities util: refactor TPM helper methods to reduce duplicationm util: replace TPM global variables with a struct array util: don't export virTPMEmulatorInit method util: ensure all TPM global vars access is protected by lock util: pull TPM capabilities probing out of main init method util: add a method for checking if swtpm is available conf: add TPM devices to domain capabilities qemu: fill in domain capabilities for TPMs qemu: mock swtpm initialization in tests run: detect daemons when run via wrapper commands docs/schemas/domaincaps.rng | 10 + run.in | 22 +- src/conf/domain_capabilities.c | 14 ++ src/conf/domain_capabilities.h | 10 + src/libvirt_private.syms | 2 +- src/qemu/qemu_capabilities.c | 34 +++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_tpm.c | 6 - src/util/virtpm.c | 232 ++++++++++-------- src/util/virtpm.h | 3 +- .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 9 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 9 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 9 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 10 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 10 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 10 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 10 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 10 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 10 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 10 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 10 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 10 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 10 + .../qemu_5.0.0-virt.aarch64.xml | 9 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 9 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 10 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 10 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 10 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 10 + .../qemu_5.2.0-virt.aarch64.xml | 9 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 9 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 10 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 10 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 10 + .../qemu_6.0.0-virt.aarch64.xml | 9 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 9 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 10 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 10 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 10 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 10 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 10 + .../qemu_6.2.0-virt.aarch64.xml | 9 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 9 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 10 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 10 + tests/domaincapstest.c | 9 + 80 files changed, 731 insertions(+), 127 deletions(-) -- 2.33.1

2 24

[libvirt PATCH 0/7] do not check return value of qemuDomainObjExitMonitor
by Ján Tomko 25 Nov '21

25 Nov '21

Ján Tomko (7): qemu: qemuDomainObjExitMonitor: do not warn on unused result qemu: do not propagate return value of qemuDomainObjExitMonitor qemu: do not check return value of qemuDomainObjExitMonitor qemu: do not check return value of qemuDomainObjExitMonitor qemu: remove ignore_value for qemuDomainObjExitMonitor qemu: turn qemuDomainObjExitMonitor into void qemu: absorb qemuDomainObjExitMonitorInternal src/qemu/THREADS.txt | 5 - src/qemu/qemu_backup.c | 22 ++-- src/qemu/qemu_block.c | 28 ++-- src/qemu/qemu_blockjob.c | 31 ++--- src/qemu/qemu_checkpoint.c | 12 +- src/qemu/qemu_domain.c | 54 +++----- src/qemu/qemu_domain.h | 7 +- src/qemu/qemu_driver.c | 173 +++++++++++-------------- src/qemu/qemu_hotplug.c | 214 +++++++++++-------------------- src/qemu/qemu_migration.c | 65 +++++----- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_migration_params.c | 12 +- src/qemu/qemu_process.c | 75 +++++------ src/qemu/qemu_snapshot.c | 11 +- 14 files changed, 291 insertions(+), 421 deletions(-) -- 2.31.1

2 9

[PATCH v2 0/2] qemu_alias: Refactor functions
by Kristina Hanicova 25 Nov '21

25 Nov '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-November/msg00748.html Diff to v1: * changed return type of functions if possible - when function always returned success (suggested by Martin) Kristina Hanicova (2): qemu_alias: Rewrite of code pattern qemu_alias: change return type to void if possible src/qemu/qemu_alias.c | 185 +++++++++++++++------------------------- src/qemu/qemu_alias.h | 44 +++++----- src/qemu/qemu_hotplug.c | 43 ++++------ 3 files changed, 105 insertions(+), 167 deletions(-) -- 2.31.1

2 4

[PATCH v2] qemu: Rewrite code to the pattern
by Kristina Hanicova 25 Nov '21

25 Nov '21

I have seen this pattern a lot in the project, so I decided to rewrite code I stumbled upon to the same pattern as well. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-November/msg00747.html Diff to v1: * adding variable 'rc' to fix buggy code and keep the code equivalent (suggested by Jano) src/qemu/qemu_driver.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1959b639da..5c4b493f64 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15975,6 +15975,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, g_autofree char *drivealias = NULL; const char *qdevid = NULL; int ret = -1; + int rc = 0; size_t i; virDomainDiskDef *conf_disk = NULL; virDomainDiskDef *disk; @@ -16229,13 +16230,10 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, !virStorageSourceIsEmpty(disk->src)) { qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, qdevid, - &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret = -1; - if (ret < 0) + rc = qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, qdevid, &info); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) goto endjob; - ret = -1; } virDomainDiskSetBlockIOTune(disk, &info); @@ -16310,6 +16308,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, g_autofree char *drivealias = NULL; const char *qdevid = NULL; int ret = -1; + int rc = 0; int maxparams; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -16361,10 +16360,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, goto endjob; } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid, &reply); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - if (ret < 0) + rc = qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid, &reply); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) goto endjob; } @@ -17375,10 +17373,8 @@ qemuDomainSetTime(virDomainPtr dom, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { qemuDomainObjEnterMonitor(driver, vm); rv = qemuMonitorRTCResetReinjection(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - if (rv < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto endjob; } -- 2.31.1

3 2

[PATCH] util: fix cache invalidation of swtpm capabilities
by Daniel P. Berrangé 24 Nov '21

24 Nov '21

The check for whether the swtpm binary was modified is checking pointers to the mtime field in two distinct structs, so will always compare different. This resulted in re-probing swtpm capabilities every time, as many as 20 times for a single VM launch. Fixes: commit 01cf7a1bb9f1da27ad8bcbaa82c4f7a948c6a793 Author: Stefan Berger <stefanb(a)us.ibm.com> Date: Thu Jul 25 14:22:04 2019 -0400 tpm: Check whether previously found executables were updated Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virtpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 8a77ba98ff..ffec23a535 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -301,7 +301,7 @@ virTPMEmulatorInit(void) findit = true; if (!findit && - &statbuf.st_mtime != &prgs[i].stat->st_mtime) + statbuf.st_mtime != prgs[i].stat->st_mtime) findit = true; } -- 2.33.1

4 3

[PATCH] qemu: Rewrite code to the pattern
by Kristina Hanicova 24 Nov '21

24 Nov '21

I have seen this pattern a lot in the project, so I decided to rewrite code I stumbled upon to the same pattern as well. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1959b639da..b938687189 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16231,10 +16231,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, qdevid, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret = -1; - if (ret < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) goto endjob; + ret = -1; } @@ -16362,9 +16361,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid, &reply); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - if (ret < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) goto endjob; } @@ -17375,10 +17372,7 @@ qemuDomainSetTime(virDomainPtr dom, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { qemuDomainObjEnterMonitor(driver, vm); rv = qemuMonitorRTCResetReinjection(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; - - if (rv < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto endjob; } -- 2.31.1

3 3

[libvirt PATCH 0/3] Expose TPM availability in domain capabilities
by Daniel P. Berrangé 24 Nov '21

24 Nov '21

If we can report whuether TPM is available, then mgmt apps can enable it by default for new VMs. This is important because OS like Win11 consider TPM to be mandatory. Daniel P. Berrangé (3): conf: add TPM devices to domain capabilities qemu: fill in domain capabilities for TPMs qemu: mock swtpm initialization in tests docs/schemas/domaincaps.rng | 10 ++++++ src/conf/domain_capabilities.c | 14 ++++++++ src/conf/domain_capabilities.h | 10 ++++++ src/qemu/qemu_capabilities.c | 32 +++++++++++++++++++ src/qemu/qemu_capabilities.h | 3 ++ .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 9 ++++++ .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 9 ++++++ tests/domaincapsdata/qemu_2.11.0.s390x.xml | 6 ++++ tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 9 ++++++ .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 10 ++++++ .../qemu_2.12.0-virt.aarch64.xml | 6 ++++ tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 6 ++++ tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_2.12.0.s390x.xml | 6 ++++ tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 10 ++++++ tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_3.0.0.s390x.xml | 6 ++++ tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 10 ++++++ tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 10 ++++++ .../qemu_4.0.0-virt.aarch64.xml | 4 +++ tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 4 +++ tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 4 +++ tests/domaincapsdata/qemu_4.0.0.s390x.xml | 4 +++ tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 10 ++++++ tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 10 ++++++ .../qemu_4.2.0-virt.aarch64.xml | 4 +++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 4 +++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 ++++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 4 +++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 10 ++++++ .../qemu_5.0.0-virt.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 10 ++++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 10 ++++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 4 +++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 10 ++++++ .../qemu_5.2.0-virt.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 10 ++++++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 4 +++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 10 ++++++ .../qemu_6.0.0-virt.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 4 +++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 10 ++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 10 ++++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 10 ++++++ .../qemu_6.2.0-virt.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 9 ++++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 10 ++++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 10 ++++++ tests/domaincapstest.c | 9 ++++++ 75 files changed, 661 insertions(+) -- 2.33.1

4 14

[PATCH] util: virExec may blocked by reading pipe if grandchild prematurely exit
by Yi Wang 24 Nov '21

24 Nov '21

From: Xu Chao <xu.chao6(a)zte.com.cn> When VIR_EXEC_DAEMON is set, if virPidFileAcquirePath/virSetInherit failed, then pipesync[0] can not be closed when granchild process exit, because pipesync[1] still opened in child process. and then saferead in child process may blocked forever, and left grandchild process in defunct state. Signed-off-by: Xu Chao <xu.chao6(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/util/vircommand.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index fead373729..fa71f40d81 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -782,6 +782,9 @@ virExec(virCommand *cmd) } if (pid > 0) { + /* close pipe[1], then the pipe can be closed if grandchild + * died prematurely */ + VIR_FORCE_CLOSE(pipesync[1]); /* The parent expect us to have written the pid file before * exiting. Wait here for the child to write it and signal us. */ if (cmd->pidfile && -- 2.27.0

2 1

[PATCH 0/4] virXXXListAdd: Transfer definition ownership
by Michal Privoznik 24 Nov '21

24 Nov '21

At a lot of places we have the following pattern: virXXXDef *def = parseDef(); if (!(obj = virXXXObjListAdd(def))) goto clenaup; def = NULL; cleanup: virXXXDefFree(def); The 'def = NULL' step is necessary because the ownership of the definition was transferred onto the object. Well, this approach is fragile as it relies on developers remembering to set the variable explicitly. If the virXXXObjListAdd() would take address of @def then the explicit set to NULL can be left out. Please note, I've reworked only a few virXXXObjListAdd() functions to see whether these are desired or not. If merged, I can post patches for the rest. Michal Prívozník (4): virInterfaceObjListAssignDef: Transfer definition ownership virSecretObjListAdd: Transfer definition ownership virStoragePoolObjListAdd: Transfer definition ownership virDomainObjListAdd: Transfer definition ownership src/bhyve/bhyve_driver.c | 6 ++---- src/ch/ch_driver.c | 7 ++----- src/conf/domain_conf.c | 8 ++++---- src/conf/domain_conf.h | 2 +- src/conf/virdomainobjlist.c | 22 +++++++++++++--------- src/conf/virdomainobjlist.h | 2 +- src/conf/virinterfaceobj.c | 25 +++++++++++++++++++------ src/conf/virinterfaceobj.h | 2 +- src/conf/virsecretobj.c | 26 ++++++++++++++------------ src/conf/virsecretobj.h | 2 +- src/conf/virstorageobj.c | 29 ++++++++++++++++------------- src/conf/virstorageobj.h | 2 +- src/libxl/libxl_domain.c | 3 +-- src/libxl/libxl_driver.c | 30 ++++++++++-------------------- src/libxl/libxl_migration.c | 6 ++---- src/lxc/lxc_driver.c | 24 ++++++++---------------- src/openvz/openvz_conf.c | 3 +-- src/openvz/openvz_driver.c | 10 ++++------ src/qemu/qemu_driver.c | 30 ++++++++++-------------------- src/qemu/qemu_migration.c | 3 +-- src/qemu/qemu_snapshot.c | 9 +++------ src/secret/secret_driver.c | 4 ++-- src/storage/storage_driver.c | 5 ++--- src/test/test_driver.c | 31 ++++++++++++------------------- src/vmware/vmware_conf.c | 6 ++---- src/vmware/vmware_driver.c | 10 ++++------ 26 files changed, 137 insertions(+), 170 deletions(-) -- 2.32.0

2 5

[PATCH 0/2] libxl: Remove dead code
by Jim Fehlig 24 Nov '21

24 Nov '21

I was too lazy to dig through history, but I think 1/2 was the result of too much copy and paste when originally implementing jobs in the libxl driver. For 2/2, I think there was some ill-conceived locking of the libxlDomainObjPrivate in the past. Its use was killed but the object remained virObjectLockable. Jim Fehlig (2): libxl: Remove unused macros libxl: Don't derive libxlDomainObjPrivate from virObjectLockable src/libxl/libxl_domain.c | 38 ++++++-------------------------------- src/libxl/libxl_domain.h | 7 ------- 2 files changed, 6 insertions(+), 39 deletions(-) -- 2.33.0

2 3

[PATCH] qemu: Remove 'else' branches after 'return' or 'goto'
by Kristina Hanicova 24 Nov '21

24 Nov '21

I think it makes no sense to have else branches after return or goto as it will never reach them in cases it should not. This patch makes the code more readable (at least to me). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/libvirt.c | 3 ++- src/qemu/qemu_agent.c | 6 +++--- src/qemu/qemu_alias.c | 9 +++++---- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_cgroup.c | 9 +++------ src/qemu/qemu_conf.c | 11 +++++------ src/qemu/qemu_domain_address.c | 11 +++++------ src/qemu/qemu_domainjob.c | 3 +-- src/qemu/qemu_driver.c | 32 ++++++++++++++++---------------- 9 files changed, 42 insertions(+), 46 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 80bdcd1db3..ef9fc403d0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -663,7 +663,8 @@ virStateInitialize(bool privileged, virStateDriverTab[i]->name, virGetLastErrorMessage()); return -1; - } else if (ret == VIR_DRV_STATE_INIT_SKIPPED && mandatory) { + } + if (ret == VIR_DRV_STATE_INIT_SKIPPED && mandatory) { VIR_ERROR(_("Initialization of mandatory %s state driver skipped"), virStateDriverTab[i]->name); return -1; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c3b02569cd..75eb1620c0 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -989,8 +989,7 @@ qemuAgentCommandName(virJSONValue *cmd) const char *name = virJSONValueObjectGetString(cmd, "execute"); if (name) return name; - else - return "<unknown>"; + return "<unknown>"; } static int @@ -1029,7 +1028,8 @@ qemuAgentCheckError(virJSONValue *cmd, qemuAgentStringifyError(error)); return -1; - } else if (!virJSONValueObjectHasKey(reply, "return")) { + } + if (!virJSONValueObjectHasKey(reply, "return")) { g_autofree char *cmdstr = virJSONValueToString(cmd, false); g_autofree char *replystr = virJSONValueToString(reply, false); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a36f346592..5b525415de 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -137,7 +137,8 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, */ controller->info.alias = g_strdup("pci"); return 0; - } else if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { + } + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { /* The pcie-root controller on Q35 machinetypes uses a * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. @@ -151,7 +152,8 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, */ controller->info.alias = g_strdup_printf("pci.%d", controller->idx); return 0; - } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { + } + if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the * first (and currently only) IDE controller is an integrated * controller hardcoded with id "ide" @@ -821,8 +823,7 @@ qemuAliasForSecret(const char *parentalias, { if (obj) return g_strdup_printf("%s-%s-secret0", parentalias, obj); - else - return g_strdup_printf("%s-secret0", parentalias); + return g_strdup_printf("%s-secret0", parentalias); } /* qemuAliasTLSObjFromSrcAlias diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a4c492dde2..3b63996170 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -773,9 +773,9 @@ const char *virQEMUCapsArchToString(virArch arch) { if (arch == VIR_ARCH_I686) return "i386"; - else if (arch == VIR_ARCH_ARMV6L || arch == VIR_ARCH_ARMV7L) + if (arch == VIR_ARCH_ARMV6L || arch == VIR_ARCH_ARMV7L) return "arm"; - else if (arch == VIR_ARCH_OR32) + if (arch == VIR_ARCH_OR32) return "or32"; return virArchToString(arch); diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1e7b562b33..bcdfa90759 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -608,9 +608,8 @@ qemuSetupBlkioCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Block I/O tuning is not available on this host")); return -1; - } else { - return 0; } + return 0; } return virDomainCgroupSetupBlkio(priv->cgroup, vm->def->blkio); @@ -629,9 +628,8 @@ qemuSetupMemoryCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory cgroup is not available on this host")); return -1; - } else { - return 0; } + return 0; } return virDomainCgroupSetupMemtune(priv->cgroup, vm->def->mem); @@ -891,9 +889,8 @@ qemuSetupCpuCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available on this host")); return -1; - } else { - return 0; } + return 0; } if (vm->def->cputune.sharesSpecified) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0451bc70ac..bbb05a4e81 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1001,12 +1001,12 @@ virQEMUDriverConfigLoadMemoryEntry(virQEMUDriverConfig *cfg, g_autofree char *dir = NULL; int rc; - if ((rc = virConfGetValueString(conf, "memory_backing_dir", &dir)) < 0) { + if ((rc = virConfGetValueString(conf, "memory_backing_dir", &dir)) < 0) return -1; - } else if (rc > 0) { + + if (rc > 0) { VIR_FREE(cfg->memoryBackingDir); cfg->memoryBackingDir = g_strdup_printf("%s/libvirt/qemu", dir); - return 0; } return 0; @@ -1777,11 +1777,10 @@ qemuSharedDeviceAddRemoveInternal(virQEMUDriver *driver, if (dev->type == VIR_DOMAIN_DEVICE_DISK) return qemuSharedDiskAddRemoveInternal(driver, dev->data.disk, name, addDevice); - else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) return qemuSharedHostdevAddRemoveInternal(driver, dev->data.hostdev, name, addDevice); - else - return 0; + return 0; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9abe2b84c8..2948630b75 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -58,13 +58,13 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def, if (qemuDomainIsPSeries(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; - else if (ARCH_IS_S390(def->os.arch)) + if (ARCH_IS_S390(def->os.arch)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - else if (qemuDomainHasBuiltinESP(def)) + if (qemuDomainHasBuiltinESP(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90; virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1589,9 +1589,8 @@ qemuDomainCollectPCIAddress(virDomainDef *def G_GNUC_UNUSED, _("Bus 0 must be PCI for integrated PIIX3 " "USB or IDE controllers")); return -1; - } else { - return 0; } + return 0; } } diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 03a8d9ba5f..cff8d7bb83 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -1036,8 +1036,7 @@ int qemuDomainObjBeginJob(virQEMUDriver *driver, QEMU_AGENT_JOB_NONE, QEMU_ASYNC_JOB_NONE, false) < 0) return -1; - else - return 0; + return 0; } /** diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16d449913c..437bf63cd4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1819,7 +1819,8 @@ static int qemuDomainSuspend(virDomainPtr dom) virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is pmsuspended")); goto endjob; - } else if (state != VIR_DOMAIN_PAUSED) { + } + if (state != VIR_DOMAIN_PAUSED) { if (qemuProcessStopCPUs(driver, vm, reason, QEMU_ASYNC_JOB_NONE) < 0) goto endjob; } @@ -1861,13 +1862,15 @@ static int qemuDomainResume(virDomainPtr dom) virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is pmsuspended")); goto endjob; - } else if (state == VIR_DOMAIN_RUNNING) { + } + if (state == VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is already running")); goto endjob; - } else if ((state == VIR_DOMAIN_CRASHED && - reason == VIR_DOMAIN_CRASHED_PANICKED) || - state == VIR_DOMAIN_PAUSED) { + } + if ((state == VIR_DOMAIN_CRASHED && + reason == VIR_DOMAIN_CRASHED_PANICKED) || + state == VIR_DOMAIN_PAUSED) { if (qemuProcessStartCPUs(driver, vm, VIR_DOMAIN_RUNNING_UNPAUSED, QEMU_ASYNC_JOB_NONE) < 0) { @@ -16358,9 +16361,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, *nparams = maxparams; ret = 0; goto endjob; - } else if (*nparams < maxparams) { - maxparams = *nparams; } + if (*nparams < maxparams) + maxparams = *nparams; *nparams = 0; @@ -20428,29 +20431,26 @@ qemuDomainGetGuestInfo(virDomainPtr dom, if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) { rc = qemuAgentGetFSInfo(agent, &agentfsinfo, report_unsupported); - if (rc == -1) { + if (rc == -1) goto exitagent; - } else if (rc >= 0) { + if (rc >= 0) nfs = rc; - } } if (supportedTypes & VIR_DOMAIN_GUEST_INFO_DISKS) { rc = qemuAgentGetDisks(agent, &agentdiskinfo, report_unsupported); - if (rc == -1) { + if (rc == -1) goto exitagent; - } else if (rc >= 0) { + if (rc >= 0) ndisks = rc; - } } if (supportedTypes & VIR_DOMAIN_GUEST_INFO_INTERFACES) { rc = qemuAgentGetInterfaces(agent, &ifaces, report_unsupported); - if (rc == -1) { + if (rc == -1) goto exitagent; - } else if (rc >= 0) { + if (rc >= 0) nifaces = rc; - } } qemuDomainObjExitAgent(vm, agent); -- 2.31.1

2 1

[RFC PATCH 0/3] Add virDomainInjectLaunchSecret API
by Jim Fehlig 23 Nov '21

23 Nov '21

Hi All! This series is an RFC impl for the missing API needed for SEV attestation as discussed here https://listman.redhat.com/archives/libvir-list/2021-May/msg00196.html I pinged about the status a few weeks back, found it had stalled, and agreed to work on an impl after returning from vacation https://listman.redhat.com/archives/libvir-list/2021-October/msg01052.html Although the series is only compile tested, I wanted to share it early in case others are considering the task. While discussing the missing API, Daniel suggested virDomainSetLaunchSecurityInfo https://listman.redhat.com/archives/libvir-list/2021-October/msg01074.html but noted the asymmetry with virDomainGetLaunchSecurityInfo. I decided to go with virDomainInjectLaunchSecret, which better describes the function IMO. I also decided to go with an explicit set of parameters, following in the footsteps of virDrvDomainAuthorizedSSHKeys*. It wasn't until patch 3 that I realized virTypedParameter is definitely a better approach for an API that may need future support for other types of secrets. I'll make that change in a V1 after collecting feedback on this RFC. Regards, Jim Jim Fehlig (3): libvirt: Introduce virDomainInjectLaunchSecret public API remote: Implement domain inject launch secret API qemu: Implement the virDomainInjectLaunchSecret API include/libvirt/libvirt-domain.h | 6 ++++ src/driver-hypervisor.h | 8 +++++ src/libvirt-domain.c | 50 +++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 53 +++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 12 +++++++ src/qemu/qemu_monitor.h | 6 ++++ src/qemu/qemu_monitor_json.c | 34 ++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 +++ src/remote/remote_daemon_dispatch.c | 27 +++++++++++++++ src/remote/remote_driver.c | 32 +++++++++++++++++ src/remote/remote_protocol.x | 16 ++++++++- src/remote_protocol-structs | 8 +++++ 13 files changed, 261 insertions(+), 1 deletion(-) -- 2.33.0

3 9

[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 21 Nov '21

21 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

[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 10

[libvirt PATCH 0/5] meson: Introduce qemu_datadir option
by Andrea Bolognani 18 Nov '21

18 Nov '21

This is mostly useful to macOS users (see [1] for background). The first two commits are fixes for small issues discovered while looking into this. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/409294109 [1] https://gitlab.com/libvirt/libvirt/-/issues/168 Andrea Bolognani (5): meson: Define qemu_moddir correctly qemu: Set QEMU data location correctly qemu: Rename interop locations meson: Introduce qemu_datadir option spec: Explicitly provide locations for QEMU data libvirt.spec.in | 6 ++++++ meson.build | 8 +++++++- meson_options.txt | 1 + src/qemu/qemu_interop_config.c | 11 +++++------ 4 files changed, 19 insertions(+), 7 deletions(-) -- 2.31.1

2 6

Plans for the next release
by Jiri Denemark 18 Nov '21

18 Nov '21

We are getting close to the next release of libvirt. To aim for the release on Dec 01 I suggest entering the freeze on Thursday Nov 25 and tagging RC2 on Monday Nov 29. I hope this works for everyone. Jirka

1 0

[PATCH] qemuDomainPrepareStorageSourceBlockdev: Set default encryption engine also when preparing virStorageSource
by Peter Krempa 18 Nov '21

18 Nov '21

Originally the default encryption engine is populated in the disk post-parse callback code. This works for disks but for any additional images introduced either via the block copy API or via the backup API we don't populate the default. In case when the backup or block copy is requested on an encrypted image this would then lead to an error: error: internal error: Unexpected enum value 0 for virStorageEncryptionEngine This patch adds another point where we populate the default which is when setting up a virStorageSource for actual usage. We keep the original setting in the post-parse callback as that's the only point that is recorded in the XML file after definition. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2023674 Fixes: ab1d46d6128 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fb203bc830..5aad321e36 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10651,6 +10651,9 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDef *disk, if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) src->sliceStorage->nodename = g_strdup_printf("libvirt-%u-slice-sto", src->id); + if (src->encryption && src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_DEFAULT) + src->encryption->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; + if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0) return -1; -- 2.31.1

2 1

[libvirt PATCH] spec: Don't create unnecessary directory
by Andrea Bolognani 18 Nov '21

18 Nov '21

The directory is already created by the build system, so we don't need to create it explicitly in the spec file; moreover, the path was incorrect, because it used datadir instead of localstatedir. Fixes: 4e041189f85bc1b0f8d5278c0cafdd4aba55beaf Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5f1773ef93..85e879fedb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1192,7 +1192,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la %endif -install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ # We don't want to install /etc/libvirt/qemu/networks in the main %%files list # because if the admin wants to delete the default network completely, we don't # want to end up re-incarnating it on every RPM upgrade. -- 2.31.1

2 1

[PATCH 0/2] qemuBuildHostdevMediatedDevProps: Format 'ramfb' only when enabled
by Peter Krempa 18 Nov '21

18 Nov '21

Fix a regression introduced by the conversion of -device formatters and add a test case for it. Peter Krempa (2): qemuBuildHostdevMediatedDevProps: Format 'ramfb' only when enabled qemuxml2argvtest: Add device with 'ramfb=off' to 'hostdev-mdev-display-ramfb' src/qemu/qemu_command.c | 4 +++- .../hostdev-mdev-display-ramfb.x86_64-latest.args | 1 + tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml | 5 +++++ .../hostdev-mdev-display-ramfb.x86_64-latest.xml | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) -- 2.31.1

2 3

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

17 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/411044099 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. [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 src/hypervisor/virhostdev.c | 4 +- src/libvirt_private.syms | 7 ++ src/util/virnetdev.c | 218 ++++++++++++++++++++------------ src/util/virnetdevpriv.h | 44 +++++++ tests/virnetdevtest.c | 241 +++++++++++++++++++++++++++++++++++- 5 files changed, 436 insertions(+), 78 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

1 3

[libvirt PATCH v3 0/1] Ignore EPERM on attempts to clear a VF VLAN ID
by Dmitrii Shcherbakov 17 Nov '21

17 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, the error is simply ignored. 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/409312792 v2 -> v3 changes: * Fixed a bug caught during functional testing; * Added a news file entry. [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 (1): Ignore EPERM on attempts to clear VF VLAN ID NEWS.rst | 9 ++ src/libvirt_private.syms | 7 ++ src/util/virnetdev.c | 196 +++++++++++++++++++++------------- src/util/virnetdevpriv.h | 44 ++++++++ tests/virnetdevtest.c | 222 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 405 insertions(+), 73 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

3 5

[RFC PATCH] tests/qemuxml2*/graphics-spice-timeout: skip CPU model check
by Daniel Henrique Barboza 17 Nov '21

17 Nov '21

Commit 65b0b746b516 changed spice tests to use latest caps. Before this change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs(). The absence of this flag triggered the code path inside testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function will update the host CPU via virQEMUCapsUpdateHostCPUModel() into virQEMUCapsInitHostCPUModel(). In this function, virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned commit, the host CPU was being defaulted to x86_64, vendor Intel, for the 'graphics-spice-timeout' test that is using the 'pc' machine type and 'accel=kvm'. Today, "FLAG_REAL_CAPS" is being set because we're using the latest caps from x86_64. This means that the whole code path mentioned above is skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache() directly. Without the handling being done by testUpdateQEMUCaps(), the host CPU is being retrieved later on, down below qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU(). The latter will attempt to update the domain cpu and executing a virCPUCompare with the hostCPU and def->cpu. All this logic ended up causing a failure of the 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is being run with KVM acceleration, and the KVM driver for ppc64 and s390x will return a default x86_64 CPU with vendor "AMD", making virCPUCompare() fail with the following message: "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU Driver error : the CPU is incompatible with host CPU: host CPU vendor does not match required CPU vendor Intel" Fix this test by setting cpu check='none' and avoid the virCPUCompare() that causes the problem for ppc64 and s390x hosts. Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Sending as a RFC because I'm not sure if this patch fixes the problem for s390x. Boris, can you please test and see if this fix works for you? tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +- .../qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml index 065318651f..33dae5c4bf 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml @@ -15,7 +15,7 @@ <apic/> <pae/> </features> - <cpu match='exact'> + <cpu match='exact' check='none'> <model>core2duo</model> <vendor>Intel</vendor> <topology sockets='1' dies='1' cores='2' threads='1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml index fd34a6caf5..9e6782d00b 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml @@ -15,7 +15,7 @@ <apic/> <pae/> </features> - <cpu mode='custom' match='exact' check='partial'> + <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>core2duo</model> <vendor>Intel</vendor> <topology sockets='1' dies='1' cores='2' threads='1'/> -- 2.31.1

3 9

[PATCH v2 0/1] fix graphics-spice-timeout for ppc64le and s390x
by Daniel Henrique Barboza 17 Nov '21

17 Nov '21

Hi, Re-sending the patch with the commit msg change proposed by Peter (i.e. mentioning that this is a build fix, root cause is still under investigation) and with Boris r-b. v1 link: https://listman.redhat.com/archives/libvir-list/2021-November/msg00457.html Daniel Henrique Barboza (1): tests/qemuxml2*/graphics-spice-timeout: skip CPU model check tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +- .../qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.31.1

1 1

[libvirt PATCH] docs: Use new URLs for Go modules in downloads page
by Andrea Bolognani 17 Nov '21

17 Nov '21

We've been using the new repositories for a few months now, but the downloads page still points to the obsolete Go packages. Fixes: 1832c0a02b3c9ceb518a4338cb3609fd7d1233a2 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/downloads.html.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 0187062cef..40724cce22 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -68,20 +68,20 @@ <tr> <td>Go</td> <td> - <a href="https://libvirt.org/libvirt-go">libvirt</a> + <a href="https://libvirt.org/go/libvirt">libvirt</a> </td> <td> - <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a> + <a href="https://gitlab.com/libvirt/libvirt-go-module">gitlab</a> </td> <td> - <a href="https://gitlab.com/libvirt/libvirt-go/-/issues">issues</a> + <a href="https://gitlab.com/libvirt/libvirt-go-module/-/issues">issues</a> </td> <td class="gitmirror"> - <a href="https://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a> - <a href="https://github.com/libvirt/libvirt-go">github</a> + <a href="https://libvirt.org/git/?p=libvirt-go-module.git;a=summary">libvirt</a> + <a href="https://github.com/libvirt/libvirt-go-module">github</a> </td> <td> - <a href="https://pkg.go.dev/libvirt.org/libvirt-go">api ref</a> + <a href="https://pkg.go.dev/libvirt.org/go/libvirt">api ref</a> </td> </tr> <tr> @@ -232,20 +232,20 @@ <tr> <td>Go XML</td> <td> - <a href="https://libvirt.org/libvirt-go-xml">libvirt</a> + <a href="https://libvirt.org/go/libvirtxml">libvirt</a> </td> <td> - <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a> + <a href="https://gitlab.com/libvirt/libvirt-go-xml-module">gitlab</a> </td> <td> - <a href="https://gitlab.com/libvirt/libvirt-go-xml/-/issues">issues</a> + <a href="https://gitlab.com/libvirt/libvirt-go-xml-module/-/issues">issues</a> </td> <td class="gitmirror"> - <a href="https://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> - <a href="https://github.com/libvirt/libvirt-go-xml">github</a> + <a href="https://libvirt.org/git/?p=libvirt-go-xml-module.git;a=summary">libvirt</a> + <a href="https://github.com/libvirt/libvirt-go-xml-module">github</a> </td> <td> - <a href="https://pkg.go.dev/libvirt.org/libvirt-go-xml">api ref</a> + <a href="https://pkg.go.dev/libvirt.org/go/libvirtxml">api ref</a> </td> </tr> <tr> -- 2.31.1

2 1

[libvirt PATCH] conf: device: compare drive address fields separately
by Ján Tomko 16 Nov '21

16 Nov '21

Commit 3210c8b04 introduced a separate field 'diskbus' for internal use by the commandline formatter. Adjust the check for address equality to compare the relevant fields separately instead of the whole struct. This means that the changes of the 'diskbus' field added in commit 03ed14d2d4 no longer affect the outcome of the address equality check. https://bugzilla.redhat.com/show_bug.cgi?id=2023605 Fixes: 3210c8b047534f7e1d3ccde7ea3bcf11e7c92ad9 Fixes: 03ed14d2d4a4e51568b1ee5a6e6c9c3371bb4d34 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/device_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index e587d90c59..cb523d3a0d 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -119,7 +119,10 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: - if (memcmp(&a->addr.drive, &b->addr.drive, sizeof(a->addr.drive))) + if (a->addr.drive.controller != b->addr.drive.controller || + a->addr.drive.unit != b->addr.drive.unit || + a->addr.drive.bus != b->addr.drive.bus || + a->addr.drive.target != b->addr.drive.target) return false; break; -- 2.31.1

2 1

[PATCH] virt-aa-helper: fix bool initialization
by christian.ehrhardt＠canonical.com 16 Nov '21

16 Nov '21

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Since purged is a bool variable it should be initialized by false instead of 0. Suggested-by: Sergio Durigan Junior <sergio.durigan(a)canonical.com> Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 218e07bfb0..898f9f1a16 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1438,7 +1438,7 @@ main(int argc, char **argv) char *profile = NULL; char *include_file = NULL; off_t size; - bool purged = 0; + bool purged = false; if (virGettextInitialize() < 0 || virErrorInitialize() < 0) { -- 2.33.1

2 1

[PATCH 00/18] qemu: command: Convert '-compat' and '-audiodev' to use JSON
by Peter Krempa 15 Nov '21

15 Nov '21

In line of the previous work to use the long-term stable versions of the commandline interface. Peter Krempa (18): virJSONValueObjectAdd: Convert @obj argument to double pointer virJSONValueObjectAddVArgs: Take double pointer virJSONValueObjectAddVArgs: Allocate new object if passed pointer is NULL qemu: block: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemu: agent: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemu: monitor_json: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemu: monitor: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemu: migration_cookie: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemuDiskSourceGetProps: Initialize 'ret' qemu: command: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemublocktest: Replace virJSONValueObjectCreate by virJSONValueObjectAdd virjsontest: Replace virJSONValueObjectCreate by virJSONValueObjectAdd qemu: migration_params: Replace virJSONValueObjectCreate by virJSONValueObjectAdd virsh: domain: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Replace virJSONValueObjectCreateVArgs with virJSONValueObjectAddVArgs util: json: Remove virJSONValueObjectCreate(VArgs) qemu: command: Use JSON for parameters of -compat qemu: command: Use JSON for parameters of -audiodev src/libvirt_private.syms | 2 - src/qemu/qemu_agent.c | 10 +- src/qemu/qemu_block.c | 378 ++++---- src/qemu/qemu_command.c | 890 +++++++++--------- src/qemu/qemu_migration_cookie.c | 25 +- src/qemu/qemu_migration_params.c | 8 +- src/qemu/qemu_monitor.c | 20 +- src/qemu/qemu_monitor_json.c | 51 +- src/util/virjson.c | 50 +- src/util/virjson.h | 8 +- tests/qemublocktest.c | 2 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- ...arch64-os-firmware-efi.aarch64-latest.args | 2 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../audio-alsa-best.x86_64-latest.args | 2 +- .../audio-alsa-full.x86_64-latest.args | 2 +- .../audio-alsa-minimal.x86_64-latest.args | 2 +- .../audio-coreaudio-best.x86_64-latest.args | 2 +- .../audio-coreaudio-full.x86_64-latest.args | 2 +- ...audio-coreaudio-minimal.x86_64-latest.args | 2 +- ...udio-default-nographics.x86_64-latest.args | 2 +- .../audio-default-sdl.x86_64-latest.args | 2 +- .../audio-default-spice.x86_64-latest.args | 2 +- .../audio-default-vnc.x86_64-latest.args | 2 +- .../audio-file-best.x86_64-latest.args | 2 +- .../audio-file-full.x86_64-latest.args | 2 +- .../audio-file-minimal.x86_64-latest.args | 2 +- .../audio-jack-full.x86_64-latest.args | 2 +- .../audio-jack-minimal.x86_64-latest.args | 2 +- .../audio-many-backends.x86_64-latest.args | 6 +- .../audio-none-best.x86_64-latest.args | 2 +- .../audio-none-full.x86_64-latest.args | 2 +- .../audio-none-minimal.x86_64-latest.args | 2 +- .../audio-oss-best.x86_64-latest.args | 2 +- .../audio-oss-full.x86_64-latest.args | 2 +- .../audio-oss-minimal.x86_64-latest.args | 2 +- .../audio-pulseaudio-best.x86_64-latest.args | 2 +- .../audio-pulseaudio-full.x86_64-latest.args | 2 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 2 +- .../audio-sdl-best.x86_64-latest.args | 2 +- .../audio-sdl-full.x86_64-latest.args | 2 +- .../audio-sdl-minimal.x86_64-latest.args | 2 +- .../audio-spice-best.x86_64-latest.args | 2 +- .../audio-spice-full.x86_64-latest.args | 2 +- .../audio-spice-minimal.x86_64-latest.args | 2 +- .../blkdeviotune-group-num.x86_64-latest.args | 2 +- ...blkdeviotune-max-length.x86_64-latest.args | 2 +- .../blkdeviotune-max.x86_64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 2 +- .../clock-timer-armvtimer.aarch64-latest.args | 2 +- .../console-sclp.s390x-latest.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-5.1.0.args | 2 +- .../cpu-host-model.x86_64-5.2.0.args | 2 +- .../cpu-host-model.x86_64-6.0.0.args | 2 +- .../cpu-host-model.x86_64-6.1.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 2 +- ...default-video-type-ppc64.ppc64-latest.args | 2 +- ...ult-video-type-riscv64.riscv64-latest.args | 2 +- ...default-video-type-s390x.s390x-latest.args | 2 +- .../devices-acpi-index.x86_64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- .../disk-aio.x86_64-latest.args | 2 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 2 +- .../disk-blockio.x86_64-latest.args | 2 +- .../disk-boot-cdrom.x86_64-latest.args | 2 +- .../disk-boot-disk.x86_64-latest.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-bus-other.x86_64-latest.args | 2 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-cdrom.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- .../disk-discard.x86_64-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 2 +- .../disk-floppy-tray.x86_64-latest.args | 2 +- .../disk-floppy.x86_64-latest.args | 2 +- .../disk-fmt-qcow.x86_64-latest.args | 2 +- .../disk-geometry.x86_64-latest.args | 2 +- .../disk-ide-split.x86_64-latest.args | 2 +- .../disk-ide-wwn.x86_64-latest.args | 2 +- .../disk-ioeventfd.x86_64-latest.args | 2 +- .../disk-metadata-cache.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 2 +- .../disk-network-http.x86_64-latest.args | 2 +- .../disk-network-iscsi.x86_64-latest.args | 2 +- .../disk-network-nbd.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- ...-network-rbd-encryption.x86_64-latest.args | 2 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 2 +- .../disk-network-rbd.x86_64-latest.args | 2 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 2 +- .../disk-no-boot.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 2 +- .../disk-order.x86_64-latest.args | 2 +- .../disk-readonly-disk.x86_64-latest.args | 2 +- .../disk-rotation.x86_64-latest.args | 2 +- .../disk-sata-device.x86_64-latest.args | 2 +- .../disk-scsi-device-auto.x86_64-latest.args | 2 +- .../disk-scsi-disk-split.x86_64-latest.args | 2 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 2 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 2 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../disk-serial.x86_64-latest.args | 2 +- .../disk-shared.x86_64-latest.args | 2 +- .../disk-slices.x86_64-latest.args | 2 +- .../disk-snapshot.x86_64-latest.args | 2 +- .../disk-source-pool-mode.x86_64-latest.args | 2 +- .../disk-source-pool.x86_64-latest.args | 2 +- .../disk-transient.x86_64-latest.args | 2 +- ...sk-usb-device-removable.x86_64-latest.args | 2 +- .../disk-usb-device.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../disk-virtio-ccw-many.s390x-latest.args | 2 +- .../disk-virtio-ccw.s390x-latest.args | 2 +- .../disk-virtio-queues.x86_64-latest.args | 2 +- .../disk-virtio-s390-zpci.s390x-latest.args | 2 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 2 +- ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio.x86_64-latest.args | 2 +- .../encrypted-disk-usage.x86_64-latest.args | 2 +- .../encrypted-disk.x86_64-latest.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../event_idx.x86_64-latest.args | 2 +- .../fips-enabled.x86_64-5.1.0.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- .../fs9p-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 2 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 2 +- ...aphics-spice-agentmouse.x86_64-latest.args | 2 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 2 +- ...phics-spice-auto-socket.x86_64-latest.args | 2 +- ...phics-spice-compression.x86_64-latest.args | 2 +- ...hics-spice-egl-headless.x86_64-latest.args | 2 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 2 +- .../graphics-spice-no-args.x86_64-latest.args | 2 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 2 +- .../graphics-spice-sasl.x86_64-latest.args | 2 +- .../graphics-spice-socket.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- ...raphics-spice-usb-redir.x86_64-latest.args | 2 +- .../graphics-spice.x86_64-latest.args | 2 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 2 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 2 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 2 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 2 +- .../graphics-vnc-none.x86_64-latest.args | 2 +- .../graphics-vnc-policy.x86_64-latest.args | 2 +- .../graphics-vnc-power.x86_64-latest.args | 2 +- ...remove-generated-socket.x86_64-latest.args | 2 +- .../graphics-vnc-sasl.x86_64-latest.args | 2 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 2 +- .../graphics-vnc-socket.x86_64-latest.args | 2 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 2 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- .../graphics-vnc-websocket.x86_64-latest.args | 2 +- .../graphics-vnc.x86_64-latest.args | 2 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 2 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 2 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- .../hyperv-off.x86_64-latest.args | 2 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 2 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- .../launch-security-sev.x86_64-6.0.0.args | 2 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 2 +- .../luks-disks-source.x86_64-latest.args | 2 +- .../luks-disks.x86_64-latest.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-numa.x86_64-latest.args | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../misc-no-reboot.x86_64-5.2.0.args | 2 +- .../misc-no-reboot.x86_64-latest.args | 2 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- .../numatune-hmat.x86_64-latest.args | 2 +- ...emnode-restrictive-mode.x86_64-latest.args | 2 +- .../numatune-memnode.x86_64-5.2.0.args | 2 +- .../numatune-memnode.x86_64-latest.args | 2 +- .../numatune-system-memory.x86_64-latest.args | 2 +- .../os-firmware-bios.x86_64-latest.args | 2 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...os-firmware-efi-secboot.x86_64-latest.args | 2 +- .../os-firmware-efi.x86_64-latest.args | 2 +- .../panic-double.x86_64-latest.args | 2 +- .../panic-no-address.x86_64-latest.args | 2 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 2 +- ...pi-root-hotplug-disable.x86_64-latest.args | 2 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 2 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 4 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- ...low-bogus-usb-controller.s390x-latest.args | 2 +- ...390-allow-bogus-usb-none.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 2 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 2 +- .../tpm-passthrough.x86_64-latest.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-vga.x86_64-latest.args | 2 +- .../vhost-vsock-auto.x86_64-latest.args | 2 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 2 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- .../vhost-vsock-ccw.s390x-latest.args | 2 +- .../vhost-vsock.x86_64-latest.args | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 2 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- .../virtio-lun.x86_64-latest.args | 2 +- ...virtio-non-transitional.x86_64-latest.args | 2 +- ...-options-controller-ats.x86_64-latest.args | 2 +- ...ptions-controller-iommu.x86_64-latest.args | 2 +- ...tions-controller-packed.x86_64-latest.args | 2 +- ...virtio-options-disk-ats.x86_64-latest.args | 2 +- ...rtio-options-disk-iommu.x86_64-latest.args | 2 +- ...tio-options-disk-packed.x86_64-latest.args | 2 +- .../virtio-options-fs-ats.x86_64-latest.args | 2 +- ...virtio-options-fs-iommu.x86_64-latest.args | 2 +- ...irtio-options-fs-packed.x86_64-latest.args | 2 +- ...irtio-options-input-ats.x86_64-latest.args | 2 +- ...tio-options-input-iommu.x86_64-latest.args | 2 +- ...io-options-input-packed.x86_64-latest.args | 2 +- ...-options-memballoon-ats.x86_64-latest.args | 2 +- ...loon-freepage-reporting.x86_64-latest.args | 2 +- ...ptions-memballoon-iommu.x86_64-latest.args | 2 +- ...tions-memballoon-packed.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 2 +- ...irtio-options-net-iommu.x86_64-latest.args | 2 +- ...rtio-options-net-packed.x86_64-latest.args | 2 +- .../virtio-options-rng-ats.x86_64-latest.args | 2 +- ...irtio-options-rng-iommu.x86_64-latest.args | 2 +- ...rtio-options-rng-packed.x86_64-latest.args | 2 +- ...irtio-options-video-ats.x86_64-latest.args | 2 +- ...tio-options-video-iommu.x86_64-latest.args | 2 +- ...io-options-video-packed.x86_64-latest.args | 2 +- .../virtio-options.x86_64-latest.args | 2 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 2 +- .../virtio-rng-builtin.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 2 +- .../virtio-transitional.x86_64-latest.args | 2 +- .../watchdog-device.x86_64-latest.args | 2 +- .../watchdog-diag288.s390x-latest.args | 2 +- .../watchdog-dump.x86_64-latest.args | 2 +- .../watchdog-injectnmi.x86_64-latest.args | 2 +- .../watchdog.x86_64-latest.args | 2 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- tests/virjsontest.c | 18 +- tools/virsh-domain.c | 8 +- 352 files changed, 1080 insertions(+), 1074 deletions(-) -- 2.31.1

2 21

[PATCH 0/2] qemu_command: Generate -mem-prealloc in one corner case more
by Michal Privoznik 15 Nov '21

15 Nov '21

This is a result of mu discussion with Jing: https://listman.redhat.com/archives/libvir-list/2021-September/msg00407.html Turns out, the problem has nothing to do with my virtio-mem patches so I'm sending fix separately. Michal Prívozník (2): qemuxml2argvtest: Introduce another numa-topology test qemu_command: Generate -mem-prealloc in one corner case more src/qemu/qemu_command.c | 17 ++++----- .../fd-memory-numa-topology.args | 3 +- .../fd-memory-numa-topology2.args | 5 +-- .../fd-memory-numa-topology3.args | 7 ++-- ...d-memory-numa-topology4.x86_64-latest.args | 34 +++++++++++++++++ .../fd-memory-numa-topology4.xml | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...fd-memory-numa-topology4.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 9 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology4.xml create mode 120000 tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml -- 2.32.0

2 3

[PATCH] lib: Drop needless one line labels
by Michal Privoznik 15 Nov '21

15 Nov '21

In some cases we have a label that contains nothing but a return statement. The amount of such labels rises as we use automagic cleanup. Anyway, such labels are pointless and can be dropped. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/c/domain/dommigrate.c | 6 +- src/conf/domain_conf.c | 70 +++++++++----------- src/conf/netdev_vport_profile_conf.c | 33 +++++----- src/conf/storage_conf.c | 12 ++-- src/conf/storage_source_conf.c | 15 ++--- src/conf/virsavecookie.c | 3 +- src/hypervisor/virhostdev.c | 4 +- src/libxl/libxl_migration.c | 5 +- src/libxl/xen_xl.c | 9 +-- src/openvz/openvz_driver.c | 5 +- src/qemu/qemu_capabilities.c | 5 +- src/qemu/qemu_monitor_json.c | 16 ++--- src/qemu/qemu_snapshot.c | 21 +++--- src/qemu/qemu_virtiofs.c | 22 +++---- src/rpc/virnetlibsshsession.c | 10 +-- src/storage/storage_backend_iscsi.c | 13 ++-- src/test/test_driver.c | 5 +- src/util/vircgroup.c | 4 +- src/util/vircgroupv1.c | 24 +++---- src/util/virdnsmasq.c | 42 +++++------- src/util/virhostcpu.c | 11 ++-- tests/domainconftest.c | 5 +- tests/qemuxml2argvtest.c | 11 +--- tests/virpcitest.c | 15 ++--- tools/virsh-domain.c | 8 +-- tools/virsh-host.c | 6 +- tools/virsh-nodedev.c | 45 +++++-------- tools/virsh-volume.c | 96 +++++++++++----------------- 28 files changed, 199 insertions(+), 322 deletions(-) diff --git a/examples/c/domain/dommigrate.c b/examples/c/domain/dommigrate.c index 3d32ada6d3..07a947e869 100644 --- a/examples/c/domain/dommigrate.c +++ b/examples/c/domain/dommigrate.c @@ -42,7 +42,7 @@ main(int argc, char *argv[]) if (argc < 4) { usage(argv[0]); - goto out; + return EXIT_FAILURE; } src_uri = argv[1]; @@ -54,7 +54,7 @@ main(int argc, char *argv[]) if (!conn) { fprintf(stderr, "No connection to the source hypervisor: %s.\n", virGetLastErrorMessage()); - goto out; + return EXIT_FAILURE; } printf("Attempting to retrieve domain %s...\n", domname); @@ -79,7 +79,5 @@ main(int argc, char *argv[]) if (dom != NULL) virDomainFree(dom); virConnectClose(conn); - - out: return ret; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index da0c64b460..54218e76e7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18859,7 +18859,7 @@ virDomainDefParseIDs(virDomainDef *def, /* Extract domain name */ if (!(def->name = virXPathString("string(./name[1])", ctxt))) { virReportError(VIR_ERR_NO_NAME, NULL); - goto error; + return -1; } /* Extract domain uuid. If both uuid and sysinfo/system/entry/uuid @@ -18870,50 +18870,47 @@ virDomainDefParseIDs(virDomainDef *def, if (virUUIDGenerate(def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); - goto error; + return -1; } *uuid_generated = true; } else { if (virUUIDParse(tmp, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed uuid element")); - goto error; + return -1; } VIR_FREE(tmp); } /* Extract domain genid - a genid can either be provided or generated */ if ((n = virXPathNodeSet("./genid", ctxt, &nodes)) < 0) - goto error; + return -1; if (n > 0) { if (n != 1) { virReportError(VIR_ERR_XML_ERROR, "%s", _("element 'genid' can only appear once")); - goto error; + return -1; } def->genidRequested = true; if (!(tmp = virXPathString("string(./genid)", ctxt))) { if (virUUIDGenerate(def->genid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate genid")); - goto error; + return -1; } def->genidGenerated = true; } else { if (virUUIDParse(tmp, def->genid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed genid element")); - goto error; + return -1; } VIR_FREE(tmp); } } VIR_FREE(nodes); return 0; - - error: - return -1; } @@ -19002,20 +18999,20 @@ virDomainDefParseMemory(virDomainDef *def, /* Extract domain memory */ if (virDomainParseMemory("./memory[1]", NULL, ctxt, &def->mem.total_memory, false, true) < 0) - goto error; + return -1; if (virDomainParseMemory("./currentMemory[1]", NULL, ctxt, &def->mem.cur_balloon, false, true) < 0) - goto error; + return -1; if (virDomainParseMemory("./maxMemory[1]", NULL, ctxt, &def->mem.max_memory, false, false) < 0) - goto error; + return -1; if (virXPathUInt("string(./maxMemory[1]/@slots)", ctxt, &def->mem.memory_slots) == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Failed to parse memory slot count")); - goto error; + return -1; } /* and info about it */ @@ -19023,7 +19020,7 @@ virDomainDefParseMemory(virDomainDef *def, (def->mem.dump_core = virTristateSwitchTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid memory core dump attribute value '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); @@ -19032,7 +19029,7 @@ virDomainDefParseMemory(virDomainDef *def, if ((def->mem.source = virDomainMemorySourceTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/source/type '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); } @@ -19042,7 +19039,7 @@ virDomainDefParseMemory(virDomainDef *def, if ((def->mem.access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/access/mode '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); } @@ -19052,7 +19049,7 @@ virDomainDefParseMemory(virDomainDef *def, if ((def->mem.allocation = virDomainMemoryAllocationTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/allocation/mode '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); } @@ -19062,7 +19059,7 @@ virDomainDefParseMemory(virDomainDef *def, if ((n = virXPathNodeSet("./memoryBacking/hugepages/page", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot extract hugepages nodes")); - goto error; + return -1; } if (n) { @@ -19071,7 +19068,7 @@ virDomainDefParseMemory(virDomainDef *def, for (i = 0; i < n; i++) { if (virDomainHugepagesParseXML(nodes[i], ctxt, &def->mem.hugepages[i]) < 0) - goto error; + return -1; def->mem.nhugepages++; } @@ -19093,9 +19090,6 @@ virDomainDefParseMemory(virDomainDef *def, def->mem.discard = VIR_TRISTATE_BOOL_YES; return 0; - - error: - return -1; } @@ -19446,43 +19440,40 @@ virDomainDefLifecycleParse(virDomainDef *def, &def->onReboot, VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, virDomainLifecycleActionTypeFromString) < 0) - goto error; + return -1; if (virDomainEventActionParseXML(ctxt, "on_poweroff", "string(./on_poweroff[1])", &def->onPoweroff, VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, virDomainLifecycleActionTypeFromString) < 0) - goto error; + return -1; if (virDomainEventActionParseXML(ctxt, "on_crash", "string(./on_crash[1])", &def->onCrash, VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, virDomainLifecycleActionTypeFromString) < 0) - goto error; + return -1; if (virDomainEventActionParseXML(ctxt, "on_lockfailure", "string(./on_lockfailure[1])", &def->onLockFailure, VIR_DOMAIN_LOCK_FAILURE_DEFAULT, virDomainLockFailureTypeFromString) < 0) - goto error; + return -1; if (virDomainPMStateParseXML(ctxt, "string(./pm/suspend-to-mem/@enabled)", &def->pm.s3) < 0) - goto error; + return -1; if (virDomainPMStateParseXML(ctxt, "string(./pm/suspend-to-disk/@enabled)", &def->pm.s4) < 0) - goto error; + return -1; return 0; - - error: - return -1; } @@ -19499,7 +19490,7 @@ virDomainDefClockParse(virDomainDef *def, (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown clock offset '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); @@ -19516,7 +19507,7 @@ virDomainDefClockParse(virDomainDef *def, virReportError(VIR_ERR_XML_ERROR, _("unknown clock adjustment '%s'"), tmp); - goto error; + return -1; } switch (def->clock.offset) { case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: @@ -19546,7 +19537,7 @@ virDomainDefClockParse(virDomainDef *def, if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown clock basis '%s'"), tmp); - goto error; + return -1; } VIR_FREE(tmp); } else { @@ -19559,13 +19550,13 @@ virDomainDefClockParse(virDomainDef *def, if (!def->clock.data.timezone) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing 'timezone' attribute for clock with offset='timezone'")); - goto error; + return -1; } break; } if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0) - goto error; + return -1; if (n) def->clock.timers = g_new0(virDomainTimerDef *, n); @@ -19574,16 +19565,13 @@ virDomainDefClockParse(virDomainDef *def, virDomainTimerDef *timer = virDomainTimerDefParseXML(nodes[i], ctxt); if (!timer) - goto error; + return -1; def->clock.timers[def->clock.ntimers++] = timer; } VIR_FREE(nodes); return 0; - - error: - return -1; } static int diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index dfffc4dd70..d13833d7df 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -45,14 +45,14 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) (virtPort->virtPortType = virNetDevVPortTypeFromString(virtPortType)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown virtualport type %s"), virtPortType); - goto error; + return NULL; } if ((virtPort->virtPortType == VIR_NETDEV_VPORT_PROFILE_NONE) && (flags & VIR_VPORT_XML_REQUIRE_TYPE)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing required virtualport type")); - goto error; + return NULL; } while (cur != NULL) { @@ -74,12 +74,12 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virStrToLong_ui(virtPortManagerID, NULL, 0, &val)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot parse value of managerid parameter")); - goto error; + return NULL; } if (val > 0xff) { virReportError(VIR_ERR_XML_ERROR, "%s", _("value of managerid out of range")); - goto error; + return NULL; } virtPort->managerID = (uint8_t)val; virtPort->managerID_specified = true; @@ -91,12 +91,12 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virStrToLong_ui(virtPortTypeID, NULL, 0, &val)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot parse value of typeid parameter")); - goto error; + return NULL; } if (val > 0xffffff) { virReportError(VIR_ERR_XML_ERROR, "%s", _("value for typeid out of range")); - goto error; + return NULL; } virtPort->typeID = (uint32_t)val; virtPort->typeID_specified = true; @@ -108,12 +108,12 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virStrToLong_ui(virtPortTypeIDVersion, NULL, 0, &val)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot parse value of typeidversion parameter")); - goto error; + return NULL; } if (val > 0xff) { virReportError(VIR_ERR_XML_ERROR, "%s", _("value of typeidversion out of range")); - goto error; + return NULL; } virtPort->typeIDVersion = (uint8_t)val; virtPort->typeIDVersion_specified = true; @@ -123,7 +123,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virUUIDParse(virtPortInstanceID, virtPort->instanceID) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot parse instanceid parameter as a uuid")); - goto error; + return NULL; } virtPort->instanceID_specified = true; } @@ -132,14 +132,14 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) virStrcpyStatic(virtPort->profileID, virtPortProfileID) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("profileid parameter too long")); - goto error; + return NULL; } if (virtPortInterfaceID) { if (virUUIDParse(virtPortInterfaceID, virtPort->interfaceID) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot parse interfaceid parameter as a uuid")); - goto error; + return NULL; } virtPort->interfaceID_specified = true; } @@ -152,7 +152,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virUUIDGenerate(virtPort->instanceID) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot generate a random uuid for instanceid")); - goto error; + return NULL; } virtPort->instanceID_specified = true; } @@ -162,7 +162,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virUUIDGenerate(virtPort->interfaceID) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot generate a random uuid for interfaceid")); - goto error; + return NULL; } virtPort->interfaceID_specified = true; } @@ -172,16 +172,13 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if ((flags & VIR_VPORT_XML_REQUIRE_ALL_ATTRIBUTES) && (virNetDevVPortProfileCheckComplete(virtPort, false) < 0)) { - goto error; + return NULL; } if (virNetDevVPortProfileCheckNoExtras(virtPort) < 0) - goto error; + return NULL; return g_steal_pointer(&virtPort); - - error: - return NULL; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index c78456695c..6690d26ffd 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -692,7 +692,6 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, const char *permxpath) { long long val; - int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; g_autofree char *mode = NULL; @@ -715,7 +714,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, if (virStrToLong_i(mode, NULL, 8, &tmp) < 0 || (tmp & ~0777)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed octal mode")); - goto error; + return -1; } perms->mode = tmp; } else { @@ -731,7 +730,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, val != -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed owner element")); - goto error; + return -1; } perms->uid = val; @@ -746,17 +745,14 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, val != -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed group element")); - goto error; + return -1; } perms->gid = val; } /* NB, we're ignoring missing labels here - they'll simply inherit */ perms->label = virXPathString("string(./label)", ctxt); - - ret = 0; - error: - return ret; + return 0; } diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 5ca06fa30a..44944e1dbd 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -235,7 +235,6 @@ virStorageAuthDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - virStorageAuthDef *ret = NULL; xmlNodePtr secretnode = NULL; g_autoptr(virStorageAuthDef) authdef = NULL; g_autofree char *authtype = NULL; @@ -247,7 +246,7 @@ virStorageAuthDefParse(xmlNodePtr node, if (!(authdef->username = virXPathString("string(./@username)", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing username for auth")); - goto cleanup; + return NULL; } authdef->authType = VIR_STORAGE_AUTH_TYPE_NONE; @@ -259,14 +258,14 @@ virStorageAuthDefParse(xmlNodePtr node, if ((authdef->authType = virStorageAuthTypeFromString(authtype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown auth type '%s'"), authtype); - goto cleanup; + return NULL; } } if (!(secretnode = virXPathNode("./secret ", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <secret> element in auth")); - goto cleanup; + return NULL; } /* Used by the domain disk xml parsing in order to ensure the @@ -279,13 +278,9 @@ virStorageAuthDefParse(xmlNodePtr node, authdef->secrettype = virXMLPropString(secretnode, "type"); if (virSecretLookupParseSecret(secretnode, &authdef->seclookupdef) < 0) - goto cleanup; + return NULL; - ret = g_steal_pointer(&authdef); - - cleanup: - - return ret; + return g_steal_pointer(&authdef); } diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index c24a292355..5fc9ca06e1 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -61,9 +61,8 @@ virSaveCookieParse(xmlXPathContextPtr ctxt, *obj = NULL; - if (!(ctxt->node = virXPathNode("./cookie", ctxt))) { + if (!(ctxt->node = virXPathNode("./cookie", ctxt))) return 0; - } return virSaveCookieParseNode(ctxt, obj, saveCookie); } diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 14ea560309..e44eb7f1d3 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -92,7 +92,7 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddress *devAddr, void *opa if (helperData->usesVFIO && STREQ_NULLABLE(actual_drvname, helperData->driverName) && STREQ_NULLABLE(actual_domname, helperData->domainName)) - goto iommu_owner; + return 0; if (actual_drvname && actual_domname) virReportError(VIR_ERR_OPERATION_INVALID, @@ -106,7 +106,7 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddress *devAddr, void *opa virPCIDeviceGetName(actual)); return -1; } - iommu_owner: + return 0; } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index aa719a19d2..be5cc7e049 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -902,7 +902,7 @@ libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, tc->dataFD[0] = -1; tc->dataFD[1] = -1; if (virPipe(tc->dataFD) < 0) - goto out; + return -1; arg = &tc->tmThread; /* Read from pipe */ @@ -915,7 +915,7 @@ libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, name, false, arg) < 0) { virReportError(errno, "%s", _("Unable to create tunnel migration thread")); - goto out; + return -1; } virObjectUnlock(vm); @@ -923,7 +923,6 @@ libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, ret = libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]); virObjectLock(vm); - out: /* libxlMigrationSrcStopTunnel will be called in libxlDoMigrateSrcP2P * to free all resources for us. */ diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 05d4abbe81..17c5184b9b 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1607,7 +1607,6 @@ xenFormatXLDisk(virConfValue *list, virDomainDiskDef *disk) int format = virDomainDiskGetFormat(disk); const char *driver = virDomainDiskGetDriver(disk); g_autofree char *target = NULL; - int ret = -1; /* format */ virBufferAddLit(&buf, "format="); @@ -1646,7 +1645,7 @@ xenFormatXLDisk(virConfValue *list, virDomainDiskDef *disk) if (disk->transient) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("transient disks not supported yet")); - goto cleanup; + return -1; } /* backendtype */ @@ -1673,7 +1672,7 @@ xenFormatXLDisk(virConfValue *list, virDomainDiskDef *disk) * it must come last. */ if (xenFormatXLDiskSrc(disk->src, &target) < 0) - goto cleanup; + return -1; if (target) virBufferAsprintf(&buf, ",target=%s", target); @@ -1689,10 +1688,8 @@ xenFormatXLDisk(virConfValue *list, virDomainDiskDef *disk) tmp->next = val; else list->list = val; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 93549e914a..681eb734ce 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -799,7 +799,7 @@ openvzDomainSetNetworkConfig(virConnectPtr conn, if (openvzDomainSetNetwork(conn, def->name, def->nets[i], &buf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not configure network")); - goto exit; + return -1; } } @@ -817,9 +817,6 @@ openvzDomainSetNetworkConfig(virConnectPtr conn, } return 0; - - exit: - return -1; } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 67fae46a34..e87cda8c11 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5580,14 +5580,11 @@ virQEMUCapsCacheNew(const char *libDir, priv->kernelVersion = g_strdup_printf("%s %s", uts.release, uts.version); priv->cpuData = virCPUDataGetHost(); - - cleanup: return cache; error: virObjectUnref(cache); - cache = NULL; - goto cleanup; + return NULL; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9186d59ca2..731227b158 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2058,16 +2058,16 @@ qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, } if (!balloonpath) - goto cleanup; + return ret; if (!(cmd = qemuMonitorJSONMakeCommand("qom-get", "s:path", balloonpath, "s:property", "guest-stats", NULL))) - goto cleanup; + return ret; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return ret; if ((data = virJSONValueObjectGetObject(reply, "error"))) { const char *klass = virJSONValueObjectGetString(data, "class"); @@ -2077,18 +2077,18 @@ qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, STREQ_NULLABLE(desc, "guest hasn't updated any stats yet")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("the guest hasn't updated any stats yet")); - goto cleanup; + return ret; } } if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) - goto cleanup; + return ret; data = virJSONValueObjectGetObject(reply, "return"); if (!(statsdata = virJSONValueObjectGet(data, "stats"))) { VIR_DEBUG("data does not include 'stats'"); - goto cleanup; + return ret; } GET_BALLOON_STATS(statsdata, "stat-swap-in", @@ -2114,9 +2114,7 @@ qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, GET_BALLOON_STATS(statsdata, "stat-htlb-pgfail", VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGFAIL, 1); - ret = got; - cleanup: - return ret; + return got; } #undef GET_BALLOON_STATS diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index d105eead27..bd58d500eb 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1577,12 +1577,12 @@ qemuSnapshotCreateXML(virDomainPtr domain, parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto cleanup; + return NULL; if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot halt after transient domain snapshot")); - goto cleanup; + return NULL; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) || !virDomainObjIsActive(vm)) @@ -1593,7 +1593,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, if (!(def = virDomainSnapshotDefParseString(xmlDesc, driver->xmlopt, priv->qemuCaps, NULL, parse_flags))) - goto cleanup; + return NULL; /* reject snapshot names containing slashes or starting with dot as * snapshot definitions are saved in files named by the snapshot name */ @@ -1603,7 +1603,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, _("invalid snapshot name '%s': " "name can't contain '/'"), def->parent.name); - goto cleanup; + return NULL; } if (def->parent.name[0] == '.') { @@ -1611,7 +1611,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, _("invalid snapshot name '%s': " "name can't start with '.'"), def->parent.name); - goto cleanup; + return NULL; } } @@ -1622,7 +1622,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("live snapshot creation is supported only " "during full system snapshots")); - goto cleanup; + return NULL; } /* allow snapshots only in certain states */ @@ -1640,7 +1640,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, if (!redefine) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"), virDomainSnapshotStateTypeToString(state)); - goto cleanup; + return NULL; } break; @@ -1648,7 +1648,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("qemu doesn't support taking snapshots of " "PMSUSPENDED guests")); - goto cleanup; + return NULL; /* invalid states */ case VIR_DOMAIN_SNAPSHOT_NOSTATE: @@ -1656,7 +1656,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, case VIR_DOMAIN_SNAPSHOT_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"), virDomainSnapshotStateTypeToString(state)); - goto cleanup; + return NULL; } /* We are going to modify the domain below. Internal snapshots would use @@ -1665,7 +1665,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, * job mask appropriately. */ if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT, VIR_DOMAIN_JOB_OPERATION_SNAPSHOT, flags) < 0) - goto cleanup; + return NULL; qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); @@ -1801,7 +1801,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, qemuDomainObjEndAsyncJob(driver, vm); - cleanup: return snapshot; } diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 0c12c5ea22..1b853a5a59 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -182,7 +182,6 @@ qemuVirtioFSStart(virQEMUDriver *driver, pid_t pid = (pid_t) -1; VIR_AUTOCLOSE fd = -1; VIR_AUTOCLOSE logfd = -1; - int ret = -1; int rc; if (!virFileExists(fs->src->path)) { @@ -193,12 +192,12 @@ qemuVirtioFSStart(virQEMUDriver *driver, } if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias))) - goto cleanup; + goto error; socket_path = qemuDomainGetVHostUserFSSocketPath(vm->privateData, fs); if ((fd = qemuVirtioFSOpenChardev(driver, vm, socket_path)) < 0) - goto cleanup; + goto error; logpath = qemuVirtioFSCreateLogFilename(cfg, vm->def, fs->info.alias); @@ -206,7 +205,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, g_autoptr(virLogManager) logManager = virLogManagerNew(driver->privileged); if (!logManager) - goto cleanup; + goto error; if ((logfd = virLogManagerDomainOpenLogFile(logManager, "qemu", @@ -215,12 +214,12 @@ qemuVirtioFSStart(virQEMUDriver *driver, logpath, 0, NULL, NULL)) < 0) - goto cleanup; + goto error; } else { if ((logfd = open(logpath, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) < 0) { virReportSystemError(errno, _("failed to create logfile %s"), logpath); - goto cleanup; + goto error; } if (virSetCloseExec(logfd) < 0) { virReportSystemError(errno, _("failed to set close-on-exec flag on %s"), @@ -230,7 +229,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, } if (!(cmd = qemuVirtioFSBuildCommandLine(cfg, fs, &fd))) - goto cleanup; + goto error; /* so far only running as root is supported */ virCommandSetUID(cmd, 0); @@ -243,7 +242,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, virCommandDaemonize(cmd); if (qemuExtDeviceLogCommand(driver, vm, cmd, "virtiofsd") < 0) - goto cleanup; + goto error; rc = virCommandRun(cmd, NULL); @@ -267,10 +266,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, goto error; } - ret = 0; - - cleanup: - return ret; + return 0; error: if (pid != -1) @@ -279,7 +275,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, unlink(pidfile); if (socket_path) unlink(socket_path); - goto cleanup; + return -1; } diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 22d54c99be..a3adc85728 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -453,7 +453,6 @@ virNetLibsshImportPrivkey(virNetLibsshSession *sess, virNetLibsshAuthMethod *priv, ssh_key *ret_key) { - int err; int ret; ssh_key key; @@ -470,8 +469,7 @@ virNetLibsshImportPrivkey(virNetLibsshSession *sess, virReportError(VIR_ERR_AUTH_FAILED, _("error while reading private key '%s'"), priv->filename); - err = SSH_AUTH_ERROR; - goto error; + return SSH_AUTH_ERROR; } else if (ret == SSH_ERROR) { if (virGetLastErrorCode() == VIR_ERR_OK) { virReportError(VIR_ERR_AUTH_FAILED, @@ -479,15 +477,11 @@ virNetLibsshImportPrivkey(virNetLibsshSession *sess, "passphrase?"), priv->filename); } - err = SSH_AUTH_ERROR; - goto error; + return SSH_AUTH_ERROR; } *ret_key = key; return SSH_AUTH_SUCCESS; - - error: - return err; } diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index ed17ed11a6..eef1d91062 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -91,7 +91,6 @@ static int virStorageBackendISCSIGetHostNumber(const char *sysfs_path, uint32_t *host) { - int ret = -1; g_autoptr(DIR) sysdir = NULL; struct dirent *dirent = NULL; int direrr; @@ -101,17 +100,16 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, virWaitForDevices(); if (virDirOpen(&sysdir, sysfs_path) < 0) - goto cleanup; + return -1; while ((direrr = virDirRead(sysdir, &dirent, sysfs_path)) > 0) { if (STRPREFIX(dirent->d_name, "target")) { if (sscanf(dirent->d_name, "target%u:", host) == 1) { - ret = 0; - goto cleanup; + return 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse target '%s'"), dirent->d_name); - goto cleanup; + return -1; } } } @@ -120,11 +118,10 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get host number for iSCSI session " "with path '%s'"), sysfs_path); - goto cleanup; + return -1; } - cleanup: - return ret; + return -1; } static int diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ea474d55ac..d2577b2b16 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -858,13 +858,13 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) absFile = testBuildFilename(file, relFile); if (!(doc = virXMLParse(absFile, NULL, type, NULL, false))) - goto error; + return NULL; ret = xmlCopyNode(xmlDocGetRootElement(doc), 1); if (!ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to copy XML node")); - goto error; + return NULL; } xmlReplaceNode(node, ret); xmlFreeNode(node); @@ -872,7 +872,6 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) ret = node; } - error: return ret; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 6234095827..51da6e6a2f 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2764,8 +2764,7 @@ virCgroupKillRecursiveInternal(virCgroup *group, if (rc == 0) { VIR_DEBUG("Path %s does not exist, assuming done", keypath); - killedAny = false; - goto done; + return 0; } while ((direrr = virDirRead(dp, &ent, keypath)) > 0) { @@ -2791,7 +2790,6 @@ virCgroupKillRecursiveInternal(virCgroup *group, if (direrr < 0) return -1; - done: return killedAny ? 1 : 0; } diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 8a04bb2e4a..96f36c3b4d 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -926,7 +926,6 @@ virCgroupV1SetOwner(virCgroup *cgroup, gid_t gid, int controllers) { - int ret = -1; size_t i; int direrr; @@ -945,7 +944,7 @@ virCgroupV1SetOwner(virCgroup *cgroup, cgroup->legacy[i].placement); if (virDirOpen(&dh, base) < 0) - goto cleanup; + return -1; while ((direrr = virDirRead(dh, &de, base)) > 0) { g_autofree char *entry = NULL; @@ -956,24 +955,21 @@ virCgroupV1SetOwner(virCgroup *cgroup, virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), entry, uid, gid); - goto cleanup; + return -1; } } if (direrr < 0) - goto cleanup; + return -1; if (chown(base, uid, gid) < 0) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), base, uid, gid); - goto cleanup; + return -1; } } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -1599,7 +1595,6 @@ virCgroupV1GetMemoryStat(virCgroup *group, unsigned long long *inactiveFile, unsigned long long *unevictable) { - int ret = -1; g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; @@ -1629,12 +1624,12 @@ virCgroupV1GetMemoryStat(virCgroup *group, if (!valueStr) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse 'memory.stat' cgroup file.")); - goto cleanup; + return -1; } *valueStr = '\0'; if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0) - goto cleanup; + return -1; if (STREQ(line, "cache")) cacheVal = value >> 10; @@ -1662,10 +1657,7 @@ virCgroupV1GetMemoryStat(virCgroup *group, *inactiveFile = inactiveFileVal; *unevictable = unevictableVal; - ret = 0; - - cleanup: - return ret; + return 0; } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index f2f606913f..2dd9a20377 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -172,10 +172,8 @@ addnhostsWrite(const char *path, if (!(f = fopen(tmp, "w"))) { istmp = false; - if (!(f = fopen(path, "w"))) { - rc = -errno; - goto cleanup; - } + if (!(f = fopen(path, "w"))) + return -errno; } for (i = 0; i < nhosts; i++) { @@ -186,7 +184,7 @@ addnhostsWrite(const char *path, if (istmp) unlink(tmp); - goto cleanup; + return rc; } for (j = 0; j < hosts[i].nhostnames; j++) { @@ -197,7 +195,7 @@ addnhostsWrite(const char *path, if (istmp) unlink(tmp); - goto cleanup; + return rc; } } @@ -208,23 +206,20 @@ addnhostsWrite(const char *path, if (istmp) unlink(tmp); - goto cleanup; + return rc; } } - if (VIR_FCLOSE(f) == EOF) { - rc = -errno; - goto cleanup; - } + if (VIR_FCLOSE(f) == EOF) + return -errno; if (istmp && rename(tmp, path) < 0) { rc = -errno; unlink(tmp); - goto cleanup; + return rc; } - cleanup: - return rc; + return 0; } static int @@ -369,10 +364,8 @@ hostsfileWrite(const char *path, if (!(f = fopen(tmp, "w"))) { istmp = false; - if (!(f = fopen(path, "w"))) { - rc = -errno; - goto cleanup; - } + if (!(f = fopen(path, "w"))) + return -errno; } for (i = 0; i < nhosts; i++) { @@ -383,23 +376,20 @@ hostsfileWrite(const char *path, if (istmp) unlink(tmp); - goto cleanup; + return rc; } } - if (VIR_FCLOSE(f) == EOF) { - rc = -errno; - goto cleanup; - } + if (VIR_FCLOSE(f) == EOF) + return -errno; if (istmp && rename(tmp, path) < 0) { rc = -errno; unlink(tmp); - goto cleanup; + return rc; } - cleanup: - return rc; + return 0; } static int diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 3563a662d5..67b6910626 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -90,7 +90,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; - int cpu_times_num, offset, hz, stathz, ret = -1; + int cpu_times_num, offset, hz, stathz; struct field_cpu_map { const char *field; int idx[CPUSTATES]; @@ -151,7 +151,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, virReportSystemError(errno, _("sysctl failed for '%s'"), sysctl_name); - goto cleanup; + return -1; } for (i = 0; cpu_map[i].field != NULL; i++) { @@ -161,7 +161,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, virReportError(VIR_ERR_INTERNAL_ERROR, _("Field '%s' too long for destination"), cpu_map[i].field); - goto cleanup; + return -1; } param->value = 0; @@ -169,10 +169,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, param->value += cpu_times[offset + cpu_map[i].idx[j]] * TICK_TO_NSEC; } - ret = 0; - - cleanup: - return ret; + return 0; } #endif /* __FreeBSD__ */ diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 71fd1f7b73..14d84b0071 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -76,10 +76,10 @@ mymain(void) int ret = 0; if ((caps = virTestGenericCapsInit()) == NULL) - goto cleanup; + return EXIT_FAILURE; if (!(xmlopt = virTestGenericDomainXMLConfInit())) - goto cleanup; + return EXIT_FAILURE; #define DO_TEST_GET_FS(fspath, expect) \ do { \ @@ -100,7 +100,6 @@ mymain(void) virObjectUnref(caps); virObjectUnref(xmlopt); - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 161e7efa62..58f16ef459 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -141,20 +141,15 @@ fakeStorageVolLookupByName(virStoragePoolPtr pool, return NULL; } - if (!strchr(name, '+')) - goto fallback; - if (!(volinfo = g_strsplit(name, "+", 2))) return NULL; - if (!volinfo[1]) - goto fallback; + if (!volinfo[1]) { + return virGetStorageVol(pool->conn, pool->name, name, "block", NULL, NULL); + } return virGetStorageVol(pool->conn, pool->name, volinfo[1], volinfo[0], NULL, NULL); - - fallback: - return virGetStorageVol(pool->conn, pool->name, name, "block", NULL, NULL); } static int diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 4c0f0b91c3..ad2fcc6751 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -81,7 +81,7 @@ testVirPCIDeviceNew(const void *opaque G_GNUC_UNUSED) virReportError(VIR_ERR_INTERNAL_ERROR, \ "Unexpected count of items in " #list ": %d, " \ "expecting %zu", count, (size_t) cnt); \ - goto cleanup; \ + return -1; \ } static int @@ -165,7 +165,6 @@ testVirPCIDeviceReset(const void *opaque G_GNUC_UNUSED) static int testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED) { - int ret = -1; virPCIDevice *dev[] = {NULL, NULL, NULL}; size_t i, nDev = G_N_ELEMENTS(dev); g_autoptr(virPCIDeviceList) activeDevs = NULL; @@ -174,17 +173,17 @@ testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED) if (!(activeDevs = virPCIDeviceListNew()) || !(inactiveDevs = virPCIDeviceListNew())) - goto cleanup; + return -1; for (i = 0; i < nDev; i++) { virPCIDeviceAddress devAddr = {.domain = 0, .bus = 0, .slot = i + 1, .function = 0}; if (!(dev[i] = virPCIDeviceNew(&devAddr))) - goto cleanup; + return -1; if (virPCIDeviceListAdd(inactiveDevs, dev[i]) < 0) { virPCIDeviceFree(dev[i]); - goto cleanup; + return -1; } CHECK_LIST_COUNT(activeDevs, 0); @@ -198,15 +197,13 @@ testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED) for (i = 0; i < nDev; i++) { if (virPCIDeviceReattach(dev[i], activeDevs, inactiveDevs) < 0) - goto cleanup; + return -1; CHECK_LIST_COUNT(activeDevs, 0); CHECK_LIST_COUNT(inactiveDevs, nDev - i - 1); } - ret = 0; - cleanup: - return ret; + return 0; } struct testPCIDevData { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 22f428f702..c592d0281a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4453,7 +4453,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) - goto cleanup; + return false; if (vshCommandOptBool(cmd, "verbose")) verbose = true; @@ -4462,7 +4462,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) true, doSave, &data) < 0) - goto cleanup; + return false; virshWatchJob(ctl, dom, verbose, eventLoop, &data.ret, 0, NULL, NULL, _("Save")); @@ -4472,7 +4472,6 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) if (!data.ret) vshPrintExtra(ctl, _("\nDomain '%s' saved to %s\n"), name, to); - cleanup: return !data.ret; } @@ -4770,7 +4769,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) true, doManagedsave, &data) < 0) - goto cleanup; + return false; virshWatchJob(ctl, dom, verbose, eventLoop, &data.ret, 0, NULL, NULL, _("Managedsave")); @@ -4780,7 +4779,6 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) if (!data.ret) vshPrintExtra(ctl, _("\nDomain '%s' state saved by libvirt\n"), name); - cleanup: return !data.ret; } diff --git a/tools/virsh-host.c b/tools/virsh-host.c index fc84415e7b..5ae6657347 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1122,11 +1122,11 @@ vshExtractCPUDefXMLs(vshControl *ctl, } } - cleanup: - return g_steal_pointer(&cpus); + return cpus; error: - goto cleanup; + g_strfreev(cpus); + return NULL; } diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 424865962f..fe15d2d702 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -141,7 +141,6 @@ static bool cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshNodeDevice) dev = NULL; - bool ret = false; const char *device_value = NULL; if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) @@ -149,18 +148,16 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) dev = vshFindNodeDevice(ctl, device_value); if (!dev) - goto cleanup; + return false; if (virNodeDeviceDestroy(dev) == 0) { vshPrintExtra(ctl, _("Destroyed node device '%s'\n"), device_value); } else { vshError(ctl, _("Failed to destroy node device '%s'"), device_value); - goto cleanup; + return false; } - ret = true; - cleanup: - return ret; + return true; } struct virshNodeList { @@ -578,7 +575,6 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) g_autoptr(virshNodeDevice) device = NULL; g_autofree char *xml = NULL; const char *device_value = NULL; - bool ret = false; if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) return false; @@ -586,16 +582,13 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) device = vshFindNodeDevice(ctl, device_value); if (!device) - goto cleanup; + return false; if (!(xml = virNodeDeviceGetXMLDesc(device, 0))) - goto cleanup; + return false; vshPrint(ctl, "%s\n", xml); - - ret = true; - cleanup: - return ret; + return true; } /* @@ -1013,7 +1006,6 @@ static bool cmdNodeDeviceUndefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { g_autoptr(virshNodeDevice) dev = NULL; - bool ret = false; const char *device_value = NULL; if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) @@ -1022,17 +1014,15 @@ cmdNodeDeviceUndefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) dev = vshFindNodeDevice(ctl, device_value); if (!dev) - goto cleanup; + return false; if (virNodeDeviceUndefine(dev, 0) < 0) { vshError(ctl, _("Failed to undefine node device '%s'"), device_value); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Undefined node device '%s'\n"), device_value); - ret = true; - cleanup: - return ret; + return true; } @@ -1163,7 +1153,6 @@ static bool cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshNodeDevice) dev = NULL; - bool ret = false; const char *name = NULL; int autostart; @@ -1172,7 +1161,8 @@ cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) dev = vshFindNodeDevice(ctl, name); - if (!dev) goto cleanup; + if (!dev) + return false; autostart = !vshCommandOptBool(cmd, "disable"); @@ -1181,7 +1171,7 @@ cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("failed to mark device %s as autostarted"), name); else vshError(ctl, _("failed to unmark device %s as autostarted"), name); - goto cleanup; + return false; } if (autostart) @@ -1189,9 +1179,7 @@ cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) else vshPrintExtra(ctl, _("Device %s unmarked as autostarted\n"), name); - ret = true; - cleanup: - return ret; + return true; } @@ -1224,7 +1212,6 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshNodeDevice) device = NULL; const char *device_value = NULL; - bool ret = false; int autostart; const char *parent = NULL; @@ -1234,7 +1221,7 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd) device = vshFindNodeDevice(ctl, device_value); if (!device) - goto cleanup; + return false; parent = virNodeDeviceGetParent(device); vshPrint(ctl, "%-15s %s\n", _("Name:"), virNodeDeviceGetName(device)); @@ -1248,9 +1235,7 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd) else vshPrint(ctl, "%-15s %s\n", _("Autostart:"), autostart ? _("yes") : _("no")); - ret = true; - cleanup: - return ret; + return true; } diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 12773d900b..ca40fbcd72 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -238,7 +238,6 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; unsigned long flags = 0; virshControl *priv = ctl->privData; - bool ret = false; if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; @@ -247,27 +246,27 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) - goto cleanup; + return false; if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) < 0) - goto cleanup; + return false; if (virshVolSize(capacityStr, &capacity) < 0) { vshError(ctl, _("Malformed size %s"), capacityStr); - goto cleanup; + return false; } if (vshCommandOptStringQuiet(ctl, cmd, "allocation", &allocationStr) > 0 && virshVolSize(allocationStr, &allocation) < 0) { vshError(ctl, _("Malformed size %s"), allocationStr); - goto cleanup; + return false; } if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || vshCommandOptStringReq(ctl, cmd, "backing-vol", &snapshotStrVol) < 0 || vshCommandOptStringReq(ctl, cmd, "backing-vol-format", &snapshotStrFormat) < 0) - goto cleanup; + return false; virBufferAddLit(&buf, "<volume>\n"); virBufferAdjustIndent(&buf, 2); @@ -325,11 +324,11 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } if (snapVol == NULL) { vshError(ctl, _("failed to get vol '%s'"), snapshotStrVol); - goto cleanup; + return false; } if ((snapshotStrVolPath = virStorageVolGetPath(snapVol)) == NULL) { - goto cleanup; + return false; } /* Create XML for the backing store */ @@ -353,15 +352,12 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } else { if (!(vol = virStorageVolCreateXML(pool, xml, flags))) { vshError(ctl, _("Failed to create vol %s"), name); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Vol %s created\n"), name); } - ret = true; - - cleanup: - return ret; + return true; } /* @@ -393,7 +389,6 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) g_autoptr(virshStoragePool) pool = NULL; g_autoptr(virshStorageVol) vol = NULL; const char *from = NULL; - bool ret = false; unsigned int flags = 0; g_autofree char *buffer = NULL; @@ -404,23 +399,21 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) - goto cleanup; + return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { vshSaveLibvirtError(); - goto cleanup; + return false; } if (!(vol = virStorageVolCreateXML(pool, buffer, flags))) { vshError(ctl, _("Failed to create vol from %s"), from); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Vol %s created from %s\n"), virStorageVolGetName(vol), from); - ret = true; - cleanup: - return ret; + return true; } /* @@ -463,12 +456,11 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) g_autoptr(virshStorageVol) newvol = NULL; g_autoptr(virshStorageVol) inputvol = NULL; const char *from = NULL; - bool ret = false; g_autofree char *buffer = NULL; unsigned int flags = 0; if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL))) - goto cleanup; + return false; if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; @@ -477,28 +469,26 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) flags |= VIR_STORAGE_VOL_CREATE_REFLINK; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) - goto cleanup; + return false; if (!(inputvol = virshCommandOptVol(ctl, cmd, "vol", "inputpool", NULL))) - goto cleanup; + return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { vshReportError(ctl); - goto cleanup; + return false; } newvol = virStorageVolCreateXMLFrom(pool, buffer, inputvol, flags); if (!newvol) { vshError(ctl, _("Failed to create vol from %s"), from); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Vol %s created from input vol %s\n"), virStorageVolGetName(newvol), virStorageVolGetName(inputvol)); - ret = true; - cleanup: - return ret; + return true; } static xmlChar * @@ -653,7 +643,6 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; g_autoptr(virshStorageVol) vol = NULL; - bool ret = false; VIR_AUTOCLOSE fd = -1; g_autoptr(virshStream) st = NULL; const char *name = NULL; @@ -673,16 +662,16 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) - goto cleanup; + return false; if ((fd = open(file, O_RDONLY)) < 0) { vshError(ctl, _("cannot read %s"), file); - goto cleanup; + return false; } if (fstat(fd, &sb) < 0) { vshError(ctl, _("unable to stat %s"), file); - goto cleanup; + return false; } cbData.ctl = ctl; @@ -694,12 +683,12 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) if (!(st = virStreamNew(priv->conn, 0))) { vshError(ctl, _("cannot create a new stream")); - goto cleanup; + return false; } if (virStorageVolUpload(vol, st, offset, length, flags) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); - goto cleanup; + return false; } if (flags & VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM) { @@ -707,30 +696,27 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) virshStreamInData, virshStreamSourceSkip, &cbData) < 0) { vshError(ctl, _("cannot send data to volume %s"), name); - goto cleanup; + return false; } } else { if (virStreamSendAll(st, virshStreamSource, &cbData) < 0) { vshError(ctl, _("cannot send data to volume %s"), name); - goto cleanup; + return false; } } if (VIR_CLOSE(fd) < 0) { vshError(ctl, _("cannot close file %s"), file); virStreamAbort(st); - goto cleanup; + return false; } if (virStreamFinish(st) < 0) { vshError(ctl, _("cannot close volume %s"), name); - goto cleanup; + return false; } - ret = true; - - cleanup: - return ret; + return true; } /* @@ -931,7 +917,6 @@ static bool cmdVolWipe(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshStorageVol) vol = NULL; - bool ret = false; const char *name; const char *algorithm_str = NULL; int algorithm = VIR_STORAGE_VOL_WIPE_ALG_ZERO; @@ -941,12 +926,12 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "algorithm", &algorithm_str) < 0) - goto out; + return false; if (algorithm_str && (algorithm = virshStorageVolWipeAlgorithmTypeFromString(algorithm_str)) < 0) { vshError(ctl, _("Unsupported algorithm '%s'"), algorithm_str); - goto out; + return false; } if ((funcRet = virStorageVolWipePattern(vol, algorithm, 0)) < 0) { @@ -957,13 +942,11 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) if (funcRet < 0) { vshError(ctl, _("Failed to wipe vol %s"), name); - goto out; + return false; } vshPrintExtra(ctl, _("Vol %s wiped\n"), name); - ret = true; - out: - return ret; + return true; } @@ -1111,7 +1094,6 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) const char *capacityStr = NULL; unsigned long long capacity = 0; unsigned int flags = 0; - bool ret = false; bool delta = vshCommandOptBool(cmd, "delta"); if (vshCommandOptBool(cmd, "allocate")) @@ -1123,7 +1105,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) < 0) - goto cleanup; + return false; virSkipSpaces(&capacityStr); if (*capacityStr == '-') { /* The API always requires a positive value; but we allow a @@ -1134,7 +1116,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) } else { vshError(ctl, "%s", _("negative size requires --shrink")); - goto cleanup; + return false; } } @@ -1143,7 +1125,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) if (virshVolSize(capacityStr, &capacity) < 0) { vshError(ctl, _("Malformed size %s"), capacityStr); - goto cleanup; + return false; } if (virStorageVolResize(vol, capacity, flags) < 0) { @@ -1151,16 +1133,14 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) delta ? _("Failed to change size of volume '%s' by %s") : _("Failed to change size of volume '%s' to %s"), virStorageVolGetName(vol), capacityStr); - goto cleanup; + return false; } vshPrintExtra(ctl, delta ? _("Size of volume '%s' successfully changed by %s\n") : _("Size of volume '%s' successfully changed to %s\n"), virStorageVolGetName(vol), capacityStr); - ret = true; - cleanup: - return ret; + return true; } /* -- 2.32.0

3 2

[PATCH 0/9] Introduce instant memory snapshots
by Nikolay Shirokovskiy 15 Nov '21

15 Nov '21

Hi, everyone. The details for instant snapshot are given in main patch "qemu: support instant snapshots". Here I only want to mention two moments. First as instant snapshot API is synchronous we need to add an event that snapshot moment in time is passed so that client is free to make changes to guest. This way client can make use of instant snapshot while memory is still being written to disk. Second there is work in progress on adding asynchronous revert to snapshot [1]. The idea is to write memory during snapshot in such a way that it is possible to do a revert to snapshot in background. Namely start guest on revert with only minimal amount of memory restored from disk and then restore memory in background in postcopy migration fashion. In order to make it possible snapshot memory should be written to disk not just as plain migration stream. Thus the [1] patch adds a special tool to write the migration stream during snapshot. So if/when patch [1] will be merged I plan to add 'instant revert' mode to snapshot too. [1] [RFC PATCH v2 0/7] migration/snapshot: External snapshot utility https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg03619.html Nikolay Shirokovskiy (9): qemu: make snap possibility check before pausing CPUS qemu: snapshot: remove redundant flag setting qemu: don't bother saving ret code from qemuDomainSaveMemory qemu: move virQEMUSaveDataFree auto decl to header qemu: factor out qemuDomainSnapshotSaveMemory qemu: introduce qemuMigrationParamsSetCapability qemu: support instant mode in qemuMigrationSrcToFile qemu: support instant snapshots virsh: add --instant flag to snapshot-create docs/manpages/virsh.rst | 8 +- include/libvirt/libvirt-domain-snapshot.h | 2 + src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_migration.c | 20 ++- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 13 ++ src/qemu/qemu_migration_params.h | 5 + src/qemu/qemu_saveimage.c | 4 +- src/qemu/qemu_saveimage.h | 2 + src/qemu/qemu_snapshot.c | 158 +++++++++++++++------- tools/virsh-snapshot.c | 6 + 11 files changed, 162 insertions(+), 61 deletions(-) -- 2.27.0

2 17

[PATCH] virt-xml-validate: Add support for cpu and domaincheckpoint
by Han Han 13 Nov '21

13 Nov '21

Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virt-xml-validate.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 249bcf7eef..a818e2c3a5 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -77,6 +77,9 @@ if [ -z "$TYPE" ]; then *domainsnapshot*) # Must come first, since *domain* is a substring TYPE="domainsnapshot" ;; + *domaincheckpoint*) + TYPE="domaincheckpoint" + ;; *domain*) TYPE="domain" ;; @@ -110,6 +113,9 @@ if [ -z "$TYPE" ]; then *interface*) TYPE="interface" ;; + *cpu*) + TYPE="cpu" + ;; *) echo "$0: cannot determine schema type for $XMLFILE" >&2 exit 3 -- 2.33.1

2 2

[libvirt PATCH 00/13] cgroup and thread management in ch driver.
by Vineeth Pillai 12 Nov '21

12 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

2 19

[PATCH 0/2] DEVICE_UNPLUG_GUEST_ERROR support
by Daniel Henrique Barboza 12 Nov '21

12 Nov '21

Hi, This small series adds support to a new QMP event called DEVICE_UNPLUG_GUEST_SUPPORT introduced recently in upstream QEMU. This event is emitted when a device removal error is detected in the guest side. Libvirt can use this event to to abort the removal operation immediately instead of waiting for the operation to timeout. Upstream QEMU is emitting this event in the following cases: - memory removal errors in ACPI and pseries guests - CPU removal errors in pseries guests Adding support to DEVICE_UNPLUG_GUEST_ERROR will allow Libvirt to detect all device removal errors that QEMU might add in the future. The patches were tested using a common scenario where CPU removal will fail everytime in a pseries guest: - start a pseries guest with 1 CPU - add one CPU - offline vcpu0 in the guest kernel - try to remove the recently added CPU (vcpu1). The kernel will refuse the unplug because vcpu1 is the last online CPU This test case will cause 'setvcpus' to hang until the timeout is fired: [danielhb@ltc-boston118 build]$ sudo ./run tools/virsh setvcpus f34 1 error: Timed out during operation: vcpu unplug request timed out. Unplug result must be manually inspected in the domain With this series applied, 'setvcpus' will report the error as soon as the DEVICE_UNPLUG_GUEST_ERROR event is received: [danielhb@ltc-boston118 build]$ sudo ./run tools/virsh setvcpus f34 1 error: operation failed: unplug of device was rejected by the guest I haven't add any documentation because I didn't find a good place to document this change, and I'm not sure if this is necessary either since this doesn't change user ABI. If this requires a doc change please let me know. Daniel Henrique Barboza (2): tests: update QEMU and domain ppc64 capabilities for qemu 6.2 qemu: add DEVICE_UNPLUG_GUEST_ERROR event support src/qemu/qemu_monitor.c | 12 + src/qemu/qemu_monitor.h | 9 + src/qemu/qemu_monitor_json.c | 19 + src/qemu/qemu_process.c | 37 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 138 + .../caps_6.2.0.ppc64.replies | 31062 ++++++++++++++++ .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1167 + ...default-video-type-ppc64.ppc64-latest.args | 13 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 13 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 13 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 13 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 13 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 13 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 13 +- .../ppc64-pseries-graphics.ppc64-latest.args | 29 +- .../ppc64-pseries-headless.ppc64-latest.args | 23 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 11 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 13 +- .../tpm-emulator-spapr.ppc64-latest.args | 19 +- 19 files changed, 32531 insertions(+), 99 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml -- 2.31.1

2 4

[PATCH 0/4] Misc style cleanups
by Michal Privoznik 12 Nov '21

12 Nov '21

This is all done in preparation for dropping needless labels such as: cleanup: return ret; I'll post that patch as soon as these are merged. Michal Prívozník (4): virNetDevVPortProfileParse: Use g_autofree examples/dommigrate: Don't set retval in usage() examples/dommigrate: Make retval portable virsh: Remove unnecessary else branches examples/c/domain/dommigrate.c | 11 +++++----- src/conf/netdev_vport_profile_conf.c | 30 +++++++++----------------- tools/virsh-nodedev.c | 5 ++--- tools/virsh-volume.c | 32 +++++++++++++--------------- 4 files changed, 32 insertions(+), 46 deletions(-) -- 2.32.0

3 6

[libvirt PATCH] [RFC] scripts: Check spelling
by Tim Wiederhake 12 Nov '21

12 Nov '21

This is a wrapper for codespell [1], a spell checker for source code. Codespell does not compare words to a dictionary, but rather works by checking words against a list of common typos, making it produce fewer false positives than other solutions. The script in this patch works around the lack of per-directory ignore lists and some oddities regarding capitalization in ignore lists. [1] (https://github.com/codespell-project/codespell/) RFC: Is there interest in having something like this in CI? Examples of spelling mistakes that were found using codespell: 4ad3c95f4bef5c7c9657de470fb74a4d14c8a331, 785a11cec8693de7df024aae68975dd1799b646a, 1452317b5c727eb17178942012f57f0c37631ae4. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- scripts/check-spelling.py | 115 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100755 scripts/check-spelling.py diff --git a/scripts/check-spelling.py b/scripts/check-spelling.py new file mode 100755 index 0000000000..01371c0d1e --- /dev/null +++ b/scripts/check-spelling.py @@ -0,0 +1,115 @@ +#!/usr/bin/env python3 + +import argparse +import re +import subprocess +import os + + +IGNORE_LIST = [ + # ignore all translation files + ("/po/", []), + + # ignore this script + ("/scripts/check-spelling.py", []), + + # 3rd-party: keycodemapdb + ("/src/keycodemapdb/", []), + + # 3rd-party: VirtualBox SDK + ("/src/vbox/vbox_CAPI", [ + "aAdd", + "aCount", + "aLocation", + "aNumber", + "aParent", + "progess"]), + + # 3rd-party: qemu + ("/tests/qemucapabilitiesdata/caps_", "encyption"), + + # other + ("/", ["msdos", "MSDOS", "wan", "WAN", "hda", "HDA", "inout"]), + ("/NEWS.rst", ["crashers"]), + ("/docs/gitdm/companies/others", "Archiv"), + ("/docs/glib-adoption.rst", ["preferrable"]), + ("/docs/js/main.js", "whats"), + ("/examples/polkit/libvirt-acl.rules", ["userA", "userB", "userC"]), + ("/src/libvirt-domain.c", "PTD"), + ("/src/libxl/libxl_logger.c", ["purposedly"]), + ("/src/nwfilter/nwfilter_dhcpsnoop.c", "ether"), + ("/src/nwfilter/nwfilter_ebiptables_driver.c", "parm"), + ("/src/nwfilter/nwfilter_learnipaddr.c", "ether"), + ("/src/qemu/qemu_agent.c", "crypted"), + ("/src/qemu/qemu_agent.h", "crypted"), + ("/src/security/apparmor/libvirt-lxc", "devic"), + ("/src/security/apparmor/libvirt-qemu", "readby"), + ("/src/storage_file/storage_file_probe.c", "conectix"), + ("/src/util/virnetdevmacvlan.c", "calld"), + ("/src/util/virtpm.c", "parm"), + ("/tests/qemuagenttest.c", "IST"), + ("/tests/storagepoolxml2xml", "cant"), + ("/tests/sysinfodata/", ["sie"]), + ("/tests/testutils.c", ["nIn"]), + ("/tests/vircgroupdata/ovirt-node-6.6.mounts", "hald"), + ("/tests/virhostcpudata/", ["sie"]), + ("/tools/virt-host-validate-common.c", ["sie"]), +] + + +def check_spelling(directory): + """Returns list of tuple(filename, line number, word, suggestion).""" + process = subprocess.run( + ["codespell", directory], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + universal_newlines=True) + + if process.returncode not in (0, 65): + exit("error: unexpected returncode %s" % process.returncode) + + if process.stderr: + exit("error: unexpected output to stderr: \"%s\"" % process.stderr) + + line_pattern = re.compile("^(.*):(.*): (.*) ==> (.*)$") + for line in process.stdout.split("\n"): + line = line.strip().replace(directory, "") + if not line: + continue + match = line_pattern.match(line) + if not match: + exit("error: unexpected line: \"%s\"" % line) + yield match.groups() + + +def ignore(filename, linenumber, word, suggestion): + # Ignore abbreviations and ad-hoc variable names + if len(word) <= 2: + return True + + for f, w in IGNORE_LIST: + if not filename.startswith(f): + continue + if word in w or not w: + return True + return False + + +def main(): + parser = argparse.ArgumentParser(description="Check spelling") + parser.add_argument( + "dir", + help="Path to source directory", + type=os.path.realpath) + args = parser.parse_args() + + findings = [f for f in check_spelling(args.dir) if not ignore(*f)] + if findings: + template = "(\"{0}\", \"{2}\"),\t# line {1}, \"{3}\"?" + for finding in findings: + print(template.format(*finding)) + exit("error: %s spelling errors" % len(findings)) + + +if __name__ == "__main__": + main() -- 2.31.1

2 1

[PATCH 0/4] qemu_agent: Rework domain object handling in open
by Michal Privoznik 12 Nov '21

12 Nov '21

The most important patch is the first one because it fixes a race condition. The rest is just a cleanup I've noticed while looking at the code. Michal Prívozník (4): qemu_agent: Rework domain object locking when opening agent qemuAgentOpen: Rework domain object refcounting qemu_agent: Drop destroy callback qemuMonitorOpen: Rework domain object refcounting src/qemu/qemu_agent.c | 17 ++++++++--------- src/qemu/qemu_agent.h | 2 -- src/qemu/qemu_monitor.c | 5 ----- src/qemu/qemu_process.c | 20 -------------------- 4 files changed, 8 insertions(+), 36 deletions(-) -- 2.32.0

2 6

[libvirt PATCH 0/2] improve audio device compat handling on migration
by Daniel P. Berrangé 12 Nov '21

12 Nov '21

Avoid being over-eager in stripping <audio> elements. This still isn't ideal, because if a user happened to provide an audio config that *exactly* matches the libvirt historical default we'll still strip it. Thinking that maybe libvirt should advertize feature flags in te migration cookies. eg if the QEMU driver on the target host reports "explicit-audiodev", then te source host knows it doesn't need to strip it out to migrate to this host. If it doesn't report it, then it knows it must be an older libvirt version pre-dating audiodev. Daniel P. Berrangé (2): conf: add helper for comparing virDomainAudioDef objects qemu: don't strip audio elements with user config present src/conf/domain_conf.c | 144 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 72 +++++++++++--------- 4 files changed, 188 insertions(+), 32 deletions(-) -- 2.31.1

2 3

[PATCH v2 0/3] Add virt-pki-query-dn binary
by Martin Kletzander 12 Nov '21

12 Nov '21

v2: - do not use err*() functions - fix missing include dir in meson.build Patches 2 and 3 are reviewed. Martin Kletzander (3): tools: Add virt-pki-query-dn binary Add suggestions for virt-pki-query-dn usage news: Mention the addition of virt-pki-query-dn binary NEWS.rst | 6 ++ docs/remote.html.in | 4 + libvirt.spec.in | 1 + po/POTFILES.in | 1 + src/remote/libvirtd.conf.in | 5 ++ src/rpc/virnettlscontext.c | 2 +- tests/virconfdata/libvirtd.conf | 4 + tests/virconfdata/libvirtd.out | 4 + tools/meson.build | 27 ++++++ tools/virt-pki-query-dn.c | 140 ++++++++++++++++++++++++++++++++ 10 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 tools/virt-pki-query-dn.c -- 2.33.1

2 4

[PATCH 0/6] Add virt-pki-query-dn binary
by Martin Kletzander 11 Nov '21

11 Nov '21

*** BLURB HERE *** Martin Kletzander (6): rpc: Resize dname for longer DN from TLS certs tools: Add virt-pki-query-dn binary docs: Simplify explanation of tls_allowed_dn_list wildcards Remove needless space Add suggestions for virt-pki-query-dn usage news: Mention the addition of virt-pki-query-dn binary NEWS.rst | 6 ++ docs/remote.html.in | 8 +- libvirt.spec.in | 1 + po/POTFILES.in | 1 + src/remote/libvirtd.conf.in | 7 +- src/rpc/virnettlscontext.c | 22 ++--- tests/virconfdata/libvirtd.conf | 9 ++- tests/virconfdata/libvirtd.out | 9 ++- tools/meson.build | 26 ++++++ tools/virt-pki-query-dn.c | 137 ++++++++++++++++++++++++++++++++ 10 files changed, 207 insertions(+), 19 deletions(-) create mode 100644 tools/virt-pki-query-dn.c -- 2.33.1

2 9

[PATCH 0/7] Misc g_auto() rewrites
by Michal Privoznik 11 Nov '21

11 Nov '21

I've been looking at our tests lately and noticed an opportunity to rewrite pieces of code to g_auto() magic. Michal Prívozník (7): qemuagenttest: Don't leak virTypedParameter on failure Prefer g_auto(GStrv) over g_strfreev() qemu: Use g_autoptr(qemuMonitorCPUModelInfo) qemuConnectStealCPUModelFromInfo: Drop needless 'cleanup' label tests: Use g_autoptr(qemuMonitorTest) test: Use g_autofree more tests: Drop cleanup/error labels src/bhyve/bhyve_command.c | 3 +- src/bhyve/bhyve_parse_command.c | 22 +-- src/libxl/libxl_conf.c | 9 +- src/libxl/xen_common.c | 18 +- src/libxl/xen_xl.c | 17 +- src/lxc/lxc_container.c | 4 +- src/lxc/lxc_native.c | 24 +-- src/qemu/qemu_driver.c | 17 +- src/remote/remote_daemon_dispatch.c | 3 +- src/remote/remote_driver.c | 4 +- src/storage/storage_backend_rbd.c | 3 +- src/util/vircgroup.c | 3 +- src/util/vircgroupv2.c | 4 +- src/util/virfirmware.c | 6 +- src/util/viruri.c | 3 +- src/vbox/vbox_common.c | 12 +- src/vbox/vbox_snapshot_conf.c | 40 ++-- src/vbox/vbox_tmpl.c | 3 +- src/vz/vz_sdk.c | 3 +- tests/qemuagenttest.c | 286 ++++++++++++---------------- tests/qemucapabilitiestest.c | 22 +-- tests/qemuhotplugtest.c | 3 +- tests/qemumigparamstest.c | 40 ++-- tests/qemumonitorjsontest.c | 95 ++++----- tests/qemumonitortestutils.c | 63 +++--- tests/vboxsnapshotxmltest.c | 3 +- tests/virconftest.c | 3 +- tests/virfiletest.c | 3 +- tests/virstringtest.c | 3 +- tools/virsh-host.c | 13 +- tools/virt-login-shell-helper.c | 7 +- tools/vsh.c | 4 +- 32 files changed, 279 insertions(+), 464 deletions(-) -- 2.32.0

3 10

[PATCH for-6.2] docs: Deprecate incorrectly typed device_add arguments
by Kevin Wolf 11 Nov '21

11 Nov '21

While introducing a non-QemuOpts code path for device creation for JSON -device, we noticed that QMP device_add doesn't check its input correctly (accepting arguments that should have been rejected), and that users may be relying on this behaviour (libvirt did until it was fixed recently). Let's use a deprecation period before we fix this bug in QEMU to avoid nasty surprises for users. Signed-off-by: Kevin Wolf <kwolf(a)redhat.com> --- docs/about/deprecated.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 600031210d..c03fcf951f 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -250,6 +250,20 @@ options are removed in favor of using explicit ``blockdev-create`` and ``blockdev-add`` calls. See :doc:`/interop/live-block-operations` for details. +Incorrectly typed ``device_add`` arguments (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Due to shortcomings in the internal implementation of ``device_add``, QEMU +incorrectly accepts certain invalid arguments: Any object or list arguments are +silently ignored. Other argument types are not checked, but an implicit +conversion happens, so that e.g. string values can be assigned to integer +device properties or vice versa. + +This is a bug in QEMU that will be fixed in the future so that previously +accepted incorrect commands will return an error. Users should make sure that +all arguments passed to ``device_add`` are consistent with the documented +property types. + System accelerators ------------------- -- 2.31.1

3 2

[PATCH 0/5] Use virXXXEndAPI() more
by Michal Privoznik 11 Nov '21

11 Nov '21

*** BLURB HERE *** Michal Prívozník (5): Use virDomainObjEndAPI() more Use virInterfaceObjEndAPI() more Use virNWFilterBindingObjEndAPI() more Use virNodeDeviceObjEndAPI() more Use virSecretObjEndAPI() more src/conf/virdomainobjlist.c | 24 +++++++----------------- src/conf/virinterfaceobj.c | 3 +-- src/conf/virnodedeviceobj.c | 3 +-- src/conf/virnwfilterbindingobjlist.c | 10 +++------- src/conf/virsecretobj.c | 3 +-- src/libxl/libxl_driver.c | 3 +-- 6 files changed, 14 insertions(+), 32 deletions(-) -- 2.32.0

2 6

[PATCH 0/1] Fix the bug about virsh attach-interface from an ovs
by jx8zjs 11 Nov '21

11 Nov '21

bridge_driver: use ovs-vsctl to setup and clean Qos when using an OVS bridge Fix bug 1826168: bridge type network with ovs bridge can start with Qos setting which do not take any effect Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=1826168 zhangjl02 (1): bridge_driver: use ovs-vsctl to setup and clean Qos when using an OVS bridge src/network/bridge_driver.c | 65 +++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 10 deletions(-) -- 2.30.2.windows.1

5 5

[PATCH v1 0/2] qemu_process: ensure the reboot process is performed completely
by Bihong Yu 11 Nov '21

11 Nov '21

When the vm reboot in ACPI mode, the vm has a certain probability to be shutoff or paused status if the libvirtd is restarted for some reason, which is not expected. This patchset ensure the reboot process is performed completely. Bihong Yu (2): qemu_process: set fakereboot flags false after processing fakereboot over qemu_process: continue to process fakereboot after restarting libvirtd src/qemu/qemu_process.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.27.0

2 7

[libvirt PATCH v2 0/1] Ignore EPERM on attempts to clear a VF VLAN ID
by Dmitrii Shcherbakov 10 Nov '21

10 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, the error is simply ignored. 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/406528913 [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 (1): Ignore EPERM on attempts to clear VF VLAN ID src/libvirt_private.syms | 7 ++ src/util/virnetdev.c | 199 ++++++++++++++++++++++------------- src/util/virnetdevpriv.h | 44 ++++++++ tests/virnetdevtest.c | 222 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 396 insertions(+), 76 deletions(-) create mode 100644 src/util/virnetdevpriv.h -- 2.32.0

1 1

[PATCH] libxl: Free data returned from libxl_userdata_retrieve
by Jim Fehlig 10 Nov '21

10 Nov '21

Found via valgrind ==15016== 3,701 bytes in 2 blocks are definitely lost in loss record 975 of 1,009 ==15016== at 0x4C2A2AF: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==15016== by 0x1FCD30CB: libxl_read_file_contents (in /usr/lib64/libxenlight.so.4.12.0) ==15016== by 0x1FCCA58A: ??? (in /usr/lib64/libxenlight.so.4.12.0) ==15016== by 0x1FCCA6C2: libxl_userdata_retrieve (in /usr/lib64/libxenlight.so.4.12.0) ==15016== by 0x1FA42A5A: libxlReconnectDomain (libxl_driver.c:394) ==15016== by 0x53BAC99: virDomainObjListHelper (virdomainobjlist.c:802) ==15016== by 0x530842F: virHashForEach (virhash.c:575) ==15016== by 0x53BC0E0: virDomainObjListForEach (virdomainobjlist.c:817) ==15016== by 0x1FA423C4: libxlReconnectDomains (libxl_driver.c:468) ==15016== by 0x1FA423C4: libxlStateInitialize (libxl_driver.c:778) ==15016== by 0x54E8E9E: virStateInitialize (libvirt.c:657) ==15016== by 0x12DBFA: daemonRunStateInit (remote_daemon.c:797) ==15016== by 0x535BF79: virThreadHelper (virthread.c:206) Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7ea157f9c4..1a9bf8f186 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -461,6 +461,7 @@ libxlReconnectDomain(virDomainObj *vm, cleanup: libxl_dominfo_dispose(&d_info); + VIR_FREE(data); virObjectUnlock(vm); virObjectUnref(vm); virObjectUnref(cfg); -- 2.33.0

2 2

[PATCH 0/2] Remove support for tls_allowed_dn_list
by Martin Kletzander 10 Nov '21

10 Nov '21

Patch 1/2 details the reasons for this change. Martin Kletzander (2): tls: Drop support for tls_allowed_dn_list news: Add information about removing tls_allowed_dn_list NEWS.rst | 6 ++++ docs/remote.html.in | 26 -------------- docs/tlscerts.html.in | 6 ---- src/remote/libvirtd.aug.in | 1 - src/remote/libvirtd.conf.in | 16 --------- src/remote/remote_daemon.c | 2 -- src/remote/remote_daemon_config.c | 19 +++++----- src/remote/remote_daemon_config.h | 1 - src/remote/test_libvirtd.aug.in | 4 --- src/rpc/virnettlscontext.c | 60 ++++++------------------------- src/rpc/virnettlscontext.h | 2 -- tests/virconfdata/libvirtd.conf | 17 --------- tests/virconfdata/libvirtd.out | 14 -------- tests/virnettlscontexttest.c | 1 - tests/virnettlssessiontest.c | 1 - 15 files changed, 27 insertions(+), 149 deletions(-) -- 2.33.1

3 11

[PATCH v4 0/5] qapi: Add feature flags to enum members
by Markus Armbruster 09 Nov '21

09 Nov '21

PATCH 1+2 add feature flags to enum members. Awkward due to an introspection design mistake; see PATCH 1 for details. PATCH 3+4 implement policy deprecated-input={reject,crash} for enum values. Policy deprecated-output=hide is not implemented, because we can't hide a value without hiding the entire member, which is almost certainly more than the requester of this policy bargained for. Perhaps we want a new policy deprecated-output=hide-or-else-crash to help us catch unwanted use of deprecated enum values. Perhaps we want deprecated-output=hide to behave that way together with deprecated-input=crash. Or even always. Thoughts? PATCH 5 puts the new feature flags to use. It's RFC because it makes sense only on top of Vladimir's deprecation of drive-backup. See its commit message for a reference. I prefer to commit new features together with a use outside tests/. PATCH 5 adds such a use, but it's RFC, because it depends on Vladimir's work. Perhaps another use pops up. I can delay this work in the hope of a use becoming ready, but the feature flags work I have in the pipeline will eventually force my hand. v4: * PATCH 1: Deprecate SchemaInfoEnum member @values. * PATCH 2: Doc tweak v3: * PATCH 1+2: Update qapi-code-gen.rst [Kevin, Eric] * PATCH 4: Commit message typo [Eric], doc update moved to PATCH 2 * PATCH 5: Doc comment FIXME resolved [Kevin] v2: * Rebased with straightforward conflicts. * PATCH 1-4: No longer RFC. * PATCH 1: "Since" information fixed [Eric]. Commit message updated to reflect feedback. * PATCH 2: Commit message amended to point out special feature flag 'deprecated' is ignored at this stage. * PATCH 4: Documentation updated. Commit message tweaked. Markus Armbruster (5): qapi: Enable enum member introspection to show more than name qapi: Add feature flags to enum members qapi: Move compat policy from QObject to generic visitor qapi: Implement deprecated-input={reject,crash} for enum values block: Deprecate transaction type drive-backup docs/about/deprecated.rst | 6 ++++ docs/devel/qapi-code-gen.rst | 29 ++++++++++++++----- qapi/compat.json | 3 ++ qapi/introspect.json | 28 ++++++++++++++++-- qapi/transaction.json | 6 +++- include/qapi/qobject-input-visitor.h | 4 --- include/qapi/qobject-output-visitor.h | 4 --- include/qapi/util.h | 6 +++- include/qapi/visitor-impl.h | 3 ++ include/qapi/visitor.h | 9 ++++++ qapi/qapi-visit-core.c | 27 +++++++++++++++-- qapi/qmp-dispatch.c | 4 +-- qapi/qobject-input-visitor.c | 14 +-------- qapi/qobject-output-visitor.c | 14 +-------- scripts/qapi/expr.py | 3 +- scripts/qapi/introspect.py | 19 +++++++++--- scripts/qapi/schema.py | 22 ++++++++++++-- scripts/qapi/types.py | 17 ++++++++++- tests/qapi-schema/doc-good.json | 5 +++- tests/qapi-schema/doc-good.out | 3 ++ tests/qapi-schema/doc-good.txt | 3 ++ .../qapi-schema/enum-dict-member-unknown.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 3 +- tests/qapi-schema/qapi-schema-test.out | 1 + tests/qapi-schema/test-qapi.py | 1 + 25 files changed, 174 insertions(+), 62 deletions(-) -- 2.31.1

3 15

[libvirt PATCH] qemu_command: do not use host-nodes for system memory
by Pavel Hrdina 09 Nov '21

09 Nov '21

Commit 88957116c9d3cb4705380c3702c9d4315fb500bb switched to use memory-backend-* for regular VM memory as well. That change indirectly started using 'host-nodes' for system memory which results in QEMU calling mbind() to bind the system memory to specific NUMA node if the VM XML contains the configuration similar to this: ... <numatune> <memory mode='strict' nodeset='0'/> </numatune> ... Once the VM was started with that configuration it was no longer possible to change the memory NUMA nodeset. Fixes: 677c90cc1d1fcb3aba09b5d4f0f8f83099911775 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 3 +- .../numatune-system-memory.x86_64-latest.args | 32 +++++++++++++++++++ .../numatune-system-memory.xml | 24 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-system-memory.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 483041f584..9bd7258b1d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3631,7 +3631,8 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps, /* If mode is "restrictive", we should only use cgroups setting allowed memory * nodes, and skip passing the host-nodes and policy parameters to QEMU command * line which means we will use system default memory policy. */ - if (nodemask && mode != VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) { + if (!systemMemory && nodemask && + mode != VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) { if (!virNumaNodesetIsAvailable(nodemask)) return -1; if (virJSONValueObjectAdd(props, diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args new file mode 100644 index 0000000000..aee9b2ce76 --- /dev/null +++ b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=none \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-system-memory.xml b/tests/qemuxml2argvdata/numatune-system-memory.xml new file mode 100644 index 0000000000..833303fe36 --- /dev/null +++ b/tests/qemuxml2argvdata/numatune-system-memory.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>2</vcpu> + <numatune> + <memory mode='strict' nodeset='0'/> + </numatune> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a0498a0d92..161e7efa62 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2063,6 +2063,7 @@ mymain(void) DO_TEST_CAPS_LATEST("numatune-memnode"); DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); + DO_TEST_CAPS_LATEST("numatune-system-memory"); DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_NUMA, -- 2.31.1

2 1