[PATCH RFC 00/19] qemu: Bump minimum supported qemu to qemu-3.1

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

Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12. Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later. This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x). Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-aio.x86_64-4.1.0.args | 36 ++++++++++++++ ...isk-backing-chains-index.x86_64-4.1.0.args | 45 +++++++++++++++++ ...k-backing-chains-noindex.x86_64-4.1.0.args | 45 +++++++++++++++++ .../disk-cache.x86_64-4.1.0.args | 42 ++++++++++++++++ .../disk-cdrom-network.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-cdrom-tray.x86_64-4.1.0.args | 38 ++++++++++++++ .../disk-cdrom.x86_64-4.1.0.args | 39 +++++++++++++++ .../disk-copy_on_read.x86_64-4.1.0.args | 39 +++++++++++++++ .../disk-detect-zeroes.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-error-policy-s390x.s390x-4.0.0.args | 35 +++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-floppy-q35.x86_64-4.1.0.args | 36 ++++++++++++++ .../disk-floppy.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-network-gluster.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-network-iscsi.x86_64-4.1.0.args | 49 +++++++++++++++++++ .../disk-network-nbd.x86_64-4.1.0.args | 41 ++++++++++++++++ .../disk-network-rbd.x86_64-4.1.0.args | 44 +++++++++++++++++ .../disk-network-sheepdog.x86_64-4.1.0.args | 35 +++++++++++++ ...disk-network-source-auth.x86_64-4.1.0.args | 40 +++++++++++++++ ...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 +++++++++++++ ...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ++++++++++++++++ .../disk-readonly-disk.x86_64-4.1.0.args | 36 ++++++++++++++ .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++ ...virtio-scsi-reservations.x86_64-4.1.0.args | 39 +++++++++++++++ .../floppy-drive-fat.x86_64-4.1.0.args | 35 +++++++++++++ tests/qemuxml2argvtest.c | 27 ++++++++++ 26 files changed, 1003 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args 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 create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6cf35a0ebf..53f0706d85 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1391,17 +1391,23 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */ DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); @@ -1414,8 +1420,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); + DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); + DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); DO_TEST_CAPS_LATEST("disk-fmt-qcow"); @@ -1423,43 +1431,56 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); DO_TEST_CAPS_VER("disk-shared", "2.12.0"); + DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); + DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); + DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); + DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); + /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); @@ -1484,6 +1505,7 @@ mymain(void) DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); DO_TEST_CAPS_VER("disk-aio", "2.12.0"); + DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); DO_TEST_CAPS_VER("disk-source-pool", "4.1.0"); @@ -1492,10 +1514,12 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); + DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); + DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets"); @@ -1512,8 +1536,10 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); DO_TEST_CAPS_LATEST("disk-slices"); @@ -1541,6 +1567,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-blockio"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); -- 2.34.1

On a Thursday in 2022, Peter Krempa wrote:
Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12.
Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later.
There is no need for this note. You can simply remove the 2.12-versionned tests in the same commit where you add these. There are no meaningful variations in the command line between them (and git's rename detection would make the patch better suited for the list) Jano
This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x).
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-aio.x86_64-4.1.0.args | 36 ++++++++++++++

