As of April 23 2022, Ubuntu 20.04 will be out for two years, which means
we no longer have to support Ubuntu 18.04 along with qemu-2.11 shipped
with it.

The supported platforms thus will have the following qemu versions:

       Debian 10/Stable: 3.1
     OpenSUSE Leap 15.3: 5.2
           Ubuntu 20.04: 4.2
        RHEL/Centos 8.4: 4.2

If we consider 'Debian 10 backports' as update to 'Debian 10' we can
actually go further and update to 4.2.

I'm sending this series early to initiate discussion, but I won't mind
killing of the support earlier ;).

Patches 1-4 are ready to be pushed right away.

Note that the patches posted to the list are heavily trimmed, fetch
the full version at:

 git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprecation

Peter Krempa (19):
  qemuxml2argvtest: Add versioned test variants for pre-blockdev disk
    tests
  qemuxml2argvtest: Add newer variant of
    'launch-security-sev-missing-platform-info'
  qemuxml2xmltest: Remove unnecessary versioned invocation of
    'disk-cache'
  qemucapabilitiestest: Hack/fix version in qemu-3.1 tests
  qemuxml2agvtest: Retire tests based on qemu-2.11
  qemuxml2agvtest: Retire tests based on qemu-2.12
  qemuxml2agvtest: Retire tests based on qemu-3.0
  tests: qemucapabilities: Remove qemu-2.11 test data
  tests: qemucapabilities: Remove qemu-2.12 test data
  tests: qemucapabilities: Remove qemu-3.0 test data
  qemu: Formally deprecate support for qemu < 3.1
  qemu: capabilities: Remove tautological version checks
  qemu: capabilities: Remove probing of QEMU_CAPS_NUMA via
    'query-command-line-options'
  qemu: Always assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
  qemu: capabilities: Retire QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
  qemu: monitor: Remove waiting for monitor
  qemu: capabilities: Retire
    QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE
  qemu: command: Always assume QEMU_CAPS_OVERCOMMIT
  qemu: capabilities: Retire QEMU_CAPS_OVERCOMMIT

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

-- 
2.34.1

On Thu, Feb 10, 2022 at 01:45:21PM +0100, Peter Krempa wrote:
> As of April 23 2022, Ubuntu 20.04 will be out for two years, which means
> we no longer have to support Ubuntu 18.04 along with qemu-2.11 shipped
> with it.
> 
> The supported platforms thus will have the following qemu versions:
> 
>        Debian 10/Stable: 3.1
>      OpenSUSE Leap 15.3: 5.2
>            Ubuntu 20.04: 4.2
>         RHEL/Centos 8.4: 4.2
> 
> If we consider 'Debian 10 backports' as update to 'Debian 10' we can
> actually go further and update to 4.2.

I don't consider 'Debian backports' to be in scope for evaluating
min versions. Just the primary repos that can be assumed to be
present by defualt. Only signficant exception there  is EPEL
because RHEL/CentOS etc are so limited in their base package set.

Specifically in Debian backports the project itself cautions
against its general use https://backports.debian.org/

 "Backports cannot be tested as extensively as Debian stable, 
  and backports are provided on an as-is basis, with risk of 
  incompatibilities with other components in Debian stable. 
  Use with care!"

> I'm sending this series early to initiate discussion, but I won't mind
> killing of the support earlier ;).

Note until the corresponding dockerfiles are removed from the
gitlab CI config, the platforms are still in scope.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Thu, Feb 10, 2022 at 12:58:56PM +0000, Daniel P. Berrangé wrote:
> On Thu, Feb 10, 2022 at 01:45:21PM +0100, Peter Krempa wrote:
> > As of April 23 2022, Ubuntu 20.04 will be out for two years, which means
> > we no longer have to support Ubuntu 18.04 along with qemu-2.11 shipped
> > with it.
> >
> > The supported platforms thus will have the following qemu versions:
> >
> >        Debian 10/Stable: 3.1
> >      OpenSUSE Leap 15.3: 5.2
> >            Ubuntu 20.04: 4.2
> >         RHEL/Centos 8.4: 4.2
> >
> > If we consider 'Debian 10 backports' as update to 'Debian 10' we can
> > actually go further and update to 4.2.
>
> I don't consider 'Debian backports' to be in scope for evaluating
> min versions. Just the primary repos that can be assumed to be
> present by defualt. Only signficant exception there  is EPEL
> because RHEL/CentOS etc are so limited in their base package set.
>
> Specifically in Debian backports the project itself cautions
> against its general use https://backports.debian.org/
>
>  "Backports cannot be tested as extensively as Debian stable,
>   and backports are provided on an as-is basis, with risk of
>   incompatibilities with other components in Debian stable.
>   Use with care!"

Agreed. I'll prepare a patch clarifying this in platforms.rst.

-- 
Andrea Bolognani / Red Hat / Virtualization

Upcoming patches will raise the minimum required qemu version to 3.1.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_2.11.0.s390x.replies                 | 18237 ---------------
 .../caps_2.11.0.s390x.xml                     |  2593 --
 .../caps_2.11.0.x86_64.replies                | 19525 ----------------
 .../caps_2.11.0.x86_64.xml                    |   953 -
 4 files changed, 41308 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

 [snipped]

Upcoming patches will raise the minimum required qemu version to 3.1.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_2.12.0.aarch64.replies               | 19577 -------------
 .../caps_2.12.0.aarch64.xml                   |   329 -
 .../caps_2.12.0.ppc64.replies                 | 23072 ----------------
 .../caps_2.12.0.ppc64.xml                     |  1069 -
 .../caps_2.12.0.s390x.replies                 | 19937 -------------
 .../caps_2.12.0.s390x.xml                     |  2466 --
 .../caps_2.12.0.x86_64.replies                | 23003 ---------------
 .../caps_2.12.0.x86_64.xml                    |  1263 -
 8 files changed, 90716 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

 [snipped]

Upcoming patches will raise the minimum required qemu version to 3.1.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../caps_3.0.0.ppc64.replies                  | 23945 ----------------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |  1073 -
 .../caps_3.0.0.riscv32.replies                | 14919 ----------
 .../caps_3.0.0.riscv32.xml                    |    87 -
 .../caps_3.0.0.riscv64.replies                | 14919 ----------
 .../caps_3.0.0.riscv64.xml                    |    87 -
 .../caps_3.0.0.s390x.replies                  | 20683 -------------
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |  2677 --
 .../caps_3.0.0.x86_64.replies                 | 23719 ---------------
 .../caps_3.0.0.x86_64.xml                     |  1206 -
 10 files changed, 103315 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

 [snipped]