- Devel - libvirt List Archives

[libvirt PATCH] conf: Fix documentation for virDomainDefGetShortName()
by Andrea Bolognani 03 Feb '22

03 Feb '22

The @unique argument didn't exist even when the function was introduced in a042275a396e, and the @vm argument was not renamed when the function was changed to take a virDomainDef* instead of a virDomainObj* in 7ed6934f3b92. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 467f708350..d66496c9b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30086,8 +30086,7 @@ virDomainDefHasMemballoon(const virDomainDef *def) /** * virDomainDefGetShortName: - * @vm: Machine for which to get a name - * @unique: Make sure the name is unique (use id as well) + * @def: domain definition * * Shorten domain name to avoid possible path length limitations. */ -- 2.34.1

2 1

[libvirt PATCH v8 0/3] Ignore EPERM on implicit clearing of VF VLAN ID
by Dmitrii Shcherbakov 03 Feb '22

03 Feb '22

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 may fail with EPERM. Specifically for the mlx5 driver this behavior was altered in the Linux kernel upstream [2] to avoid getting EPERM when trying to program VLAN 0. This may also get backported to older downstream kernels (e.g. [3]). However, Libvirt could potentially handle this case gracefully without needing a specific kernel version or depending on a specific driver fix. 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 [4] eventually. The equivalent ip link commands below provide an illustration: 1. This will work without an error: sudo ip link set enp130s0f0 vf 2 mac de:ad:be:ef:ca:fe 2. Setting (or clearing) a VLAN will fail 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/460293963 v8 change: * Rebased on top of the latest changes to Libvirt; * Added relevant upstream Linux and downstream kernel references to this cover letter. [1] https://docs.mellanox.com/display/BlueFieldSWv35111601/Modes+of+Operation#M… [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… [3] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1957753 [4] 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

3 14

[libvirt PATCH] docs: Add example for isa-debugcon
by Andrea Bolognani 03 Feb '22

03 Feb '22

Most people will want to use isa-debugcon to obtain debug output for SeaBIOS / EDK II, so let's include a ready-made example for that scenario in our documentation. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 8fa5940469..583c195568 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6395,6 +6395,14 @@ Serial port <source path='/dev/pts/3'/> <target port='0'/> </serial> +  + <serial type='pty'> + <target type='isa-debug'> + <model type='isa-debugcon'/> + </target> + <address type='isa' iobase='0x402'/> + </console> + </devices> ... -- 2.34.1

2 1

[libvirt PATCH] syntax-check: Suggest correct replacement for str(n)dup()
by Andrea Bolognani 03 Feb '22

03 Feb '22

As of 610963cd0411 VIR_STRDUP() no longer exists. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d5cdb3c70e..b96d126bdc 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -244,7 +244,7 @@ sc_prohobit_vsnprintf: sc_prohibit_strdup: @prohibit='\<strn?dup\> *\(' \ - halt='use VIR_STRDUP, not strdup' \ + halt='use g_str(n)dup, not str(n)dup' \ $(_sc_search_regexp) # Prefer virSetUIDGID. -- 2.34.1

2 1

[libvirt PATCH] util: Reorder virStringParseVersion() arguments
by Andrea Bolognani 03 Feb '22

03 Feb '22

