February 2022 - Devel - libvirt List Archives

[PATCH 0/3] ci: regenerate wit new lcitool and replace centos 8
by Peter Krempa 14 Feb '22

14 Feb '22

Centos-8 was killed off, so lcitool suggests using AlmaLinux 8 as a replacement. Re-generate the manifests with new lcitool. Pipeline with these patches: https://gitlab.com/pipo.sk/libvirt/-/pipelines/470699381 Peter Krempa (3): ci: Regenerate with new lcitool ci: Move from 'centos-8' to 'almalinux-8' ci: Regenerate with new lcitool .gitlab-ci.yml | 6 +- ...os-8.Dockerfile => almalinux-8.Dockerfile} | 2 +- ci/containers/centos-stream-9.Dockerfile | 3 + .../debian-10-cross-aarch64.Dockerfile | 3 +- .../debian-10-cross-armv6l.Dockerfile | 3 +- .../debian-10-cross-armv7l.Dockerfile | 3 +- ci/containers/debian-10-cross-i686.Dockerfile | 3 +- ci/containers/debian-10-cross-mips.Dockerfile | 3 +- .../debian-10-cross-mips64el.Dockerfile | 3 +- .../debian-10-cross-mipsel.Dockerfile | 3 +- .../debian-10-cross-ppc64le.Dockerfile | 3 +- .../debian-10-cross-s390x.Dockerfile | 3 +- ci/containers/debian-10.Dockerfile | 3 +- ci/containers/opensuse-leap-152.Dockerfile | 3 +- ci/containers/ubuntu-1804.Dockerfile | 3 +- ci/containers/ubuntu-2004.Dockerfile | 3 +- ci/gitlab.yml | 74 ++++++++++--------- ci/manifest.yml | 2 +- 18 files changed, 59 insertions(+), 67 deletions(-) rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%) -- 2.34.1

2 6

[libvirt PATCH v2 0/6] virnetclient: Cleanups and improvements
by Andrea Bolognani 14 Feb '22

14 Feb '22

Changes from [v1]: * most patches have been pushed; * reduce quoting for most users by only using it when it's actually necessary to do so. [v1] https://listman.redhat.com/archives/libvir-list/2022-February/msg00477.html Andrea Bolognani (6): virnetclient: Improve spacing of ssh script virnetclient: Use 'if' consistently virnetclient: Handle netcatPath presence all at once virnetclient: Don't unnecessarily quote user-provided values virnetsockettest: Test more socket paths virnetclient: Escape socket path src/rpc/virnetclient.c | 78 +++++++++++++++++++------------ tests/virnetsockettest.c | 99 ++++++++++++++++++++-------------------- 2 files changed, 99 insertions(+), 78 deletions(-) -- 2.35.1

2 7

[PATCH 0/6] qemu: Clean up monitor structs and assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE in the hotplug test
by Peter Krempa 14 Feb '22

14 Feb '22

qemu-2.11 is the last one which couldn't do FD passing of unix listening sockets. Since it's approaching time to remove the support for such old version we need to make sure that some tests don't break. Peter Krempa (6): qemu: monitor: Drop old monitor fields from 'struct _qemuMonitorMessage' qemu: Privatize 'struct _qemuMonitorMessage' qemu: monitor: Move declaration of struct _qemuMonitor to qemu_monitor_priv.h syntax-check: sc_avoid_write: Don't use blanket file exceptions qemuhotplugmock: Mock fd passing to qemu via 'SCM_RIGHTS' qemuhotplugtest: Assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE build-aux/syntax-check.mk | 6 +-- src/locking/lock_daemon.c | 4 +- src/logging/log_daemon.c | 4 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_monitor.c | 54 +----------------------- src/qemu/qemu_monitor.h | 19 --------- src/qemu/qemu_monitor_json.c | 3 ++ src/qemu/qemu_monitor_priv.h | 77 ++++++++++++++++++++++++++++++++++ src/remote/remote_ssh_helper.c | 2 +- src/rpc/virnetsocket.c | 4 +- src/util/vircommand.c | 4 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 10 ++--- tests/qemucapsprobemock.c | 3 ++ tests/qemuhotplugmock.c | 14 +++++++ tests/qemuhotplugtest.c | 3 ++ tests/shunloadtest.c | 2 +- tests/vircgroupmock.c | 2 +- tests/virnettlssessiontest.c | 2 +- tools/virsh-console.c | 2 +- 20 files changed, 124 insertions(+), 95 deletions(-) -- 2.34.1

2 9

[PATCH 0/5] qemu: Test case modernization
by Peter Krempa 14 Feb '22

14 Feb '22

This is split out and updated based on comments on my RFC series bumping minimum supported qemu version to 3.1. - commit 1 is new - commit 2 is a separated update to 'disk-error-policy' case as pure update to 4.1 (as with others) would camouflage changes in placing of rerror/werror properties - commit 3 is a separated update to test cases having 'device_id' of SCSI disk due to same reason as above - commit 4 is now an update of disk test cases using qemu-2.12 caps to qemu 4.1 caps. Now only test cases which which are not related to disks are contained in this commit - commit 5 is a similar update to a sev test case that was missing Peter Krempa (5): qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy qemuxml2argvtest: Add pre-blockdev post-werror-move version of 'disk-error-policy' qemuxml2argvtest: Update disk test cases having 'device_id' argument of SCSI disk qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk tests to 4.1.0 qemuxml2argvtest: Add newer variant of 'launch-security-sev-missing-platform-info' src/qemu/qemu_command.c | 29 ++++------ ...2.12.0.args => disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 1 + ...12.0.args => disk-cache.x86_64-3.1.0.args} | 4 +- .../disk-cache.x86_64-4.1.0.args | 42 +++++++++++++++ ...s => disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args => disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args => disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs => disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s => disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- .../disk-error-policy-s390x.s390x-4.0.0.args | 35 ++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 +++++++++++++ ...args => disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-floppy.x86_64-4.1.0.args} | 4 +- ...=> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s => disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s => disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-shared.x86_64-3.1.0.args} | 4 +- .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++ ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- ...rgs => floppy-drive-fat.x86_64-4.1.0.args} | 4 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++ tests/qemuxml2argvtest.c | 53 +++++++++++-------- 31 files changed, 278 insertions(+), 86 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.args => disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-3.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args => disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args => disk-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args => disk-cdrom.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args => disk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args => disk-detect-zeroes.x86_64-4.1.0.args} (94%) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args => disk-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args => disk-floppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args => disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args => disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args => disk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args => disk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args => disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args => disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args => disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.args => disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args => disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-3.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0.args => disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args => floppy-drive-fat.x86_64-4.1.0.args} (93%) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args -- 2.34.1

2 8

[PATCH 0/2] tests: Don't destroy locked mutexes
by Michal Privoznik 14 Feb '22

14 Feb '22

I've rewritten our virMutexes to check for failures [1] and saw couple of problems. In most cases we are destroying a locked mutex which these patches aim to fix. Then we have virLogLock() which is locked in virFork() and then unlocked from child (a different process) which is problematic. Pthread doesn't like it when one thread locks a mutex only so that another one unlocks it. Semaphores don't care. Anyway, leave virLogMutex aside, patches here fix problems at hand. BTW: commits v8.0.0-267-g39ac285c6b and v8.0.0-236-ga7201789ab were spotted because of this branch of mine. 1: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/tests_mutext/ Michal Prívozník (2): tests: Track if @vm was created by qemuMonitorCommonTestNew() tests: Destroy domain object properly tests/qemuhotplugtest.c | 13 +++++-------- tests/qemumonitortestutils.c | 7 ++++++- tests/qemusecuritytest.c | 3 ++- tests/qemuxml2argvtest.c | 22 +++++++++++++--------- 4 files changed, 26 insertions(+), 19 deletions(-) -- 2.34.1

3 5

[PATCH v3 0/7] support mode option for dirtyrate calculation
by huangy81＠chinatelecom.cn 14 Feb '22

14 Feb '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> v3: - Rebase the master - [PATCH v2 2/6]: Fix the usage of virQEMUCapsGet - [PATCH v2 4/6]: Fix the cleanup missed in qemuDomainStartDirtyRateCalc - [PATCH v2 4/6]: Move all blocks below ACL check - [PATCH v2 4/6]: Make the qemuMonitorJSONStartDirtyRateCalc cleaner by merging the different case of qemuMonitorJSONMakeCommand - [PATCH v2 4/6]: Code clean, make the error message not be line-broken - [PATCH v2 5/6]: Abstract the enum definition into a standalone commit - [PATCH v2 5/6]: Move the validations code above calculating flags block - [PATCH v2 6/6]: Change the type of 'value' field to unsigned in struct qemuMonitorDirtyRateVcpu - [PATCH v2 6/6]: Rename the enum type qemuMonitorDirtyRateCalcMode to virDomainDirtyRateCalcMode - [PATCH v2 6/6]: Code clean, align the code in qemuDomainGetStatsDirtyRate Thanks Peter for quick and precise response, please review. Regards Yong 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(黄勇) (7): 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 include: Introduce enum for qemuDomainStartDirtyRateCalc qemu_driver: Add mode parameter to qemuDomainStartDirtyRateCalc virsh: Add mode option to domdirtyrate-calc virsh api qemu_driver: Add calc_mode for dirtyrate statistics docs/manpages/virsh.rst | 7 ++- include/libvirt/libvirt-domain.h | 24 ++++++++ src/libvirt-domain.c | 17 +++++- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 48 +++++++++++++++- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 13 ++++- src/qemu/qemu_monitor_json.c | 69 ++++++++++++++++++++++- 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, 226 insertions(+), 12 deletions(-) -- 1.8.3.1

