[PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)

Peter Krempa posted 20 patches 1 year, 9 months ago
Only 14 patches received!
docs/drvqemu.rst                              |     2 +-
src/qemu/qemu_capabilities.c                  |     7 +-
src/qemu/qemu_capabilities.h                  |     2 +-
src/qemu/qemu_command.c                       |   221 +-
src/qemu/qemu_validate.c                      |    86 -
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   211 -
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   230 -
tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   138 -
tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   211 -
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   211 -
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   230 -
.../qemu_4.0.0-virt.aarch64.xml               |   179 -
tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   173 -
tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   139 -
tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   236 -
tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   211 -
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   217 -
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   233 -
tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   217 -
.../caps_3.1.0.ppc64.replies                  | 23732 ---------------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
.../caps_3.1.0.x86_64.replies                 | 24428 ---------------
.../caps_3.1.0.x86_64.xml                     |  1387 -
.../caps_4.0.0.aarch64.replies                | 20893 -------------
.../caps_4.0.0.aarch64.xml                    |   363 -
.../caps_4.0.0.ppc64.replies                  | 24461 ---------------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
.../caps_4.0.0.riscv32.replies                | 18154 -----------
.../caps_4.0.0.riscv32.xml                    |   157 -
.../caps_4.0.0.riscv64.replies                | 18154 -----------
.../caps_4.0.0.riscv64.xml                    |   157 -
.../caps_4.0.0.s390x.replies                  | 21721 -------------
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
.../caps_4.0.0.x86_64.replies                 | 25001 ---------------
.../caps_4.0.0.x86_64.xml                     |  1398 -
.../caps_4.1.0.x86_64.replies                 | 25198 ----------------
.../caps_4.1.0.x86_64.xml                     |  1971 --
.../caps_4.2.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     1 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     1 -
.../caps_4.2.0.x86_64.xml                     |     1 -
.../caps_5.0.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     1 -
.../caps_5.0.0.riscv64.xml                    |     1 -
.../caps_5.0.0.x86_64.xml                     |     1 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     1 -
.../caps_5.1.0.x86_64.xml                     |     1 -
.../caps_5.2.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     1 -
.../caps_5.2.0.riscv64.xml                    |     1 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     1 -
.../caps_5.2.0.x86_64.xml                     |     1 -
.../caps_6.0.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml |     1 -
.../caps_6.0.0.x86_64.xml                     |     1 -
.../caps_6.1.0.x86_64.xml                     |     1 -
.../caps_6.2.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |     1 -
.../caps_6.2.0.x86_64.xml                     |     1 -
.../caps_7.0.0.aarch64.xml                    |     1 -
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |     1 -
.../caps_7.0.0.x86_64.xml                     |     1 -
.../caps_7.1.0.x86_64.xml                     |     1 -
.../aarch64-aavmf-virtio-mmio.args            |     2 +-
.../aarch64-cpu-passthrough.args              |     2 +-
.../aarch64-features-sve.aarch64-4.0.0.err    |     1 -
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 +-
.../qemuxml2argvdata/aarch64-pci-serial.args  |     2 +-
.../aarch64-traditional-pci.args              |     2 +-
.../aarch64-usb-controller-nec-xhci.args      |     2 +-
.../aarch64-usb-controller-qemu-xhci.args     |     2 +-
.../aarch64-video-default.args                |     4 +-
.../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 +-
.../audio-alsa-best.x86_64-4.1.0.args         |    46 -
.../audio-alsa-full.x86_64-4.1.0.err          |     1 -
.../audio-alsa-minimal.x86_64-4.1.0.args      |    33 -
.../audio-coreaudio-best.x86_64-4.1.0.args    |    46 -
.../audio-coreaudio-full.x86_64-4.1.0.err     |     1 -
.../audio-coreaudio-minimal.x86_64-4.1.0.args |    33 -
...audio-default-nographics.x86_64-4.1.0.args |    33 -
tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
.../qemuxml2argvdata/audio-default-spice.args |     2 +-
tests/qemuxml2argvdata/audio-default-vnc.args |     4 +-
.../audio-file-best.x86_64-4.1.0.args         |    45 -
.../audio-file-full.x86_64-4.1.0.err          |     1 -
.../audio-file-minimal.x86_64-4.1.0.args      |    33 -
.../audio-jack-full.x86_64-4.1.0.err          |     1 -
.../audio-jack-minimal.x86_64-4.1.0.err       |     1 -
.../audio-many-backends.x86_64-4.1.0.err      |     1 -
.../audio-none-best.x86_64-4.1.0.args         |    44 -
.../audio-none-full.x86_64-4.1.0.err          |     1 -
.../audio-none-minimal.x86_64-4.1.0.args      |    33 -
.../audio-oss-best.x86_64-4.1.0.args          |    49 -
.../audio-oss-full.x86_64-4.1.0.err           |     1 -
.../audio-oss-minimal.x86_64-4.1.0.args       |    33 -
.../audio-pulseaudio-best.x86_64-4.1.0.args   |    48 -
.../audio-pulseaudio-full.x86_64-4.1.0.err    |     1 -
...audio-pulseaudio-minimal.x86_64-4.1.0.args |    33 -
.../audio-sdl-best.x86_64-4.1.0.args          |    46 -
.../audio-sdl-full.x86_64-4.1.0.err           |     1 -
.../audio-sdl-minimal.x86_64-4.1.0.args       |    33 -
.../audio-spice-best.x86_64-4.1.0.args        |    45 -
.../audio-spice-full.x86_64-4.1.0.err         |     1 -
.../audio-spice-minimal.x86_64-4.1.0.args     |    34 -
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 +-
.../blkdeviotune-group-num.x86_64-4.1.0.args  |    37 -
.../blkdeviotune-max-length.x86_64-4.1.0.args |    37 -
.../blkdeviotune-max.x86_64-4.1.0.args        |    37 -
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 |     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 +-
.../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  |     4 +-
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-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-cmt.x86_64-4.0.0.args      |    33 -
.../cpu-host-model-fallback.args              |     2 +-
.../cpu-host-model-vendor.args                |     2 +-
tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
.../cpu-host-model.x86_64-3.1.0.args          |    36 -
.../cpu-host-model.x86_64-4.0.0.args          |    36 -
.../cpu-host-model.x86_64-4.1.0.args          |    36 -
.../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 +-
.../cpu-tsc-frequency.x86_64-4.0.0.args       |    33 -
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 +-
.../disk-aio.x86_64-4.1.0.args                |    36 -
.../disk-arm-virtio-sd.aarch64-4.0.0.args     |    38 -
...isk-backing-chains-index.x86_64-4.1.0.args |    45 -
...k-backing-chains-noindex.x86_64-4.1.0.args |     1 -
.../disk-cache.x86_64-3.1.0.args              |    42 -
.../disk-cache.x86_64-4.1.0.args              |    42 -
.../disk-cdrom-network.x86_64-4.1.0.args      |    39 -
.../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-discard.x86_64-4.1.0.args            |    36 -
.../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-fmt-qcow.x86_64-4.1.0.args           |    35 -
.../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-no-colon.x86_64-4.1.0.err |     1 -
.../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-3.1.0.args             |    41 -
.../disk-shared.x86_64-4.1.0.args             |    41 -
.../disk-source-pool-mode.x86_64-4.1.0.args   |    40 -
.../disk-source-pool.x86_64-4.1.0.args        |    42 -
.../disk-transient.x86_64-4.1.0.err           |     1 -
...virtio-scsi-reservations.x86_64-4.1.0.args |    39 -
.../encrypted-disk-usage.x86_64-4.1.0.args    |    35 -
.../encrypted-disk.x86_64-4.1.0.args          |    35 -
.../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 +-
.../firmware-manual-bios.args                 |     2 +-
.../firmware-manual-efi-acpi-aarch64.args     |     2 +-
.../firmware-manual-efi-acpi-q35.args         |     2 +-
.../firmware-manual-efi-noacpi-aarch64.args   |     2 +-
...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |     1 -
.../firmware-manual-efi-secure.args           |     2 +-
.../qemuxml2argvdata/firmware-manual-efi.args |     2 +-
.../firmware-manual-noefi-acpi-q35.args       |     2 +-
.../firmware-manual-noefi-noacpi-aarch64.args |     2 +-
.../firmware-manual-noefi-noacpi-q35.args     |     2 +-
.../floppy-drive-fat.x86_64-4.1.0.args        |    35 -
.../hostdev-mdev-precreated.args              |     2 +-
.../hostdev-pci-address-unassigned.args       |     2 +-
.../hostdev-pci-multifunction.args            |     2 +-
.../hostdev-scsi-lsi.x86_64-4.1.0.args        |    49 -
.../hostdev-scsi-vhost-scsi-ccw.args          |     2 +-
.../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
.../hostdev-scsi-vhost-scsi-pcie.args         |     2 +-
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args |    51 -
.../hostdev-subsys-mdev-vfio-ccw.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            |     2 +-
.../hvf-x86_64-q35-headless.args              |     2 +-
.../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 +-
.../luks-disks-source.x86_64-4.1.0.args       |    48 -
.../luks-disks.x86_64-4.1.0.args              |    39 -
.../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 +-
.../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-vhostuser.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        |     4 +-
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 +-
.../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-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 +-
.../q35-default-devices-only.args             |     2 +-
tests/qemuxml2argvdata/q35-multifunction.args |     2 +-
.../q35-pci-force-address.args                |     4 +-
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 |     2 +-
tests/qemuxml2argvdata/serial-file-log.args   |     2 +-
.../qemuxml2argvdata/serial-many-chardev.args |     2 +-
.../qemuxml2argvdata/serial-pty-chardev.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 |     2 +-
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      |    26 +-
tests/qemuxml2argvdata/sound.args             |     8 +-
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      |     6 +-
.../vcpu-placement-static.args                |     2 +-
.../video-device-pciaddr-default.args         |     4 +-
tests/qemuxml2argvdata/video-none-device.args |     4 +-
.../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                 |     4 +-
.../video-virtio-gpu-device.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 +-
.../virtio-non-transitional.x86_64-3.1.0.args |    53 -
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 +-
.../virtio-transitional.x86_64-3.1.0.args     |    46 -
tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.args        |    31 -
tests/qemuxml2argvtest.c                      |    93 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.xml         |    24 -
tests/qemuxml2xmltest.c                       |    21 +-
590 files changed, 495 insertions(+), 218552 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
[PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Peter Krempa 1 year, 9 months ago
In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.

QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it)  will deal
with:
 - old auidiodev config via ENV variables
 - old-style VIRTIO tranitional setup (possibly)
 - most of legacy block device setup (upcoming series)