In order to match the existing virStringParse*() and virStrTo*() functions, input arguments should come before output arguments. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/ch/ch_conf.c | 2 +- src/esx/esx_vi.c | 8 ++++---- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ++-- src/openvz/openvz_conf.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virfirewalld.c | 2 +- src/util/virstring.c | 10 +++++----- src/util/virstring.h | 6 +++--- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_utils.c | 2 +- tests/testutilsqemu.c | 2 +- tests/utiltest.c | 4 ++-- tools/virt-host-validate-common.c | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 578fcfe1d2..1cf0b2abce 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -267,7 +267,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned long *version) uname(&ver); - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 88a23a59cd..41d753fd21 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -204,7 +204,7 @@ chExtractVersion(virCHDriver *driver) return -1; } - if (virStringParseVersion(&version, tmp, true) < 0) { + if (virStringParseVersion(tmp, true, &version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %s"), tmp); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 36e9dc1d2c..1ea81a649c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -868,8 +868,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->apiVersion, - ctx->service->about->apiVersion, true) < 0) { + if (virStringParseVersion(ctx->service->about->apiVersion, true, + &ctx->apiVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); @@ -883,8 +883,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (virStringParseVersion(&ctx->productVersion, - ctx->service->about->version, true) < 0) { + if (virStringParseVersion(ctx->service->about->version, true, + &ctx->productVersion) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3d17b87e8c..51596a820c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1656,7 +1656,7 @@ static int lxcConnectGetVersion(virConnectPtr conn, unsigned long *version) if (virConnectGetVersionEnsureACL(conn) < 0) return -1; - if (virStringParseVersion(version, ver.release, true) < 0) { + if (virStringParseVersion(ver.release, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release); return -1; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 54065a0f75..7798dc47b0 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3655,7 +3655,7 @@ ebiptablesDriverProbeCtdir(void) } /* following Linux lxr, the logic was inverted in 2.6.39 */ - if (virStringParseVersion(&thisversion, utsname.release, true) < 0) { + if (virStringParseVersion(utsname.release, true, &thisversion) < 0) { VIR_ERROR(_("Could not determine kernel version from string %s"), utsname.release); return; @@ -3688,7 +3688,7 @@ ebiptablesDriverProbeStateMatchQuery(virFirewall *fw G_GNUC_UNUSED, * 'iptables v1.4.16' */ if (!(tmp = strchr(lines[0], 'v')) || - virStringParseVersion(version, tmp + 1, true) < 0) { + virStringParseVersion(tmp + 1, true, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse version string '%s'"), lines[0]); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 191c79e1e2..c85829be86 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -85,7 +85,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion) if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL) return -1; - if (virStringParseVersion(&version, tmp, true) < 0) + if (virStringParseVersion(tmp, true, &version) < 0) return -1; if (retversion) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index fd4efa802c..3467d8e4e0 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -614,7 +614,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf) virSkipToDigit(&p); - if (virStringParseVersion(&version, p, true) < 0) + if (virStringParseVersion(p, true, &version) < 0) goto error; if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) { diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index c909901833..05a8f4e714 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -107,7 +107,7 @@ virFirewallDGetVersion(unsigned long *version) g_variant_get(reply, "(v)", &gvar); g_variant_get(gvar, "&s", &versionStr); - if (virStringParseVersion(version, versionStr, false) < 0) { + if (virStringParseVersion(versionStr, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse firewalld version '%s'"), versionStr); diff --git a/src/util/virstring.c b/src/util/virstring.c index ad0b158ad4..ee0fe7fc9e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1023,10 +1023,10 @@ int virStringParseYesNo(const char *str, bool *result) /** * virStringParseVersion: - * @version: unsigned long pointer to output the version number * @str: const char pointer to the version string * @allowMissing: true to treat 3 like 3.0.0, false to error out on - * missing minor or micro + * missing minor or micro + * @version: unsigned long pointer to output the version number * * Parse an unsigned version number from a version string. Expecting * 'major.minor.micro' format, ignoring an optional suffix. @@ -1038,9 +1038,9 @@ int virStringParseYesNo(const char *str, bool *result) * Returns the 0 for success, -1 for error. */ int -virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing) +virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version) { unsigned int major, minor = 0, micro = 0; char *tmp; diff --git a/src/util/virstring.h b/src/util/virstring.h index ec8ceb0022..6334c4f177 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -136,6 +136,6 @@ int virStringParseYesNo(const char *str, bool *result) G_GNUC_WARN_UNUSED_RESULT; -int virStringParseVersion(unsigned long *version, - const char *str, - bool allowMissing); +int virStringParseVersion(const char *str, + bool allowMissing, + unsigned long *version); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index eec47a02fc..ccb719c69d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -170,7 +170,7 @@ vboxExtractVersion(void) gVBoxAPI.UPFN.Utf16ToUtf8(vbox_driver->pFuncs, versionUtf16, &vboxVersion); - if (virStringParseVersion(&vbox_driver->version, vboxVersion, false) >= 0) + if (virStringParseVersion(vboxVersion, false, &vbox_driver->version) >= 0) ret = 0; gVBoxAPI.UPFN.Utf8Free(vbox_driver->pFuncs, vboxVersion); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ebba435cc4..e449d7dcc7 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -229,7 +229,7 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) return -1; } - if (virStringParseVersion(version, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, version) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("version parsing error")); return -1; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fcf6d363a9..c4edf9f673 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -182,7 +182,7 @@ vzInitVersion(struct _vzDriver *driver) } tmp[0] = '\0'; - if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) { + if (virStringParseVersion(sVer, true, &(driver->vzVersion)) < 0) { vzParseError(); goto cleanup; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 646ef415d1..59044bd915 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -695,7 +695,7 @@ testQemuGetLatestCapsForArch(const char *arch, if (!virStringStripSuffix(tmp, fullsuffix)) continue; - if (virStringParseVersion(&ver, tmp, false) < 0) { + if (virStringParseVersion(tmp, false, &ver) < 0) { VIR_TEST_DEBUG("skipping caps file '%s'", ent->d_name); continue; } diff --git a/tests/utiltest.c b/tests/utiltest.c index 419dfea913..59f87f7cf2 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -151,8 +151,8 @@ testParseVersionString(const void *data G_GNUC_UNUSED) unsigned long version; for (i = 0; i < G_N_ELEMENTS(versions); ++i) { - result = virStringParseVersion(&version, versions[i].string, - versions[i].allowMissing); + result = virStringParseVersion(versions[i].string, + versions[i].allowMissing, &version); if (result != versions[i].result) { VIR_TEST_DEBUG("\nVersion string [%s]", versions[i].string); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 2ac96d1e19..7c2cb8b908 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -267,7 +267,7 @@ int virHostValidateLinuxKernel(const char *hvname, return VIR_HOST_VALIDATE_FAILURE(level); } - if (virStringParseVersion(&thisversion, uts.release, true) < 0) { + if (virStringParseVersion(uts.release, true, &thisversion) < 0) { virHostMsgFail(level, "%s", hint); return VIR_HOST_VALIDATE_FAILURE(level); } -- 2.34.1

3 3

[libvirt PATCH v3] NEWS: add note about the ISA debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 666a593b58..d00bda5d50 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -22,6 +22,12 @@ v8.1.0 (unreleased) It works on Intel machines as well as recent machines powered by Apple Silicon. QEMU 6.2.0 is needed for Apple Silicon support. + * qemu: the isa-debugcon device is now supported + + The <serial> element accepts a ``isa-debug`` as a target type + to configure the QEMU ISA debug console, for receiving messages + from the firmware. + * **Improvements** * packaging: sysconfig files no longer installed -- 2.34.1

2 1

[PATCH 0/3] network: Generate TFTP config regardless of DHCP
by Michal Privoznik 03 Feb '22

03 Feb '22

See 3/3 for explanation. Michal Prívozník (3): network: Initialize variables in networkDnsmasqConfContents() network: Separate DHCP config generator into a function network: Generate TFTP config regardless of DHCP src/network/bridge_driver.c | 262 ++++++++++-------- .../networkxml2confdata/netboot-network.conf | 4 +- tests/networkxml2confdata/netboot-tftp.conf | 13 + tests/networkxml2confdata/netboot-tftp.xml | 9 + tests/networkxml2conftest.c | 1 + tests/networkxml2xmlin/netboot-tftp.xml | 1 + tests/networkxml2xmlout/netboot-tftp.xml | 1 + tests/networkxml2xmltest.c | 1 + 8 files changed, 172 insertions(+), 120 deletions(-) create mode 100644 tests/networkxml2confdata/netboot-tftp.conf create mode 100644 tests/networkxml2confdata/netboot-tftp.xml create mode 120000 tests/networkxml2xmlin/netboot-tftp.xml create mode 120000 tests/networkxml2xmlout/netboot-tftp.xml -- 2.32.0

2 4

[libvirt PATCH] meson: Don't overwrite includedir
by Andrea Bolognani 03 Feb '22

03 Feb '22

The current implementation of the workaround for yajl's broken pkg-config file accidentally overwrites the value of includedir that is later used by the installation process. Rename the local variable to avoid this issue. Fixes: c97075e1e46e9305d62620d8b05046aae0139438 Closes: https://gitlab.com/libvirt/libvirt/-/issues/271 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0e6f0f22fc..9016c0458a 100644 --- a/meson.build +++ b/meson.build @@ -1325,18 +1325,18 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() != 'linux' - includedir = yajl_dep.get_pkgconfig_variable('includedir') - if includedir.contains('include/yajl') + yajl_includedir = yajl_dep.get_pkgconfig_variable('includedir') + if yajl_includedir.contains('include/yajl') rc = run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( - includedir, 'include/yajl', 'include', + yajl_includedir, 'include/yajl', 'include', ), check: true, ) - includedir = rc.stdout().strip() + yajl_includedir = rc.stdout().strip() yajl_dep = declare_dependency( - compile_args: [ '-I' + includedir ], + compile_args: [ '-I' + yajl_includedir ], dependencies: [ yajl_dep ], ) endif -- 2.34.1

2 1

[libvirt PATCH v2 0/3] qemu: support the SeaBIOS/EDK2 debug console
by Daniel P. Berrangé 03 Feb '22

03 Feb '22

# virsh dumpxml fedora34x86_64 | xmllint -xpath '/domain/devices/console[2]' - <serial type="pty"> <target type="isa-debug"> <model type="isa-debugcon"/> </target> <address type="isa" iobase="0x402"/> </serial> # virsh console --devname console1 fedora34x86_64 Of course you really want to start the guest paused initially to allow time to connect to the console before resuming CPUs, and thus be able to catch early firmware output. In v2: - Use <serial> instead of <console> Daniel P. Berrangé (3): conf: validate serial port model in ABI checks conf: support firmware ISA debug console qemu: add tests for the ISA debug console command line docs/formatdomain.rst | 14 +++--- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 26 +++++++++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 4 ++ src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_validate.c | 5 +++ .../serial-debugcon.x86_64-latest.args | 39 +++++++++++++++++ tests/qemuxml2argvdata/serial-debugcon.xml | 29 +++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/serial-debugcon.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-debugcon.xml create mode 100644 tests/qemuxml2xmloutdata/serial-debugcon.xml -- 2.34.1

3 12

[libvirt PATCH v5 0/9] Automatic mutex management
by Tim Wiederhake 02 Feb '22

02 Feb '22

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html V2: https://listman.redhat.com/archives/libvir-list/2021-September/msg00249.html V3: https://listman.redhat.com/archives/libvir-list/2021-September/msg00964.html V4: https://listman.redhat.com/archives/libvir-list/2022-January/msg01262.html Changes since V4: * Replaced usage of "__LINE__" with "__COUNTER__" Regards, Tim Tim Wiederhake (9): internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardLock virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virchrdev.c | 12 +++++------- src/internal.h | 3 +++ src/libvirt_private.syms | 3 +++ src/lxc/lxc_driver.c | 6 +++--- src/util/virobject.c | 16 ++++++++++++++++ src/util/virobject.h | 26 ++++++++++++++++++++++++++ src/util/virthread.c | 15 +++++++++++++++ src/util/virthread.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 104 insertions(+), 12 deletions(-) -- 2.31.1

4 25

[PATCH v2] virnodedeviceobj: Don't unlock virNodeDeviceObj in virNodeDeviceObjListRemove()
by Michal Privoznik 02 Feb '22

02 Feb '22

When virNodeDeviceObjListRemove() is called, the passed virNodeDeviceObj is removed from internal list of node devices and then unrefed and unlocked. While the former is warranted (the object was refed at the beginning of the function) the unlock is not. In fact, it's wrong from conceptual POV. We still want threads working on the object tu mutually exclude each other. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-February/msg00036.html diff to v1: - Fixed test driver which worked around broken logic Note, there is similar problem with virNodeDeviceObjListForEachRemove() which removes objects from the list, even without lock, but that happens only with mdevs and I have none to test with. src/conf/virnodedeviceobj.c | 2 +- src/test/test_driver.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2e4ef2df3c..7a560349d4 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,7 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virNodeDeviceObjEndAPI(&obj); + virObjectUnref(obj); virObjectRWUnlock(devs); } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9e1fc65972..f900123941 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6810,7 +6810,7 @@ testDestroyVport(testDriver *privconn, 0); virNodeDeviceObjListRemove(privconn->devs, obj); - virObjectUnref(obj); + virNodeDeviceObjEndAPI(&obj); virObjectEventStateQueue(privconn->eventState, event); return 0; @@ -7797,8 +7797,6 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virObjectLock(obj); virNodeDeviceObjListRemove(driver->devs, obj); - virObjectUnref(obj); - obj = NULL; cleanup: virNodeDeviceObjEndAPI(&obj); -- 2.34.1

2 1

[libvirt PATCH 0/2] ch: fix some issues pointed out by Coverity
by Ján Tomko 02 Feb '22

02 Feb '22

Ján Tomko (2): ch: virCHMonitorGetIOThreads: fix g_steal_pointer usage ch: virCHProcessSetupIOThreads: use correct type for return value src/ch/ch_monitor.c | 2 +- src/ch/ch_process.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] tests: Cover virtio-mem being plugged into a bridge
by Andrea Bolognani 02 Feb '22

02 Feb '22

This is a perfectly valid configuration that we need to keep working, so add test coverage for it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../memory-hotplug-virtio-mem.x86_64-latest.args | 3 ++- tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index dba2452ccf..5aa8110aeb 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -28,11 +28,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index ea9f5e8765..73036d8602 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -35,6 +35,11 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='1' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> @@ -61,7 +66,7 @@ <block unit='KiB'>2048</block> <requested unit='KiB'>1048576</requested> </target> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </memory> </devices> </domain> -- 2.34.1

2 1

[PATCH] qemu_command: Generate memory only after controllers
by Michal Privoznik 02 Feb '22

02 Feb '22

Currently, memory device (def->mems) part of cmd line is generated before any controller. In majority of cases it doesn't matter because neither of memory devices live on a bus that's created by an exposed controller (e.g. there's no DIMM controller, at least not exposed). Except for virtio-mem and virtio-pmem, which do have a PCI address. And if it so happens that the device goes onto non-default bus (pci.0) starting such guest fails, because the controller that creates the desired bus wasn't processed yet. QEMU processes arguments in order. For instance, if virtio-mem has address with bus='0x01' QEMU refuses to start with the following message: Bus 'pci.1' not found Similarly for virtio-pmem. I've successfully tested migration and changing the order does not affect migration stream. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2047271 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 6 +++--- tests/qemuxml2argvdata/hugepages-memaccess.args | 4 ++-- tests/qemuxml2argvdata/hugepages-memaccess2.args | 4 ++-- tests/qemuxml2argvdata/hugepages-numa-default-dimm.args | 4 ++-- .../qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 4 ++-- .../qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 8 ++++---- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 8 ++++---- .../memory-hotplug-nvdimm-access.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-align.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-label.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-ppc64-abi-update.args | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 4 ++-- .../memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 4 ++-- .../memory-hotplug-ppc64-nonuma-abi-update.args | 8 ++++---- tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 8 ++++---- .../memory-hotplug-virtio-mem.x86_64-latest.args | 8 ++++---- .../memory-hotplug-virtio-pmem.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-virtio-pmem.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/pages-dimm-discard.args | 8 ++++---- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fc778901d1..e12512a78c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10579,9 +10579,6 @@ qemuBuildCommandLine(virQEMUDriver *driver, qemuBuildNumaCommandLine(cfg, def, cmd, priv) < 0) return NULL; - if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) - return NULL; - virUUIDFormat(def->uuid, uuid); virCommandAddArgList(cmd, "-uuid", uuid, NULL); @@ -10631,6 +10628,9 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) return NULL; + if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) + return NULL; + if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) return NULL; diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args index b89f791697..a369c7f6da 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ --device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ +-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args index 0c296797e9..434ebdaa62 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=off,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ --device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ +-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args index f560cabf8e..57bb70346d 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args @@ -19,8 +19,6 @@ QEMU_AUDIO_DRV=none \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -32,4 +30,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 72eae74869..ac719b8c9c 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 9d1f9831d9..6f5a983d3a 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -smp 8,sockets=1,dies=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args index 907072d55d..b36117f1e8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ --object memory-backend-ram,id=memdimm2,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ +-object memory-backend-ram,id=memdimm2,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 5d87f4a3ef..72c2803c5e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args index 1d4fee4b6e..5967b3566e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args index 6c28c86004..0b29a6fded 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ --device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args index 711864037b..dd6884ca14 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args index c45b401af5..7c67161b78 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ --device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ +-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args index ca4bd6c406..2a1ae03004 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args index 3f35d4dca2..c4dae0cfd1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ --device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 68174e96b5..a0d30a15e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args index ebdb0429d0..55b16c9dc2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args @@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ --device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ +-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args index ebdb0429d0..55b16c9dc2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args @@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ --device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ +-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args index bca2f286ba..b1873c100f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ --device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ +-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args index a1709c918c..9ad3f239da 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1dd3f9f1a4..4e8eea2bcf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index 5380c9e805..e8a6451841 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ -m size=1048576k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-ram,id=memdimm1,size=536870912 \ --device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-ram,id=memdimm1,size=536870912 \ +-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args index acff36eb78..181409cde0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args @@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ -m size=1310720k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-ram,id=memdimm1,size=536870912 \ --device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-ram,id=memdimm1,size=536870912 \ +-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 77dbc0c89c..dba2452ccf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -18,10 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ --object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -33,6 +29,10 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args index 17fd98fb88..8fa678c209 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=2145386496 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ --device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ +-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args index fdbdfa00c3..25b521978f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ --device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virtiopmem0","bus":"pci.0","addr":"0x5"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ +-device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virtiopmem0","bus":"pci.0","addr":"0x5"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args index 2ebe9c1350..e63c908549 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ b/tests/qemuxml2argvdata/pages-dimm-discard.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -32,4 +28,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on -- 2.34.1

3 6

[libvirt PATCH 0/3] meson: Fix RPM builds
by Andrea Bolognani 02 Feb '22

02 Feb '22

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/461702102 The Ubuntu failures are due to connection issues and should be transient; all RPM builds passed. Andrea Bolognani (3): rpm: List one more directory meson: Sort virt_install_dirs meson: Add missing virt_install_dirs libvirt.spec.in | 1 + src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 8 +++++++- src/lxc/meson.build | 4 +++- src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 20 ++++++++++++++++---- src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 13 files changed, 58 insertions(+), 7 deletions(-) -- 2.34.1

2 4

[PATCH v2 0/4] qemu_tpm: Get swtpm pid without binary validation
by Vasiliy Ulyanov 02 Feb '22

02 Feb '22

v2 of https://listman.redhat.com/archives/libvir-list/2022-January/msg00008.html The v2 series introduces the new approach following the previous review comments. It adds a function for pidfile lock validation (i.e. if its locked by the expected process) and adds the new check to virPidFileReadPathIfAlive. The daemonization and pidfile handling for swtpm command are now handled by libvirt. The fix to qemu_vhost_user_gpu is currently done by visual code checking. Not really sure how to test e2e as I dont have a quick reproducer atm :( Note: I wasn't sure about the refactoring of virPidFileReadPathIfAlive (i.e. whether to remove the binary path from there). For now decided to introduce the new lock check only if the path is not provided. But I am open for suggestions on how to better fit the new check. Vasiliy Ulyanov (4): virfile: Add virFileGetLockOwner function virpidfile: Refactor virPidFileReadPathIfAlive qemu_tpm: Get swtpm pid without binary validation qemu: gpu: Get pid without binary validation src/libvirt_private.syms | 1 + src/qemu/qemu_tpm.c | 26 +++++++++----------- src/qemu/qemu_vhost_user_gpu.c | 9 +++---- src/util/virfile.c | 45 ++++++++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ src/util/virpidfile.c | 20 +++++++++++++++ 6 files changed, 82 insertions(+), 21 deletions(-) -- 2.34.1

3 9

[libvirt PATCH 0/3] rpm: Fix and improve handling of directories
by Andrea Bolognani 02 Feb '22

02 Feb '22

With respect to the permissions topic mentioned in patch 3/3, I'm currently working on some patches that aim to improve that situation as well. Andrea Bolognani (3): rpm: Move /etc/libvirt from -daemon to -libs rpm: Move /var/lib/libvirt from -libs to -daemon rpm: List more directories libvirt.spec.in | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) -- 2.34.1

2 6

[libvirt PATCH 0/2] qemu: QEMU_AUDIO_DRV fixes and cleanups
by Andrea Bolognani 02 Feb '22

02 Feb '22

Andrea Bolognani (2): qemu: Correctly translate QEMU_AUDIO_DRV=wav qemu: Drop qemuAudioDriver enumeration src/qemu/qemu_command.c | 46 +++++++++++++++++++++++++++++------------ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_domain.c | 16 ++++---------- 3 files changed, 40 insertions(+), 25 deletions(-) -- 2.34.1

2 4

[libvirt PATCH 0/4] move virParseVersionString to virstring.c
by Ján Tomko 02 Feb '22

02 Feb '22

And clean up some includes while doing it. Ján Tomko (4): maint: add required includes util: virParseVersionString: move to virstring.c virParseVersionString: rename to virStringParseVersion maint: remove unnecessary virutil.h includes src/bhyve/bhyve_driver.c | 2 +- src/ch/ch_conf.c | 2 +- src/esx/esx_vi.c | 9 ++--- src/libvirt_private.syms | 2 +- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 6 +-- src/openvz/openvz_conf.c | 3 +- src/util/virdnsmasq.c | 3 +- src/util/virfirewalld.c | 4 +- src/util/virstring.c | 48 +++++++++++++++++++++++ src/util/virstring.h | 4 ++ src/util/virutil.c | 46 ---------------------- src/util/virutil.h | 3 -- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 3 +- src/vz/vz_utils.c | 2 +- tests/testutilsqemu.c | 3 +- tests/utiltest.c | 2 +- tools/virt-host-validate-common.c | 2 +- 19 files changed, 73 insertions(+), 75 deletions(-) -- 2.34.1

3 6

[libvirt PATCH] qemu: virtiofs: check whether the supplied binary exists
by Ján Tomko 02 Feb '22

02 Feb '22

Report an error upfront if the binary does not exist or is not executable. https://bugzilla.redhat.com/show_bug.cgi?id=1999372 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_virtiofs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 1b853a5a59..7e3324b017 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -184,6 +184,13 @@ qemuVirtioFSStart(virQEMUDriver *driver, VIR_AUTOCLOSE logfd = -1; int rc; + if (!virFileIsExecutable(fs->binary)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("virtiofsd binary '%s' is not executable"), + fs->binary); + return -1; + } + if (!virFileExists(fs->src->path)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("the virtiofs export directory '%s' does not exist"), -- 2.31.1

2 1

[PATCH] virnodedeviceobj: Don't unlock virNodeDeviceObj in virNodeDeviceObjListRemove()
by Michal Privoznik 02 Feb '22

02 Feb '22

When virNodeDeviceObjListRemove() is called, the passed virNodeDeviceObj is removed from internal list of node devices and then unrefed and unlocked. While the former is warranted (the object was refed at the beginning of the function) the unlock is not. In fact, it's wrong from conceptual POV. We still want threads working on the object tu mutually exclude each other. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnodedeviceobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2e4ef2df3c..7a560349d4 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,7 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virNodeDeviceObjEndAPI(&obj); + virObjectUnref(obj); virObjectRWUnlock(devs); } -- 2.34.1

2 1

[libvirt PATCH v5 0/7] cgroup and thread management in ch driver
by Praveen K Paladugu 01 Feb '22

01 Feb '22

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. v5: * bumped the verion of callbacks in ch driver to 8.1.0 v4: * addressed all open comments in v3 * dropped all the merged commits v3: * addrressed all the formatting comments in v2 patch set * dropped indentation patches are they do not adhere to libvirt coding style * fixed build issue in qemu driver that was introduced in v2 Praveen K Paladugu (3): qemu,hypervisor: refactor some cgroup mgmt methods ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (4): ch: 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 src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 4 +- src/ch/ch_domain.c | 64 ++++ src/ch/ch_domain.h | 18 +- src/ch/ch_driver.c | 590 +++++++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 156 +++++++++ src/ch/ch_monitor.h | 56 +++- src/ch/ch_process.c | 385 ++++++++++++++++++++- src/ch/ch_process.h | 3 + src/hypervisor/domain_cgroup.c | 457 ++++++++++++++++++++++++- src/hypervisor/domain_cgroup.h | 72 ++++ src/libvirt_private.syms | 14 +- src/qemu/qemu_cgroup.c | 413 +---------------------- src/qemu/qemu_cgroup.h | 11 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 24 +- 17 files changed, 1835 insertions(+), 455 deletions(-) -- 2.27.0

2 17

[PATCH 0/4] Couple of misc cleanups
by Michal Privoznik 01 Feb '22

01 Feb '22

*** BLURB HERE *** Michal Prívozník (4): test_driver: Don't leak @group_name lib: Don't set variable to NULL after VIR_FREE() virpcivpdtest: Fix potential double-free() src: Use g_steal_pointer() more src/conf/domain_conf.c | 1 - src/conf/nwfilter_conf.c | 1 - src/esx/esx_vi.c | 6 ++---- src/hyperv/hyperv_driver.c | 8 +++----- src/hyperv/hyperv_wmi.c | 3 +-- src/hypervisor/virhostdev.c | 3 +-- src/libxl/xen_common.c | 12 ++++-------- src/qemu/qemu_hotplug.c | 6 ++---- src/qemu/qemu_migration.c | 9 +++------ src/storage/storage_backend_gluster.c | 9 +++------ src/storage/storage_util.c | 6 ++---- src/test/test_driver.c | 1 - src/util/virfile.c | 3 +-- src/util/virlease.c | 3 +-- src/util/virnuma.c | 9 +++------ tests/virpcivpdtest.c | 4 +++- tests/virtypedparamtest.c | 1 - 17 files changed, 29 insertions(+), 56 deletions(-) -- 2.34.1

3 11

[PATCH v2] docs: expand firmware descriptor to allow flash without NVRAM
by Daniel P. Berrangé 01 Feb '22

01 Feb '22

The current firmware descriptor schema for flash requires that both the executable to NVRAM template paths be provided. This is fine for the most common usage of EDK2 builds in virtualization where the separate _CODE and _VARS files are provided. With confidential computing technology like AMD SEV, persistent storage of variables may be completely disabled because the firmware requires a known clean state on every cold boot. There is no way to express this in the firmware descriptor today. Even with regular EDK2 builds it is possible to create a firmware that has both executable code and variable persistence in a single file. This hasn't been commonly used, since it would mean every guest bootup would need to clone the full firmware file, leading to redundant duplicate storage of the code portion. In some scenarios this may not matter and might even be beneficial. For example if a public cloud allows users to bring their own firmware, such that the user can pre-enroll their own secure boot keys, you're going to have this copied on disk for each tenant already. At this point the it can be simpler to just deal with a single file rather than split builds. The firmware descriptor ought to be able to express this combined firmware model too. This all points towards expanding the schema for flash with a 'mode' concept: - "split" - the current implicit behaviour with separate files for code and variables. - "combined" - the alternate behaviour where a single file contains both code and variables. - "stateless" - the confidential computing use case where storage of variables is completely disable, leaving only the code. Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/interop/firmware.json | 54 ++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) In v2: - Mark 'mode' as optional field - Misc typos in docs diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 8d8b0be030..f5d1d0b6e7 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -210,24 +210,61 @@ 'data' : { 'filename' : 'str', 'format' : 'BlockdevDriver' } } + +## +# @FirmwareFlashType: +# +# Describes how the firmware build handles code versus variable +# persistence. +# +# @split: the executable file contains code while the NVRAM +# template provides variable storage. The executable +# must be configured read-only and can be shared between +# multiple guests. The NVRAM template must be cloned +# for each new guest and configured read-write. +# +# @combined: the executable file contains both code and +# variable storage. The executable must be cloned +# for each new guest and configured read-write. +# No NVRAM template will be specified. +# +# @stateless: the executable file contains code and variable +# storage is not persisted. The executed must +# be configured read-only and can be shared +# between multiple guests. No NVRAM template +# will be specified. +# +# Since: 7.0.0 +## +{ 'enum': 'FirmwareFlashMode', + 'data': [ 'split', 'combined', 'stateless' ] } + ## # @FirmwareMappingFlash: # # Describes loading and mapping properties for the firmware executable # and its accompanying NVRAM file, when @FirmwareDevice is @flash. # -# @executable: Identifies the firmware executable. The firmware -# executable may be shared by multiple virtual machine -# definitions. The preferred corresponding QEMU command -# line options are +# @mode: describes how the firmware build handles code versus variable +# storage. If not present, it must be treated as if it was +# configured with value ``split``. Since: 7.0.0 +# +# @executable: Identifies the firmware executable. The @mode +# indicates whether there will be an associated +# NVRAM template present. The preferred +# corresponding QEMU command line options are # -drive if=none,id=pflash0,readonly=on,file=@executable.@filename,format=@executable.@format # -machine pflash0=pflash0 -# or equivalent -blockdev instead of -drive. +# or equivalent -blockdev instead of -drive. When +# @mode is ``combined`` the executable must be +# cloned before use and configured with readonly=off. # With QEMU versions older than 4.0, you have to use # -drive if=pflash,unit=0,readonly=on,file=@executable.@filename,format=@executable.@format # # @nvram-template: Identifies the NVRAM template compatible with -# @executable. Management software instantiates an +# @executable, when @mode is set to ``split``, +# otherwise it should not be present. +# Management software instantiates an # individual copy -- a specific NVRAM file -- from # @nvram-template.@filename for each new virtual # machine definition created. @nvram-template.@filename @@ -246,8 +283,9 @@ # Since: 3.0 ## { 'struct' : 'FirmwareMappingFlash', - 'data' : { 'executable' : 'FirmwareFlashFile', - 'nvram-template' : 'FirmwareFlashFile' } } + 'data' : { '*mode': 'FirmwareFlashMode', + 'executable' : 'FirmwareFlashFile', + '*nvram-template' : 'FirmwareFlashFile' } } ## # @FirmwareMappingKernel: -- 2.34.1

3 6

[PATCH] virnwfilterobj: Unlock virNWFilterObj before triggering rebuild
by Michal Privoznik 01 Feb '22

01 Feb '22

When updating am NWFilter, rebuilding of all NWFilters is triggered. This happens in virNWFilterObjListAssignDef() by calling virNWFilterTriggerRebuild(). Now consider another thread, that's currently executing virNWFilterBindingCreateXML() over the same NWFilter. What happens is that this second thread gets all the way into virNWFilterInstantiateFilterInternal(), acquires @updateMutex and transitively calls virNWFilterObjListFindByName() which iterates over list of NWFilters, locking one by one, comparing names trying to find the desired one. Sooner or later it will try to lock the object that the other, original thread is redefining and which it holds locked. Now that thread can't continue either because it's waiting for the @updateMutex lock. So we end up in a typical deadlock situation, one thread holding lock A trying to acquire lock B, the other thread holding B and trying to acquire A. The solution is to unlock the virNWFilterObj in the first thread, just before triggering rebuild. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2044379 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'm not sure this is 100% correct, but hey - it make that particular bug go away. src/conf/virnwfilterobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 6bbdf6e6fa..d6c2e59ce8 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -352,12 +352,17 @@ virNWFilterObjListAssignDef(virNWFilterObjList *nwfilters, } obj->newDef = def; - /* trigger the update on VMs referencing the filter */ + + /* Trigger the update on VMs referencing the filter, but + * unlock the filter because rebuild will lock it again. */ + virNWFilterObjUnlock(obj); if (virNWFilterTriggerRebuild() < 0) { + virNWFilterObjLock(obj); obj->newDef = NULL; virNWFilterObjUnlock(obj); return NULL; } + virNWFilterObjLock(obj); virNWFilterDefFree(objdef); obj->def = def; -- 2.34.1

2 1

[PATCH] systemd: Use correct man page name in modular daemon service files
by Peter Krempa 01 Feb '22

01 Feb '22

The service files were copied out of the service file for libvirtd and the name of the corresponding manpage was not fixed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2045959 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/ch/virtchd.service.in | 2 +- src/interface/virtinterfaced.service.in | 2 +- src/libxl/virtxend.service.in | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/network/virtnetworkd.service.in | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- src/remote/virtproxyd.service.in | 2 +- src/secret/virtsecretd.service.in | 2 +- src/storage/virtstoraged.service.in | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vz/virtvzd.service.in | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index f08339f211..f53a12ea05 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -13,7 +13,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtchd(8) Documentation=https://libvirt.org [Service] diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in index 3d944e17a9..cb860ff1c4 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtinterfaced(8) Documentation=https://libvirt.org [Service] diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 2b5163e179..6b083c414f 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -12,7 +12,7 @@ After=local-fs.target After=remote-fs.target After=xencommons.service Conflicts=xendomains.service -Documentation=man:libvirtd(8) +Documentation=man:virtxend(8) Documentation=https://libvirt.org ConditionPathExists=/proc/xen/capabilities diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index d58bde9f5d..334c34db44 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -13,7 +13,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtlxcd(8) Documentation=https://libvirt.org [Service] diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in index 3decfbbf1d..05ce672b73 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -11,7 +11,7 @@ After=ip6tables.service After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnetworkd(8) Documentation=https://libvirt.org [Service] diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in index 688cf89822..cd9de362fd 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnodedevd(8) Documentation=https://libvirt.org [Service] diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in index 36d00b58f0..ab65419e0c 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnwfilterd(8) Documentation=https://libvirt.org [Service] diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 551eb4d405..5ad968ace9 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -15,7 +15,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtqemud(8) Documentation=https://libvirt.org [Service] diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index 10e8cf7263..f9bb6b84a9 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtproxyd(8) Documentation=https://libvirt.org [Service] diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in index cbd63fe0b2..6d298c5334 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtsecretd(8) Documentation=https://libvirt.org [Service] diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in index f72f8426fd..eda4d86d37 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -10,7 +10,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtstoraged(8) Documentation=https://libvirt.org [Service] diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index cfdafc39d2..6f447276e9 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -9,7 +9,7 @@ After=dbus.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtvboxd(8) Documentation=https://libvirt.org [Service] diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 7636bf2b9e..2b1165c92b 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -9,7 +9,7 @@ After=dbus.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtvzd(8) Documentation=https://libvirt.org [Service] -- 2.34.1

2 1

[PATCH] virnwfilterbindingobj: Fix virNWFilterBindingObjNew()
by Michal Privoznik 01 Feb '22

01 Feb '22

The idea behind virNWFilterBindingObjNew() is to create and return an object of virNWFilterBindingObjClass class. The class is virObjectLockable (and the corresponding _virNWFilterBindingObj structure has virObjectLockable parent). But for some reason plain virObjectNew() is called. This is wrong because the mutex in the parent is left uninitialized. Next, the returned object is not locked. This is wrong because in some cases the returned object is added onto a list of bindings and then passed to virNWFilterBindingObjEndAPI() which unlocks it right away. This is potentially dangerous because we might just have unlocked the object for another thread. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnwfilterbindingobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index acea240b5d..d387af68c0 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -57,10 +57,15 @@ VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj); virNWFilterBindingObj * virNWFilterBindingObjNew(void) { + virNWFilterBindingObj *ret; if (virNWFilterBindingObjInitialize() < 0) return NULL; - return virObjectNew(virNWFilterBindingObjClass); + if (!(ret = virObjectLockableNew(virNWFilterBindingObjClass))) + return NULL; + + virObjectLock(ret); + return ret; } -- 2.34.1

2 1

Re: [PATCH v3 1/2] hw/i386: Attach CPUs to machine
by Daniel P. Berrangé 01 Feb '22

01 Feb '22

Cc libvir-list since this will (intentionally) break compatibility with current libvirt code that looks for "/machine/unattached/device[0]" in the assumption it is the first CPU. On Tue, Feb 01, 2022 at 12:35:06AM +0100, Philippe Mathieu-Daudé wrote: > Previously CPUs were exposed in the QOM tree at a path > > /machine/unattached/device[nn] > > where the 'nn' of the first CPU is usually zero, but can > vary depending on what devices were already created. > > With this change the CPUs are now at > > /machine/cpu[nn] > > where the 'nn' of the first CPU is always zero. > > Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> > --- > hw/i386/x86.c | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> > > diff --git a/hw/i386/x86.c b/hw/i386/x86.c > index b84840a1bb9..50bf249c700 100644 > --- a/hw/i386/x86.c > +++ b/hw/i386/x86.c > @@ -108,6 +108,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) > { > Object *cpu = object_new(MACHINE(x86ms)->cpu_type); > > + object_property_add_child(OBJECT(x86ms), "cpu[*]", OBJECT(cpu)); > if (!object_property_set_uint(cpu, "apic-id", apic_id, errp)) { > goto out; > } > -- > 2.34.1 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt PATCH] tests: refactor testSELinuxLoadDef
by Ján Tomko 31 Jan '22