Upcoming patches will remove support for qemu-2.12. Since tests of 'sev' use hacked data we need to use our capability dump of qemu-6.0 as it has the required fields. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args new file mode 100644 index 0000000000..5dfaf69063 --- /dev/null +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args @@ -0,0 +1,37 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \ +-accel kvm \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-bits":1,"policy":1,"dh-cert-file":"/tmp/lib/domain--1-QEMUGuest1/dh_cert.base64","session-file":"/tmp/lib/domain--1-QEMUGuest1/session.base64"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 53f0706d85..551716ba03 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3458,6 +3458,7 @@ mymain(void) DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"); + DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "6.0.0"); DO_TEST_CAPS_ARCH_LATEST_FULL("launch-security-sev-direct", "x86_64", ARG_QEMU_CAPS, -- 2.34.1

The 'disk-cache' output file is identical in the interesting parts (everything besides CPU config) to the '-latest' version, so the versioned invocation can be dropped. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-cache.x86_64-2.12.0.xml | 61 ------------------- tests/qemuxml2xmltest.c | 1 - 2 files changed, 62 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml deleted file mode 100644 index 15a6665145..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml +++ /dev/null @@ -1,61 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='usb'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0' model='lsilogic'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 007c9edacd..052950b86f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -333,7 +333,6 @@ mymain(void) DO_TEST_NOCAPS("disk-error-policy"); DO_TEST_CAPS_LATEST("disk-transient"); DO_TEST_NOCAPS("disk-fmt-qcow"); - DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_NOCAPS("disk-network-nbd"); -- 2.34.1

On a Thursday in 2022, Peter Krempa wrote:
The 'disk-cache' output file is identical in the interesting parts (everything besides CPU config) to the '-latest' version, so the versioned invocation can be dropped.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-cache.x86_64-2.12.0.xml | 61 ------------------- tests/qemuxml2xmltest.c | 1 - 2 files changed, 62 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

The test dumps for x86_64 and ppc64 were generated from pre-release qemu-3.0-rc1/rc2 and thus wouldn't pass our minimum version check. As these are very old, fix the version info we use for our check to 3.1 without re-generating them and keep the version tag intact. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index 64080b52ad..5663253798 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -17,8 +17,8 @@ { "return": { "qemu": { - "micro": 91, - "minor": 0, + "micro": 0, + "minor": 1, "major": 3 }, "package": "v3.1.0-rc1-74-g3c035a41dc" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index ca2ce49684..08ae7072d5 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -143,7 +143,7 @@ <flag name='cpu-max'/> <flag name='input-linux'/> <flag name='virtio-blk.queue-size'/> - <version>3000091</version> + <version>3001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> <package>v3.1.0-rc1-74-g3c035a41dc</package> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index d021745a06..144448783a 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -17,8 +17,8 @@ { "return": { "qemu": { - "micro": 92, - "minor": 0, + "micro": 0, + "minor": 1, "major": 3 }, "package": "v3.1.0-rc2-48-g039d4e3df0" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 654e9acca4..c342862b9a 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -186,7 +186,7 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <version>3000092</version> + <version>3001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> <package>v3.1.0-rc2-48-g039d4e3df0</package> -- 2.34.1

On a Thursday in 2022, Peter Krempa wrote:
The test dumps for x86_64 and ppc64 were generated from pre-release qemu-3.0-rc1/rc2 and thus wouldn't pass our minimum version check.
As these are very old, fix the version info we use for our check to 3.1 without re-generating them and keep the version tag intact.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-host-model.x86_64-2.11.0.args | 36 -------------- ...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 -------------- .../name-escape.x86_64-2.11.0.args | 47 ------------------- tests/qemuxml2argvtest.c | 18 ------- 16 files changed, 535 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args 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/name-escape.x86_64-2.11.0.args [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 551716ba03..75d9d00435 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1577,41 +1577,26 @@ mymain(void) DO_TEST_CAPS_LATEST("graphics-egl-headless"); DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode"); - /* DO_TEST_CAPS_VER("graphics-vnc-*", "2.11.0"); were added as a demonstration - * that the old fake-caps tests were already using the new format, thus - * they can be removed without replacement when "2.11.0" will be retired */ - DO_TEST_CAPS_VER("graphics-vnc", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc"); - DO_TEST_CAPS_VER("graphics-vnc-socket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-socket"); - DO_TEST_CAPS_VER("graphics-vnc-websocket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-websocket"); - DO_TEST_CAPS_VER("graphics-vnc-policy", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-policy"); DO_TEST_CAPS_LATEST("graphics-vnc-power"); - DO_TEST_CAPS_VER("graphics-vnc-no-listen-attr", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-no-listen-attr"); - DO_TEST_CAPS_VER("graphics-vnc-remove-generated-socket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-remove-generated-socket"); driver.config->vncAutoUnixSocket = true; - DO_TEST_CAPS_VER("graphics-vnc-auto-socket-cfg", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket-cfg"); driver.config->vncAutoUnixSocket = false; - DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket"); - DO_TEST_CAPS_VER("graphics-vnc-none", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-none"); - DO_TEST_CAPS_VER("graphics-vnc-socket-new-cmdline", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-socket-new-cmdline"); driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); driver.config->vncSASLdir = g_strdup("/root/.sasl2"); - DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; - DO_TEST_CAPS_VER("graphics-vnc-tls", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-tls"); driver.config->vncTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0"); @@ -1620,7 +1605,6 @@ mymain(void) driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0; VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncTLSx509certdir); - DO_TEST_CAPS_VER("graphics-vnc-egl-headless", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless"); DO_TEST("graphics-sdl", @@ -2149,7 +2133,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "2.11.0"); DO_TEST_CAPS_VER("cpu-host-model", "2.12.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); @@ -3323,7 +3306,6 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("missing-machine"); - DO_TEST_CAPS_VER("name-escape", "2.11.0"); DO_TEST_CAPS_LATEST("name-escape"); DO_TEST_NOCAPS("master-key"); -- 2.34.1

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-host-model.x86_64-2.12.0.args | 36 -------------- .../disk-aio.x86_64-2.12.0.args | 36 -------------- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...-backing-chains-noindex.x86_64-2.12.0.args | 45 ----------------- .../disk-cache.x86_64-2.12.0.args | 42 ---------------- .../disk-cdrom-network.x86_64-2.12.0.args | 37 -------------- .../disk-cdrom-tray.x86_64-2.12.0.args | 38 -------------- .../disk-cdrom.x86_64-2.12.0.args | 39 --------------- .../disk-copy_on_read.x86_64-2.12.0.args | 39 --------------- .../disk-detect-zeroes.x86_64-2.12.0.args | 37 -------------- .../disk-error-policy.x86_64-2.12.0.args | 37 -------------- .../disk-floppy-q35.x86_64-2.12.0.args | 36 -------------- .../disk-floppy.x86_64-2.12.0.args | 37 -------------- .../disk-network-gluster.x86_64-2.12.0.args | 37 -------------- .../disk-network-iscsi.x86_64-2.12.0.args | 49 ------------------- .../disk-network-nbd.x86_64-2.12.0.args | 41 ---------------- .../disk-network-rbd.x86_64-2.12.0.args | 44 ----------------- .../disk-network-sheepdog.x86_64-2.12.0.args | 35 ------------- ...isk-network-source-auth.x86_64-2.12.0.args | 40 --------------- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 35 ------------- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 41 ---------------- .../disk-readonly-disk.x86_64-2.12.0.args | 36 -------------- .../disk-shared.x86_64-2.12.0.args | 41 ---------------- ...irtio-scsi-reservations.x86_64-2.12.0.args | 39 --------------- .../floppy-drive-fat.x86_64-2.12.0.args | 35 ------------- ...v-missing-platform-info.x86_64-2.12.0.args | 34 ------------- .../launch-security-sev.x86_64-2.12.0.args | 34 ------------- tests/qemuxml2argvtest.c | 28 ----------- 28 files changed, 1029 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 75d9d00435..34f1f714a0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1392,21 +1392,16 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */ - DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); - DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); @@ -1419,10 +1414,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); - DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); - DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); @@ -1430,56 +1423,44 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); - DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); - DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); - DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); - DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); - DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); - DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); - DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); - DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); - DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); @@ -1504,7 +1485,6 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); - DO_TEST_CAPS_VER("disk-aio", "2.12.0"); DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); @@ -1513,12 +1493,10 @@ mymain(void) DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0"); DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); - DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); - DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); @@ -1535,10 +1513,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); - DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); - DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); @@ -1566,7 +1542,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); @@ -2133,7 +2108,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "2.12.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); DO_TEST_CAPS_VER("cpu-host-model", "4.0.0"); @@ -3437,9 +3411,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); - DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); - DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "6.0.0"); DO_TEST_CAPS_ARCH_LATEST_FULL("launch-security-sev-direct", "x86_64", -- 2.34.1

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-host-model.x86_64-3.0.0.args | 36 ------------------- .../mlock-off.x86_64-3.0.0.args | 31 ---------------- .../mlock-on.x86_64-3.0.0.args | 31 ---------------- tests/qemuxml2argvtest.c | 3 -- 4 files changed, 101 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.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 [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 34f1f714a0..fc758686a7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2108,7 +2108,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "3.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); DO_TEST_CAPS_VER("cpu-host-model", "4.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "4.1.0"); @@ -2894,8 +2893,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); - DO_TEST_CAPS_VER("mlock-on", "3.0.0"); - DO_TEST_CAPS_VER("mlock-off", "3.0.0"); DO_TEST_CAPS_LATEST("mlock-on"); DO_TEST_CAPS_LATEST("mlock-off"); -- 2.34.1

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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 - 4 files changed, 41308 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 [snipped]

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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 - 8 files changed, 90716 deletions(-) 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 [snipped]

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../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 - 10 files changed, 103315 deletions(-) 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 [snipped]

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. This then brings the minimum qemu version we have to support to qemu-3.1: Debian 10/Stable: 3.1 OpenSUSE Leap 15.3: 5.2 Ubuntu 20.04: 4.2 RHEL/Centos 8.4: 4.2 Next event in this space will be 2023/07/06 when Debian 11 will be out for two years, or alternatively when we consider Debian 10 backports as the target as it has qemu-5.2. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- docs/drvqemu.rst | 6 +++--- src/qemu/qemu_capabilities.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index 9d7dd2656b..9e5dfde56a 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -5,7 +5,7 @@ QEMU/KVM/HVF hypervisor driver ============================== -The libvirt KVM/QEMU driver can manage any QEMU emulator from version 2.11.0 or +The libvirt KVM/QEMU driver can manage any QEMU emulator from version 3.1.0 or later. It supports multiple QEMU accelerators: software @@ -34,8 +34,8 @@ Deployment pre-requisites ``qemu-kvm`` and ``/dev/kvm`` device node. If both are found, then KVM fully virtualized, hardware accelerated guests will be available. - **Hypervisor.framework (HVF)**: The driver will probe ``sysctl`` for the - presence of ``Hypervisor.framework``. If it is found and QEMU is newer than - 2.12, then it will be possible to create hardware accelerated guests. + presence of ``Hypervisor.framework``. If it is found it will be possible to + create hardware accelerated guests. Connections to QEMU driver -------------------------- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1b28c3f161..0ff0e12f75 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5373,8 +5373,8 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps, return 0; } -#define QEMU_MIN_MAJOR 2 -#define QEMU_MIN_MINOR 11 +#define QEMU_MIN_MAJOR 3 +#define QEMU_MIN_MINOR 1 #define QEMU_MIN_MICRO 0 virDomainVirtType -- 2.34.1