This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.

The patches can also be fetched at:

 git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1

as some of the pure-removal patches here will be truncated to prevent
spamming the list.

Peter Krempa (20):
  qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
    'x86-kvm-32-on-64'
  tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
    tests
  qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
  qemuxml2argvtest: Remove 'qemu-3.1' versions of
    virtio-(non-)transitional tests
  qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
    test
  qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
    case
  qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
    and 'cpu-tsc-frequency'
  tests: qemucapabilities: Remove qemu-3.1 test data
  tests: domaincaps: Remove test data for qemu-3.1
  qemucapabilitiestest: Remove test data for qemu-4.0
  domaincapstest: Remove test data for qemu-4.0
  qemucapabilitiestest: Remove test data for qemu-4.1
  domaincapstest: Remove test data for qemu-4.1
  qemu: Formally deprecate support for qemu < 4.2
  qemu: command: Always assume QEMU_CAPS_AUDIODEV
  qemu: command: Drop the code for configuring audio devices via
    environment variables
  qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
  qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
  qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
    tests
  qemu: capabilities: Retire QEMU_CAPS_AUDIODEV

 docs/drvqemu.rst                              |     2 +-
 src/qemu/qemu_capabilities.c                  |     7 +-
 src/qemu/qemu_capabilities.h                  |     2 +-
 src/qemu/qemu_command.c                       |   221 +-
 src/qemu/qemu_validate.c                      |    86 -
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   211 -
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   230 -
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   138 -
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   211 -
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   211 -
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   230 -
 .../qemu_4.0.0-virt.aarch64.xml               |   179 -
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   173 -
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   139 -
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   236 -
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   211 -
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   217 -
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   233 -
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   217 -
 .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
 .../caps_3.1.0.x86_64.replies                 | 24428 ---------------
 .../caps_3.1.0.x86_64.xml                     |  1387 -
 .../caps_4.0.0.aarch64.replies                | 20893 -------------
 .../caps_4.0.0.aarch64.xml                    |   363 -
 .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
 .../caps_4.0.0.riscv32.replies                | 18154 -----------
 .../caps_4.0.0.riscv32.xml                    |   157 -
 .../caps_4.0.0.riscv64.replies                | 18154 -----------
 .../caps_4.0.0.riscv64.xml                    |   157 -
 .../caps_4.0.0.s390x.replies                  | 21721 -------------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
 .../caps_4.0.0.x86_64.replies                 | 25001 ---------------
 .../caps_4.0.0.x86_64.xml                     |  1398 -
 .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
 .../caps_4.1.0.x86_64.xml                     |  1971 --
 .../caps_4.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     1 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     1 -
 .../caps_4.2.0.x86_64.xml                     |     1 -
 .../caps_5.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     1 -
 .../caps_5.0.0.riscv64.xml                    |     1 -
 .../caps_5.0.0.x86_64.xml                     |     1 -
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     1 -
 .../caps_5.1.0.x86_64.xml                     |     1 -
 .../caps_5.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     1 -
 .../caps_5.2.0.riscv64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     1 -
 .../caps_5.2.0.x86_64.xml                     |     1 -
 .../caps_6.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |     1 -
 .../caps_6.0.0.x86_64.xml                     |     1 -
 .../caps_6.1.0.x86_64.xml                     |     1 -
 .../caps_6.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |     1 -
 .../caps_6.2.0.x86_64.xml                     |     1 -
 .../caps_7.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |     1 -
 .../caps_7.0.0.x86_64.xml                     |     1 -
 .../caps_7.1.0.x86_64.xml                     |     1 -
 .../aarch64-aavmf-virtio-mmio.args            |     2 +-
 .../aarch64-cpu-passthrough.args              |     2 +-
 .../aarch64-features-sve.aarch64-4.0.0.err    |     1 -
 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 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |     2 +-
 .../aarch64-traditional-pci.args              |     2 +-
 .../aarch64-usb-controller-nec-xhci.args      |     2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |     2 +-
 .../aarch64-video-default.args                |     4 +-
 .../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 +-
 .../audio-alsa-best.x86_64-4.1.0.args         |    46 -
 .../audio-alsa-full.x86_64-4.1.0.err          |     1 -
 .../audio-alsa-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-coreaudio-best.x86_64-4.1.0.args    |    46 -
 .../audio-coreaudio-full.x86_64-4.1.0.err     |     1 -
 .../audio-coreaudio-minimal.x86_64-4.1.0.args |    33 -
 ...audio-default-nographics.x86_64-4.1.0.args |    33 -
 tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
 .../qemuxml2argvdata/audio-default-spice.args |     2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |     4 +-
 .../audio-file-best.x86_64-4.1.0.args         |    45 -
 .../audio-file-full.x86_64-4.1.0.err          |     1 -
 .../audio-file-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-jack-full.x86_64-4.1.0.err          |     1 -
 .../audio-jack-minimal.x86_64-4.1.0.err       |     1 -
 .../audio-many-backends.x86_64-4.1.0.err      |     1 -
 .../audio-none-best.x86_64-4.1.0.args         |    44 -
 .../audio-none-full.x86_64-4.1.0.err          |     1 -
 .../audio-none-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-oss-best.x86_64-4.1.0.args          |    49 -
 .../audio-oss-full.x86_64-4.1.0.err           |     1 -
 .../audio-oss-minimal.x86_64-4.1.0.args       |    33 -
 .../audio-pulseaudio-best.x86_64-4.1.0.args   |    48 -
 .../audio-pulseaudio-full.x86_64-4.1.0.err    |     1 -
 ...audio-pulseaudio-minimal.x86_64-4.1.0.args |    33 -
 .../audio-sdl-best.x86_64-4.1.0.args          |    46 -
 .../audio-sdl-full.x86_64-4.1.0.err           |     1 -
 .../audio-sdl-minimal.x86_64-4.1.0.args       |    33 -
 .../audio-spice-best.x86_64-4.1.0.args        |    45 -
 .../audio-spice-full.x86_64-4.1.0.err         |     1 -
 .../audio-spice-minimal.x86_64-4.1.0.args     |    34 -
 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 +-
 .../blkdeviotune-group-num.x86_64-4.1.0.args  |    37 -
 .../blkdeviotune-max-length.x86_64-4.1.0.args |    37 -
 .../blkdeviotune-max.x86_64-4.1.0.args        |    37 -
 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 |     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 +-
 .../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  |     4 +-
 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-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-cmt.x86_64-4.0.0.args      |    33 -
 .../cpu-host-model-fallback.args              |     2 +-
 .../cpu-host-model-vendor.args                |     2 +-
 tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
 .../cpu-host-model.x86_64-3.1.0.args          |    36 -
 .../cpu-host-model.x86_64-4.0.0.args          |    36 -
 .../cpu-host-model.x86_64-4.1.0.args          |    36 -
 .../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 +-
 .../cpu-tsc-frequency.x86_64-4.0.0.args       |    33 -
 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 +-
 .../disk-aio.x86_64-4.1.0.args                |    36 -
 .../disk-arm-virtio-sd.aarch64-4.0.0.args     |    38 -
 ...isk-backing-chains-index.x86_64-4.1.0.args |    45 -
 ...k-backing-chains-noindex.x86_64-4.1.0.args |     1 -
 .../disk-cache.x86_64-3.1.0.args              |    42 -
 .../disk-cache.x86_64-4.1.0.args              |    42 -
 .../disk-cdrom-network.x86_64-4.1.0.args      |    39 -
 .../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-discard.x86_64-4.1.0.args            |    36 -
 .../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-fmt-qcow.x86_64-4.1.0.args           |    35 -
 .../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-no-colon.x86_64-4.1.0.err |     1 -
 .../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-3.1.0.args             |    41 -
 .../disk-shared.x86_64-4.1.0.args             |    41 -
 .../disk-source-pool-mode.x86_64-4.1.0.args   |    40 -
 .../disk-source-pool.x86_64-4.1.0.args        |    42 -
 .../disk-transient.x86_64-4.1.0.err           |     1 -
 ...virtio-scsi-reservations.x86_64-4.1.0.args |    39 -
 .../encrypted-disk-usage.x86_64-4.1.0.args    |    35 -
 .../encrypted-disk.x86_64-4.1.0.args          |    35 -
 .../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 +-
 .../firmware-manual-bios.args                 |     2 +-
 .../firmware-manual-efi-acpi-aarch64.args     |     2 +-
 .../firmware-manual-efi-acpi-q35.args         |     2 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |     2 +-
 ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |     1 -
 .../firmware-manual-efi-secure.args           |     2 +-
 .../qemuxml2argvdata/firmware-manual-efi.args |     2 +-
 .../firmware-manual-noefi-acpi-q35.args       |     2 +-
 .../firmware-manual-noefi-noacpi-aarch64.args |     2 +-
 .../firmware-manual-noefi-noacpi-q35.args     |     2 +-
 .../floppy-drive-fat.x86_64-4.1.0.args        |    35 -
 .../hostdev-mdev-precreated.args              |     2 +-
 .../hostdev-pci-address-unassigned.args       |     2 +-
 .../hostdev-pci-multifunction.args            |     2 +-
 .../hostdev-scsi-lsi.x86_64-4.1.0.args        |    49 -
 .../hostdev-scsi-vhost-scsi-ccw.args          |     2 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
 .../hostdev-scsi-vhost-scsi-pcie.args         |     2 +-
 ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args |    51 -
 .../hostdev-subsys-mdev-vfio-ccw.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            |     2 +-
 .../hvf-x86_64-q35-headless.args              |     2 +-
 .../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 +-
 .../luks-disks-source.x86_64-4.1.0.args       |    48 -
 .../luks-disks.x86_64-4.1.0.args              |    39 -
 .../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 +-
 .../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-vhostuser.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        |     4 +-
 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 +-
 .../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-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 +-
 .../q35-default-devices-only.args             |     2 +-
 tests/qemuxml2argvdata/q35-multifunction.args |     2 +-
 .../q35-pci-force-address.args                |     4 +-
 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 |     2 +-
 tests/qemuxml2argvdata/serial-file-log.args   |     2 +-
 .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
 .../qemuxml2argvdata/serial-pty-chardev.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 |     2 +-
 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      |    26 +-
 tests/qemuxml2argvdata/sound.args             |     8 +-
 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      |     6 +-
 .../vcpu-placement-static.args                |     2 +-
 .../video-device-pciaddr-default.args         |     4 +-
 tests/qemuxml2argvdata/video-none-device.args |     4 +-
 .../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                 |     4 +-
 .../video-virtio-gpu-device.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 +-
 .../virtio-non-transitional.x86_64-3.1.0.args |    53 -
 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 +-
 .../virtio-transitional.x86_64-3.1.0.args     |    46 -
 tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
 .../x86-kvm-32-on-64.x86_64-4.1.0.args        |    31 -
 tests/qemuxml2argvtest.c                      |    93 +-
 .../x86-kvm-32-on-64.x86_64-4.1.0.xml         |    24 -
 tests/qemuxml2xmltest.c                       |    21 +-
 590 files changed, 495 insertions(+), 218552 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
 delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
 delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml

-- 
2.36.1
Re: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Michal Prívozník 1 year, 9 months ago
On 7/15/22 13:44, Peter Krempa wrote:
> In August Debian 10 officially reaches EOL, thus we can bump minimum
> qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
> 
> QEMU-4.2 allows us to remove a big bunch of old code though. Few
> examples which this series (and the next iterations of it)  will deal
> with:
>  - old auidiodev config via ENV variables
>  - old-style VIRTIO tranitional setup (possibly)
>  - most of legacy block device setup (upcoming series)
> 
> This series is lacking the removal of Debian 10 from our CI infra
> though, I'll post that separately once I get to it.
> 
> The patches can also be fetched at:
> 
>  git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
> 
> as some of the pure-removal patches here will be truncated to prevent
> spamming the list.
> 
> Peter Krempa (20):
>   qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
>     'x86-kvm-32-on-64'
>   tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
>     tests
>   qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
>   qemuxml2argvtest: Remove 'qemu-3.1' versions of
>     virtio-(non-)transitional tests
>   qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
>     test
>   qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
>     case
>   qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
>     and 'cpu-tsc-frequency'
>   tests: qemucapabilities: Remove qemu-3.1 test data
>   tests: domaincaps: Remove test data for qemu-3.1
>   qemucapabilitiestest: Remove test data for qemu-4.0
>   domaincapstest: Remove test data for qemu-4.0
>   qemucapabilitiestest: Remove test data for qemu-4.1
>   domaincapstest: Remove test data for qemu-4.1
>   qemu: Formally deprecate support for qemu < 4.2
>   qemu: command: Always assume QEMU_CAPS_AUDIODEV
>   qemu: command: Drop the code for configuring audio devices via
>     environment variables
>   qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
>   qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
>   qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
>     tests
>   qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
> 