31 Jan '22

Since its introduction in commit 907a39e735d256b8428ed4c77009d1f713aea19b Add a test suite for validating SELinux labelling this function did not return NULL on OOM. Since we abort on OOM now, switch testSELinuxMungePath to void, return NULL explicitly on XML parsing failure and remove the (now pointless) cleanup label. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/securityselinuxlabeltest.c | 35 +++++++++++--------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 09902e1c54..b62162fe9f 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -82,16 +82,12 @@ testUserXattrEnabled(void) return ret; } -static int +static void testSELinuxMungePath(char **path) { - char *tmp; - - tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, *path); - - VIR_FREE(*path); + char *tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, *path); + g_free(*path); *path = tmp; - return 0; } static int @@ -154,7 +150,7 @@ testSELinuxLoadFileList(const char *testname, static virDomainDef * testSELinuxLoadDef(const char *testname) { - char *xmlfile = NULL; + g_autofree char *xmlfile = NULL; virDomainDef *def = NULL; size_t i; @@ -163,15 +159,14 @@ testSELinuxLoadDef(const char *testname) if (!(def = virDomainDefParseFile(xmlfile, driver.xmlopt, NULL, 0))) - goto cleanup; + return NULL; for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->src->type != VIR_STORAGE_TYPE_FILE && def->disks[i]->src->type != VIR_STORAGE_TYPE_BLOCK) continue; - if (testSELinuxMungePath(&def->disks[i]->src->path) < 0) - goto cleanup; + testSELinuxMungePath(&def->disks[i]->src->path); } for (i = 0; i < def->nserials; i++) { @@ -182,23 +177,17 @@ testSELinuxLoadDef(const char *testname) continue; if (def->serials[i]->source->type == VIR_DOMAIN_CHR_TYPE_UNIX) { - if (testSELinuxMungePath(&def->serials[i]->source->data.nix.path) < 0) - goto cleanup; + testSELinuxMungePath(&def->serials[i]->source->data.nix.path); } else { - if (testSELinuxMungePath(&def->serials[i]->source->data.file.path) < 0) - goto cleanup; + testSELinuxMungePath(&def->serials[i]->source->data.file.path); } } - if (def->os.kernel && - testSELinuxMungePath(&def->os.kernel) < 0) - goto cleanup; - if (def->os.initrd && - testSELinuxMungePath(&def->os.initrd) < 0) - goto cleanup; + if (def->os.kernel) + testSELinuxMungePath(&def->os.kernel); + if (def->os.initrd) + testSELinuxMungePath(&def->os.initrd); - cleanup: - VIR_FREE(xmlfile); return def; } -- 2.34.1