5 19

[PATCH 0/2] qemu: domain: Move and rename qemuDomainStorageIdNew/Reset
by Peter Krempa 14 Feb '22

14 Feb '22

In a review adding similar APIs I was asked to use 'ID' instead of 'Id'. Rename the existing helpers. Patch 1 is a second version as 'qemuDomainStorageIdNew' can be unexported too. Peter Krempa (2): qemu: domain: Move and unexport 'qemuDomainStorageIdNew/Reset' qemu: domain: Change 'Id' to 'ID' in qemuDomainStorageIdNew/Reset src/qemu/qemu_domain.c | 62 +++++++++++++++++++++--------------------- src/qemu/qemu_domain.h | 3 -- 2 files changed, 31 insertions(+), 34 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] util: Fix getting CPU frequency on Apple Silicon
by Andrea Bolognani 14 Feb '22

14 Feb '22

The hw.cpufrequency sysctl, which we use to obtain the CPU frequency on macOS, is not available when running on Apple Silicon, and as a consequence we currently report an error whenever such information is requested. The virNodeInfo.mhz field, where the CPU frequency gets stored, is documented as being zero when the information could not be obtained, and we already do that for Linux on aarch64. Extend this behavior to macOS on Apple Silicon. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/virhostcpu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index a07c00a0e9..011ef8a153 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -928,8 +928,14 @@ virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED, *mhz = cpu_freq; # else if (sysctlbyname("hw.cpufrequency", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { - virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); - return -1; + if (errno == ENOENT) { + /* The hw.cpufrequency sysctl is not implemented on Apple Silicon. + * In that case, we report 0 instead of erroring out */ + cpu_freq = 0; + } else { + virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); + return -1; + } } *mhz = cpu_freq / 1000000; -- 2.34.1

3 4

[PATCH 00/27] qemu: Fix chardev hot(un)plug issues and sanitize use of /dev/fdset/N
by Peter Krempa 14 Feb '22

14 Feb '22

This series addresses the following issues: - hot-unplug of chardevs leaks the FDset in qemu - hot-plug of chardev doesn't use virtlogd even when configured - the name of the FD used for vdpa doesn't really tie it to the device There's also improvement in the common code handling the FD passing and few other drive-by fixes. Peter Krempa (27): scripts/moc-noinline: Use full name of the required annotation in error message qemuProcessPrepareHostBackendChardevFileHelper: Always use FD passing qemuProcessPrepareHostBackendChardev: Drop unneeded arguments qemuMonitorJSONQueryFdsetsParse: Don't check value passed to g_strdup qemuMonitorRemoveFdset: Convert @fdset to unsigned int to avoid error qemu: monitor: Make 'id' in 'struct _qemuMonitorFdsetInfo' unsigned qemu: domain: Move and unexport 'qemuDomainStorageIdReset' qemu: domain: Add helper for generating 'fdset' ids for VM startup qemu: Introduce helper functions for passing FDs to qemu qemuBuildInterfaceCommandLine: Use qemuFDPass for the vdpa fd qemu: hotplug: Extract code for unplugging fdsets qemuHotplugRemoveFDSet: Prepare for proper FD unplug handling qemuBuildInterfaceCommandLine: Use new pattern for naming the VDPA fdset qemu: Rewrite chardev startup code to use qemuFDPass qemuDomainRemoveChrDevice: Detach fdset after chardev hot-unplug qemumonitorjsontest: chardev: Remove need to allow unused commands qemumonitorjsontest: Refactor chardev hotplug testing qemuMonitorJSONTestAttachChardev: Add test for TLS-secured TCP chardev qemuMonitorJSONTestAttachChardev: Add logfile to some tests qemuMonitorJSONAttachCharDevGetProps: Properly handle private data tests: Move testPrepareHostBackendChardevOne into test utils qemuMonitorJSONTestAttachChardev: Add tests for FD passing of file backend qemu: process: Add a hotplug version of qemuProcessPrepareHostBackendChardev qemu: Honour 'virtlogd' use when hotplugging chardevs virTPMCreateCancelPath: Refactor value returning qemuBuildTPMOpenBackendFDs: Construct 'cancel_path' internally qemuBuildTPMCommandLine: Use 'qemuPassFD' infrastructure po/POTFILES.in | 1 + scripts/mock-noinline.py | 2 +- src/qemu/meson.build | 1 + src/qemu/qemu_command.c | 260 +++++---------- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_domain.c | 94 +++--- src/qemu/qemu_domain.h | 13 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_fd.c | 296 ++++++++++++++++++ src/qemu/qemu_fd.h | 56 ++++ src/qemu/qemu_hotplug.c | 100 ++++-- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 82 +++-- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_process.c | 102 ++++-- src/qemu/qemu_process.h | 6 + src/util/virtpm.c | 13 +- tests/qemuhotplugmock.c | 11 + tests/qemuhotplugtest.c | 6 +- tests/qemumonitorjsontest.c | 253 +++++++++------ .../qemuxml2argvdata/aarch64-pci-serial.args | 3 +- .../name-escape.x86_64-2.11.0.args | 3 +- .../name-escape.x86_64-latest.args | 4 +- .../net-vdpa.x86_64-latest.args | 4 +- .../qemuxml2argvdata/serial-file-chardev.args | 3 +- .../serial-file-chardev.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/serial-file-log.args | 4 +- .../serial-file-log.x86_64-latest.args | 6 +- .../qemuxml2argvdata/serial-many-chardev.args | 3 +- .../serial-many-chardev.x86_64-latest.args | 4 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- tests/qemuxml2argvmock.c | 1 - tests/qemuxml2argvtest.c | 87 +---- tests/testutilsqemu.c | 106 +++++++ tests/testutilsqemu.h | 3 + 38 files changed, 1011 insertions(+), 561 deletions(-) create mode 100644 src/qemu/qemu_fd.c create mode 100644 src/qemu/qemu_fd.h -- 2.34.1

2 58

[libvirt PATCH] tests: Use freecon in testSELinuxCheckLabels
by Jiri Denemark 11 Feb '22

11 Feb '22

This partially reverts commit 0fc4a43d248b86fd54ad7323beb66faec8c1043c. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/securityselinuxlabeltest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index dfe9d38d34..83532d8090 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -230,7 +230,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) size_t i; for (i = 0; i < nfiles; i++) { - g_autofree char *ctx = NULL; + char *ctx = NULL; if (getfilecon(files[i].file, &ctx) < 0) { if (errno == ENODATA) { /* nothing to do */ @@ -247,8 +247,10 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) virReportError(VIR_ERR_INTERNAL_ERROR, "File %s context '%s' did not match expected '%s'", files[i].file, ctx, files[i].context); + freecon(ctx); return -1; } + freecon(ctx); } return 0; } -- 2.35.0

3 4

[libvirt PATCH] conf: Initialize devAddr in virNodeDeviceGetPCIVPDDynamicCap
by Jiri Denemark 11 Feb '22

11 Feb '22