Some version checks no longer make sense as the minimum supported qemu is now qemu-3.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0ff0e12f75..35bf07142a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3261,12 +3261,6 @@ virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) if (qemuCaps->arch != hostArch) return 0; - /* We don't have a nice way to probe whether the QEMU binary - * contains HVF support, but we know that versions older than - * QEMU 2.12 didn't have the feature at all */ - if (qemuCaps->version < 2012000) - return 0; - /* We need the OS to report Hypervisor.framework availability */ if (sysctlbyname("kern.hv_support", &hv_support, &len, NULL, 0) < 0) return 0; @@ -5303,9 +5297,7 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) * query-cpu-model-expansion arguments even though it was not properly * advertised as a CPU property. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE) || - qemuCaps->version < 2012000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE); } if (ARCH_IS_S390(qemuCaps->arch)) { -- 2.34.1

On a Thursday in 2022, Peter Krempa wrote:
Some version checks no longer make sense as the minimum supported qemu is now qemu-3.1.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0ff0e12f75..35bf07142a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3261,12 +3261,6 @@ virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) if (qemuCaps->arch != hostArch) return 0;
- /* We don't have a nice way to probe whether the QEMU binary - * contains HVF support, but we know that versions older than - * QEMU 2.12 didn't have the feature at all */ - if (qemuCaps->version < 2012000) - return 0; - /* We need the OS to report Hypervisor.framework availability */ if (sysctlbyname("kern.hv_support", &hv_support, &len, NULL, 0) < 0) return 0; @@ -5303,9 +5297,7 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) * query-cpu-model-expansion arguments even though it was not properly * advertised as a CPU property. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE) || - qemuCaps->version < 2012000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE);
After this change, this capability effectively means ARCH_IS_X86. Its only user - virQEMUCapsProbeQMPHostCPU - already has some arch-specific code, so I don't see the value in keeping this capability. Jano
}
if (ARCH_IS_S390(qemuCaps->arch)) { -- 2.34.1

For modern qemu versions we use the presence of 'set-numa-node' qmp commnad. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 35bf07142a..43880d24e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3291,7 +3291,6 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE }, { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, - { "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */ { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, -- 2.34.1

All qemu versions now support FD passing either directly or via FDset. Assume that we always have this capability so that we can simplify chardev handling in many cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_process.c | 26 ++------------ .../aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- .../aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- .../aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- .../aarch64-kvm-32-on-64.args | 2 +- .../aarch64-noacpi-nouefi.args | 2 +- .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 5 +-- .../aarch64-traditional-pci.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- .../aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 2 +- .../aarch64-virt-2.6-virtio-pci-default.args | 2 +- .../aarch64-virt-default-nic.args | 2 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +- .../aarch64-virtio-pci-default.args | 2 +- .../aarch64-virtio-pci-manual-addresses.args | 2 +- tests/qemuxml2argvdata/acpi-table.args | 2 +- .../arm-vexpressa9-basic.args | 2 +- .../arm-vexpressa9-nodevs.args | 2 +- .../arm-vexpressa9-virtio.args | 2 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +- tests/qemuxml2argvdata/audio-default-sdl.args | 2 +- .../qemuxml2argvdata/audio-default-spice.args | 2 +- tests/qemuxml2argvdata/audio-default-vnc.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 2 +- .../balloon-device-deflate-off.args | 2 +- .../balloon-device-deflate.args | 2 +- .../balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- .../balloon-mmio-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 2 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- .../qemuxml2argvdata/channel-virtio-auto.args | 2 +- .../channel-virtio-autoadd.args | 2 +- .../channel-virtio-autoassign.args | 2 +- .../channel-virtio-default.args | 2 +- .../channel-virtio-state.args | 2 +- .../qemuxml2argvdata/channel-virtio-unix.args | 10 +++--- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-realtime.args | 2 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../qemuxml2argvdata/console-virtio-ccw.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable2.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-cache-emulate-l3.args | 2 +- .../cpu-cache-passthrough.args | 2 +- .../cpu-cache-passthrough2.args | 2 +- .../cpu-check-default-none.args | 2 +- .../cpu-check-default-none2.args | 2 +- .../cpu-check-default-partial.args | 2 +- .../cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- .../cpu-host-passthrough.args | 2 +- .../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- .../cpu-no-removed-features.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 2 +- .../cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-s390-features.args | 2 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- tests/qemuxml2argvdata/cputune-numatune.args | 2 +- .../qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- .../default-kvm-host-arch.args | 2 +- .../default-qemu-host-arch.args | 2 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../graphics-egl-headless.args | 2 +- .../graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- .../hostdev-mdev-precreated.args | 2 +- .../hostdev-pci-address-device.args | 2 +- .../hostdev-pci-address-unassigned.args | 2 +- .../qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../hostdev-pci-multifunction.args | 2 +- .../hostdev-scsi-vhost-scsi-ccw.args | 2 +- .../hostdev-scsi-vhost-scsi-pci.args | 2 +- .../hostdev-scsi-vhost-scsi-pcie.args | 2 +- .../hostdev-subsys-mdev-vfio-ccw.args | 2 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 2 +- .../qemuxml2argvdata/hostdev-usb-address.args | 2 +- .../hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-zpci-autogenerate-fids.args | 2 +- .../hostdev-vfio-zpci-autogenerate-uids.args | 2 +- .../hostdev-vfio-zpci-autogenerate.args | 2 +- .../hostdev-vfio-zpci-boundaries.args | 2 +- .../hostdev-vfio-zpci-ccw-memballoon.args | 2 +- .../hostdev-vfio-zpci-multidomain-many.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- .../hugepages-default-2M.args | 2 +- .../hugepages-default-system-size.args | 2 +- tests/qemuxml2argvdata/hugepages-default.args | 2 +- .../qemuxml2argvdata/hugepages-memaccess.args | 2 +- .../hugepages-memaccess2.args | 2 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +- .../hugepages-numa-default-2M.args | 2 +- .../hugepages-numa-default-dimm.args | 2 +- .../hugepages-numa-default.args | 2 +- .../hugepages-numa-nodeset-part.args | 2 +- .../hugepages-numa-nodeset.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- .../hvf-aarch64-virt-headless.args | 4 +-- .../hvf-x86_64-q35-headless.args | 4 +-- .../qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +- .../iothreads-disk-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk.args | 2 +- .../iothreads-ids-partial.args | 2 +- tests/qemuxml2argvdata/iothreads-ids.args | 2 +- tests/qemuxml2argvdata/iothreads.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../mach-virt-console-virtio.args | 2 +- .../mach-virt-serial-native.args | 2 +- .../mach-virt-serial-pci.args | 2 +- .../mach-virt-serial-usb.args | 2 +- .../machine-aeskeywrap-off-cap.args | 2 +- .../machine-aeskeywrap-off-caps.args | 2 +- .../machine-aeskeywrap-on-cap.args | 2 +- .../machine-aeskeywrap-on-caps.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- .../machine-deakeywrap-off-cap.args | 2 +- .../machine-deakeywrap-off-caps.args | 2 +- .../machine-deakeywrap-on-cap.args | 2 +- .../machine-deakeywrap-on-caps.args | 2 +- .../machine-keywrap-none-caps.args | 2 +- .../machine-keywrap-none.args | 2 +- ...ine-loadparm-multiple-disks-nets-s390.args | 2 +- .../machine-loadparm-net-s390.args | 2 +- .../machine-loadparm-s390.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- .../qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- .../memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- ...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +- .../memory-hotplug-nvdimm-ppc64.args | 2 +- ...emory-hotplug-ppc64-nonuma-abi-update.args | 2 +- .../memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- .../migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- .../misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- .../multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/net-client.args | 2 +- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-names.args | 2 +- .../net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth.args | 2 +- .../net-hostdev-bootorder.args | 2 +- .../net-hostdev-multidomain.args | 2 +- .../net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-many-models.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 2 +- tests/qemuxml2argvdata/net-server.args | 2 +- tests/qemuxml2argvdata/net-udp.args | 2 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user.args | 2 +- .../net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/net-virtio-device.args | 2 +- .../net-virtio-disable-offloads.args | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- .../net-virtio-rxtxqueuesize.args | 2 +- .../net-virtio-teaming-hostdev.args | 2 +- .../qemuxml2argvdata/net-virtio-teaming.args | 2 +- tests/qemuxml2argvdata/net-virtio.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- .../numatune-auto-prefer.args | 2 +- .../qemuxml2argvdata/numatune-distances.args | 2 +- .../numatune-memnode-no-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +- .../qemuxml2argvdata/pages-dimm-discard.args | 2 +- .../pages-discard-hugepages.args | 2 +- tests/qemuxml2argvdata/pages-discard.args | 2 +- .../parallel-parport-chardev.args | 2 +- .../parallel-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- .../pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- .../pci-serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- .../pcie-root-port-model-generic.args | 2 +- .../pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/ppc-dtb.args | 2 +- .../ppc64-usb-controller-legacy.args | 2 +- .../ppc64-usb-controller-qemu-xhci.args | 2 +- .../ppc64-usb-controller.args | 2 +- tests/qemuxml2argvdata/ppce500-serial.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- .../pseries-console-virtio.args | 2 +- .../pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- tests/qemuxml2argvdata/pseries-features.args | 2 +- .../qemuxml2argvdata/pseries-hostdevs-1.args | 2 +- .../qemuxml2argvdata/pseries-hostdevs-2.args | 2 +- .../qemuxml2argvdata/pseries-hostdevs-3.args | 2 +- .../pseries-machine-max-cpu-compat.args | 2 +- .../pseries-many-buses-1.args | 2 +- .../pseries-many-buses-2.args | 2 +- .../pseries-many-devices.args | 2 +- tests/qemuxml2argvdata/pseries-nvram.args | 2 +- .../pseries-panic-missing.args | 2 +- .../pseries-panic-no-address.args | 2 +- .../pseries-phb-default-missing.args | 2 +- .../pseries-phb-numa-node.args | 2 +- .../qemuxml2argvdata/pseries-phb-simple.args | 2 +- .../pseries-serial-native.args | 2 +- .../qemuxml2argvdata/pseries-serial-pci.args | 2 +- .../qemuxml2argvdata/pseries-serial-usb.args | 2 +- .../qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- .../pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 2 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- .../q35-default-devices-only.args | 2 +- tests/qemuxml2argvdata/q35-multifunction.args | 2 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +- .../q35-pci-force-address.args | 2 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +- tests/qemuxml2argvdata/q35-pcie.args | 2 +- .../q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- .../q35-virt-manager-basic.args | 4 +-- tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- .../qemu-ns-commandline-ns0.args | 2 +- .../qemu-ns-commandline-ns1.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline.args | 2 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +- tests/qemuxml2argvdata/riscv64-virt.args | 2 +- .../qemuxml2argvdata/s390-panic-missing.args | 2 +- .../s390-panic-no-address.args | 2 +- tests/qemuxml2argvdata/s390-serial-2.args | 2 +- .../qemuxml2argvdata/s390-serial-console.args | 2 +- tests/qemuxml2argvdata/s390-serial.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-override.args | 2 +- .../seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- .../seclabel-static-labelskip.args | 2 +- .../seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 5 +-- tests/qemuxml2argvdata/serial-file-log.args | 6 ++-- .../qemuxml2argvdata/serial-many-chardev.args | 5 +-- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../serial-spiceport-nospice.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- .../qemuxml2argvdata/serial-udp-chardev.args | 2 +- .../qemuxml2argvdata/serial-unix-chardev.args | 4 +-- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- .../shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- .../smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/sound-device.args | 2 +- tests/qemuxml2argvdata/sound.args | 2 +- tests/qemuxml2argvdata/sparc-minimal.args | 2 +- .../usb-controller-default-q35.args | 2 +- .../usb-controller-explicit-q35.args | 2 +- .../usb-controller-qemu-xhci.args | 2 +- .../qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- .../usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- .../qemuxml2argvdata/usb-ich9-companion.args | 2 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- .../qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- .../usb-piix3-controller.args | 2 +- .../qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- .../usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 4 +-- .../vcpu-placement-static.args | 2 +- .../video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-none-device.args | 2 +- .../video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- .../video-qxl-resolution.args | 2 +- .../video-qxl-sec-device-vgamem.args | 2 +- .../video-qxl-sec-device.args | 2 +- .../video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- .../video-virtio-gpu-ccw.args | 2 +- .../video-virtio-gpu-device.args | 2 +- .../video-virtio-gpu-sdl-gl.args | 2 +- .../video-virtio-gpu-secondary.args | 2 +- .../video-virtio-gpu-spice-gl.args | 2 +- .../video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- .../virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- .../qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvtest.c | 36 +++++++------------ 459 files changed, 491 insertions(+), 516 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 24873f6fb7..0b2ebaf123 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2342,11 +2342,7 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver, int ret = -1; g_autoptr(GHashTable) info = NULL; qemuDomainObjPrivate *priv = vm->privateData; - bool retry = true; - - if (priv->qemuCaps && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) - retry = false; + bool retry = false; VIR_DEBUG("Connect monitor to vm=%p name='%s' retry=%d", vm, vm->def->name, retry); @@ -6758,18 +6754,9 @@ qemuProcessPrepareHostBackendChardevFileHelper(const char *path, int *fd, virLogManager *logManager, virSecurityManager *secManager, - virQEMUCaps *qemuCaps, virQEMUDriverConfig *cfg, const virDomainDef *def) { - /* Technically, to pass an FD via /dev/fdset we don't need - * any capability check because X_QEMU_CAPS_ADD_FD is already - * assumed. But keeping the old style is still handy when - * building a standalone command line (e.g. for tests). */ - if (!logManager && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) - return 0; - if (logManager) { int flags = 0; @@ -6867,7 +6854,6 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev, &charpriv->fd, data->logManager, data->secManager, - data->qemuCaps, data->cfg, data->def) < 0) return -1; @@ -6875,9 +6861,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (chardev->data.nix.listen && - virQEMUCapsGet(data->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) { - + if (chardev->data.nix.listen) { if (qemuSecuritySetSocketLabel(data->secManager, data->def) < 0) return -1; @@ -6908,7 +6892,6 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev, &charpriv->logfd, data->logManager, data->secManager, - data->qemuCaps, data->cfg, data->def) < 0) return -1; @@ -8729,7 +8712,7 @@ qemuProcessReconnect(void *opaque) size_t i; unsigned int stopFlags = 0; bool jobStarted = false; - bool retry = true; + bool retry = false; bool tryMonReconn = false; virIdentitySetCurrent(data->identity); @@ -8765,9 +8748,6 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) - retry = false; - if (qemuDomainObjStartWorker(obj) < 0) goto error; diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 4be6cc308b..b8af6b7f3b 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ [ snipped ]

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - 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 | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - 35 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43880d24e7..91a9e75d17 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -496,7 +496,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "blockdev-del", /* QEMU_CAPS_BLOCKDEV_DEL */ "vmgenid", /* QEMU_CAPS_DEVICE_VMGENID */ "vhost-vsock", /* QEMU_CAPS_DEVICE_VHOST_VSOCK */ - "chardev-fd-pass", /* QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */ + "chardev-fd-pass", /* X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */ /* 305 */ "tpm-emulator", /* QEMU_CAPS_DEVICE_TPM_EMULATOR */ @@ -3289,7 +3289,6 @@ struct virQEMUCapsCommandLineProps { * in qemu and thus isn't being properly extended. Other means to detect * features should be used if possible. */ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { - { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE }, { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6ff0b7a78b..0b8d25e1dd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -471,7 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */ QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */ QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */ - QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */ + X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */ /* 305 */ QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */ diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 08ae7072d5..3b2cffbafe 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -111,7 +111,6 @@ <flag name='hda-output'/> <flag name='blockdev-del'/> <flag name='vhost-vsock'/> - <flag name='chardev-fd-pass'/> <flag name='tpm-emulator'/> <flag name='machine.pseries.cap-hpt-max-page-size'/> <flag name='machine.pseries.cap-htm'/> [ snipped ]

Now all supported qemus have FD passing for the monitor so all of the backoff timer infra used to wait for qemu to create the monitor socket became obsolete and can be removed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 61 ++++++------------------------------ src/qemu/qemu_monitor.h | 4 +-- src/qemu/qemu_process.c | 29 ++++++----------- tests/qemumonitortestutils.c | 2 -- 4 files changed, 19 insertions(+), 77 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 95ed6199b1..a4c6848a80 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -227,14 +227,10 @@ qemuMonitorDispose(void *obj) static int -qemuMonitorOpenUnix(const char *monitor, - pid_t cpid, - bool retry, - unsigned long long timeout) +qemuMonitorOpenUnix(const char *monitor) { struct sockaddr_un addr; VIR_AUTOCLOSE monfd = -1; - virTimeBackOffVar timebackoff; int ret = -1; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { @@ -251,39 +247,11 @@ qemuMonitorOpenUnix(const char *monitor, return -1; } - if (retry) { - if (virTimeBackOffStart(&timebackoff, 1, timeout * 1000) < 0) - return -1; - while (virTimeBackOffWait(&timebackoff)) { - ret = connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); - - if (ret == 0) - break; - - if ((errno == ENOENT || errno == ECONNREFUSED) && - (!cpid || virProcessKill(cpid, 0) == 0)) { - /* ENOENT : Socket may not have shown up yet - * ECONNREFUSED : Leftover socket hasn't been removed yet */ - continue; - } - - virReportSystemError(errno, "%s", - _("failed to connect to monitor socket")); - return -1; - } - - if (ret != 0) { - virReportSystemError(errno, "%s", - _("monitor socket did not show up")); - return -1; - } - } else { - ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); - if (ret < 0) { - virReportSystemError(errno, "%s", - _("failed to connect to monitor socket")); - return -1; - } + ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + if (ret < 0) { + virReportSystemError(errno, "%s", + _("failed to connect to monitor socket")); + return -1; } ret = monfd; @@ -698,29 +666,21 @@ qemuMonitorOpenInternal(virDomainObj *vm, } -#define QEMU_DEFAULT_MONITOR_WAIT 30 - /** * qemuMonitorOpen: * @vm: domain object * @config: monitor configuration - * @timeout: number of seconds to add to default timeout * @cb: monitor event handles * @opaque: opaque data for @cb * - * Opens the monitor for running qemu. It may happen that it - * takes some time for qemu to create the monitor socket (e.g. - * because kernel is zeroing configured hugepages), therefore we - * wait up to default + timeout seconds for the monitor to show - * up after which a failure is claimed. + * Opens the monitor for running qemu. We now always pass a pre-opened FD to + * qemu so the connection can happen right away. * * Returns monitor object, NULL on error. */ qemuMonitor * qemuMonitorOpen(virDomainObj *vm, virDomainChrSourceDef *config, - bool retry, - unsigned long long timeout, GMainContext *context, qemuMonitorCallbacks *cb, void *opaque) @@ -728,8 +688,6 @@ qemuMonitorOpen(virDomainObj *vm, VIR_AUTOCLOSE fd = -1; qemuMonitor *ret = NULL; - timeout += QEMU_DEFAULT_MONITOR_WAIT; - if (config->type != VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to handle monitor type: %s"), @@ -738,8 +696,7 @@ qemuMonitorOpen(virDomainObj *vm, } virObjectUnlock(vm); - fd = qemuMonitorOpenUnix(config->data.nix.path, - vm->pid, retry, timeout); + fd = qemuMonitorOpenUnix(config->data.nix.path); virObjectLock(vm); if (fd < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index efc4721ea9..97ffedea0a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -464,12 +464,10 @@ struct _qemuMonitorCallbacks { qemuMonitor *qemuMonitorOpen(virDomainObj *vm, virDomainChrSourceDef *config, - bool retry, - unsigned long long timeout, GMainContext *context, qemuMonitorCallbacks *cb, void *opaque) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); void qemuMonitorWatchDispose(void); bool qemuMonitorWasDisposed(void); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0b2ebaf123..ae9fcd31b8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1908,12 +1908,13 @@ qemuProcessInitMonitor(virQEMUDriver *driver, static int -qemuConnectMonitor(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, - bool retry, qemuDomainLogContext *logCtxt) +qemuConnectMonitor(virQEMUDriver *driver, + virDomainObj *vm, + int asyncJob, + qemuDomainLogContext *logCtxt) { qemuDomainObjPrivate *priv = vm->privateData; qemuMonitor *mon = NULL; - unsigned long long timeout = 0; if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to set security context for monitor for %s"), @@ -1921,18 +1922,10 @@ qemuConnectMonitor(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, return -1; } - /* When using hugepages, kernel zeroes them out before - * handing them over to qemu. This can be very time - * consuming. Therefore, add a second to timeout for each - * 1GiB of guest RAM. */ - timeout = virDomainDefGetMemoryTotal(vm->def) / (1024 * 1024); - ignore_value(virTimeMillisNow(&priv->monStart)); mon = qemuMonitorOpen(vm, priv->monConfig, - retry, - timeout, virEventThreadGetContext(priv->eventThread), &monitorCallbacks, driver); @@ -2342,12 +2335,10 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver, int ret = -1; g_autoptr(GHashTable) info = NULL; qemuDomainObjPrivate *priv = vm->privateData; - bool retry = false; - VIR_DEBUG("Connect monitor to vm=%p name='%s' retry=%d", - vm, vm->def->name, retry); + VIR_DEBUG("Connect monitor to vm=%p name='%s", vm, vm->def->name); - if (qemuConnectMonitor(driver, vm, asyncJob, retry, logCtxt) < 0) + if (qemuConnectMonitor(driver, vm, asyncJob, logCtxt) < 0) goto cleanup; /* Try to get the pty path mappings again via the monitor. This is much more @@ -8712,7 +8703,6 @@ qemuProcessReconnect(void *opaque) size_t i; unsigned int stopFlags = 0; bool jobStarted = false; - bool retry = false; bool tryMonReconn = false; virIdentitySetCurrent(data->identity); @@ -8751,13 +8741,12 @@ qemuProcessReconnect(void *opaque) if (qemuDomainObjStartWorker(obj) < 0) goto error; - VIR_DEBUG("Reconnect monitor to def=%p name='%s' retry=%d", - obj, obj->def->name, retry); + VIR_DEBUG("Reconnect monitor to def=%p name='%s'", obj, obj->def->name); tryMonReconn = true; /* XXX check PID liveliness & EXE path */ - if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, retry, NULL) < 0) + if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, NULL) < 0) goto error; priv->machineName = qemuDomainGetMachineName(obj); @@ -9354,7 +9343,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc) proc->vm->pid = proc->pid; - if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, 0, + if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, virEventThreadGetContext(proc->eventThread), &callbacks, NULL))) return -1; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index ce8e6e1645..d807d9d62c 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1123,8 +1123,6 @@ qemuMonitorTestNew(virDomainXMLOption *xmlopt, test->qapischema = schema; if (!(test->mon = qemuMonitorOpen(test->vm, &src, - true, - 0, virEventThreadGetContext(test->eventThread), &qemuMonitorTestCallbacks, driver))) -- 2.34.1

The flag was based on a version check which no longer made sense. Remove the flag by replacing it's only use by an arch-check which is equivalent at this point. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 10 ++-------- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.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.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - 13 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 91a9e75d17..caa92ca4b0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -591,7 +591,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 370 */ "cpu.migratable", /* QEMU_CAPS_CPU_MIGRATABLE */ - "query-cpu-model-expansion.migratable", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */ + "query-cpu-model-expansion.migratable", /* X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */ "fw_cfg", /* X_QEMU_CAPS_FW_CFG */ "migration-param.bandwidth", /* QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */ "migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */ @@ -3080,7 +3080,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, /* Try to check migratability of each feature. */ if (modelInfo && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE) && + ARCH_IS_X86(qemuCaps->arch) && qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_props, &nonMigratable) < 0) return -1; @@ -5290,12 +5290,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); - - /* Old x86 QEMU supported migratable:false property in - * query-cpu-model-expansion arguments even though it was not properly - * advertised as a CPU property. - */ - virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE); } if (ARCH_IS_S390(qemuCaps->arch)) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0b8d25e1dd..a52fe2a6f7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -566,7 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 370 */ QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */ - QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */ + X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */ X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */ QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */ QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */ diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 53c3ee16d7..c679d6da45 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -174,7 +174,6 @@ <flag name='tcg'/> <flag name='pvscsi'/> <flag name='cpu.migratable'/> - <flag name='query-cpu-model-expansion.migratable'/> <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> [snipped]

Starting with qemu-3.1 we always have the '-overcommit' argument and use it instead of '-realtime'. Remove the capability check and fix all fake-caps tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 10 ++-------- tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +- tests/qemuxml2argvdata/aarch64-traditional-pci.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/aarch64-video-default.args | 2 +- .../qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args | 2 +- .../aarch64-virt-2.6-virtio-pci-default.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-default-nic.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 2 +- tests/qemuxml2argvdata/aarch64-virtio-pci-default.args | 2 +- .../aarch64-virtio-pci-manual-addresses.args | 2 +- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 2 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +- tests/qemuxml2argvdata/audio-default-sdl.args | 2 +- tests/qemuxml2argvdata/audio-default-spice.args | 2 +- tests/qemuxml2argvdata/audio-default-vnc.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 2 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 2 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-realtime.args | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/console-compat-auto.args | 2 +- tests/qemuxml2argvdata/console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none2.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-no-removed-features.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-s390-features.args | 2 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- tests/qemuxml2argvdata/cputune-numatune.args | 2 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +- tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +- tests/qemuxml2argvdata/graphics-egl-headless.args | 2 +- tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address-device.args | 2 +- .../hostdev-pci-address-unassigned.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args | 2 +- .../qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args | 2 +- .../hostdev-usb-address-device-boot.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-zpci-autogenerate-fids.args | 2 +- .../hostdev-vfio-zpci-autogenerate-uids.args | 2 +- .../hostdev-vfio-zpci-autogenerate.args | 2 +- .../qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args | 2 +- .../hostdev-vfio-zpci-ccw-memballoon.args | 2 +- .../hostdev-vfio-zpci-multidomain-many.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- tests/qemuxml2argvdata/hugepages-default-2M.args | 2 +- .../hugepages-default-system-size.args | 2 +- tests/qemuxml2argvdata/hugepages-default.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-default-2M.args | 2 +- .../qemuxml2argvdata/hugepages-numa-default-dimm.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-default.args | 2 +- .../qemuxml2argvdata/hugepages-numa-nodeset-part.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args | 2 +- tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk.args | 2 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +- tests/qemuxml2argvdata/iothreads-ids.args | 2 +- tests/qemuxml2argvdata/iothreads.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/mach-virt-console-virtio.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-native.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +- tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args | 2 +- .../qemuxml2argvdata/machine-aeskeywrap-off-caps.args | 2 +- tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args | 2 +- tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args | 2 +- .../qemuxml2argvdata/machine-deakeywrap-off-caps.args | 2 +- tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args | 2 +- tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args | 2 +- tests/qemuxml2argvdata/machine-keywrap-none-caps.args | 2 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 2 +- .../machine-loadparm-multiple-disks-nets-s390.args | 2 +- tests/qemuxml2argvdata/machine-loadparm-net-s390.args | 2 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- .../memory-hotplug-nvdimm-ppc64-abi-update.args | 2 +- .../qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 2 +- .../memory-hotplug-ppc64-nonuma-abi-update.args | 2 +- .../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/net-client.args | 2 +- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-names.args | 2 +- tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth.args | 2 +- tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +- tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +- .../qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-many-models.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 2 +- tests/qemuxml2argvdata/net-server.args | 2 +- tests/qemuxml2argvdata/net-udp.args | 2 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user.args | 2 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/net-virtio-device.args | 2 +- .../qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +- tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args | 2 +- tests/qemuxml2argvdata/net-virtio-teaming.args | 2 +- tests/qemuxml2argvdata/net-virtio.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 2 +- tests/qemuxml2argvdata/numatune-distances.args | 2 +- tests/qemuxml2argvdata/numatune-memnode-no-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.args | 2 +- tests/qemuxml2argvdata/pages-discard-hugepages.args | 2 +- tests/qemuxml2argvdata/pages-discard.args | 2 +- tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- .../qemuxml2argvdata/pcie-root-port-model-generic.args | 2 +- .../qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/ppc-dtb.args | 2 +- .../qemuxml2argvdata/ppc64-usb-controller-legacy.args | 2 +- .../ppc64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 2 +- tests/qemuxml2argvdata/ppce500-serial.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-compat-power9.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 2 +- .../pseries-machine-max-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 2 +- tests/qemuxml2argvdata/pseries-many-devices.args | 2 +- tests/qemuxml2argvdata/pseries-nvram.args | 2 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 2 +- tests/qemuxml2argvdata/pseries-panic-no-address.args | 2 +- .../qemuxml2argvdata/pseries-phb-default-missing.args | 2 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 2 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 2 +- tests/qemuxml2argvdata/pseries-serial-native.args | 2 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 2 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 2 +- tests/qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- tests/qemuxml2argvdata/pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 2 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/q35-default-devices-only.args | 2 +- tests/qemuxml2argvdata/q35-multifunction.args | 2 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +- tests/qemuxml2argvdata/q35-pcie.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +- tests/qemuxml2argvdata/riscv64-virt.args | 2 +- tests/qemuxml2argvdata/s390-panic-missing.args | 2 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 2 +- tests/qemuxml2argvdata/s390-serial-2.args | 2 +- tests/qemuxml2argvdata/s390-serial-console.args | 2 +- tests/qemuxml2argvdata/s390-serial.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- tests/qemuxml2argvdata/serial-many-chardev.args | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +- tests/qemuxml2argvdata/serial-spiceport-nospice.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../qemuxml2argvdata/smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/sound-device.args | 2 +- tests/qemuxml2argvdata/sound.args | 2 +- tests/qemuxml2argvdata/sparc-minimal.args | 2 +- tests/qemuxml2argvdata/usb-controller-default-q35.args | 2 +- .../qemuxml2argvdata/usb-controller-explicit-q35.args | 2 +- tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +- .../qemuxml2argvdata/video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-none-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +- .../qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-secondary.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- 459 files changed, 460 insertions(+), 466 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9713467aa8..c88e9bbac4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7483,14 +7483,8 @@ qemuBuildMemCommandLine(virCommand *cmd, return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OVERCOMMIT)) { - virCommandAddArg(cmd, "-overcommit"); - virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ? "on" : "off"); - } else { - virCommandAddArg(cmd, "-realtime"); - virCommandAddArgFormat(cmd, "mlock=%s", - def->mem.locked ? "on" : "off"); - } + virCommandAddArg(cmd, "-overcommit"); + virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ? "on" : "off"); return 0; } diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index b8af6b7f3b..f41907ce2b 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -accel tcg \ -cpu cortex-a53 \ -m 1024 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -display none \ [snipped]

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - 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 | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - 35 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index caa92ca4b0..bc99f3cdcc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -529,7 +529,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 325 */ "scsi-disk.device_id", /* QEMU_CAPS_SCSI_DISK_DEVICE_ID */ "virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL */ - "overcommit", /* QEMU_CAPS_OVERCOMMIT */ + "overcommit", /* X_QEMU_CAPS_OVERCOMMIT */ "query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE */ "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ @@ -3290,7 +3290,6 @@ struct virQEMUCapsCommandLineProps { * features should be used if possible. */ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, - { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a52fe2a6f7..1bf4c1a97f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -504,7 +504,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 325 */ QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */ QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional devices */ - QEMU_CAPS_OVERCOMMIT, /* -overcommit */ + X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */ QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 3b2cffbafe..b53e3f0273 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -123,7 +123,6 @@ <flag name='machine.pseries.cap-nested-hv'/> <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> - <flag name='overcommit'/> <flag name='bochs-display'/> <flag name='drive-nvme'/> <flag name='i8042'/> [snipped]