2 1

[libvirt PATCH 0/4] libxl: clean up more LIBXL_HAVE constants
by Ján Tomko 31 Jan '22

31 Jan '22

We still were checking for some that were introduced before Xen 4.9 Ján Tomko (4): libxl: assume LIBXL_HAVE_DEVICE_BACKEND_DOMNAME libxl: remove LIBXL_ATTR_UNUSED libxl: assume LIBXL_HAVE_SRM_V2 libxl: assume LIBXL_HAVE_PVUSB src/libxl/libxl_conf.c | 20 ++------------------ src/libxl/libxl_conf.h | 13 +------------ 2 files changed, 3 insertions(+), 30 deletions(-) -- 2.34.1

2 5

[libvirt PATCH] syntax-check: https: list the HTTP-only sites
by Ján Tomko 31 Jan '22

31 Jan '22

Instead of listing the sites that surely support HTTPS, list the ones that don't. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- build-aux/syntax-check.mk | 66 ++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 4d396699c9..d5cdb3c70e 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -874,20 +874,62 @@ sc_prohibit_obj_free_apis_in_virsh: halt='avoid using public virXXXFree in virsh, use virsh-prefixed wrappers instead' \ $(_sc_search_regexp) -https_sites = www.libvirt.org -https_sites += libvirt.org -https_sites += security.libvirt.org -https_sites += qemu.org -https_sites += www.qemu.org -https_sites += wiki.qemu.org -https_sites += linux-kvm.org -https_sites += www.linux-kvm.org - -https_re= ($(subst $(space),|,$(https_sites))) +# Links in various schemas +http_sites = libvirt.org.*\/schemas\/ +http_sites += \.dtd +http_sites += libosinfo +http_sites += localhost +http_sites += rdf:resource +http_sites += schemas.dmtf.org +http_sites += schemas.microsoft.com +http_sites += schemas.xmlsoap.org +http_sites += www.inkscape.org +http_sites += www.innotek.de +http_sites += www.w3.org +http_sites += xmlns + +# Links in licenses +http_sites += scripts.sil.org +http_sites += www.gnu.org\/licenses\/ +http_sites += www.sun.com + +# Example links +http_sites += example.com +http_sites += example.org +http_sites += herp.derp + +# HTTP-only sites +http_sites += 0pointer.de +http_sites += mah.everybody.org +http_sites += mingw.org +http_sites += munin.projects.linpro.no +http_sites += netcat.sourceforge.net +http_sites += snooze.inria.fr +http_sites += www.nimbusproject.org +http_sites += www.odin.com +http_sites += www.sflow.net +http_sites += xmlsoft.org +http_sites += etallen.com + +# dead sites +http_sites += blog.lystor.org.ua +http_sites += blog.mes-stats.fr +http_sites += cc1.ifj.edu.pl +http_sites += www.javvin.com + +# 404 links +http_sites += publib.boulder.ibm.com +http_sites += kerneltrap.org +http_sites += valloric.github.io +http_sites += www.microsoft.com +http_sites += xenbits.xen.org +http_sites += lovezutto.googlepages.com + +http_re= ($(subst $(space),|,$(http_sites))) sc_prohibit_http_urls: - @prohibit='http://$(https_re)' \ - exclude="/schemas/" \ + @prohibit='http://\w' \ + exclude="$(http_re)" \ halt='Links must use https:// protocol' \ $(_sc_search_regexp) -- 2.34.1