Otherwise devAddr.multi would be uninitialized. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 61c8715037..eaa42c05ee 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -3018,7 +3018,7 @@ static int virNodeDeviceGetPCIVPDDynamicCap(virNodeDevCapPCIDev *devCapPCIDev) { g_autoptr(virPCIDevice) pciDev = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = {0}; g_autoptr(virPCIVPDResource) res = NULL; devAddr.domain = devCapPCIDev->domain; -- 2.35.0

2 2

[PATCH] src: Initialize stack allocated virPCIDeviceAddress variables
by Michal Privoznik 11 Feb '22

11 Feb '22

There are few places where a virPCIDeviceAddress typed variable is allocated on the stack but it's not initialized. This can lead to random values of its members which in turn can lead to a random behaviour. Generated with help of the following spatch: @@ identifier I; @@ - virPCIDeviceAddress I; + virPCIDeviceAddress I = { 0 }; And then fixing bhyveAssignDevicePCISlots() which does declare the variable and then explicitly zero it by calling memset() only to set a specific member afterwards. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/bhyve/bhyve_device.c | 5 +---- src/conf/domain_addr.c | 2 +- src/conf/node_device_conf.c | 4 ++-- src/hypervisor/domain_driver.c | 6 +++--- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_domain_address.c | 4 ++-- src/util/virpci.c | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 36b93c0d4c..5654028ca5 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -83,10 +83,7 @@ bhyveAssignDevicePCISlots(virDomainDef *def, virDomainPCIAddressSet *addrs) { size_t i; - virPCIDeviceAddress lpc_addr; - - memset(&lpc_addr, 0, sizeof(lpc_addr)); - lpc_addr.slot = 0x1; + virPCIDeviceAddress lpc_addr = { .slot = 0x1 }; /* If the user didn't explicitly specify slot 1 for some of the devices, reserve it for LPC, even if there's no LPC device configured. diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 49745ba881..49ca775a52 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1181,7 +1181,7 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSet *addrs, virDomainPCIConnectFlags flags, int function) { - virPCIDeviceAddress addr; + virPCIDeviceAddress addr = { 0 }; if (virDomainPCIAddressGetNextAddr(addrs, &addr, flags, dev->isolationGroup, function) < 0) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 61c8715037..8b20a7bee9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2947,7 +2947,7 @@ virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDev *pci_dev) { size_t i; int tmpGroup; - virPCIDeviceAddress addr; + virPCIDeviceAddress addr = { 0 }; /* this could be a refresh, so clear out the old data */ for (i = 0; i < pci_dev->nIommuGroupDevices; i++) @@ -3018,7 +3018,7 @@ static int virNodeDeviceGetPCIVPDDynamicCap(virNodeDevCapPCIDev *devCapPCIDev) { g_autoptr(virPCIDevice) pciDev = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = { 0 }; g_autoptr(virPCIVPDResource) res = NULL; devAddr.domain = devCapPCIDev->domain; diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index 2083f06287..bb1da7ac6b 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -375,7 +375,7 @@ virDomainDriverNodeDeviceReset(virNodeDevicePtr dev, virHostdevManager *hostdevMgr) { g_autoptr(virPCIDevice) pci = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = { 0 }; g_autoptr(virNodeDeviceDef) def = NULL; g_autofree char *xml = NULL; g_autoptr(virConnect) nodeconn = NULL; @@ -421,7 +421,7 @@ virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev, virHostdevManager *hostdevMgr) { g_autoptr(virPCIDevice) pci = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = { 0 }; g_autoptr(virNodeDeviceDef) def = NULL; g_autofree char *xml = NULL; g_autoptr(virConnect) nodeconn = NULL; @@ -466,7 +466,7 @@ virDomainDriverNodeDeviceDetachFlags(virNodeDevicePtr dev, const char *driverName) { g_autoptr(virPCIDevice) pci = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = { 0 }; g_autoptr(virNodeDeviceDef) def = NULL; g_autofree char *xml = NULL; g_autoptr(virConnect) nodeconn = NULL; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 3d5e25424a..b0a5e6302c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -366,7 +366,7 @@ udevProcessPCI(struct udev_device *device, virNodeDevCapPCIDev *pci_dev = &def->caps->data.pci_dev; virPCIEDeviceInfo *pci_express = NULL; virPCIDevice *pciDev = NULL; - virPCIDeviceAddress devAddr; + virPCIDeviceAddress devAddr = { 0 }; int ret = -1; char *p; bool privileged = false; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 4e7095d3a7..dd0680f57f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1743,7 +1743,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDef *def, virDomainPCIAddressSet *addrs) { size_t i; - virPCIDeviceAddress tmp_addr; + virPCIDeviceAddress tmp_addr = { 0 }; g_autofree char *addrStr = NULL; virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_AUTOASSIGN | VIR_PCI_CONNECT_TYPE_PCI_DEVICE); @@ -1853,7 +1853,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDef *def, virDomainPCIAddressSet *addrs) { size_t i; - virPCIDeviceAddress tmp_addr; + virPCIDeviceAddress tmp_addr = { 0 }; g_autofree char *addrStr = NULL; virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE; diff --git a/src/util/virpci.c b/src/util/virpci.c index adc255f438..d141fde814 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1865,7 +1865,7 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddress *orig, } while ((direrr = virDirRead(groupDir, &ent, groupPath)) > 0) { - virPCIDeviceAddress newDev; + virPCIDeviceAddress newDev = { 0 }; if (virPCIDeviceAddressParse(ent->d_name, &newDev) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.34.1

2 1

[libvirt PATCH v2 0/2] qemu_migration_cookie: Properly fetch cert DN
by Jiri Denemark 11 Feb '22

11 Feb '22

Jiri Denemark (2): qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject qemu_migration_cookie: Properly fetch cert DN src/qemu/qemu_migration_cookie.c | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) -- 2.35.0

2 3

[libvirt PATCH] conf: Avoid NULL-dereference in virDomainObjGetMessages
by Jiri Denemark 11 Feb '22

11 Feb '22

All callers currently guarantee flags passed to virDomainObjGetMessages are either zero or contain at least one of the supported flags. But it doesn't mean we should not check for the possibility an unknown flag was the only one passed to virDomainObjGetMessages. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ab8f2a52cc..093b719b2c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31472,7 +31472,8 @@ virDomainObjGetMessages(virDomainObj *vm, } } - (*msgs)[nmsgs] = NULL; + if (*msgs) + (*msgs)[nmsgs] = NULL; rv = nmsgs; -- 2.35.0

2 1

[PATCH v2 0/5] More reset nvram fixes
by Michal Privoznik 11 Feb '22

11 Feb '22

v2 of: https://listman.redhat.com/archives/libvir-list/2022-February/msg00330.html I've pushed patches 1/5 and 2/5 from the original patchset because they were independent. diff to v1: - Reworked virFileRewrite() so that it's callback's responsibility to report error, - More trivial cleanups (VIR_AUTOCLOSE, drop 'cleanup' label) Michal Prívozník (5): virFileRewrite: Allow setting owner virFileRewrite: Move error reporting into callback qemuPrepareNVRAM: Us virFileRewrite() to write NVRAM qemuPrepareNVRAM: Switch to VIR_AUTOCLOSE qemuPrepareNVRAM: Drop cleanup label src/qemu/qemu_process.c | 124 ++++++++++++++++------------------------ src/util/virfile.c | 44 +++++++++++--- src/util/virfile.h | 5 +- src/util/virxml.c | 22 +++++-- 4 files changed, 104 insertions(+), 91 deletions(-) -- 2.34.1

2 9

[libvirt PATCH 0/2] qemu_migration_cookie: Properly fetch cert DN
by Jiri Denemark 11 Feb '22

11 Feb '22

Jiri Denemark (2): qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject qemu_migration_cookie: Properly fetch cert DN src/qemu/qemu_migration_cookie.c | 35 +++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) -- 2.35.1

2 5

Edge cases around writable firmware and/or NVRAM cleanup
by Daniel P. Berrangé 11 Feb '22

11 Feb '22

The typical scenario for UEFI is that we have readonly firmware with separate NVRAM <loader readonly="on">/some/ovmf/path_CODE.fd</loader> <nvram template="/some/ovmf/path_VARS.fd"/> In this case we of course copy path_VARS.fd into a private file path we invent under /var/lib. The user can give an explicit NVRAM path too: <loader readonly="on">/some/ovmf/path_CODE.fd</loader> <nvram>/var/lib/libvirt/images/guest_vars.fd</nvram> If template isn't set, and can't be identified from path_CODE.fd automatically, then the NVRAM file must exist ahead of time. When undefining a VM's persistent config we refuse to allow it if an NVRAM exists, unless UNDEFINE_NVRAM is set which causes it to be deleted. Alternatively KEEP_NVRAM can cause the NVRAM to be left behind. I've always felt this is quite dubious because we happily let the VM be undefined with disks still existing, or TPM state still exist, or any number of files remaining. With that in mind, we have other configurations that are possible. For example, a single writable loader file, either implicitly: <loader>/var/lib/libvirt/images/guest.fd</loader> or explicitly: <loader readonly="off">/var/lib/libvirt/images/guest.fd</loader> In both cases this guest.fd must be pre-populated by the mgt apps since we don't initialize it from any template. We also dont place any restrictions on the undefine step when using a writable loader. This config is fairly sane in that yu can build EDK2 with both CODE and VARs in one file. This makes sense for a public cloud scenario if the user is allowed to bring along their own firmware, as there's no benefit to splitting CODE+VARs if the firmware is just used for a single VM. Building on that though we allow a somewhuat questionable config: <loader>/var/lib/libvirt/images/guest.fd</loader> <nvram>/var/lib/libvirt/images/guest_vars.fd</nvram> where both loader + nvram are writable. We allow 'template' to be set but we completely ignore it, since the loader is not marked read-only. THe mgmt app must pre-create both these writable files now, and undefine only complains about the nvram file. I'm wondering what, if anything, we should do in these edge cases - Allow 'template' on the <loader> element to populate a writable combined CODE+VARS image ? This would let us use a combined CODE+VARS file as a template for writable firmware. - Allow 'template' on the <nvram> element to populate a writable combined CODE+VARS image for <loader>? Takes advantage of fact that 'template' is ignored currently if <loader> is not read-only. That rationale is that <nvram> element doesn't imply that the NVRAM has to be separate, just that there is NVRAM and the primary writable loader provides that. - Or reject 'template' on <nvram> element if <loader> is writable rather than ignoring it ? Mutually exclusive with previous point - Make undefine use NVRAM flags to apply to writable <loader> too ? That could be considwered a behaviour change for existing users though, unless we only do that when support use of a 'template' for the <loader>. - Reject the wierd writable loader + writable NVRAM config ? I can't imagine why we need this, but QEMU allows it, and blocking it would be a behavioural change 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