On Thu, Feb 10, 2022 at 01:45:21PM +0100, Peter Krempa wrote:
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 don't consider 'Debian backports' to be in scope for evaluating min versions. Just the primary repos that can be assumed to be present by defualt. Only signficant exception there is EPEL because RHEL/CentOS etc are so limited in their base package set. Specifically in Debian backports the project itself cautions against its general use https://backports.debian.org/ "Backports cannot be tested as extensively as Debian stable, and backports are provided on an as-is basis, with risk of incompatibilities with other components in Debian stable. Use with care!"
I'm sending this series early to initiate discussion, but I won't mind killing of the support earlier ;).
Note until the corresponding dockerfiles are removed from the gitlab CI config, the platforms are still in scope. 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 :|

On Thu, Feb 10, 2022 at 12:58:56PM +0000, Daniel P. Berrangé wrote:
On Thu, Feb 10, 2022 at 01:45:21PM +0100, Peter Krempa wrote:
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 don't consider 'Debian backports' to be in scope for evaluating min versions. Just the primary repos that can be assumed to be present by defualt. Only signficant exception there is EPEL because RHEL/CentOS etc are so limited in their base package set.
Specifically in Debian backports the project itself cautions against its general use https://backports.debian.org/
"Backports cannot be tested as extensively as Debian stable, and backports are provided on an as-is basis, with risk of incompatibilities with other components in Debian stable. Use with care!"
Agreed. I'll prepare a patch clarifying this in platforms.rst. -- Andrea Bolognani / Red Hat / Virtualization
participants (4)
-
Andrea Bolognani
-
Daniel P. Berrangé
-
Ján Tomko
-
Peter Krempa