2 1

[libvirt PATCH] qemu_firmware: don't error out for unknown firmware features
by Pavel Hrdina 31 Jan '22

31 Jan '22

When QEMU introduces new firmware features libvirt will fail until we list that feature in our code as well which doesn't sound right. We should simply ignore the new feature until we add a proper support for it. Reported-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_firmware.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 94e88ebe4b..e37a7edefa 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -567,6 +567,7 @@ qemuFirmwareFeatureParse(const char *path, virJSONValue *featuresJSON; g_autoptr(qemuFirmwareFeature) features = NULL; size_t nfeatures; + size_t nparsed = 0; size_t i; if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { @@ -586,17 +587,16 @@ qemuFirmwareFeatureParse(const char *path, int tmp; if ((tmp = qemuFirmwareFeatureTypeFromString(tmpStr)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown feature %s"), - tmpStr); - return -1; + VIR_DEBUG("unknown feature %s", tmpStr); + continue; } - features[i] = tmp; + features[nparsed] = tmp; + nparsed++; } fw->features = g_steal_pointer(&features); - fw->nfeatures = nfeatures; + fw->nfeatures = nparsed; return 0; } -- 2.30.2

4 10

[libvirt PATCH] qemu: qemuDomainSetLaunchSecurityState: do not lookup qemuCaps in cache
by Ján Tomko 31 Jan '22