[PATCH] ch: Report VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER as supported
by Michal Privoznik 11 Feb '22

11 Feb '22

Even though the CH driver doesn't implement virNetworkUpdate() API, when it does it will see the arguments in correct order. This is similar to other drivers that don't implement the API, like ESX, libxl, LXC, etc. Enabling this driver feature stops clients from swapping the arguments (see comment in the API for more info). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/ch/ch_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index e751ddba19..bb2959d108 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -934,6 +934,7 @@ chConnectSupportsFeature(virConnectPtr conn, switch ((virDrvFeature) feature) { case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: return 1; case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: @@ -949,7 +950,6 @@ chConnectSupportsFeature(virConnectPtr conn, case VIR_DRV_FEATURE_REMOTE: case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: - case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: default: return 0; } -- 2.34.1

2 1

[libvirt PATCH 0/4] Add support for 'blob' to virtio video device
by Jonathon Jongsma 11 Feb '22

11 Feb '22

Add support to libvirt for the 'blob' option for virtio video devices in qemu. Also do a little preparatory refactoring of the video device xml parsing code. Jonathon Jongsma (4): conf: Refactor video model parsing conf: switch to virXMLProp* functions conf: use enum variable for video type conf: add support for 'blob' in virtio-vga/virtio-gpu docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 133 +++++++++--------- src/conf/domain_conf.h | 3 +- src/conf/domain_validate.c | 13 +- src/libxl/libxl_conf.c | 10 ++ src/libxl/libxl_domain.c | 11 ++ src/qemu/qemu_command.c | 3 + src/qemu/qemu_monitor_json.c | 16 ++- src/qemu/qemu_process.c | 7 + .../video-virtio-blob-absent.args | 34 +++++ .../video-virtio-blob-absent.xml | 33 +++++ .../video-virtio-blob-off.args | 34 +++++ .../video-virtio-blob-off.xml | 33 +++++ .../video-virtio-blob-on.args | 34 +++++ .../qemuxml2argvdata/video-virtio-blob-on.xml | 33 +++++ .../video-virtio-vga-blob-on.args | 34 +++++ .../video-virtio-vga-blob-on.xml | 33 +++++ tests/qemuxml2argvtest.c | 9 ++ .../video-virtio-blob-absent.xml | 41 ++++++ .../video-virtio-blob-off.xml | 41 ++++++ .../video-virtio-blob-on.xml | 41 ++++++ .../video-virtio-vga-blob-on.xml | 41 ++++++ tests/qemuxml2xmltest.c | 9 ++ 23 files changed, 577 insertions(+), 74 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-absent.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-absent.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-off.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-off.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-on.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-on.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-blob-on.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-blob-on.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-absent.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-off.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-on.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-vga-blob-on.xml -- 2.34.1

2 5

[libvirt PATCH 00/11] Automatic mutex management
by Tim Wiederhake 11 Feb '22

11 Feb '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. This made a solitary "virMutexUnlock()" call without previous call to "virMutexLock()" in ch_driver.c obvious, which is removed in patch #8. Tim Wiederhake (11): virthreadpool: Use automatic memory management virthreadpool: Cleanup libxl: Use automatic memory management lxc: Prepare virLXCDriverGetCapabilities for automatic mutex management lxc: Use automatic mutex management ch: Prepare virCHDriverGetCapabilities for automatic mutex management ch: Use automatic mutex management ch: Remove solitary virMutexUnlock network: Use automatic mutex management bhyve_driver: Use automatic mutex management node_device: Use automatic mutex management src/bhyve/bhyve_conf.c | 7 +-- src/bhyve/bhyve_driver.c | 12 ---- src/bhyve/bhyve_utils.h | 3 - src/ch/ch_conf.c | 31 +++++----- src/ch/ch_conf.h | 10 ---- src/ch/ch_driver.c | 29 +++++---- src/libxl/libxl_conf.c | 8 +-- src/libxl/libxl_conf.h | 12 ---- src/libxl/libxl_logger.c | 20 +++---- src/lxc/lxc_conf.c | 41 ++++++------- src/lxc/lxc_conf.h | 9 --- src/lxc/lxc_controller.c | 25 ++++---- src/lxc/lxc_fuse.c | 12 ++-- src/network/bridge_driver.c | 41 ++++--------- src/node_device/node_device_driver.c | 23 ++----- src/node_device/node_device_udev.c | 52 +++++++--------- src/util/virthreadpool.c | 90 ++++++++-------------------- 17 files changed, 138 insertions(+), 287 deletions(-) -- 2.31.1

2 14

[PATCH 0/6] ch_driver: Misc cleanups
by Michal Privoznik 11 Feb '22

11 Feb '22

While reviewing Tim's patches [1] I've found couple of places in CH driver that are downright bugs. Fix them. 1: https://listman.redhat.com/archives/libvir-list/2022-February/msg00226.html Michal Prívozník (6): ch_driver: Don't lock driver when getting version ch_driver: Don't lock driver when looking up domains chDomainCreateXML: Drop spurious driver unlock ch_driver: End job properly on failed chDomainCreateXML() ch_driver: Introduce and use virCHDomainRemoveInactive() ch_process: Check whether domain is already running before starting it src/ch/ch_domain.c | 9 +++++++++ src/ch/ch_domain.h | 4 ++++ src/ch/ch_driver.c | 32 +++++++++++--------------------- src/ch/ch_process.c | 6 ++++++ 4 files changed, 30 insertions(+), 21 deletions(-) -- 2.34.1

2 7

[PATCH 0/5] More reset nvram fixes
by Michal Privoznik 11 Feb '22

11 Feb '22

I've played with the new functionality and found couple of bugs/possible improvements. Michal Prívozník (5): qemu_process: Accept VIR_QEMU_PROCESS_START_RESET_NVRAM flag when starting a domain qemuFirmwareFillDomain: Use FW descriptors to lookup template when resetting NVRAM virFileRewrite: Allow setting owner virFileRewrite: Allow callback report errors qemuPrepareNVRAM: Us virFileRewrite() to write NVRAM src/qemu/qemu_firmware.c | 3 +- src/qemu/qemu_process.c | 124 ++++++++++++++------------------------- src/util/virfile.c | 41 +++++++++++-- src/util/virfile.h | 1 + src/util/virxml.c | 3 +- 5 files changed, 83 insertions(+), 89 deletions(-) -- 2.34.1

3 12

removing VMs logs
by Nikolay Shirokovskiy 11 Feb '22

11 Feb '22

Hi, all. Libvirt QEMU driver writes QEMU process log to /var/log/libvirt/qemu/<VM_NAME>.log file. This file is owned by libvirt that is no API client knows about it and no client will remove it. Thus this file stays forever. I guess it does not cause harddisk space waste in some deploys as the number of VMs thru node lifecycle is not very large. In Virtuozzo we have a service which checks VMs disks every 5 min using guestfs. This generates about 100k files and about 400MiB disk usage per VM per year. This is a lot. I guess we could refine the service to avoid this issue yet I think the issue is general and need to be addressed. If this is agreed then in terms of architecture should we have a distinct timer/service to cleanup log files or we'd better clean up in scope of qemu driver itself? Nikolay

3 4

[PATCH RFC 00/19] qemu: Bump minimum supported qemu to qemu-3.1
by Peter Krempa 10 Feb '22

10 Feb '22

As of April 23 2022, Ubuntu 20.04 will be out for two years, which means we no longer have to support Ubuntu 18.04 along with qemu-2.11 shipped with it. The supported platforms thus will have the following qemu versions: Debian 10/Stable: 3.1 OpenSUSE Leap 15.3: 5.2 Ubuntu 20.04: 4.2 RHEL/Centos 8.4: 4.2 If we consider 'Debian 10 backports' as update to 'Debian 10' we can actually go further and update to 4.2. I'm sending this series early to initiate discussion, but I won't mind killing of the support earlier ;). Patches 1-4 are ready to be pushed right away. Note that the patches posted to the list are heavily trimmed, fetch the full version at: git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprecation Peter Krempa (19): qemuxml2argvtest: Add versioned test variants for pre-blockdev disk tests qemuxml2argvtest: Add newer variant of 'launch-security-sev-missing-platform-info' qemuxml2xmltest: Remove unnecessary versioned invocation of 'disk-cache' qemucapabilitiestest: Hack/fix version in qemu-3.1 tests qemuxml2agvtest: Retire tests based on qemu-2.11 qemuxml2agvtest: Retire tests based on qemu-2.12 qemuxml2agvtest: Retire tests based on qemu-3.0 tests: qemucapabilities: Remove qemu-2.11 test data tests: qemucapabilities: Remove qemu-2.12 test data tests: qemucapabilities: Remove qemu-3.0 test data qemu: Formally deprecate support for qemu < 3.1 qemu: capabilities: Remove tautological version checks qemu: capabilities: Remove probing of QEMU_CAPS_NUMA via 'query-command-line-options' qemu: Always assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE qemu: capabilities: Retire QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE qemu: monitor: Remove waiting for monitor qemu: capabilities: Retire QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE qemu: command: Always assume QEMU_CAPS_OVERCOMMIT qemu: capabilities: Retire QEMU_CAPS_OVERCOMMIT docs/drvqemu.rst | 6 +- src/qemu/qemu_capabilities.c | 29 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_monitor.c | 61 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_process.c | 51 +- .../caps_2.11.0.s390x.replies | 18237 ------------ .../caps_2.11.0.s390x.xml | 2593 -- .../caps_2.11.0.x86_64.replies | 19525 ------------- .../caps_2.11.0.x86_64.xml | 953 - .../caps_2.12.0.aarch64.replies | 19577 ------------- .../caps_2.12.0.aarch64.xml | 329 - .../caps_2.12.0.ppc64.replies | 23072 --------------- .../caps_2.12.0.ppc64.xml | 1069 - .../caps_2.12.0.s390x.replies | 19937 ------------- .../caps_2.12.0.s390x.xml | 2466 -- .../caps_2.12.0.x86_64.replies | 23003 --------------- .../caps_2.12.0.x86_64.xml | 1263 - .../caps_3.0.0.ppc64.replies | 23945 ---------------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1073 - .../caps_3.0.0.riscv32.replies | 14919 ---------- .../caps_3.0.0.riscv32.xml | 87 - .../caps_3.0.0.riscv64.replies | 14919 ---------- .../caps_3.0.0.riscv64.xml | 87 - .../caps_3.0.0.s390x.replies | 20683 ------------- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2677 -- .../caps_3.0.0.x86_64.replies | 23719 --------------- .../caps_3.0.0.x86_64.xml | 1206 - .../caps_3.1.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 +- .../caps_3.1.0.x86_64.replies | 4 +- .../caps_3.1.0.x86_64.xml | 5 +- .../caps_4.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 - .../caps_4.0.0.riscv32.xml | 2 - .../caps_4.0.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 - .../caps_4.0.0.x86_64.xml | 3 - .../caps_4.1.0.x86_64.xml | 3 - .../caps_4.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 - .../caps_4.2.0.x86_64.xml | 3 - .../caps_5.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 - .../caps_5.0.0.riscv64.xml | 2 - .../caps_5.0.0.x86_64.xml | 3 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 - .../caps_5.1.0.x86_64.xml | 3 - .../caps_5.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 - .../caps_5.2.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 - .../caps_5.2.0.x86_64.xml | 3 - .../caps_6.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 - .../caps_6.0.0.x86_64.xml | 3 - .../caps_6.1.0.x86_64.xml | 3 - .../caps_6.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 - .../caps_6.2.0.x86_64.xml | 3 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 - .../caps_7.0.0.x86_64.xml | 3 - tests/qemumonitortestutils.c | 2 - .../aarch64-aavmf-virtio-mmio.args | 4 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 4 +- .../aarch64-cpu-passthrough.args | 4 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 4 +- .../aarch64-gic-none-tcg.args | 4 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 4 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 4 +- .../aarch64-kvm-32-on-64.args | 4 +- .../aarch64-noacpi-nouefi.args | 4 +- .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 4 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 7 +- .../aarch64-traditional-pci.args | 4 +- .../aarch64-usb-controller-nec-xhci.args | 4 +- .../aarch64-usb-controller-qemu-xhci.args | 4 +- .../aarch64-video-default.args | 4 +- .../aarch64-video-virtio-gpu-pci.args | 4 +- .../aarch64-virt-2.6-virtio-pci-default.args | 4 +- .../aarch64-virt-default-nic.args | 4 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 4 +- .../aarch64-virtio-pci-default.args | 4 +- .../aarch64-virtio-pci-manual-addresses.args | 4 +- tests/qemuxml2argvdata/acpi-table.args | 4 +- .../arm-vexpressa9-basic.args | 4 +- .../arm-vexpressa9-nodevs.args | 4 +- .../arm-vexpressa9-virtio.args | 4 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 4 +- tests/qemuxml2argvdata/audio-default-sdl.args | 4 +- .../qemuxml2argvdata/audio-default-spice.args | 4 +- tests/qemuxml2argvdata/audio-default-vnc.args | 4 +- tests/qemuxml2argvdata/autoindex.args | 4 +- .../qemuxml2argvdata/balloon-ccw-deflate.args | 4 +- .../qemuxml2argvdata/balloon-device-auto.args | 4 +- .../balloon-device-deflate-off.args | 4 +- .../balloon-device-deflate.args | 4 +- .../balloon-device-period.args | 4 +- tests/qemuxml2argvdata/balloon-device.args | 4 +- .../balloon-mmio-deflate.args | 4 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +- tests/qemuxml2argvdata/bios-nvram.args | 4 +- tests/qemuxml2argvdata/bios.args | 4 +- tests/qemuxml2argvdata/blkiotune-device.args | 4 +- tests/qemuxml2argvdata/blkiotune.args | 4 +- tests/qemuxml2argvdata/boot-cdrom.args | 4 +- tests/qemuxml2argvdata/boot-complex.args | 4 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 4 +- tests/qemuxml2argvdata/boot-floppy.args | 4 +- .../boot-menu-disable-drive.args | 4 +- tests/qemuxml2argvdata/boot-menu-disable.args | 4 +- .../boot-menu-enable-with-timeout.args | 4 +- tests/qemuxml2argvdata/boot-menu-enable.args | 4 +- tests/qemuxml2argvdata/boot-multi.args | 4 +- tests/qemuxml2argvdata/boot-network.args | 4 +- tests/qemuxml2argvdata/boot-order.args | 4 +- tests/qemuxml2argvdata/channel-guestfwd.args | 4 +- tests/qemuxml2argvdata/channel-spicevmc.args | 4 +- .../qemuxml2argvdata/channel-virtio-auto.args | 4 +- .../channel-virtio-autoadd.args | 4 +- .../channel-virtio-autoassign.args | 4 +- .../channel-virtio-default.args | 4 +- .../channel-virtio-state.args | 4 +- .../qemuxml2argvdata/channel-virtio-unix.args | 12 +- tests/qemuxml2argvdata/channel-virtio.args | 4 +- tests/qemuxml2argvdata/chardev-reconnect.args | 4 +- tests/qemuxml2argvdata/clock-catchup.args | 4 +- tests/qemuxml2argvdata/clock-france.args | 4 +- tests/qemuxml2argvdata/clock-hpet-off.args | 4 +- .../clock-localtime-basis-localtime.args | 4 +- tests/qemuxml2argvdata/clock-localtime.args | 4 +- tests/qemuxml2argvdata/clock-realtime.args | 4 +- .../clock-timer-hyperv-rtc.args | 4 +- tests/qemuxml2argvdata/clock-utc.args | 4 +- tests/qemuxml2argvdata/clock-variable.args | 4 +- .../qemuxml2argvdata/console-compat-auto.args | 4 +- .../console-compat-chardev.args | 4 +- tests/qemuxml2argvdata/console-compat.args | 4 +- .../qemuxml2argvdata/console-virtio-ccw.args | 4 +- .../qemuxml2argvdata/console-virtio-many.args | 4 +- tests/qemuxml2argvdata/console-virtio.args | 4 +- tests/qemuxml2argvdata/controller-order.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 4 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 4 +- .../qemuxml2argvdata/cpu-cache-disable2.args | 4 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 4 +- .../cpu-cache-emulate-l3.args | 4 +- .../cpu-cache-passthrough.args | 4 +- .../cpu-cache-passthrough2.args | 4 +- .../cpu-check-default-none.args | 4 +- .../cpu-check-default-none2.args | 4 +- .../cpu-check-default-partial.args | 4 +- .../cpu-check-default-partial2.args | 4 +- tests/qemuxml2argvdata/cpu-check-none.args | 4 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 4 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 4 +- tests/qemuxml2argvdata/cpu-exact1.args | 4 +- .../cpu-exact2-nofallback.args | 4 +- tests/qemuxml2argvdata/cpu-exact2.args | 4 +- tests/qemuxml2argvdata/cpu-fallback.args | 4 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 4 +- .../cpu-host-model-fallback.args | 4 +- .../cpu-host-model-vendor.args | 4 +- tests/qemuxml2argvdata/cpu-host-model.args | 4 +- .../cpu-host-model.x86_64-2.11.0.args | 36 - .../cpu-host-model.x86_64-2.12.0.args | 36 - .../cpu-host-model.x86_64-3.0.0.args | 36 - .../cpu-host-passthrough-features.args | 4 +- .../cpu-host-passthrough.args | 4 +- .../qemuxml2argvdata/cpu-hotplug-startup.args | 4 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 4 +- tests/qemuxml2argvdata/cpu-minimum1.args | 4 +- tests/qemuxml2argvdata/cpu-minimum2.args | 4 +- .../cpu-no-removed-features.args | 4 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 4 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 4 +- .../cpu-numa-no-memory-element.args | 4 +- tests/qemuxml2argvdata/cpu-numa1.args | 4 +- tests/qemuxml2argvdata/cpu-numa2.args | 4 +- tests/qemuxml2argvdata/cpu-s390-features.args | 4 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 4 +- tests/qemuxml2argvdata/cpu-strict1.args | 4 +- tests/qemuxml2argvdata/cpu-topology1.args | 4 +- tests/qemuxml2argvdata/cpu-topology2.args | 4 +- tests/qemuxml2argvdata/cpu-topology3.args | 4 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 +- tests/qemuxml2argvdata/cputune-numatune.args | 4 +- .../qemuxml2argvdata/cputune-zero-shares.args | 4 +- tests/qemuxml2argvdata/cputune.args | 4 +- .../default-kvm-host-arch.args | 4 +- .../default-qemu-host-arch.args | 4 +- ...2.12.0.args => disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 45 + ...12.0.args => disk-cache.x86_64-4.1.0.args} | 6 +- ...s => disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args => disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args => disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs => disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s => disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- .../disk-error-policy-s390x.s390x-4.0.0.args | 35 + ...gs => disk-error-policy.x86_64-4.1.0.args} | 16 +- ...args => disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-floppy.x86_64-4.1.0.args} | 4 +- ...=> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s => disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s => disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-shared.x86_64-4.1.0.args} | 6 +- ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- .../fd-memory-no-numa-topology.args | 4 +- .../fd-memory-numa-topology.args | 4 +- .../fd-memory-numa-topology2.args | 4 +- .../fd-memory-numa-topology3.args | 4 +- ...rgs => floppy-drive-fat.x86_64-4.1.0.args} | 4 +- .../graphics-egl-headless.args | 4 +- .../graphics-sdl-fullscreen.args | 4 +- tests/qemuxml2argvdata/graphics-sdl.args | 4 +- ...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 34 - ...raphics-vnc-auto-socket.x86_64-2.11.0.args | 32 - ...aphics-vnc-egl-headless.x86_64-2.11.0.args | 35 - ...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 34 - .../graphics-vnc-none.x86_64-2.11.0.args | 32 - .../graphics-vnc-policy.x86_64-2.11.0.args | 34 - ...remove-generated-socket.x86_64-2.11.0.args | 34 - .../graphics-vnc-sasl.x86_64-2.11.0.args | 35 - ...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 32 - .../graphics-vnc-socket.x86_64-2.11.0.args | 32 - .../graphics-vnc-tls.x86_64-2.11.0.args | 34 - .../graphics-vnc-websocket.x86_64-2.11.0.args | 32 - .../graphics-vnc.x86_64-2.11.0.args | 34 - .../hostdev-mdev-precreated.args | 4 +- .../hostdev-pci-address-device.args | 4 +- .../hostdev-pci-address-unassigned.args | 4 +- .../qemuxml2argvdata/hostdev-pci-address.args | 4 +- .../hostdev-pci-multifunction.args | 4 +- .../hostdev-scsi-vhost-scsi-ccw.args | 4 +- .../hostdev-scsi-vhost-scsi-pci.args | 4 +- .../hostdev-scsi-vhost-scsi-pcie.args | 4 +- .../hostdev-subsys-mdev-vfio-ccw.args | 4 +- .../hostdev-usb-address-device-boot.args | 4 +- .../hostdev-usb-address-device.args | 4 +- .../qemuxml2argvdata/hostdev-usb-address.args | 4 +- .../hostdev-vfio-multidomain.args | 4 +- .../hostdev-vfio-zpci-autogenerate-fids.args | 4 +- .../hostdev-vfio-zpci-autogenerate-uids.args | 4 +- .../hostdev-vfio-zpci-autogenerate.args | 4 +- .../hostdev-vfio-zpci-boundaries.args | 4 +- .../hostdev-vfio-zpci-ccw-memballoon.args | 4 +- .../hostdev-vfio-zpci-multidomain-many.args | 4 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 4 +- tests/qemuxml2argvdata/hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/hotplug-base.args | 4 +- .../hugepages-default-2M.args | 4 +- .../hugepages-default-system-size.args | 4 +- tests/qemuxml2argvdata/hugepages-default.args | 4 +- .../qemuxml2argvdata/hugepages-memaccess.args | 4 +- .../hugepages-memaccess2.args | 4 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 4 +- .../hugepages-numa-default-2M.args | 4 +- .../hugepages-numa-default-dimm.args | 4 +- .../hugepages-numa-default.args | 4 +- .../hugepages-numa-nodeset-part.args | 4 +- .../hugepages-numa-nodeset.args | 4 +- tests/qemuxml2argvdata/hugepages-shared.args | 4 +- .../hvf-aarch64-virt-headless.args | 6 +- .../hvf-x86_64-q35-headless.args | 6 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 4 +- tests/qemuxml2argvdata/input-usbmouse.args | 4 +- tests/qemuxml2argvdata/input-usbtablet.args | 4 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 4 +- .../iothreads-disk-virtio-ccw.args | 4 +- tests/qemuxml2argvdata/iothreads-disk.args | 4 +- .../iothreads-ids-partial.args | 4 +- tests/qemuxml2argvdata/iothreads-ids.args | 4 +- tests/qemuxml2argvdata/iothreads.args | 4 +- tests/qemuxml2argvdata/kvm-features-off.args | 4 +- tests/qemuxml2argvdata/kvm-features.args | 4 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 4 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 4 +- tests/qemuxml2argvdata/kvmclock.args | 4 +- ...v-missing-platform-info.x86_64-2.12.0.args | 34 - ...ev-missing-platform-info.x86_64-6.0.0.args | 37 + .../launch-security-sev.x86_64-2.12.0.args | 34 - .../mach-virt-console-virtio.args | 4 +- .../mach-virt-serial-native.args | 4 +- .../mach-virt-serial-pci.args | 4 +- .../mach-virt-serial-usb.args | 4 +- .../machine-aeskeywrap-off-cap.args | 4 +- .../machine-aeskeywrap-off-caps.args | 4 +- .../machine-aeskeywrap-on-cap.args | 4 +- .../machine-aeskeywrap-on-caps.args | 4 +- tests/qemuxml2argvdata/machine-aliases1.args | 4 +- tests/qemuxml2argvdata/machine-aliases2.args | 4 +- tests/qemuxml2argvdata/machine-core-off.args | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 4 +- .../machine-deakeywrap-off-cap.args | 4 +- .../machine-deakeywrap-off-caps.args | 4 +- .../machine-deakeywrap-on-cap.args | 4 +- .../machine-deakeywrap-on-caps.args | 4 +- .../machine-keywrap-none-caps.args | 4 +- .../machine-keywrap-none.args | 4 +- ...ine-loadparm-multiple-disks-nets-s390.args | 4 +- .../machine-loadparm-net-s390.args | 4 +- .../machine-loadparm-s390.args | 4 +- tests/qemuxml2argvdata/machine-smm-opt.args | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 4 +- tests/qemuxml2argvdata/master-key.args | 4 +- .../memory-hotplug-dimm-addr.args | 4 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 4 +- ...emory-hotplug-nvdimm-ppc64-abi-update.args | 4 +- .../memory-hotplug-nvdimm-ppc64.args | 4 +- ...emory-hotplug-ppc64-nonuma-abi-update.args | 4 +- .../memory-hotplug-ppc64-nonuma.args | 4 +- tests/qemuxml2argvdata/memory-hotplug.args | 4 +- tests/qemuxml2argvdata/memtune-unlimited.args | 4 +- tests/qemuxml2argvdata/memtune.args | 4 +- .../migrate-numa-unaligned.args | 4 +- tests/qemuxml2argvdata/migrate.args | 4 +- tests/qemuxml2argvdata/minimal.args | 4 +- tests/qemuxml2argvdata/misc-acpi.args | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 4 +- .../misc-disable-suspends.args | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 4 +- .../mlock-off.x86_64-3.0.0.args | 31 - .../mlock-on.x86_64-3.0.0.args | 31 - tests/qemuxml2argvdata/monitor-json.args | 4 +- .../multifunction-pci-device.args | 4 +- .../name-escape.x86_64-2.11.0.args | 47 - tests/qemuxml2argvdata/net-client.args | 4 +- tests/qemuxml2argvdata/net-eth-hostip.args | 4 +- tests/qemuxml2argvdata/net-eth-ifname.args | 4 +- tests/qemuxml2argvdata/net-eth-names.args | 4 +- .../net-eth-unmanaged-tap.args | 4 +- tests/qemuxml2argvdata/net-eth.args | 4 +- .../net-hostdev-bootorder.args | 4 +- .../net-hostdev-multidomain.args | 4 +- .../net-hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/net-hostdev.args | 4 +- tests/qemuxml2argvdata/net-many-models.args | 4 +- tests/qemuxml2argvdata/net-mcast.args | 4 +- tests/qemuxml2argvdata/net-server.args | 4 +- tests/qemuxml2argvdata/net-udp.args | 4 +- tests/qemuxml2argvdata/net-user-addr.args | 4 +- tests/qemuxml2argvdata/net-user.args | 4 +- .../net-vhostuser-multiq.args | 4 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 4 +- tests/qemuxml2argvdata/net-virtio-device.args | 4 +- .../net-virtio-disable-offloads.args | 4 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +- .../net-virtio-rxtxqueuesize.args | 4 +- .../net-virtio-teaming-hostdev.args | 4 +- .../qemuxml2argvdata/net-virtio-teaming.args | 4 +- tests/qemuxml2argvdata/net-virtio.args | 4 +- tests/qemuxml2argvdata/nosharepages.args | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 4 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 4 +- .../numad-auto-vcpu-static-numatune.args | 4 +- .../numad-static-memory-auto-vcpu.args | 4 +- tests/qemuxml2argvdata/numad.args | 4 +- .../numatune-auto-nodeset-invalid.args | 4 +- .../numatune-auto-prefer.args | 4 +- .../qemuxml2argvdata/numatune-distances.args | 4 +- .../numatune-memnode-no-memory.args | 4 +- tests/qemuxml2argvdata/numatune-memnode.args | 4 +- tests/qemuxml2argvdata/numatune-memory.args | 4 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 4 +- .../qemuxml2argvdata/pages-dimm-discard.args | 4 +- .../pages-discard-hugepages.args | 4 +- tests/qemuxml2argvdata/pages-discard.args | 4 +- .../parallel-parport-chardev.args | 4 +- .../parallel-tcp-chardev.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 4 +- .../pci-bridge-many-disks.args | 4 +- tests/qemuxml2argvdata/pci-bridge.args | 4 +- tests/qemuxml2argvdata/pci-expander-bus.args | 4 +- tests/qemuxml2argvdata/pci-many.args | 4 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 4 +- tests/qemuxml2argvdata/pci-rom.args | 4 +- .../pci-serial-dev-chardev.args | 4 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 4 +- .../pcie-root-port-model-generic.args | 4 +- .../pcie-root-port-model-ioh3420.args | 4 +- tests/qemuxml2argvdata/pcie-root-port.args | 4 +- tests/qemuxml2argvdata/pcie-root.args | 4 +- .../pcie-switch-downstream-port.args | 4 +- .../pcie-switch-upstream-port.args | 4 +- tests/qemuxml2argvdata/pcihole64-q35.args | 4 +- tests/qemuxml2argvdata/pcihole64.args | 4 +- tests/qemuxml2argvdata/pmu-feature-off.args | 4 +- tests/qemuxml2argvdata/pmu-feature.args | 4 +- tests/qemuxml2argvdata/ppc-dtb.args | 4 +- .../ppc64-usb-controller-legacy.args | 4 +- .../ppc64-usb-controller-qemu-xhci.args | 4 +- .../ppc64-usb-controller.args | 4 +- tests/qemuxml2argvdata/ppce500-serial.args | 4 +- tests/qemuxml2argvdata/pseries-basic.args | 4 +- .../pseries-console-virtio.args | 4 +- .../pseries-cpu-compat-power9.args | 4 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 4 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 4 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 4 +- tests/qemuxml2argvdata/pseries-features.args | 4 +- .../qemuxml2argvdata/pseries-hostdevs-1.args | 4 +- .../qemuxml2argvdata/pseries-hostdevs-2.args | 4 +- .../qemuxml2argvdata/pseries-hostdevs-3.args | 4 +- .../pseries-machine-max-cpu-compat.args | 4 +- .../pseries-many-buses-1.args | 4 +- .../pseries-many-buses-2.args | 4 +- .../pseries-many-devices.args | 4 +- tests/qemuxml2argvdata/pseries-nvram.args | 4 +- .../pseries-panic-missing.args | 4 +- .../pseries-panic-no-address.args | 4 +- .../pseries-phb-default-missing.args | 4 +- .../pseries-phb-numa-node.args | 4 +- .../qemuxml2argvdata/pseries-phb-simple.args | 4 +- .../pseries-serial-native.args | 4 +- .../qemuxml2argvdata/pseries-serial-pci.args | 4 +- .../qemuxml2argvdata/pseries-serial-usb.args | 4 +- .../qemuxml2argvdata/pseries-usb-default.args | 4 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 4 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 4 +- .../pseries-vio-user-assigned.args | 4 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 4 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 4 +- .../q35-default-devices-only.args | 4 +- tests/qemuxml2argvdata/q35-multifunction.args | 4 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 4 +- .../q35-pci-force-address.args | 4 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 4 +- tests/qemuxml2argvdata/q35-pcie.args | 4 +- .../q35-pm-disable-fallback.args | 4 +- tests/qemuxml2argvdata/q35-pm-disable.args | 4 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 4 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 4 +- tests/qemuxml2argvdata/q35-usb2.args | 4 +- .../q35-virt-manager-basic.args | 6 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 4 +- tests/qemuxml2argvdata/q35.args | 4 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 4 +- .../qemu-ns-commandline-ns0.args | 4 +- .../qemu-ns-commandline-ns1.args | 4 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 4 +- .../qemu-ns-domain-commandline-ns0.args | 4 +- .../qemu-ns-domain-commandline.args | 4 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 4 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +- .../reboot-timeout-disabled.args | 4 +- .../reboot-timeout-enabled.args | 4 +- tests/qemuxml2argvdata/restore-v2-fd.args | 4 +- tests/qemuxml2argvdata/restore-v2.args | 4 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 4 +- tests/qemuxml2argvdata/riscv64-virt.args | 4 +- .../qemuxml2argvdata/s390-panic-missing.args | 4 +- .../s390-panic-no-address.args | 4 +- tests/qemuxml2argvdata/s390-serial-2.args | 4 +- .../qemuxml2argvdata/s390-serial-console.args | 4 +- tests/qemuxml2argvdata/s390-serial.args | 4 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 4 +- .../seclabel-dynamic-baselabel.args | 4 +- .../seclabel-dynamic-labelskip.args | 4 +- .../seclabel-dynamic-override.args | 4 +- .../seclabel-dynamic-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 4 +- tests/qemuxml2argvdata/seclabel-none.args | 4 +- .../seclabel-static-labelskip.args | 4 +- .../seclabel-static-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-static.args | 4 +- .../serial-dev-chardev-iobase.args | 4 +- .../qemuxml2argvdata/serial-dev-chardev.args | 4 +- .../qemuxml2argvdata/serial-file-chardev.args | 7 +- tests/qemuxml2argvdata/serial-file-log.args | 8 +- .../qemuxml2argvdata/serial-many-chardev.args | 7 +- .../qemuxml2argvdata/serial-pty-chardev.args | 4 +- .../serial-spiceport-nospice.args | 4 +- tests/qemuxml2argvdata/serial-spiceport.args | 4 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 4 +- .../serial-tcp-telnet-chardev.args | 4 +- .../serial-tcp-tlsx509-chardev-notls.args | 4 +- .../serial-tcp-tlsx509-chardev-verify.args | 4 +- .../serial-tcp-tlsx509-chardev.args | 4 +- .../serial-tcp-tlsx509-secret-chardev.args | 4 +- .../qemuxml2argvdata/serial-udp-chardev.args | 4 +- .../qemuxml2argvdata/serial-unix-chardev.args | 6 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 4 +- .../shmem-plain-doorbell.args | 4 +- tests/qemuxml2argvdata/shmem.args | 4 +- .../smartcard-controller.args | 4 +- .../smartcard-host-certificates-database.args | 4 +- .../smartcard-host-certificates.args | 4 +- tests/qemuxml2argvdata/smartcard-host.args | 4 +- .../smartcard-passthrough-spicevmc.args | 4 +- .../smartcard-passthrough-tcp.args | 4 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 4 +- tests/qemuxml2argvdata/smbios.args | 4 +- tests/qemuxml2argvdata/smp-dies.args | 4 +- tests/qemuxml2argvdata/smp.args | 4 +- tests/qemuxml2argvdata/sound-device.args | 4 +- tests/qemuxml2argvdata/sound.args | 4 +- tests/qemuxml2argvdata/sparc-minimal.args | 4 +- .../usb-controller-default-q35.args | 4 +- .../usb-controller-explicit-q35.args | 4 +- .../usb-controller-qemu-xhci.args | 4 +- .../qemuxml2argvdata/usb-controller-xhci.args | 4 +- tests/qemuxml2argvdata/usb-controller.args | 4 +- .../usb-hub-autoadd-deluxe.args | 4 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 4 +- tests/qemuxml2argvdata/usb-hub.args | 4 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 4 +- .../qemuxml2argvdata/usb-ich9-companion.args | 4 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 4 +- .../qemuxml2argvdata/usb-long-port-path.args | 4 +- tests/qemuxml2argvdata/usb-none.args | 4 +- .../usb-piix3-controller.args | 4 +- .../qemuxml2argvdata/usb-port-autoassign.args | 4 +- tests/qemuxml2argvdata/usb-port-missing.args | 4 +- tests/qemuxml2argvdata/usb-ports.args | 4 +- tests/qemuxml2argvdata/usb-redir-boot.args | 4 +- .../usb-redir-filter-version.args | 4 +- tests/qemuxml2argvdata/usb-redir-filter.args | 4 +- tests/qemuxml2argvdata/usb-redir.args | 4 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 4 +- tests/qemuxml2argvdata/usb1-usb2.args | 4 +- tests/qemuxml2argvdata/user-aliases-usb.args | 4 +- tests/qemuxml2argvdata/user-aliases.args | 6 +- .../vcpu-placement-static.args | 4 +- .../video-device-pciaddr-default.args | 4 +- tests/qemuxml2argvdata/video-none-device.args | 4 +- .../video-qxl-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-qxl-device.args | 4 +- tests/qemuxml2argvdata/video-qxl-heads.args | 4 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 4 +- .../video-qxl-resolution.args | 4 +- .../video-qxl-sec-device-vgamem.args | 4 +- .../video-qxl-sec-device.args | 4 +- .../video-vga-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-vga-device.args | 4 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 4 +- .../video-virtio-gpu-ccw.args | 4 +- .../video-virtio-gpu-device.args | 4 +- .../video-virtio-gpu-sdl-gl.args | 4 +- .../video-virtio-gpu-secondary.args | 4 +- .../video-virtio-gpu-spice-gl.args | 4 +- .../video-virtio-gpu-virgl.args | 4 +- tests/qemuxml2argvdata/video-virtio-vga.args | 4 +- .../virtio-input-passthrough.args | 4 +- tests/qemuxml2argvdata/virtio-input.args | 4 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 4 +- .../qemuxml2argvdata/virtio-rng-default.args | 4 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 4 +- tests/qemuxml2argvdata/virtio-rng-random.args | 4 +- tests/qemuxml2argvdata/vmcoreinfo.args | 4 +- tests/qemuxml2argvtest.c | 113 +- .../disk-cache.x86_64-2.12.0.xml | 61 - tests/qemuxml2xmltest.c | 1 - 574 files changed, 1185 insertions(+), 237393 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.args => disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-4.1.0.args} (90%) rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args => disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args => disk-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args => disk-cdrom.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args => disk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args => disk-detect-zeroes.x86_64-4.1.0.args} (94%) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args rename tests/qemuxml2argvdata/{disk-error-policy.x86_64-2.12.0.args => disk-error-policy.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args => disk-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args => disk-floppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args => disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args => disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args => disk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args => disk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args => disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args => disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args => disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.args => disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args => disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-4.1.0.args} (88%) rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0.args => disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args => floppy-drive-fat.x86_64-4.1.0.args} (93%) delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args delete mode 100644 tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args delete mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml -- 2.34.1