>  590 files changed, 495 insertions(+), 218552 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal
Re: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Claudio Fontana 1 year, 9 months ago
Hello Peter,

can we retire as well support for migration_set_speed then?

The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

Thanks,

Claudio


On 7/15/22 13:44, Peter Krempa wrote:
> In August Debian 10 officially reaches EOL, thus we can bump minimum
> qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
> 
> QEMU-4.2 allows us to remove a big bunch of old code though. Few
> examples which this series (and the next iterations of it)  will deal
> with:
>  - old auidiodev config via ENV variables
>  - old-style VIRTIO tranitional setup (possibly)
>  - most of legacy block device setup (upcoming series)
> 
> This series is lacking the removal of Debian 10 from our CI infra
> though, I'll post that separately once I get to it.
> 
> The patches can also be fetched at:
> 
>  git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
> 
> as some of the pure-removal patches here will be truncated to prevent
> spamming the list.
> 
> Peter Krempa (20):
>   qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
>     'x86-kvm-32-on-64'
>   tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
>     tests
>   qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
>   qemuxml2argvtest: Remove 'qemu-3.1' versions of
>     virtio-(non-)transitional tests
>   qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
>     test
>   qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
>     case
>   qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
>     and 'cpu-tsc-frequency'
>   tests: qemucapabilities: Remove qemu-3.1 test data
>   tests: domaincaps: Remove test data for qemu-3.1
>   qemucapabilitiestest: Remove test data for qemu-4.0
>   domaincapstest: Remove test data for qemu-4.0
>   qemucapabilitiestest: Remove test data for qemu-4.1
>   domaincapstest: Remove test data for qemu-4.1
>   qemu: Formally deprecate support for qemu < 4.2
>   qemu: command: Always assume QEMU_CAPS_AUDIODEV
>   qemu: command: Drop the code for configuring audio devices via
>     environment variables
>   qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
>   qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
>   qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
>     tests
>   qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
> 
>  docs/drvqemu.rst                              |     2 +-
>  src/qemu/qemu_capabilities.c                  |     7 +-
>  src/qemu/qemu_capabilities.h                  |     2 +-
>  src/qemu/qemu_command.c                       |   221 +-
>  src/qemu/qemu_validate.c                      |    86 -
>  .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   211 -
>  .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   230 -
>  tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   138 -
>  tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   211 -
>  .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   211 -
>  .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   230 -
>  .../qemu_4.0.0-virt.aarch64.xml               |   179 -
>  tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   173 -
>  tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   139 -
>  tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   236 -
>  tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   211 -
>  .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   217 -
>  .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   233 -
>  tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   217 -
>  .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
>  .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
>  .../caps_3.1.0.x86_64.replies                 | 24428 ---------------
>  .../caps_3.1.0.x86_64.xml                     |  1387 -
>  .../caps_4.0.0.aarch64.replies                | 20893 -------------
>  .../caps_4.0.0.aarch64.xml                    |   363 -
>  .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
>  .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
>  .../caps_4.0.0.riscv32.replies                | 18154 -----------
>  .../caps_4.0.0.riscv32.xml                    |   157 -
>  .../caps_4.0.0.riscv64.replies                | 18154 -----------
>  .../caps_4.0.0.riscv64.xml                    |   157 -
>  .../caps_4.0.0.s390x.replies                  | 21721 -------------
>  .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
>  .../caps_4.0.0.x86_64.replies                 | 25001 ---------------
>  .../caps_4.0.0.x86_64.xml                     |  1398 -
>  .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
>  .../caps_4.1.0.x86_64.xml                     |  1971 --
>  .../caps_4.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     1 -
>  .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     1 -
>  .../caps_4.2.0.x86_64.xml                     |     1 -
>  .../caps_5.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     1 -
>  .../caps_5.0.0.riscv64.xml                    |     1 -
>  .../caps_5.0.0.x86_64.xml                     |     1 -
>  .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     1 -
>  .../caps_5.1.0.x86_64.xml                     |     1 -
>  .../caps_5.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     1 -
>  .../caps_5.2.0.riscv64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     1 -
>  .../caps_5.2.0.x86_64.xml                     |     1 -
>  .../caps_6.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |     1 -
>  .../caps_6.0.0.x86_64.xml                     |     1 -
>  .../caps_6.1.0.x86_64.xml                     |     1 -
>  .../caps_6.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |     1 -
>  .../caps_6.2.0.x86_64.xml                     |     1 -
>  .../caps_7.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |     1 -
>  .../caps_7.0.0.x86_64.xml                     |     1 -
>  .../caps_7.1.0.x86_64.xml                     |     1 -
>  .../aarch64-aavmf-virtio-mmio.args            |     2 +-
>  .../aarch64-cpu-passthrough.args              |     2 +-
>  .../aarch64-features-sve.aarch64-4.0.0.err    |     1 -
>  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 +-
>  .../qemuxml2argvdata/aarch64-pci-serial.args  |     2 +-
>  .../aarch64-traditional-pci.args              |     2 +-
>  .../aarch64-usb-controller-nec-xhci.args      |     2 +-
>  .../aarch64-usb-controller-qemu-xhci.args     |     2 +-
>  .../aarch64-video-default.args                |     4 +-
>  .../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 +-
>  .../audio-alsa-best.x86_64-4.1.0.args         |    46 -
>  .../audio-alsa-full.x86_64-4.1.0.err          |     1 -
>  .../audio-alsa-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-coreaudio-best.x86_64-4.1.0.args    |    46 -
>  .../audio-coreaudio-full.x86_64-4.1.0.err     |     1 -
>  .../audio-coreaudio-minimal.x86_64-4.1.0.args |    33 -
>  ...audio-default-nographics.x86_64-4.1.0.args |    33 -
>  tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
>  .../qemuxml2argvdata/audio-default-spice.args |     2 +-
>  tests/qemuxml2argvdata/audio-default-vnc.args |     4 +-
>  .../audio-file-best.x86_64-4.1.0.args         |    45 -
>  .../audio-file-full.x86_64-4.1.0.err          |     1 -
>  .../audio-file-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-jack-full.x86_64-4.1.0.err          |     1 -
>  .../audio-jack-minimal.x86_64-4.1.0.err       |     1 -
>  .../audio-many-backends.x86_64-4.1.0.err      |     1 -
>  .../audio-none-best.x86_64-4.1.0.args         |    44 -
>  .../audio-none-full.x86_64-4.1.0.err          |     1 -
>  .../audio-none-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-oss-best.x86_64-4.1.0.args          |    49 -
>  .../audio-oss-full.x86_64-4.1.0.err           |     1 -
>  .../audio-oss-minimal.x86_64-4.1.0.args       |    33 -
>  .../audio-pulseaudio-best.x86_64-4.1.0.args   |    48 -
>  .../audio-pulseaudio-full.x86_64-4.1.0.err    |     1 -
>  ...audio-pulseaudio-minimal.x86_64-4.1.0.args |    33 -
>  .../audio-sdl-best.x86_64-4.1.0.args          |    46 -
>  .../audio-sdl-full.x86_64-4.1.0.err           |     1 -
>  .../audio-sdl-minimal.x86_64-4.1.0.args       |    33 -
>  .../audio-spice-best.x86_64-4.1.0.args        |    45 -
>  .../audio-spice-full.x86_64-4.1.0.err         |     1 -
>  .../audio-spice-minimal.x86_64-4.1.0.args     |    34 -
>  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 +-
>  .../blkdeviotune-group-num.x86_64-4.1.0.args  |    37 -
>  .../blkdeviotune-max-length.x86_64-4.1.0.args |    37 -
>  .../blkdeviotune-max.x86_64-4.1.0.args        |    37 -
>  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 |     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 +-
>  .../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  |     4 +-
>  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-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-cmt.x86_64-4.0.0.args      |    33 -
>  .../cpu-host-model-fallback.args              |     2 +-
>  .../cpu-host-model-vendor.args                |     2 +-
>  tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
>  .../cpu-host-model.x86_64-3.1.0.args          |    36 -
>  .../cpu-host-model.x86_64-4.0.0.args          |    36 -
>  .../cpu-host-model.x86_64-4.1.0.args          |    36 -
>  .../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 +-
>  .../cpu-tsc-frequency.x86_64-4.0.0.args       |    33 -
>  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 +-
>  .../disk-aio.x86_64-4.1.0.args                |    36 -
>  .../disk-arm-virtio-sd.aarch64-4.0.0.args     |    38 -
>  ...isk-backing-chains-index.x86_64-4.1.0.args |    45 -
>  ...k-backing-chains-noindex.x86_64-4.1.0.args |     1 -
>  .../disk-cache.x86_64-3.1.0.args              |    42 -
>  .../disk-cache.x86_64-4.1.0.args              |    42 -
>  .../disk-cdrom-network.x86_64-4.1.0.args      |    39 -
>  .../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-discard.x86_64-4.1.0.args            |    36 -
>  .../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-fmt-qcow.x86_64-4.1.0.args           |    35 -
>  .../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-no-colon.x86_64-4.1.0.err |     1 -
>  .../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-3.1.0.args             |    41 -
>  .../disk-shared.x86_64-4.1.0.args             |    41 -
>  .../disk-source-pool-mode.x86_64-4.1.0.args   |    40 -
>  .../disk-source-pool.x86_64-4.1.0.args        |    42 -
>  .../disk-transient.x86_64-4.1.0.err           |     1 -
>  ...virtio-scsi-reservations.x86_64-4.1.0.args |    39 -
>  .../encrypted-disk-usage.x86_64-4.1.0.args    |    35 -
>  .../encrypted-disk.x86_64-4.1.0.args          |    35 -
>  .../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 +-
>  .../firmware-manual-bios.args                 |     2 +-
>  .../firmware-manual-efi-acpi-aarch64.args     |     2 +-
>  .../firmware-manual-efi-acpi-q35.args         |     2 +-
>  .../firmware-manual-efi-noacpi-aarch64.args   |     2 +-
>  ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |     1 -
>  .../firmware-manual-efi-secure.args           |     2 +-
>  .../qemuxml2argvdata/firmware-manual-efi.args |     2 +-
>  .../firmware-manual-noefi-acpi-q35.args       |     2 +-
>  .../firmware-manual-noefi-noacpi-aarch64.args |     2 +-
>  .../firmware-manual-noefi-noacpi-q35.args     |     2 +-
>  .../floppy-drive-fat.x86_64-4.1.0.args        |    35 -
>  .../hostdev-mdev-precreated.args              |     2 +-
>  .../hostdev-pci-address-unassigned.args       |     2 +-
>  .../hostdev-pci-multifunction.args            |     2 +-
>  .../hostdev-scsi-lsi.x86_64-4.1.0.args        |    49 -
>  .../hostdev-scsi-vhost-scsi-ccw.args          |     2 +-
>  .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
>  .../hostdev-scsi-vhost-scsi-pcie.args         |     2 +-
>  ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args |    51 -
>  .../hostdev-subsys-mdev-vfio-ccw.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            |     2 +-
>  .../hvf-x86_64-q35-headless.args              |     2 +-
>  .../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 +-
>  .../luks-disks-source.x86_64-4.1.0.args       |    48 -
>  .../luks-disks.x86_64-4.1.0.args              |    39 -
>  .../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 +-
>  .../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-vhostuser.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        |     4 +-
>  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 +-
>  .../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-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 +-
>  .../q35-default-devices-only.args             |     2 +-
>  tests/qemuxml2argvdata/q35-multifunction.args |     2 +-
>  .../q35-pci-force-address.args                |     4 +-
>  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 |     2 +-
>  tests/qemuxml2argvdata/serial-file-log.args   |     2 +-
>  .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
>  .../qemuxml2argvdata/serial-pty-chardev.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 |     2 +-
>  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      |    26 +-
>  tests/qemuxml2argvdata/sound.args             |     8 +-
>  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      |     6 +-
>  .../vcpu-placement-static.args                |     2 +-
>  .../video-device-pciaddr-default.args         |     4 +-
>  tests/qemuxml2argvdata/video-none-device.args |     4 +-
>  .../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                 |     4 +-
>  .../video-virtio-gpu-device.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 +-
>  .../virtio-non-transitional.x86_64-3.1.0.args |    53 -
>  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 +-
>  .../virtio-transitional.x86_64-3.1.0.args     |    46 -
>  tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
>  .../x86-kvm-32-on-64.x86_64-4.1.0.args        |    31 -
>  tests/qemuxml2argvtest.c                      |    93 +-
>  .../x86-kvm-32-on-64.x86_64-4.1.0.xml         |    24 -
>  tests/qemuxml2xmltest.c                       |    21 +-
>  590 files changed, 495 insertions(+), 218552 deletions(-)
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
>  delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
>  delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
>
Re: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Peter Krempa 1 year, 9 months ago
On Fri, Jul 15, 2022 at 13:54:26 +0200, Claudio Fontana wrote:
> Hello Peter,
> 
> can we retire as well support for migration_set_speed then?
> 
> The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