31 Jan '22

Any active domain has a copy in the privateData, filled in qemuProcessInit. Move the qemu capability check below the activeness check and remove the extra lookup. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_driver.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cbd17c10ae..acaa6f7629 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19975,12 +19975,12 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, virDomainObj *vm; int ret = -1; int rc; - g_autoptr(virQEMUCaps) qemucaps = NULL; const char *secrethdr = NULL; const char *secret = NULL; unsigned long long setaddr = 0; bool hasSetaddr = false; int state; + qemuDomainObjPrivate *priv; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, @@ -19996,6 +19996,8 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, if (!(vm = qemuDomainObjFromDomain(domain))) goto cleanup; + priv = vm->privateData; + if (virDomainSetLaunchSecurityStateEnsureACL(domain->conn, vm->def) < 0) goto cleanup; @@ -20007,17 +20009,6 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, goto cleanup; } - if (!(qemucaps = virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL))) - goto cleanup; - - if (!virQEMUCapsGet(qemucaps, QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("QEMU does not support setting a launch secret")); - goto cleanup; - } - if (virTypedParamsGetString(params, nparams, VIR_DOMAIN_LAUNCH_SECURITY_SEV_SECRET_HEADER, &secrethdr) < 0 || @@ -20050,6 +20041,12 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, goto endjob; } + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("QEMU does not support setting a launch secret")); + goto cleanup; + } + qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetLaunchSecurityState(QEMU_DOMAIN_PRIVATE(vm)->mon, secrethdr, secret, setaddr, hasSetaddr); -- 2.34.1

2 2

[PATCH] kbase: debuglogs: Add note about sensitive information in the logs
by Peter Krempa 31 Jan '22

31 Jan '22

Outline information commonly logged which users could consider sensitive. Add a note that VNC/SPICE passwords are logged in plaintext. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/kbase/debuglogs.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index c361c698c5..00dbc9bbf7 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -300,6 +300,8 @@ Now you should go and reproduce the bug. Once you're finished, attach: - If you are asked for client logs, ``/tmp/libvirt_client.log``. - Ideally don't tear down the environment in case additional information is required. +- Consider whether you consider any of the information in the debug logs + sensitive: `Sensitive information in debug logs`_. Example filter settings ======================= @@ -339,3 +341,25 @@ This filter logs only QMP traffic and skips most of libvirt's messages. :: 2:qemu.qemu_monitor 3:* + +Sensitive information in debug logs +=================================== + +Debug logs may contain information that certain users may consider sensitive +although generally it's okay to share debuglogs publicly. + +Information which could be deemed sensitive: + + - hostname of the host + - names of VMs and other objects + - paths to disk images + - IP addresses of guests and the host + - hostnames/IP addresses of disks accessed via network + + +Libvirt's debug logs only ever have passwords and disk encryption secrets in +encrypted form without the key being part of the log. There's one notable +exception, that ``VNC/SPICE`` passwords can be found in the logs. + +In case you decide to mask information you consider sensitive from the posted +debug logs, make sure that the masking doesn't introduce ambiguity. -- 2.34.1

2 2

[libvirt PATCH] conf: network: remove hostname validation
by Ján Tomko 31 Jan '22

31 Jan '22