4 25

[libvirt PATCH] tests: Fix fd leaks in virpcivpdtest
by Jiri Denemark 10 Feb '22

10 Feb '22

Tests testVirPCIVPDReadVPDBytes and testVirPCIVPDParseFullVPDInvalid failed to properly close open fildescriptors in some cases. Let's fix it by switching to VIR_AUTOCLOSE in the whole file. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/virpcivpdtest.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/virpcivpdtest.c b/tests/virpcivpdtest.c index 3fd40b518c..b4dd68b7aa 100644 --- a/tests/virpcivpdtest.c +++ b/tests/virpcivpdtest.c @@ -432,7 +432,7 @@ testPCIVPDGetFieldValueFormat(const void *data G_GNUC_UNUSED) static int testVirPCIVPDReadVPDBytes(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; g_autofree uint8_t *buf = NULL; uint8_t csum = 0; size_t readBytes = 0; @@ -471,7 +471,7 @@ testVirPCIVPDReadVPDBytes(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseVPDStringResource(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; uint8_t csum = 0; size_t dataLen = 0; bool result = false; @@ -488,7 +488,6 @@ testVirPCIVPDParseVPDStringResource(const void *opaque G_GNUC_UNUSED) return -1; result = virPCIVPDParseVPDLargeResourceString(fd, 0, dataLen, &csum, res); - VIR_FORCE_CLOSE(fd); if (!result) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -541,7 +540,7 @@ testVirPCIVPDValidateExampleReadOnlyFields(virPCIVPDResource *res) static int testVirPCIVPDParseFullVPD(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; size_t dataLen = 0; g_autoptr(virPCIVPDResource) res = NULL; @@ -560,7 +559,6 @@ testVirPCIVPDParseFullVPD(const void *opaque G_GNUC_UNUSED) return -1; res = virPCIVPDParse(fd); - VIR_FORCE_CLOSE(fd); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -609,7 +607,7 @@ testVirPCIVPDParseFullVPD(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseZeroLengthRW(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; size_t dataLen = 0; g_autoptr(virPCIVPDResource) res = NULL; @@ -630,7 +628,6 @@ testVirPCIVPDParseZeroLengthRW(const void *opaque G_GNUC_UNUSED) return -1; res = virPCIVPDParse(fd); - VIR_FORCE_CLOSE(fd); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -662,7 +659,7 @@ testVirPCIVPDParseZeroLengthRW(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseNoRW(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; size_t dataLen = 0; g_autoptr(virPCIVPDResource) res = NULL; @@ -682,7 +679,6 @@ testVirPCIVPDParseNoRW(const void *opaque G_GNUC_UNUSED) return -1; res = virPCIVPDParse(fd); - VIR_FORCE_CLOSE(fd); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -714,7 +710,7 @@ testVirPCIVPDParseNoRW(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseFullVPDSkipInvalidKeywords(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; size_t dataLen = 0; g_autoptr(virPCIVPDResource) res = NULL; @@ -737,7 +733,6 @@ testVirPCIVPDParseFullVPDSkipInvalidKeywords(const void *opaque G_GNUC_UNUSED) return -1; res = virPCIVPDParse(fd); - VIR_FORCE_CLOSE(fd); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -759,7 +754,7 @@ testVirPCIVPDParseFullVPDSkipInvalidKeywords(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseFullVPDSkipInvalidValues(const void *opaque G_GNUC_UNUSED) { - int fd = -1; + VIR_AUTOCLOSE fd = -1; size_t dataLen = 0; size_t i = 0; virPCIVPDResourceCustom *custom = NULL; @@ -792,7 +787,6 @@ testVirPCIVPDParseFullVPDSkipInvalidValues(const void *opaque G_GNUC_UNUSED) return -1; res = virPCIVPDParse(fd); - VIR_FORCE_CLOSE(fd); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -868,7 +862,6 @@ testVirPCIVPDParseFullVPDSkipInvalidValues(const void *opaque G_GNUC_UNUSED) static int testVirPCIVPDParseFullVPDInvalid(const void *opaque G_GNUC_UNUSED) { - int fd = -1; size_t dataLen = 0; # define VPD_INVALID_ZERO_BYTE \ @@ -963,6 +956,7 @@ testVirPCIVPDParseFullVPDInvalid(const void *opaque G_GNUC_UNUSED) # define TEST_INVALID_VPD(invalidVPD) \ do { \ + VIR_AUTOCLOSE fd = -1; \ g_autoptr(virPCIVPDResource) res = NULL; \ const uint8_t testCase[] = { invalidVPD }; \ dataLen = G_N_ELEMENTS(testCase); \ @@ -973,7 +967,6 @@ testVirPCIVPDParseFullVPDInvalid(const void *opaque G_GNUC_UNUSED) "Successfully parsed an invalid VPD - this is not expected"); \ return -1; \ } \ - VIR_FORCE_CLOSE(fd); \ } while (0); TEST_INVALID_VPD(VPD_INVALID_ZERO_BYTE); -- 2.35.1

2 1