Indeed. I've noticed multiple qemu params which can be assumed (e.g. the
speed parameter is in starting with qemu-2.8).

I'll post patches very shortly.
Re: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Michal Prívozník 1 year, 9 months ago
On 7/15/22 13:54, Claudio Fontana wrote:
> Hello Peter,
> 
> can we retire as well support for migration_set_speed then?
> 
> The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

While there are only a few such branches, I believe we can do that, but
in a separate commit/series since QEMU docs claim this was introduced in
2.8.

qapi/migration.json:

# @max-bandwidth: to set maximum speed for migration. maximum speed in
#                 bytes per second. (Since 2.8)


Michal
Re: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to qemu-4.2 (part 1)
Posted by Ján Tomko 1 year, 9 months ago
On a Friday in 2022, Peter Krempa wrote:
>In August Debian 10 officially reaches EOL, thus we can bump minimum
>qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
>
>QEMU-4.2 allows us to remove a big bunch of old code though. Few
>examples which this series (and the next iterations of it)  will deal
>with:
> - old auidiodev config via ENV variables
> - old-style VIRTIO tranitional setup (possibly)
> - most of legacy block device setup (upcoming series)
>
>This series is lacking the removal of Debian 10 from our CI infra
>though, I'll post that separately once I get to it.
>
>The patches can also be fetched at:
>
> git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
>
>as some of the pure-removal patches here will be truncated to prevent
>spamming the list.
>
>Peter Krempa (20):
>  qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
>    'x86-kvm-32-on-64'
>  tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
>    tests
>  qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
>  qemuxml2argvtest: Remove 'qemu-3.1' versions of
>    virtio-(non-)transitional tests
>  qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
>    test
>  qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
>    case
>  qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
>    and 'cpu-tsc-frequency'
>  tests: qemucapabilities: Remove qemu-3.1 test data
>  tests: domaincaps: Remove test data for qemu-3.1
>  qemucapabilitiestest: Remove test data for qemu-4.0
>  domaincapstest: Remove test data for qemu-4.0
>  qemucapabilitiestest: Remove test data for qemu-4.1
>  domaincapstest: Remove test data for qemu-4.1
>  qemu: Formally deprecate support for qemu < 4.2
>  qemu: command: Always assume QEMU_CAPS_AUDIODEV
>  qemu: command: Drop the code for configuring audio devices via
>    environment variables
>  qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
>  qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
>  qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
>    tests
>  qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
[PATCH 08/20] tests: qemucapabilities: Remove qemu-3.1 test data
Posted by Peter Krempa 1 year, 9 months ago
Upcoming patches will raise the minimum required qemu version to 4.2.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
 .../caps_3.1.0.x86_64.replies                 | 24428 ----------------
 .../caps_3.1.0.x86_64.xml                     |  1387 -
 4 files changed, 50619 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml

Truncated for mail posting.
[PATCH 09/20] tests: domaincaps: Remove test data for qemu-3.1
Posted by Peter Krempa 1 year, 9 months ago
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  | 211 ----------------
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  | 230 ------------------
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     | 138 -----------
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    | 211 ----------------
 4 files changed, 790 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml

 Truncated.
[PATCH 10/20] qemucapabilitiestest: Remove test data for qemu-4.0
Posted by Peter Krempa 1 year, 9 months ago
qemu-4.0 will no longer be supported, remove the test data.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_4.0.0.aarch64.replies                | 20893 -------------
 .../caps_4.0.0.aarch64.xml                    |   363 -
 .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
 .../caps_4.0.0.riscv32.replies                | 18154 -----------
 .../caps_4.0.0.riscv32.xml                    |   157 -
 .../caps_4.0.0.riscv64.replies                | 18154 -----------
 .../caps_4.0.0.riscv64.xml                    |   157 -
 .../caps_4.0.0.s390x.replies                  | 21721 --------------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
 .../caps_4.0.0.x86_64.replies                 | 25001 ----------------
 .../caps_4.0.0.x86_64.xml                     |  1398 -
 12 files changed, 134441 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

 Trucated.
[PATCH 11/20] domaincapstest: Remove test data for qemu-4.0
Posted by Peter Krempa 1 year, 9 months ago
qemu-4.0 will no longer be supported.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  | 211 ----------------
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  | 230 -----------------
 .../qemu_4.0.0-virt.aarch64.xml               | 179 -------------
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   | 173 -------------
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     | 139 -----------
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     | 236 ------------------
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    | 211 ----------------
 7 files changed, 1379 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml

Truncated.
[PATCH 12/20] qemucapabilitiestest: Remove test data for qemu-4.1
Posted by Peter Krempa 1 year, 9 months ago
qemu-4.1 will not be supported any more.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
 .../caps_4.1.0.x86_64.xml                     |  1971 --
 2 files changed, 27169 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

Truncated.
[PATCH 13/20] domaincapstest: Remove test data for qemu-4.1
Posted by Peter Krempa 1 year, 9 months ago
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  | 217 ----------------
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  | 233 ------------------
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    | 217 ----------------
 3 files changed, 667 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml

Truncated.