We used to validate that the first character of the hostname is a letter. Later, RFC1123 relaxed the requirements to allow a number as well. Drop the validation completely, since we do not care about the following characters, and neither does dnsmasq (even if it's a comma, which is a delimiter in the hosts file). Reverts: 673b74be5fda928da5e9f3c2cfbf6c1cb1eda0c6 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/network_conf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c769bbaeb5..8f50e22be5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -548,12 +548,6 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } name = virXMLPropString(node, "name"); - if (name && !(g_ascii_isalpha(name[0]) || g_ascii_isdigit(name[0]))) { - virReportError(VIR_ERR_XML_ERROR, - _("Cannot use host name '%s' in network '%s'"), - name, networkName); - return -1; - } ip = virXMLPropString(node, "ip"); if (ip && (virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) { -- 2.31.1

2 2

[PATCH] lib: Drop '&*' from '&*variable'
by Michal Privoznik 31 Jan '22

31 Jan '22

Apparently, some of '&*variable' slipped in. Drop '&*' and access the variable directly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration_cookie.c | 2 +- src/rpc/virnetclientstream.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index aa8f6b8d05..6b915d7535 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1765,7 +1765,7 @@ qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainSecretInfo **secinfo, *secinfo = g_new0(qemuDomainSecretInfo, 1); } - (*secinfo)->alias = g_steal_pointer(&*alias); + (*secinfo)->alias = g_steal_pointer(alias); return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1141efef4b..370d223198 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12221,7 +12221,7 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst, virCPUDefFreeModel(dst); - info = g_steal_pointer(&*src); + info = g_steal_pointer(src); dst->model = g_steal_pointer(&info->name); for (i = 0; i < info->nprops; i++) { diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index bffab7c13d..ba05a5a07f 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -423,7 +423,7 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookie *mig, if (!def || !*def) return 0; - mig->persistent = g_steal_pointer(&*def); + mig->persistent = g_steal_pointer(def); mig->flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; mig->flagsMandatory |= QEMU_MIGRATION_COOKIE_PERSISTENT; return 0; diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index eb4dc6854d..e8e8ca2af2 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -286,18 +286,18 @@ int virNetClientStreamSetError(virNetClientStream *st, st->err.code = err.code; } if (err.message) { - st->err.message = g_steal_pointer(&*err.message); + st->err.message = g_steal_pointer(err.message); } st->err.domain = err.domain; st->err.level = err.level; if (err.str1) { - st->err.str1 = g_steal_pointer(&*err.str1); + st->err.str1 = g_steal_pointer(err.str1); } if (err.str2) { - st->err.str2 = g_steal_pointer(&*err.str2); + st->err.str2 = g_steal_pointer(err.str2); } if (err.str3) { - st->err.str3 = g_steal_pointer(&*err.str3); + st->err.str3 = g_steal_pointer(err.str3); } st->err.int1 = err.int1; st->err.int2 = err.int2; -- 2.34.1

2 1

[PATCH] qemu: Audit VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE flag usage
by Michal Privoznik 31 Jan '22

31 Jan '22

There is plenty of places where a domain XML is parsed using VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE flag, but not all are warranted. The flag usage is okay when parsing an XML produced by us (e.g. when copying virDomainDef). In the rest of places (especially when the XML might come from user) we need to validate the XML, otherwise we may start QEMU assuming it has certain capabilities while in fact it doesn't. For instance, in this specific case when migrating a guest with virtio-mem to a QEMU that has virtio-mem disabled, loading migration fails with: qemu-kvm: ... 'virtio-mem-pci' is not a valid device model name This bug is more visible the more we transfer validation from qemu_command.c into qemu_validate.c. There is a possibility that we might prevent migration because of a bug in our validator, but that's better than starting a QEMU with features it doesn't support. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2048435 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ++--- src/qemu/qemu_migration.c | 9 +++------ src/qemu/qemu_saveimage.c | 3 +-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 370d223198..7d12b187ba 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2681,8 +2681,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, if (!(def = virDomainDefParseString(xmlin, driver->xmlopt, priv->qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) { + VIR_DOMAIN_DEF_PARSE_INACTIVE))) { goto endjob; } if (!qemuDomainCheckABIStability(driver, vm, def)) @@ -7944,7 +7943,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriver *driver, g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virDomainDeviceDef) dev = NULL; virDomainDeviceDef *dev_copy = NULL; - unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; + unsigned int parse_flags = 0; g_autoptr(virDomainDef) vmdef = NULL; int ret = -1; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2635ef1162..c83eb41693 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2469,8 +2469,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, if (xmlin) { if (!(def = virDomainDefParseString(xmlin, driver->xmlopt, priv->qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) return NULL; if (!qemuDomainCheckABIStability(driver, vm, def)) @@ -2858,8 +2857,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout); newdef = virDomainDefParseString(xmlout, driver->xmlopt, NULL, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); + VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!newdef) goto cleanup; @@ -3355,8 +3353,7 @@ qemuMigrationAnyPrepareDef(virQEMUDriver *driver, if (!(def = virDomainDefParseString(dom_xml, driver->xmlopt, qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; if (dname) { diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 557ee2cd21..b106e5b299 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -556,8 +556,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, /* Create a domain from this XML */ if (!(def = virDomainDefParseString(data->xml, driver->xmlopt, qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) return -1; *ret_def = g_steal_pointer(&def); -- 2.34.1

3 2

The unix domain socket remains even after the VM is destroyed
by Masayoshi Mizuma 28 Jan '22

28 Jan '22

Hello, I found an issue that libvirt isn't close an unix domain socket to connect to the qemu monitor even after the VM is destroyed. This issue happens since commit 695bdb3841 ("src: ensure GSource background unref happens in correct event loop") on the system whose glib version is 2.56. I would appreciate it if you could give any ideas to solve the issue. The socket is allocated in qemuMonitorOpenUnix(), and used by the monitor->socket and monitor->watch: qemuMonitorOpen qemuMonitorOpenUnix if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { qemuMonitorOpenInternal mon->socket = g_socket_new_from_fd(fd, &gerr); qemuMonitorRegister mon->watch = g_socket_create_source(mon->socket, Usually, the socket is closed when the reference counter of the glib object (mon->socket and mon->watch) gets 0: qemuMonitorClose qemuMonitorUnregister vir_g_source_unref(mon->watch, mon->context); g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL); virEventGLibSourceUnrefIdle g_source_unref(src); <== unref monitor->watch g_object_unref(mon->socket); <== unref monitor->socket It seems that the callback virEventGLibSourceUnrefIdle() to unref the monitor->watch doesn't work when qemuMonitorUnregister() is called via qemuProcessStop(), so the socket isn't closed. I'm not sure why the callback doesn't work at that time. I suspect that the VM is closing so the main loop of the monitor doesn't work any more. We can close the socket to add g_socket_close() before unref the mon->socket, however, it may remain a memory leak because of mon->watch (GSource object), so probably it isn't a good idea to close the socket. We can unref the mon->watch to set NULL to the second argument of vir_g_source_unref() because the default main loop still works at that time, however, I'm not sure it's an appropriate way to avoid the gobject issue which the commit solves... I found this issue on the qemu monitor, and probably the qemu agent has the same issue because the socket procedure is almost the same as the monitor. I would appreciate it if you could give any ideas to solve this issue. Following is to observe the callback working: --- diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c index eb6dcc0111..b8b1770424 100644 --- a/src/util/glibcompat.c +++ b/src/util/glibcompat.c @@ -24,6 +24,9 @@ #include "glibcompat.h" +#include "virlog.h" + +VIR_LOG_INIT("util.glibcompat"); /* * Note that because of the GLIB_VERSION_MAX_ALLOWED constant in * config-post.h, allowing use of functions from newer GLib via @@ -244,6 +247,7 @@ virEventGLibSourceUnrefIdle(gpointer data) GSource *src = data; g_source_unref(src); + VIR_DEBUG("unrefed: %p", src); return FALSE; } @@ -257,6 +261,7 @@ void vir_g_source_unref(GSource *src, GMainContext *ctx) g_source_attach(idle, ctx); g_source_unref(idle); + VIR_DEBUG("unref registered: %p ctx: %p", src, ctx); } #endif --- Case the mon->watch (0xffff28008af0) is unreffed correctly (via qemuMonitorUpdateWatch()): 18:54:15.403+0000: 16845: debug : qemuMonitorEmitResume:1159 : mon=0xffff683ac020 18:54:15.403+0000: 16845: debug : qemuProcessHandleResume:713 : Transitioned guest test-vm into running state, reason 'booted', event detail 0 18:54:15.404+0000: 16845: debug : vir_g_source_unref:264 : unref registered: 0xffff28008af0 ctx: 0xffff780169a0 18:54:15.404+0000: 16845: debug : qemuMonitorJSONIOProcessLine:222 : Line [{"return": {}, "id": "libvirt-10"}] 18:54:15.404+0000: 16845: info : qemuMonitorJSONIOProcessLine:242 : QEMU_MONITOR_RECV_REPLY: mon=0xffff683ac020 reply={"return": {}, "id": "libvirt-10"} 18:54:15.404+0000: 16845: debug : vir_g_source_unref:264 : unref registered: 0xffff2819a260 ctx: 0xffff780169a0 18:54:15.404+0000: 16845: debug : virEventGLibSourceUnrefIdle:250 : unrefed: 0xffff28008af0 Case the mon->watch (0xffff7802bb30) isn't unreffed (via qemuProcessStop()): 18:54:15.642+0000: 16589: debug : qemuProcessStop:8008 : Shutting down vm=0xaaaad40edec0 name=test-vm id=3 pid=16842, reason=destroyed, asyncJob=none, flags=0x0 18:54:15.642+0000: 16589: debug : qemuDomainLogAppendMessage:6733 : Append log message (vm='test-vm' message='2022-01-25 18:54:15.642+0000: shutting down, reason=destroyed) stdioLogD=1 18:54:15.643+0000: 16589: info : qemuMonitorClose:834 : QEMU_MONITOR_CLOSE: mon=0xffff683ac020 18:54:15.643+0000: 16589: debug : vir_g_source_unref:264 : unref registered: 0xffff7802bb30 ctx: 0xffff780169a0 18:54:15.643+0000: 16845: debug : qemuMonitorJSONIOProcessEvent:209 : handle SHUTDOWN handler=0xffff4ef057c0 data=0xffff28007da0 18:54:15.643+0000: 16845: debug : qemuMonitorEmitShutdown:1132 : mon=0xffff683ac020 guest=2 18:54:15.643+0000: 16845: debug : qemuProcessHandleShutdown:572 : vm=0xaaaad40edec0 18:54:15.643+0000: 16845: debug : qemuProcessHandleShutdown:592 : Transitioned guest test-vm to shutdown state 18:54:15.643+0000: 16845: debug : qemuProcessKill:7921 : vm=0xaaaad40edec0 name=test-vm pid=16842 flags=0x2 18:54:15.643+0000: 16845: debug : qemuMonitorDispose:216 : mon=0xffff683ac020 18:54:15.643+0000: 16589: debug : qemuProcessKill:7921 : vm=0xaaaad40edec0 name=test-vm pid=16842 flags=0x5 18:54:15.643+0000: 16589: debug : qemuDomainCleanupRun:7313 : driver=0xffff281441b0, vm=test-vm 18:54:15.644+0000: 16589: debug : qemuProcessAutoDestroyRemove:8395 : vm=test-vm 18:54:15.645+0000: 16589: debug : qemuRemoveCgroup:1221 : Failed to terminate cgroup for test-vm 18:54:15.647+0000: 16589: debug : qemuDomainObjEndJob:1141 : Stopping job: destroy (async=none vm=0xaaaad40edec0 name=test-vm) Thanks! Masa

2 1

[PATCH] domain_cgroup: Don't put semicolon at the end of VIR_GET_LIMIT_PARAMETER macro
by Michal Privoznik 28 Jan '22

28 Jan '22

In domain_cgroup.c there's VIR_GET_LIMIT_PARAMETER macro which has a semicolon at the end of its declaration. Well, remove it so that the places where macro is used have to put the semicolon explicitly. This helps with automatic reformatting (at least in vim). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/hypervisor/domain_cgroup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index 61b54f071c..aea0817a7f 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/src/hypervisor/domain_cgroup.c @@ -211,11 +211,11 @@ virDomainCgroupSetMemoryLimitParameters(virCgroup *cgroup, return -1; \ \ if (rc == 1) \ - set_ ## VALUE = true; + set_ ## VALUE = true - VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) - VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, hard_limit) - VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, soft_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit); + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, hard_limit); + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, soft_limit); #undef VIR_GET_LIMIT_PARAMETER -- 2.34.1

2 1

[libvirt PATCH v3 0/3] ci: Check spelling
by Tim Wiederhake 28 Jan '22

28 Jan '22

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/) V1: https://listman.redhat.com/archives/libvir-list/2021-October/msg00015.html V2: https://listman.redhat.com/archives/libvir-list/2022-January/msg00382.html Changes since V2: * Added meson integration * Add option to ignore files untracked by git * Pre-filter .po files to reduce run time Regards, Tim Tim Wiederhake (3): scripts: Check spelling meson: Add spell checking ci: Add spell checking .codespellrc | 2 + .gitlab-ci.yml | 13 +++- build-aux/meson.build | 16 +++++ meson.build | 1 + meson_options.txt | 1 + scripts/check-spelling.py | 135 ++++++++++++++++++++++++++++++++++++++ scripts/meson.build | 1 + 7 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 .codespellrc create mode 100755 scripts/check-spelling.py -- 2.31.1

2 4

[libvirt PATCH v4 0/9] Automatic mutex management
by Tim Wiederhake 28 Jan '22

28 Jan '22

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html V2: https://listman.redhat.com/archives/libvir-list/2021-September/msg00249.html V3: https://listman.redhat.com/archives/libvir-list/2021-September/msg00964.html Changes since V3: * Remove not strictly necessary heap allocations from virLockGuard Regards, Tim Tim Wiederhake (9): internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardLock virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virchrdev.c | 12 +++++------- src/internal.h | 3 +++ src/libvirt_private.syms | 3 +++ src/lxc/lxc_driver.c | 6 +++--- src/util/virobject.c | 16 ++++++++++++++++ src/util/virobject.h | 24 ++++++++++++++++++++++++ src/util/virthread.c | 15 +++++++++++++++ src/util/virthread.h | 30 ++++++++++++++++++++++++++++++ 9 files changed, 101 insertions(+), 12 deletions(-) -- 2.31.1

2 10

[libvirt PATCHv2 0/2] virsh: domsetlaunchsecstate: report error if no options are passed
by Ján Tomko 28 Jan '22

28 Jan '22

Use a different approach that is hopefully more future-proof and also add a check to the qemu driver, as suggested by Michal. Ján Tomko (2): virsh: domsetlaunchsecstate: report error if no options are passed qemu: qemuDomainSetLaunchSecurityState: check for params presence src/qemu/qemu_driver.c | 33 +++++++++++++++++++-------------- tools/virsh-domain.c | 4 +++- 2 files changed, 22 insertions(+), 15 deletions(-) -- 2.31.1

2 3

[libvirt PATCH] cpu-data.py: Query hyperv enlightenments
by Tim Wiederhake 28 Jan '22

28 Jan '22

Reporting hv-* properties properly requires hv to be enabled, see qemu commit 071ce4b03b. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tests/cputestdata/cpu-data.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/cputestdata/cpu-data.py b/tests/cputestdata/cpu-data.py index d8a89ebc2a..0200db7a78 100755 --- a/tests/cputestdata/cpu-data.py +++ b/tests/cputestdata/cpu-data.py @@ -216,12 +216,19 @@ def gather_model(args): "id": "model-expansion" }]) + version = 0, 0 static_model = None for o in output: if o.get("id") == "model-expansion": static_model = o["return"]["model"] + if "QMP" in o: + version = o["QMP"]["version"]["qemu"] + version = version["major"], version["minor"] if static_model: + if version[0] > 6 or (version[0] == 6 and version[1] >= 1): + static_model["props"]["hv-passthrough"] = True + return call_qemu(args.path_to_qemu, [ { "execute": "query-cpu-model-expansion", -- 2.31.1

2 1

[PATCH v2] virProcessGetStatInfo: add a comment describing why we can not report error
by Ani Sinha 28 Jan '22

28 Jan '22

virProcessGetStatInfo() currently is unable to report error conditions because that breaks libvirt's public best effort APIs. We add a comment in the function to indicate this. Adding comment here prevents others from going down the path of reporting error conditions in this functions in the future. It also reminds us that at some point in the future we need to fix the code so that this limitations no longer exists. Please also see commit 105dace22cc7 ("Revert "report error when virProcessGetStatInfo() is unable to parse data"") Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/util/virprocess.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b559a4257e..9422829b8b 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1784,6 +1784,12 @@ virProcessGetStatInfo(unsigned long long *cpuTime, virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 0 || virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 || virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) { + /* This function can not report error at present. Reporting error here + * causes some of libvirt's best effort public APIs to fail. This + * resuts in external API behavior change. Until we can fix this in + * a way so that public API behavior remains unchanged, we can only + * write a warning log here. + */ VIR_WARN("cannot parse process status data"); } -- 2.25.1

1 2

[PATCH 0/3] src: use virDomainJobData
by Kristina Hanicova 27 Jan '22

27 Jan '22

This series is the continued rewriting of the jobs functions with more to come in the future. Kristina Hanicova (3): qemu: use generalized virDomainJobData instead of qemuDomainJobInfo qemu: make separate function for setting statsType of privateData libxl: use virDomainJobData instead of virDomainJobInfo src/hypervisor/domain_job.c | 78 +++++++++++ src/hypervisor/domain_job.h | 72 ++++++++++ src/hypervisor/meson.build | 1 + src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 10 +- src/libxl/libxl_domain.h | 3 +- src/libxl/libxl_driver.c | 14 +- src/qemu/qemu_backup.c | 40 +++--- src/qemu/qemu_backup.h | 4 +- src/qemu/qemu_domain.c | 8 ++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_domainjob.c | 227 +++++++++++++++---------------- src/qemu/qemu_domainjob.h | 54 ++------ src/qemu/qemu_driver.c | 109 ++++++++------- src/qemu/qemu_migration.c | 187 +++++++++++++------------ src/qemu/qemu_migration.h | 4 +- src/qemu/qemu_migration_cookie.c | 60 ++++---- src/qemu/qemu_migration_cookie.h | 2 +- src/qemu/qemu_process.c | 23 ++-- src/qemu/qemu_snapshot.c | 3 +- 20 files changed, 539 insertions(+), 370 deletions(-) create mode 100644 src/hypervisor/domain_job.c create mode 100644 src/hypervisor/domain_job.h -- 2.34.1

2 6

[libvirt PATCH] include: Fix documentation for various VIR_*_LAST values
by Andrea Bolognani 27 Jan '22

27 Jan '22

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- include/libvirt/libvirt-domain.h | 6 +++--- include/libvirt/libvirt-secret.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4da1a63a14..374859fdff 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -62,7 +62,7 @@ typedef enum { # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_LAST /* - * NB: this enum value will increase over time as new events are + * NB: this enum value will increase over time as new states are * added to the libvirt API. It reflects the last state supported * by this version of the libvirt API. */ @@ -696,7 +696,7 @@ typedef enum { VIR_DOMAIN_CORE_DUMP_FORMAT_LAST /* * NB: this enum value will increase over time as new formats are - * added to the libvirt API. It reflects the last state supported + * added to the libvirt API. It reflects the last format supported * by this version of the libvirt API. */ # endif @@ -2909,7 +2909,7 @@ typedef enum { # ifdef VIR_ENUM_SENTINELS VIR_KEYCODE_SET_LAST /* - * NB: this enum value will increase over time as new events are + * NB: this enum value will increase over time as new keycode sets are * added to the libvirt API. It reflects the last keycode set supported * by this version of the libvirt API. */ diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h index a75abc832a..82e18b8611 100644 --- a/include/libvirt/libvirt-secret.h +++ b/include/libvirt/libvirt-secret.h @@ -48,9 +48,9 @@ typedef enum { # ifdef VIR_ENUM_SENTINELS VIR_SECRET_USAGE_TYPE_LAST /* - * NB: this enum value will increase over time as new events are - * added to the libvirt API. It reflects the last secret owner ID - * supported by this version of the libvirt API. + * NB: this enum value will increase over time as new usage types are + * added to the libvirt API. It reflects the last usage type supported + * by this version of the libvirt API. */ # endif } virSecretUsageType; -- 2.34.1

2 1

Backend memory object creation - query
by M, Shivakumar 27 Jan '22

27 Jan '22

Hello, For our use-case with Libvirt we want to create the Memory backend object , Expected QEMU args would be -object memory-backend-memfd,id=mem1,size=4096M Request you to please help us to specify this arg in the libvirt XML. Thanks, Shiv

2 2

[PATCH v2 0/3] Fix hotplug of unassigned hostdevs
by Michal Privoznik 27 Jan '22

27 Jan '22

v2 of: https://listman.redhat.com/archives/libvir-list/2022-January/msg01111.html Patches 1/3 and 2/3 were ACKed but I'm sending them for completeness. diff to v1: - Reworked patch 3/3 Michal Prívozník (3): domain_validate: Refuse VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED qemuDomainAttachHostPCIDevice: Handle hostevs with unassigned type of address qemuDomainDetachDeviceLive: Handle hostevs with unassigned type of address src/conf/domain_validate.c | 45 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.c | 11 ++++++++++ 2 files changed, 56 insertions(+) -- 2.34.1

4 7

[libvirt PATCH 0/5] meson: Fixes and improvements to handling of qemu_user and qemu_group
by Andrea Bolognani 27 Jan '22

27 Jan '22

Mostly reported/suggested by Olaf. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/456827585 Ignore the macOS failure, which is caused by a transient network error on GitLab's part. I have verified manually that the default values are still the ones we expect. Andrea Bolognani (5): meson: Don't require /etc/os-release to be present meson: Check for os-release's ID_LIKE in addition to ID meson: Don't check whether qemu_user and qemu_group exist meson: Require that both qemu_user and qemu_group are provided meson: Optimize handling of qemu_user and qemu_group meson.build | 68 ++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) -- 2.34.1

2 11

[PATCH v2 0/6] support mode option for dirtyrate calculation
by huangy81＠chinatelecom.cn 27 Jan '22

27 Jan '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> v2: Rebase master and fix confilicts with commit "Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC" Thanks ! v1: This patchset introduce mode option as the supplement of qemuDomainStartDirtyRateCalc api, add calc_mode for dirtyrate statistics correspondingly. Qemu add mode parameter for calc-dirty-rate command since >= 6.2.0, either of these three mode "page-sampling, dirty-bitmap, dirty-ring" can be specified when calculating dirty page rate. Page sampling is the original mode and used as default mode. Dirty bitmap mode use kvm log sync api to fetch the dirty-bitmap and count the increased 1 bits number during measurement, thus, calculate the dirty page rate. Dirty ring mode use the dirty-ring mechanism implemented in Qemu which can count the increased dirty page on virtual cpu granularity, thus, calculate the per-vcpu dirty page rate. These three calculation mode can be used in different scenarios, and the dirty-bitmap, dirty-ring mode may be more accurate to a certain degree. So maybe it's time to support the mode option for dirtyrate calculation. This series make main modifications as the following: 1. introduce QEMU_CAPS_CALC_DIRTY_RATE capability to probe calc-dirty-rate command in case of failure since it just introduced since >= 5.2.0 2. introduce QEMU_CAPS_DIRTYRATE_MODE capability to probe mode option of calc-dirty-rate command in case of failure, same as 1. 3. implement mode option support for dirtyrate calculation. Please review, thanks ! Best Regards ! Hyman Huang(黄勇) (6): qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE capability qemu_driver: Probe capability before calculating dirty page rate qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE capability qemu_driver: Add mode option for qemuDomainStartDirtyRateCalc virsh: Extend domdirtyrate-calc virsh api qemu_driver: Add calc_mode for dirtyrate statistics docs/manpages/virsh.rst | 7 +- include/libvirt/libvirt-domain.h | 13 ++++ src/libvirt-domain.c | 17 ++++- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 59 ++++++++++++++++- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 20 +++++- src/qemu/qemu_monitor_json.c | 78 +++++++++++++++++++++-- src/qemu/qemu_monitor_json.h | 3 +- tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 + tools/virsh-domain.c | 28 +++++++- 25 files changed, 239 insertions(+), 15 deletions(-) -- 1.8.3.1

3 12