[RFC PATCH 00/43] qemu: Remove support for qemu-1.5 - qemu-2.10 and clean up capabilities

Peter Krempa posted 43 patches 3 years ago
Failed in applying to current master (apply log)
There is a newer version of this series
NEWS.rst                                      |     7 +
docs/drvqemu.rst                              |     2 +-
docs/platforms.rst                            |     2 -
src/qemu/qemu_alias.c                         |     5 +-
src/qemu/qemu_alias.h                         |     1 -
src/qemu/qemu_capabilities.c                  |   237 +-
src/qemu/qemu_capabilities.h                  |     7 +-
src/qemu/qemu_command.c                       |   190 +-
src/qemu/qemu_domain_address.c                |    82 +-
src/qemu/qemu_hotplug.c                       |     2 +-
src/qemu/qemu_monitor.c                       |    23 -
src/qemu/qemu_monitor.h                       |     3 -
src/qemu/qemu_monitor_json.c                  |    90 -
src/qemu/qemu_monitor_json.h                  |     6 -
.../caps_1.5.3.x86_64.replies                 |  3327 --
.../caps_1.5.3.x86_64.xml                     |   176 -
.../caps_1.6.0.x86_64.replies                 |  3298 --
.../caps_1.6.0.x86_64.xml                     |   185 -
.../caps_1.7.0.x86_64.replies                 |  3521 --
.../caps_1.7.0.x86_64.xml                     |   191 -
.../caps_2.1.1.x86_64.replies                 |  4041 --
.../caps_2.1.1.x86_64.xml                     |   217 -
.../caps_2.10.0.aarch64.replies               | 16975 ------
.../caps_2.10.0.aarch64.xml                   |   325 -
.../caps_2.10.0.ppc64.replies                 | 20756 -------
.../caps_2.10.0.ppc64.xml                     |  1067 -
.../caps_2.10.0.s390x.replies                 | 16608 ------
.../caps_2.10.0.s390x.xml                     |  1277 -
.../caps_2.10.0.x86_64.replies                | 19329 -------
.../caps_2.10.0.x86_64.xml                    |   997 -
.../caps_2.11.0.s390x.replies                 | 24392 ++++----
.../caps_2.11.0.s390x.xml                     |     3 -
.../caps_2.11.0.x86_64.replies                | 25712 ++++-----
.../caps_2.11.0.x86_64.xml                    |     3 -
.../caps_2.12.0.aarch64.replies               | 29188 +++++-----
.../caps_2.12.0.aarch64.xml                   |     2 -
.../caps_2.12.0.ppc64.replies                 | 31502 +++++------
.../caps_2.12.0.ppc64.xml                     |     3 -
.../caps_2.12.0.s390x.replies                 | 27224 ++++-----
.../caps_2.12.0.s390x.xml                     |     3 -
.../caps_2.12.0.x86_64.replies                | 30352 +++++-----
.../caps_2.12.0.x86_64.xml                    |     3 -
.../caps_2.4.0.x86_64.replies                 |  4868 --
.../caps_2.4.0.x86_64.xml                     |   263 -
.../caps_2.5.0.x86_64.replies                 | 12506 -----
.../caps_2.5.0.x86_64.xml                     |   273 -
.../caps_2.6.0.aarch64.replies                | 13317 -----
.../caps_2.6.0.aarch64.xml                    |   283 -
.../caps_2.6.0.ppc64.replies                  | 15692 ------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  1026 -
.../caps_2.6.0.x86_64.replies                 | 13061 -----
.../caps_2.6.0.x86_64.xml                     |   273 -
.../caps_2.7.0.s390x.replies                  | 12137 ----
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml |   113 -
.../caps_2.7.0.x86_64.replies                 | 13680 -----
.../caps_2.7.0.x86_64.xml                     |   284 -
.../caps_2.8.0.s390x.replies                  | 13553 -----
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml |   265 -
.../caps_2.8.0.x86_64.replies                 | 14594 -----
.../caps_2.8.0.x86_64.xml                     |   419 -
.../caps_2.9.0.ppc64.replies                  | 19514 -------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  1056 -
.../caps_2.9.0.s390x.replies                  | 14607 -----
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml |   273 -
.../caps_2.9.0.x86_64.replies                 | 18290 ------
.../caps_2.9.0.x86_64.xml                     |   910 -
.../caps_3.0.0.ppc64.replies                  | 32872 +++++------
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |     3 -
.../caps_3.0.0.riscv32.replies                | 21760 ++++----
.../caps_3.0.0.riscv32.xml                    |     3 -
.../caps_3.0.0.riscv64.replies                | 21760 ++++----
.../caps_3.0.0.riscv64.xml                    |     3 -
.../caps_3.0.0.s390x.replies                  | 28066 +++++-----
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml |     3 -
.../caps_3.0.0.x86_64.replies                 | 31463 ++++++-----
.../caps_3.0.0.x86_64.xml                     |     3 -
.../caps_3.1.0.ppc64.replies                  | 32440 +++++------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |     3 -
.../caps_3.1.0.x86_64.replies                 | 32304 +++++------
.../caps_3.1.0.x86_64.xml                     |     3 -
.../caps_4.0.0.aarch64.replies                | 31294 +++++------
.../caps_4.0.0.aarch64.xml                    |     2 -
.../caps_4.0.0.ppc64.replies                  | 33422 +++++------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |     3 -
.../caps_4.0.0.riscv32.replies                | 29062 +++++-----
.../caps_4.0.0.riscv32.xml                    |     3 -
.../caps_4.0.0.riscv64.replies                | 29062 +++++-----
.../caps_4.0.0.riscv64.xml                    |     3 -
.../caps_4.0.0.s390x.replies                  | 29542 +++++-----
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml |     3 -
.../caps_4.0.0.x86_64.replies                 | 32932 +++++------
.../caps_4.0.0.x86_64.xml                     |     3 -
.../caps_4.1.0.x86_64.replies                 | 34454 ++++++------
.../caps_4.1.0.x86_64.xml                     |     3 -
.../caps_4.2.0.aarch64.replies                | 33732 ++++++------
.../caps_4.2.0.aarch64.xml                    |     2 -
.../caps_4.2.0.ppc64.replies                  | 34230 ++++++------
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     3 -
.../caps_4.2.0.s390x.replies                  | 31044 +++++------
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     3 -
.../caps_4.2.0.x86_64.replies                 | 36818 ++++++-------
.../caps_4.2.0.x86_64.xml                     |     3 -
.../caps_5.0.0.aarch64.replies                | 36336 ++++++------
.../caps_5.0.0.aarch64.xml                    |     2 -
.../caps_5.0.0.ppc64.replies                  | 37738 ++++++-------
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     3 -
.../caps_5.0.0.riscv64.replies                | 32784 +++++------
.../caps_5.0.0.riscv64.xml                    |     3 -
.../caps_5.0.0.x86_64.replies                 | 39726 ++++++-------
.../caps_5.0.0.x86_64.xml                     |     3 -
.../caps_5.1.0.sparc.replies                  | 25244 ++++-----
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     3 -
.../caps_5.1.0.x86_64.replies                 | 41066 +++++++-------
.../caps_5.1.0.x86_64.xml                     |     3 -
.../caps_5.2.0.aarch64.replies                | 38490 ++++++-------
.../caps_5.2.0.aarch64.xml                    |     2 -
.../caps_5.2.0.ppc64.replies                  | 40514 +++++++-------
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     3 -
.../caps_5.2.0.riscv64.replies                | 34452 ++++++------
.../caps_5.2.0.riscv64.xml                    |     3 -
.../caps_5.2.0.s390x.replies                  | 35480 ++++++------
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     3 -
.../caps_5.2.0.x86_64.replies                 | 42432 +++++++-------
.../caps_5.2.0.x86_64.xml                     |     3 -
.../caps_6.0.0.x86_64.replies                 | 45838 ++++++++--------
.../caps_6.0.0.x86_64.xml                     |     3 -
tests/qemuhotplugtest.c                       |     5 +
.../ppc64-modern-bulk-result-conf.xml         |     2 +-
.../ppc64-modern-bulk-result-live.xml         |     2 +-
.../ppc64-modern-individual-result-conf.xml   |     2 +-
.../ppc64-modern-individual-result-live.xml   |     2 +-
.../x86-modern-bulk-result-conf.xml           |     2 +-
.../x86-modern-bulk-result-live.xml           |     2 +-
.../x86-modern-individual-add-result-conf.xml |     2 +-
.../x86-modern-individual-add-result-live.xml |     2 +-
.../x86-old-bulk-result-conf.xml              |     2 +-
.../x86-old-bulk-result-live.xml              |     2 +-
.../qemuhotplug-ivshmem-doorbell-detach.xml   |     2 +-
.../qemuhotplug-ivshmem-plain-detach.xml      |     2 +-
.../qemuhotplug-watchdog-full.xml             |     2 +-
.../qemuhotplug-watchdog-user-alias-full.xml  |     2 +-
.../qemuhotplug-base-live+disk-virtio.xml     |     2 +-
.../qemuhotplug-base-live+hostdev-pci.xml     |     2 +-
.../qemuhotplug-base-live+interface-vdpa.xml  |     2 +-
...qemuhotplug-base-live+ivshmem-doorbell.xml |     4 +-
.../qemuhotplug-base-live+ivshmem-plain.xml   |     2 +-
...uhotplug-base-live+watchdog-user-alias.xml |     2 +-
.../qemuhotplug-base-live+watchdog.xml        |     2 +-
...hotplug-base-with-scsi-controller-live.xml |     8 +-
...thout-scsi-controller-live+disk-scsi-2.xml |     8 +-
tests/qemumonitorjsontest.c                   |    44 -
.../aarch64-aavmf-virtio-mmio.args            |     2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args |     2 +-
.../aarch64-cpu-passthrough.args              |     2 +-
tests/qemuxml2argvdata/aarch64-gic-host.err   |     1 -
tests/qemuxml2argvdata/aarch64-gic-v3.err     |     1 -
.../aarch64-noacpi-nouefi.args                |     2 +-
.../qemuxml2argvdata/aarch64-noacpi-uefi.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                |     2 +-
.../aarch64-video-virtio-gpu-pci.args         |     2 +-
.../aarch64-virt-2.6-virtio-pci-default.args  |     2 +-
.../aarch64-virt-default-nic.args             |     2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args |     2 +-
.../aarch64-virtio-pci-default.args           |     2 +-
.../aarch64-virtio-pci-manual-addresses.args  |     2 +-
tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
.../qemuxml2argvdata/audio-default-spice.args |     2 +-
tests/qemuxml2argvdata/audio-default-vnc.args |     2 +-
tests/qemuxml2argvdata/autoindex.args         |     2 +-
.../qemuxml2argvdata/balloon-device-auto.args |     2 +-
.../balloon-mmio-deflate.args                 |     2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args |     2 +-
tests/qemuxml2argvdata/bios-nvram.args        |     2 +-
tests/qemuxml2argvdata/bios.args              |     2 +-
tests/qemuxml2argvdata/blkiotune-device.args  |     2 +-
tests/qemuxml2argvdata/blkiotune.args         |     2 +-
tests/qemuxml2argvdata/boot-complex.args      |     8 +-
.../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-order.args        |     6 +-
tests/qemuxml2argvdata/boot-strict.args       |     8 +-
tests/qemuxml2argvdata/channel-guestfwd.args  |     2 +-
tests/qemuxml2argvdata/channel-spicevmc.args  |     2 +-
.../channel-unix-guestfwd.x86_64-2.5.0.args   |    33 -
.../qemuxml2argvdata/channel-virtio-auto.args |     6 +-
.../channel-virtio-autoadd.args               |     6 +-
.../channel-virtio-autoassign.args            |     4 +-
.../channel-virtio-default.args               |     4 +-
.../channel-virtio-state.args                 |     2 +-
.../qemuxml2argvdata/channel-virtio-unix.args |     2 +-
tests/qemuxml2argvdata/channel-virtio.args    |     2 +-
tests/qemuxml2argvdata/chardev-reconnect.args |     4 +-
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 +-
.../clock-timer-hyperv-rtc.args               |     2 +-
tests/qemuxml2argvdata/clock-variable.args    |     2 +-
.../qemuxml2argvdata/console-compat-auto.args |     2 +-
.../console-compat-chardev.args               |     2 +-
.../qemuxml2argvdata/console-virtio-many.args |     4 +-
.../console-virtio-unix.x86_64-2.5.0.args     |    34 -
tests/qemuxml2argvdata/console-virtio.args    |     4 +-
tests/qemuxml2argvdata/controller-order.args  |     2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |     2 +-
tests/qemuxml2argvdata/cpu-Haswell.args       |     2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args      |     2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args      |     2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args |     2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args  |     2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args  |     2 +-
.../cpu-cache-emulate-l3.args                 |     2 +-
.../cpu-cache-passthrough.args                |     2 +-
.../cpu-cache-passthrough2.args               |     2 +-
.../cpu-check-default-none.args               |     2 +-
.../cpu-check-default-none2.args              |     2 +-
.../cpu-check-default-partial.args            |     2 +-
.../cpu-check-default-partial2.args           |     2 +-
tests/qemuxml2argvdata/cpu-check-none.args    |     2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args  |     2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args   |     2 +-
tests/qemuxml2argvdata/cpu-exact1.args        |     2 +-
.../cpu-exact2-nofallback.args                |     2 +-
tests/qemuxml2argvdata/cpu-exact2.args        |     2 +-
tests/qemuxml2argvdata/cpu-fallback.args      |     2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args |     2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args  |     2 +-
.../cpu-host-model-fallback.args              |     2 +-
.../cpu-host-model-vendor.args                |     2 +-
tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
.../cpu-host-passthrough-features.args        |     2 +-
.../cpu-host-passthrough.args                 |     2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args |     2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args      |     2 +-
tests/qemuxml2argvdata/cpu-minimum1.args      |     2 +-
tests/qemuxml2argvdata/cpu-minimum2.args      |     2 +-
.../cpu-no-removed-features.args              |     2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args |     2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args  |     2 +-
.../cpu-numa-no-memory-element.args           |     2 +-
tests/qemuxml2argvdata/cpu-numa1.args         |     2 +-
tests/qemuxml2argvdata/cpu-numa2.args         |     2 +-
tests/qemuxml2argvdata/cpu-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 +-
.../qemuxml2argvdata/cputune-zero-shares.args |     2 +-
tests/qemuxml2argvdata/cputune.args           |     2 +-
tests/qemuxml2argvdata/debug-threads.args     |     2 +-
.../default-kvm-host-arch.args                |     2 +-
.../default-qemu-host-arch.args               |     2 +-
tests/qemuxml2argvdata/disk-aio.args          |     2 +-
tests/qemuxml2argvdata/disk-blockio.args      |     2 +-
.../disk-cache.x86_64-1.5.3.args              |    38 -
.../disk-cache.x86_64-2.6.0.args              |    40 -
.../disk-cache.x86_64-2.7.0.args              |    40 -
.../qemuxml2argvdata/disk-cdrom-network.args  |     2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args   |     2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args |     4 +-
tests/qemuxml2argvdata/disk-floppy-tray.args  |     2 +-
tests/qemuxml2argvdata/disk-geometry.args     |     2 +-
tests/qemuxml2argvdata/disk-ide-split.args    |     2 +-
tests/qemuxml2argvdata/disk-ide-wwn.args      |     2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args    |     4 +-
.../disk-network-gluster.args                 |     6 +-
.../disk-network-iscsi-modern.args            |    10 +-
.../qemuxml2argvdata/disk-network-iscsi.args  |    10 +-
tests/qemuxml2argvdata/disk-network-nbd.args  |    10 +-
.../disk-network-rbd.x86_64-2.5.0.args        |    40 -
.../disk-network-sheepdog.args                |     2 +-
.../disk-network-source-auth.args             |     6 +-
tests/qemuxml2argvdata/disk-order.args        |     6 +-
.../qemuxml2argvdata/disk-readonly-disk.args  |     2 +-
tests/qemuxml2argvdata/disk-sata-device.args  |     4 +-
.../disk-scsi-device-auto.x86_64-1.5.3.args   |    33 -
.../disk-scsi-disk-split.args                 |    10 +-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args  |     6 +-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args  |     6 +-
.../disk-scsi-lun-passthrough.args            |     6 +-
tests/qemuxml2argvdata/disk-serial.args       |     2 +-
tests/qemuxml2argvdata/disk-snapshot.args     |     2 +-
.../disk-source-pool-mode.args                |     2 +-
tests/qemuxml2argvdata/disk-source-pool.args  |     4 +-
.../disk-usb-device-removable.args            |     2 +-
tests/qemuxml2argvdata/disk-usb-device.args   |     2 +-
tests/qemuxml2argvdata/disk-virtio.args       |     4 +-
tests/qemuxml2argvdata/encrypted-disk.args    |     2 +-
.../eoi-disabled.x86_64-2.7.0.args            |    30 -
.../eoi-enabled.x86_64-2.7.0.args             |    30 -
tests/qemuxml2argvdata/event_idx.args         |     4 +-
tests/qemuxml2argvdata/floppy-drive-fat.args  |     2 +-
tests/qemuxml2argvdata/fs9p.args              |     6 +-
.../graphics-egl-headless.args                |     2 +-
.../graphics-sdl-fullscreen.args              |     2 +-
tests/qemuxml2argvdata/graphics-sdl.args      |     2 +-
.../graphics-spice-agent-file-xfer.args       |     4 +-
.../graphics-spice-agentmouse.args            |     2 +-
.../graphics-spice-auto-socket-cfg.args       |     2 +-
.../graphics-spice-auto-socket.args           |     2 +-
.../graphics-spice-compression.args           |     4 +-
.../graphics-spice-egl-headless.args          |     4 +-
.../graphics-spice-no-args.args               |     2 +-
.../graphics-spice-qxl-vga.args               |     4 +-
.../qemuxml2argvdata/graphics-spice-sasl.args |     4 +-
.../graphics-spice-socket.args                |     2 +-
.../graphics-spice-timeout.args               |     2 +-
.../graphics-spice-usb-redir.args             |     2 +-
tests/qemuxml2argvdata/graphics-spice.args    |     4 +-
.../graphics-vnc-auto-socket-cfg.args         |     2 +-
.../graphics-vnc-auto-socket.args             |     2 +-
.../graphics-vnc-egl-headless.args            |     2 +-
.../graphics-vnc-no-listen-attr.args          |     2 +-
tests/qemuxml2argvdata/graphics-vnc-none.args |     2 +-
.../qemuxml2argvdata/graphics-vnc-policy.args |     2 +-
.../graphics-vnc-remove-generated-socket.args |     2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args |     2 +-
.../graphics-vnc-socket-new-cmdline.args      |     2 +-
.../qemuxml2argvdata/graphics-vnc-socket.args |     2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.args  |     2 +-
.../graphics-vnc-tls.x86_64-2.4.0.args        |    30 -
.../graphics-vnc-websocket.args               |     2 +-
tests/qemuxml2argvdata/graphics-vnc.args      |     2 +-
.../hostdev-mdev-precreated.args              |     2 +-
.../hostdev-pci-address-device.args           |     4 +-
.../hostdev-pci-address-unassigned.args       |     8 +-
.../qemuxml2argvdata/hostdev-pci-address.args |     2 +-
.../hostdev-pci-multifunction.args            |    16 +-
.../hostdev-scsi-lsi.x86_64-2.8.0.args        |    45 -
.../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
.../hostdev-scsi-vhost-scsi-pcie.args         |     4 +-
...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args |    47 -
.../hostdev-usb-address-device-boot.args      |     2 +-
.../hostdev-usb-address-device.args           |     2 +-
.../hostdev-vfio-multidomain.args             |     4 +-
tests/qemuxml2argvdata/hostdev-vfio.args      |     4 +-
tests/qemuxml2argvdata/hugepages-default.args |     2 +-
tests/qemuxml2argvdata/hugepages-shared.args  |     2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args |     2 +-
.../intel-iommu.x86_64-2.6.0.args             |    29 -
tests/qemuxml2argvdata/iothreads-disk.args    |     2 +-
tests/qemuxml2argvdata/kvm-features-off.args  |     2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args     |     2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args   |     2 +-
.../kvmclock+eoi-disabled.x86_64-2.7.0.args   |    30 -
.../luks-disks-source-qcow2.args              |     8 +-
tests/qemuxml2argvdata/luks-disks-source.args |     6 +-
.../mach-virt-console-virtio.args             |     2 +-
.../mach-virt-serial-native.args              |     2 +-
.../mach-virt-serial-pci.args                 |     2 +-
.../mach-virt-serial-usb.args                 |     2 +-
tests/qemuxml2argvdata/machine-aliases1.args  |     2 +-
tests/qemuxml2argvdata/machine-aliases2.args  |     2 +-
tests/qemuxml2argvdata/machine-smm-opt.args   |     2 +-
.../qemuxml2argvdata/machine-vmport-opt.args  |     2 +-
.../memory-hotplug-dimm-addr.args             |     2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args |     2 +-
tests/qemuxml2argvdata/memory-hotplug.args    |     2 +-
tests/qemuxml2argvdata/memtune-unlimited.args |     2 +-
tests/qemuxml2argvdata/memtune.args           |     2 +-
.../migrate-numa-unaligned.args               |     2 +-
.../minimal-msg-timestamp.args                |     2 +-
tests/qemuxml2argvdata/minimal-sandbox.args   |     2 +-
tests/qemuxml2argvdata/minimal.args           |     2 +-
tests/qemuxml2argvdata/monitor-json.args      |     2 +-
.../multifunction-pci-device.args             |     2 +-
tests/qemuxml2argvdata/net-client.args        |     4 +-
tests/qemuxml2argvdata/net-eth-hostip.args    |     2 +-
tests/qemuxml2argvdata/net-eth-ifname.args    |     2 +-
tests/qemuxml2argvdata/net-eth-names.args     |     6 +-
.../net-eth-unmanaged-tap.args                |     2 +-
tests/qemuxml2argvdata/net-eth.args           |     2 +-
.../net-hostdev-bootorder.args                |     2 +-
.../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   |    12 +-
tests/qemuxml2argvdata/net-mcast.args         |     4 +-
tests/qemuxml2argvdata/net-server.args        |     4 +-
tests/qemuxml2argvdata/net-udp.args           |     4 +-
tests/qemuxml2argvdata/net-user.args          |     2 +-
.../net-vhostuser-multiq.args                 |    10 +-
.../qemuxml2argvdata/net-vhostuser-multiq.err |     1 -
tests/qemuxml2argvdata/net-vhostuser.args     |     6 +-
.../net-vhostuser.x86_64-2.5.0.args           |    36 -
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 +-
.../qemuxml2argvdata/net-virtio-teaming.args  |    10 +-
tests/qemuxml2argvdata/net-virtio.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/panic-no-address.args  |     2 +-
tests/qemuxml2argvdata/panic.args             |     2 +-
.../parallel-parport-chardev.args             |     2 +-
.../parallel-tcp-chardev.args                 |     2 +-
.../parallel-unix-chardev.x86_64-2.5.0.args   |    33 -
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                |   216 +-
tests/qemuxml2argvdata/pci-bridge.args        |     2 +-
tests/qemuxml2argvdata/pci-expander-bus.args  |    68 +-
tests/qemuxml2argvdata/pci-many.args          |     2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args  |     2 +-
tests/qemuxml2argvdata/pci-rom.args           |    10 +-
.../pci-serial-dev-chardev.args               |     2 +-
.../pcie-root-port-model-generic.args         |     6 +-
.../pcie-root-port-model-ioh3420.args         |     4 +-
tests/qemuxml2argvdata/pcihole64.args         |     2 +-
.../pseries-cpu-compat-power9.args            |     4 +-
.../qemuxml2argvdata/pseries-cpu-compat.args  |     4 +-
.../pseries-features-htp-resize.err           |     1 -
.../pseries-features-htp-resize.xml           |     1 -
.../pv-spinlock-disabled.x86_64-2.7.0.args    |    30 -
.../pv-spinlock-enabled.x86_64-2.7.0.args     |    30 -
.../q35-pci-force-address.args                |     2 +-
.../q35-pm-disable-fallback.args              |     2 +-
tests/qemuxml2argvdata/q35-pm-disable.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/restore-v2-fd.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 +-
.../qemuxml2argvdata/serial-many-chardev.args |     2 +-
.../qemuxml2argvdata/serial-pty-chardev.args  |     2 +-
.../serial-spiceport-nospice.args             |     2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args  |     2 +-
.../serial-tcp-telnet-chardev.args            |     2 +-
.../serial-tcp-tlsx509-chardev-verify.args    |     2 +-
.../serial-tcp-tlsx509-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                 |    14 +-
tests/qemuxml2argvdata/shmem.args             |    14 +-
.../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 +-
...artcard-passthrough-unix.x86_64-2.5.0.args |    32 -
tests/qemuxml2argvdata/smbios.args            |     2 +-
tests/qemuxml2argvdata/sound-device.args      |    14 +-
tests/qemuxml2argvdata/sound.args             |     4 +-
.../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  |    26 +-
.../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 +-
.../usb-redir-unix.x86_64-2.5.0.args          |    36 -
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      |     2 +-
.../qemuxml2argvdata/video-qxl-nodevice.args  |    32 -
tests/qemuxml2argvdata/video-qxl-nodevice.xml |    29 -
.../qemuxml2argvdata/video-vga-nodevice.args  |    30 -
tests/qemuxml2argvdata/video-vga-nodevice.xml |    29 -
.../qemuxml2argvdata/video-vga-qxl-heads.args |     5 +-
.../virtio-input-passthrough.args             |     4 +-
tests/qemuxml2argvdata/virtio-input.args      |     6 +-
tests/qemuxml2argvdata/virtio-lun.args        |     4 +-
.../qemuxml2argvdata/virtio-rng-default.args  |     2 +-
.../virtio-rng-egd-unix.x86_64-2.5.0.args     |    32 -
tests/qemuxml2argvdata/virtio-rng-egd.args    |     4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args |     4 +-
tests/qemuxml2argvdata/virtio-rng-random.args |     4 +-
tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
tests/qemuxml2argvdata/watchdog-device.args   |     2 +-
tests/qemuxml2argvdata/watchdog-dump.args     |     2 +-
.../qemuxml2argvdata/watchdog-injectnmi.args  |     2 +-
tests/qemuxml2argvtest.c                      |   155 +-
tests/qemuxml2xmloutdata/autoindex.xml        |     4 +-
.../balloon-device-auto.xml                   |     2 +-
.../bios-nvram-os-interleave.xml              |     2 +-
tests/qemuxml2xmloutdata/bios-nvram.xml       |     2 +-
tests/qemuxml2xmloutdata/blkiotune-device.xml |     2 +-
tests/qemuxml2xmloutdata/blkiotune.xml        |     2 +-
.../boot-menu-disable-with-timeout.xml        |     2 +-
.../qemuxml2xmloutdata/boot-menu-disable.xml  |     2 +-
.../boot-menu-enable-with-timeout.xml         |     2 +-
tests/qemuxml2xmloutdata/boot-multi.xml       |     2 +-
tests/qemuxml2xmloutdata/boot-order.xml       |     6 +-
tests/qemuxml2xmloutdata/channel-guestfwd.xml |     2 +-
.../channel-unix-source-path-active.xml       |     2 +-
.../channel-unix-source-path-inactive.xml     |     2 +-
.../channel-virtio-auto.xml                   |     6 +-
.../channel-virtio-state-active.xml           |     2 +-
.../channel-virtio-state-inactive.xml         |     2 +-
tests/qemuxml2xmloutdata/channel-virtio.xml   |     2 +-
tests/qemuxml2xmloutdata/chardev-label.xml    |     4 +-
tests/qemuxml2xmloutdata/clock-catchup.xml    |     2 +-
.../clock-timer-hyperv-rtc.xml                |     2 +-
.../console-compat-auto.xml                   |     2 +-
tests/qemuxml2xmloutdata/console-compat2.xml  |     2 +-
.../console-virtio-many.xml                   |     4 +-
tests/qemuxml2xmloutdata/console-virtio.xml   |     4 +-
.../controller-usb-order.xml                  |     2 +-
.../controller-virtio-scsi.xml                |    12 +-
.../cpu-check-default-none.xml                |     2 +-
.../cpu-check-default-none2.xml               |     2 +-
.../cpu-check-default-partial.xml             |     2 +-
.../cpu-check-default-partial2.xml            |     2 +-
tests/qemuxml2xmloutdata/cpu-check-full.xml   |     2 +-
tests/qemuxml2xmloutdata/cpu-check-none.xml   |     2 +-
.../qemuxml2xmloutdata/cpu-check-partial.xml  |     2 +-
tests/qemuxml2xmloutdata/cpu-empty.xml        |     2 +-
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |     2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |     2 +-
.../qemuxml2xmloutdata/cpu-host-kvmclock.xml  |     2 +-
.../cpu-host-model-features.xml               |     2 +-
.../cpu-host-model-vendor.xml                 |     2 +-
.../cpu-host-passthrough-features.xml         |     2 +-
tests/qemuxml2xmloutdata/cpu-kvmclock.xml     |     2 +-
.../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |     2 +-
.../cpu-numa-disordered.xml                   |     2 +-
.../qemuxml2xmloutdata/cpu-numa-memshared.xml |     2 +-
.../cpu-numa-no-memory-element.xml            |     2 +-
tests/qemuxml2xmloutdata/cpu-numa1.xml        |     2 +-
tests/qemuxml2xmloutdata/cpu-numa2.xml        |     2 +-
.../qemuxml2xmloutdata/cputune-iothreads.xml  |     2 +-
.../cputune-iothreadsched-zeropriority.xml    |     2 +-
.../cputune-iothreadsched.xml                 |     2 +-
.../cputune-zero-shares.xml                   |     2 +-
tests/qemuxml2xmloutdata/cputune.xml          |     2 +-
.../default-kvm-host-arch.xml                 |     2 +-
.../default-qemu-host-arch.xml                |     2 +-
.../disk-active-commit-active.xml             |     2 +-
.../disk-active-commit-inactive.xml           |     2 +-
tests/qemuxml2xmloutdata/disk-aio.xml         |     2 +-
.../disk-backing-chains-active.xml            |    12 +-
.../disk-backing-chains-inactive.xml          |    12 +-
.../disk-backing-chains-index-active.xml      |    14 +-
.../disk-backing-chains-index-inactive.xml    |    14 +-
.../disk-backing-chains-noindex.xml           |    14 +-
.../disk-cache.x86_64-1.5.3.xml               |    61 -
.../disk-cache.x86_64-2.6.0.xml               |    61 -
.../disk-cache.x86_64-2.7.0.xml               |    61 -
.../qemuxml2xmloutdata/disk-copy_on_read.xml  |     4 +-
.../qemuxml2xmloutdata/disk-mirror-active.xml |     8 +-
.../disk-mirror-inactive.xml                  |     8 +-
.../disk-mirror-old-active.xml                |     6 +-
.../disk-mirror-old-inactive.xml              |     6 +-
.../disk-network-gluster.xml                  |     6 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml |    10 +-
tests/qemuxml2xmloutdata/disk-network-nbd.xml |    10 +-
tests/qemuxml2xmloutdata/disk-network-rbd.xml |    12 +-
.../disk-network-sheepdog.xml                 |     2 +-
.../disk-network-source-auth.xml              |     6 +-
.../disk-scsi-device-auto.xml                 |     4 +-
.../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml |     6 +-
.../disk-scsi-lun-passthrough-sgio.xml        |     6 +-
tests/qemuxml2xmloutdata/disk-serial.xml      |     2 +-
.../disk-source-pool-mode.xml                 |     2 +-
tests/qemuxml2xmloutdata/disk-source-pool.xml |     4 +-
tests/qemuxml2xmloutdata/disk-usb-device.xml  |     2 +-
tests/qemuxml2xmloutdata/disk-virtio.xml      |     4 +-
tests/qemuxml2xmloutdata/encrypted-disk.xml   |     2 +-
tests/qemuxml2xmloutdata/eoi-disabled.xml     |     2 +-
tests/qemuxml2xmloutdata/eoi-enabled.xml      |     2 +-
tests/qemuxml2xmloutdata/event_idx.xml        |     4 +-
tests/qemuxml2xmloutdata/floppy-drive-fat.xml |     2 +-
.../hostdev-mdev-precreated.xml               |     2 +-
.../hostdev-pci-address-unassigned.xml        |     8 +-
.../hostdev-pci-address.xml                   |     2 +-
.../hostdev-pci-multifunction.xml             |    16 +-
.../hostdev-scsi-autogen-address.xml          |     6 +-
.../hostdev-scsi-large-unit.xml               |     4 +-
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml |     4 +-
.../qemuxml2xmloutdata/hostdev-scsi-rawio.xml |     4 +-
.../qemuxml2xmloutdata/hostdev-scsi-sgio.xml  |     4 +-
.../hostdev-scsi-shareable.xml                |     4 +-
.../hostdev-scsi-vhost-scsi-pci.xml           |     2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml          |     8 +-
.../hostdev-scsi-virtio-scsi.xml              |     4 +-
tests/qemuxml2xmloutdata/hostdev-vfio.xml     |     4 +-
.../qemuxml2xmloutdata/hugepages-default.xml  |     2 +-
tests/qemuxml2xmloutdata/hugepages-shared.xml |     2 +-
tests/qemuxml2xmloutdata/hyperv-off.xml       |     2 +-
.../intel-iommu.x86_64-2.6.0.xml              |    31 -
tests/qemuxml2xmloutdata/interface-driver.xml |     4 +-
tests/qemuxml2xmloutdata/iothreads-disk.xml   |     2 +-
tests/qemuxml2xmloutdata/kvm-features-off.xml |     2 +-
tests/qemuxml2xmloutdata/lease.xml            |     2 +-
.../qemuxml2xmloutdata/luks-disks-source.xml  |     6 +-
.../memory-hotplug-dimm.xml                   |     2 +-
tests/qemuxml2xmloutdata/memory-hotplug.xml   |     2 +-
.../qemuxml2xmloutdata/memorybacking-set.xml  |     2 +-
.../memorybacking-unset.xml                   |     2 +-
.../qemuxml2xmloutdata/memtune-unlimited.xml  |     2 +-
tests/qemuxml2xmloutdata/memtune.xml          |     2 +-
.../qemuxml2xmloutdata/metadata-duplicate.xml |     2 +-
tests/qemuxml2xmloutdata/metadata.xml         |     2 +-
tests/qemuxml2xmloutdata/minimal.xml          |     2 +-
tests/qemuxml2xmloutdata/net-coalesce.xml     |     8 +-
tests/qemuxml2xmloutdata/net-eth-hostip.xml   |     2 +-
tests/qemuxml2xmloutdata/net-eth-ifname.xml   |     2 +-
.../net-eth-unmanaged-tap.xml                 |     2 +-
tests/qemuxml2xmloutdata/net-eth.xml          |     2 +-
.../net-hostdev-bootorder.xml                 |     2 +-
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml |     4 +-
tests/qemuxml2xmloutdata/net-hostdev.xml      |     4 +-
tests/qemuxml2xmloutdata/net-many-models.xml  |    12 +-
tests/qemuxml2xmloutdata/net-midonet.xml      |     4 +-
tests/qemuxml2xmloutdata/net-mtu.xml          |     6 +-
tests/qemuxml2xmloutdata/net-openvswitch.xml  |     4 +-
tests/qemuxml2xmloutdata/net-udp.xml          |     4 +-
tests/qemuxml2xmloutdata/net-user.xml         |     2 +-
tests/qemuxml2xmloutdata/net-vdpa.xml         |     2 +-
tests/qemuxml2xmloutdata/net-vhostuser.xml    |     6 +-
.../qemuxml2xmloutdata/net-virtio-device.xml  |     4 +-
.../net-virtio-disable-offloads.xml           |     4 +-
.../net-virtio-network-portgroup.xml          |     8 +-
.../net-virtio-rxtxqueuesize.xml              |     4 +-
.../net-virtio-teaming-network.xml            |     6 +-
.../qemuxml2xmloutdata/net-virtio-teaming.xml |    10 +-
tests/qemuxml2xmloutdata/net-virtio.xml       |     2 +-
.../numad-auto-memory-vcpu-cpuset.xml         |     2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml |     2 +-
.../numad-auto-vcpu-no-numatune.xml           |     2 +-
.../numad-static-vcpu-no-numatune.xml         |     2 +-
.../numatune-auto-prefer.xml                  |     2 +-
.../qemuxml2xmloutdata/numatune-distances.xml |     2 +-
.../numatune-memnode-no-memory.xml            |     2 +-
tests/qemuxml2xmloutdata/numatune-memnode.xml |     2 +-
tests/qemuxml2xmloutdata/panic-isa.xml        |     2 +-
tests/qemuxml2xmloutdata/panic-no-address.xml |     2 +-
tests/qemuxml2xmloutdata/panic.xml            |     2 +-
.../pci-bridge-many-disks.xml                 |   216 +-
tests/qemuxml2xmloutdata/pci-expander-bus.xml |    68 +-
.../pci-rom-disabled-invalid.xml              |     2 +-
tests/qemuxml2xmloutdata/pci-rom-disabled.xml |     2 +-
tests/qemuxml2xmloutdata/pci-rom.xml          |    10 +-
.../pci-serial-dev-chardev.xml                |     2 +-
.../pcie-root-port-model-generic.xml          |    12 +-
.../pcie-root-port-model-ioh3420.xml          |     8 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml    |     2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml   |     2 +-
tests/qemuxml2xmloutdata/pcihole64.xml        |     2 +-
.../pv-spinlock-disabled.xml                  |     2 +-
.../pv-spinlock-enabled.xml                   |     2 +-
.../q35-pci-force-address.xml                 |     4 +-
.../qemuxml2xmloutdata/seclabel-dac-none.xml  |     2 +-
.../seclabel-device-multiple.xml              |     2 +-
.../seclabel-dynamic-baselabel-inactive.xml   |     2 +-
.../seclabel-dynamic-labelskip-inactive.xml   |     2 +-
.../seclabel-dynamic-none.xml                 |     2 +-
.../seclabel-dynamic-override-inactive.xml    |     2 +-
.../seclabel-dynamic-relabel-inactive.xml     |     2 +-
tests/qemuxml2xmloutdata/seclabel-none.xml    |     2 +-
.../seclabel-static-labelskip-active.xml      |     2 +-
.../seclabel-static-labelskip-inactive.xml    |     2 +-
tests/qemuxml2xmloutdata/seclabel-static.xml  |     2 +-
.../serial-spiceport-nospice.xml              |     2 +-
.../serial-target-port-auto.xml               |     2 +-
.../serial-tcp-tlsx509-chardev.xml            |     2 +-
.../shmem-plain-doorbell.xml                  |    14 +-
tests/qemuxml2xmloutdata/shmem.xml            |    14 +-
.../smartcard-controller.xml                  |     2 +-
.../smartcard-host-certificates-database.xml  |     2 +-
.../smartcard-host-certificates.xml           |     2 +-
tests/qemuxml2xmloutdata/smartcard-host.xml   |     2 +-
.../smartcard-passthrough-spicevmc.xml        |     2 +-
.../smartcard-passthrough-tcp.xml             |     2 +-
.../smbios-multiple-type2.xml                 |     2 +-
tests/qemuxml2xmloutdata/smbios.xml           |     2 +-
tests/qemuxml2xmloutdata/sound-device.xml     |    14 +-
tests/qemuxml2xmloutdata/sound.xml            |     4 +-
.../tap-vhost-incorrect.xml                   |     6 +-
tests/qemuxml2xmloutdata/tap-vhost.xml        |     4 +-
.../qemuxml2xmloutdata/tseg-explicit-size.xml |     4 +-
tests/qemuxml2xmloutdata/usb-controller.xml   |     2 +-
.../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml |    26 +-
tests/qemuxml2xmloutdata/usb-none.xml         |     2 +-
.../usb-piix3-controller.xml                  |     2 +-
tests/qemuxml2xmloutdata/usb-port-missing.xml |     2 +-
.../usb-redir-filter-version.xml              |     2 +-
tests/qemuxml2xmloutdata/usb-redir-filter.xml |     2 +-
tests/qemuxml2xmloutdata/usb-redir.xml        |     2 +-
tests/qemuxml2xmloutdata/vhost-vsock-auto.xml |     2 +-
tests/qemuxml2xmloutdata/vhost_queues.xml     |     4 +-
.../virtio-input-passthrough.xml              |     4 +-
tests/qemuxml2xmloutdata/virtio-input.xml     |     6 +-
tests/qemuxml2xmloutdata/virtio-lun.xml       |     4 +-
tests/qemuxml2xmloutdata/virtio-rng-egd.xml   |     4 +-
.../qemuxml2xmloutdata/virtio-rng-random.xml  |     4 +-
tests/qemuxml2xmloutdata/vmcoreinfo.xml       |     2 +-
tests/qemuxml2xmltest.c                       |    72 +-
tests/testutilsqemu.c                         |     2 +-
739 files changed, 588789 insertions(+), 853995 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
[RFC PATCH 00/43] qemu: Remove support for qemu-1.5 - qemu-2.10 and clean up capabilities
Posted by Peter Krempa 3 years ago
May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we
no longer have to support qemu-1.5.

Remove the capabilities and test data for the versions we no longer care
about and clean up some capabilities related stuff:

 - remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
 - remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
 support it

This is also a good opportunity to clean up few things regarding the
capabilties test data, namely call 'query-qmp-schema' before
'query-commands' to prepare to retire query-commands.

This series is heavily truncated since there were massive (27MiB)
patches resulting from some of the mechanical (and generated) changes
and also depends on my previous command line wrapping cleanup.
Fetch the full version at:

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

The cleanups in patches 41, 42, and the massive move of commands in
patch 43 was done using a tool based on pieces of our code which I've
uploaded to:

https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool

The tool may come in handy for other things too in the future as it
allows programatic modification of the capability replies files.

Peter Krempa (43):
  docs/platforms: Drop separate link to qemu-kvm on repology.org
  qemuxml2xmltest: testInfoSetPaths: Remove return value
  qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
    fails
  qemu: Formally deprecate support for qemu < 2.11
  NEWS: Mention that minimum supported qemu version was bumped to 2.11
  qemuxml2argvtest: Remove versioned tests for qemu < 2.11
  [fixup] qemuxml2argvdata: Remove unused output files
  qemuxml2xmltest: Remove versioned tests for qemu < 2.11
  [fixup] qemuxml2xmldata: Remove unused output files
  qemucapabilitiesdata: Drop capability test data for qemu < 2.11
  virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
  qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
  qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
  virQEMUCapsInitProcessCaps: Remove obsolete version checks
  virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
  virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
  qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
  qemuxml2argvtest: Parse 'arch' from XML early
  qemuxml2xmltest: Always include basic set of capabilities
  qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
    virQEMUCapsInitQMPBasicArch
  qemuxml2argvtest: Remove negative test case
    'pseries-features-htp-resize'
  qemu: capabilities: Move setting of PPC specific flags to
    virQEMUCapsInitQMPBasicArch
  qemuxml2argvtest: Remove negative test for gic v3/host
  qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
    virQEMUCapsInitQMPBasicArch
  qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
  qemuxml2argvtest: Remove tests for absence of
    QEMU_CAPS_DEVICE_VIDEO_PRIMARY
  qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
    virQEMUCapsInitQMPBasicArch
  [fixup] Fix test fallout in tests/qemuxml2argvdata
  [fixup] Fix test fallout in tests/qemuxml2xmloutdata
  qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
    tests
  qemu: capabilities: Move rest of always present caps to
    virQEMUCapsInitQMPArch
  qemuhotplugtest: Add also always-present capabilities
  qemu: command: Remove legacy '-vga' commandline formatter
  qemu_domain_address: Drop compatibility with pre-device vga
    specification for i440fx
  qemu_domain_address: Drop compatibility with pre-device vga
    specification for q35
  qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
  qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
  qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
  qemu: monitor: Remove qemuMonitorGetEvents
  qemu: monitor: Remove qemuMonitorSupportsActiveCommit
  tests: qemucapabilitiesdata: Fix formatting of manually added hunk
  tests: qemucapabilitiesdata: Fix wrong command identifier in
    caps_4.0.0.riscv64.replies
  qemu: capabilities: Probe QMP schema before probing commands

 NEWS.rst                                      |     7 +
 docs/drvqemu.rst                              |     2 +-
 docs/platforms.rst                            |     2 -
 src/qemu/qemu_alias.c                         |     5 +-
 src/qemu/qemu_alias.h                         |     1 -
 src/qemu/qemu_capabilities.c                  |   237 +-
 src/qemu/qemu_capabilities.h                  |     7 +-
 src/qemu/qemu_command.c                       |   190 +-
 src/qemu/qemu_domain_address.c                |    82 +-
 src/qemu/qemu_hotplug.c                       |     2 +-
 src/qemu/qemu_monitor.c                       |    23 -
 src/qemu/qemu_monitor.h                       |     3 -
 src/qemu/qemu_monitor_json.c                  |    90 -
 src/qemu/qemu_monitor_json.h                  |     6 -
 .../caps_1.5.3.x86_64.replies                 |  3327 --
 .../caps_1.5.3.x86_64.xml                     |   176 -
 .../caps_1.6.0.x86_64.replies                 |  3298 --
 .../caps_1.6.0.x86_64.xml                     |   185 -
 .../caps_1.7.0.x86_64.replies                 |  3521 --
 .../caps_1.7.0.x86_64.xml                     |   191 -
 .../caps_2.1.1.x86_64.replies                 |  4041 --
 .../caps_2.1.1.x86_64.xml                     |   217 -
 .../caps_2.10.0.aarch64.replies               | 16975 ------
 .../caps_2.10.0.aarch64.xml                   |   325 -
 .../caps_2.10.0.ppc64.replies                 | 20756 -------
 .../caps_2.10.0.ppc64.xml                     |  1067 -
 .../caps_2.10.0.s390x.replies                 | 16608 ------
 .../caps_2.10.0.s390x.xml                     |  1277 -
 .../caps_2.10.0.x86_64.replies                | 19329 -------
 .../caps_2.10.0.x86_64.xml                    |   997 -
 .../caps_2.11.0.s390x.replies                 | 24392 ++++----
 .../caps_2.11.0.s390x.xml                     |     3 -
 .../caps_2.11.0.x86_64.replies                | 25712 ++++-----
 .../caps_2.11.0.x86_64.xml                    |     3 -
 .../caps_2.12.0.aarch64.replies               | 29188 +++++-----
 .../caps_2.12.0.aarch64.xml                   |     2 -
 .../caps_2.12.0.ppc64.replies                 | 31502 +++++------
 .../caps_2.12.0.ppc64.xml                     |     3 -
 .../caps_2.12.0.s390x.replies                 | 27224 ++++-----
 .../caps_2.12.0.s390x.xml                     |     3 -
 .../caps_2.12.0.x86_64.replies                | 30352 +++++-----
 .../caps_2.12.0.x86_64.xml                    |     3 -
 .../caps_2.4.0.x86_64.replies                 |  4868 --
 .../caps_2.4.0.x86_64.xml                     |   263 -
 .../caps_2.5.0.x86_64.replies                 | 12506 -----
 .../caps_2.5.0.x86_64.xml                     |   273 -
 .../caps_2.6.0.aarch64.replies                | 13317 -----
 .../caps_2.6.0.aarch64.xml                    |   283 -
 .../caps_2.6.0.ppc64.replies                  | 15692 ------
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  1026 -
 .../caps_2.6.0.x86_64.replies                 | 13061 -----
 .../caps_2.6.0.x86_64.xml                     |   273 -
 .../caps_2.7.0.s390x.replies                  | 12137 ----
 .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |   113 -
 .../caps_2.7.0.x86_64.replies                 | 13680 -----
 .../caps_2.7.0.x86_64.xml                     |   284 -
 .../caps_2.8.0.s390x.replies                  | 13553 -----
 .../qemucapabilitiesdata/caps_2.8.0.s390x.xml |   265 -
 .../caps_2.8.0.x86_64.replies                 | 14594 -----
 .../caps_2.8.0.x86_64.xml                     |   419 -
 .../caps_2.9.0.ppc64.replies                  | 19514 -------
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  1056 -
 .../caps_2.9.0.s390x.replies                  | 14607 -----
 .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |   273 -
 .../caps_2.9.0.x86_64.replies                 | 18290 ------
 .../caps_2.9.0.x86_64.xml                     |   910 -
 .../caps_3.0.0.ppc64.replies                  | 32872 +++++------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |     3 -
 .../caps_3.0.0.riscv32.replies                | 21760 ++++----
 .../caps_3.0.0.riscv32.xml                    |     3 -
 .../caps_3.0.0.riscv64.replies                | 21760 ++++----
 .../caps_3.0.0.riscv64.xml                    |     3 -
 .../caps_3.0.0.s390x.replies                  | 28066 +++++-----
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |     3 -
 .../caps_3.0.0.x86_64.replies                 | 31463 ++++++-----
 .../caps_3.0.0.x86_64.xml                     |     3 -
 .../caps_3.1.0.ppc64.replies                  | 32440 +++++------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |     3 -
 .../caps_3.1.0.x86_64.replies                 | 32304 +++++------
 .../caps_3.1.0.x86_64.xml                     |     3 -
 .../caps_4.0.0.aarch64.replies                | 31294 +++++------
 .../caps_4.0.0.aarch64.xml                    |     2 -
 .../caps_4.0.0.ppc64.replies                  | 33422 +++++------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |     3 -
 .../caps_4.0.0.riscv32.replies                | 29062 +++++-----
 .../caps_4.0.0.riscv32.xml                    |     3 -
 .../caps_4.0.0.riscv64.replies                | 29062 +++++-----
 .../caps_4.0.0.riscv64.xml                    |     3 -
 .../caps_4.0.0.s390x.replies                  | 29542 +++++-----
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |     3 -
 .../caps_4.0.0.x86_64.replies                 | 32932 +++++------
 .../caps_4.0.0.x86_64.xml                     |     3 -
 .../caps_4.1.0.x86_64.replies                 | 34454 ++++++------
 .../caps_4.1.0.x86_64.xml                     |     3 -
 .../caps_4.2.0.aarch64.replies                | 33732 ++++++------
 .../caps_4.2.0.aarch64.xml                    |     2 -
 .../caps_4.2.0.ppc64.replies                  | 34230 ++++++------
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     3 -
 .../caps_4.2.0.s390x.replies                  | 31044 +++++------
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     3 -
 .../caps_4.2.0.x86_64.replies                 | 36818 ++++++-------
 .../caps_4.2.0.x86_64.xml                     |     3 -
 .../caps_5.0.0.aarch64.replies                | 36336 ++++++------
 .../caps_5.0.0.aarch64.xml                    |     2 -
 .../caps_5.0.0.ppc64.replies                  | 37738 ++++++-------
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     3 -
 .../caps_5.0.0.riscv64.replies                | 32784 +++++------
 .../caps_5.0.0.riscv64.xml                    |     3 -
 .../caps_5.0.0.x86_64.replies                 | 39726 ++++++-------
 .../caps_5.0.0.x86_64.xml                     |     3 -
 .../caps_5.1.0.sparc.replies                  | 25244 ++++-----
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     3 -
 .../caps_5.1.0.x86_64.replies                 | 41066 +++++++-------
 .../caps_5.1.0.x86_64.xml                     |     3 -
 .../caps_5.2.0.aarch64.replies                | 38490 ++++++-------
 .../caps_5.2.0.aarch64.xml                    |     2 -
 .../caps_5.2.0.ppc64.replies                  | 40514 +++++++-------
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     3 -
 .../caps_5.2.0.riscv64.replies                | 34452 ++++++------
 .../caps_5.2.0.riscv64.xml                    |     3 -
 .../caps_5.2.0.s390x.replies                  | 35480 ++++++------
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     3 -
 .../caps_5.2.0.x86_64.replies                 | 42432 +++++++-------
 .../caps_5.2.0.x86_64.xml                     |     3 -
 .../caps_6.0.0.x86_64.replies                 | 45838 ++++++++--------
 .../caps_6.0.0.x86_64.xml                     |     3 -
 tests/qemuhotplugtest.c                       |     5 +
 .../ppc64-modern-bulk-result-conf.xml         |     2 +-
 .../ppc64-modern-bulk-result-live.xml         |     2 +-
 .../ppc64-modern-individual-result-conf.xml   |     2 +-
 .../ppc64-modern-individual-result-live.xml   |     2 +-
 .../x86-modern-bulk-result-conf.xml           |     2 +-
 .../x86-modern-bulk-result-live.xml           |     2 +-
 .../x86-modern-individual-add-result-conf.xml |     2 +-
 .../x86-modern-individual-add-result-live.xml |     2 +-
 .../x86-old-bulk-result-conf.xml              |     2 +-
 .../x86-old-bulk-result-live.xml              |     2 +-
 .../qemuhotplug-ivshmem-doorbell-detach.xml   |     2 +-
 .../qemuhotplug-ivshmem-plain-detach.xml      |     2 +-
 .../qemuhotplug-watchdog-full.xml             |     2 +-
 .../qemuhotplug-watchdog-user-alias-full.xml  |     2 +-
 .../qemuhotplug-base-live+disk-virtio.xml     |     2 +-
 .../qemuhotplug-base-live+hostdev-pci.xml     |     2 +-
 .../qemuhotplug-base-live+interface-vdpa.xml  |     2 +-
 ...qemuhotplug-base-live+ivshmem-doorbell.xml |     4 +-
 .../qemuhotplug-base-live+ivshmem-plain.xml   |     2 +-
 ...uhotplug-base-live+watchdog-user-alias.xml |     2 +-
 .../qemuhotplug-base-live+watchdog.xml        |     2 +-
 ...hotplug-base-with-scsi-controller-live.xml |     8 +-
 ...thout-scsi-controller-live+disk-scsi-2.xml |     8 +-
 tests/qemumonitorjsontest.c                   |    44 -
 .../aarch64-aavmf-virtio-mmio.args            |     2 +-
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args |     2 +-
 .../aarch64-cpu-passthrough.args              |     2 +-
 tests/qemuxml2argvdata/aarch64-gic-host.err   |     1 -
 tests/qemuxml2argvdata/aarch64-gic-v3.err     |     1 -
 .../aarch64-noacpi-nouefi.args                |     2 +-
 .../qemuxml2argvdata/aarch64-noacpi-uefi.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                |     2 +-
 .../aarch64-video-virtio-gpu-pci.args         |     2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |     2 +-
 .../aarch64-virt-default-nic.args             |     2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |     2 +-
 .../aarch64-virtio-pci-default.args           |     2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |     2 +-
 tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
 .../qemuxml2argvdata/audio-default-spice.args |     2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |     2 +-
 tests/qemuxml2argvdata/autoindex.args         |     2 +-
 .../qemuxml2argvdata/balloon-device-auto.args |     2 +-
 .../balloon-mmio-deflate.args                 |     2 +-
 tests/qemuxml2argvdata/bios-nvram-secure.args |     2 +-
 tests/qemuxml2argvdata/bios-nvram.args        |     2 +-
 tests/qemuxml2argvdata/bios.args              |     2 +-
 tests/qemuxml2argvdata/blkiotune-device.args  |     2 +-
 tests/qemuxml2argvdata/blkiotune.args         |     2 +-
 tests/qemuxml2argvdata/boot-complex.args      |     8 +-
 .../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-order.args        |     6 +-
 tests/qemuxml2argvdata/boot-strict.args       |     8 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |     2 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |     2 +-
 .../channel-unix-guestfwd.x86_64-2.5.0.args   |    33 -
 .../qemuxml2argvdata/channel-virtio-auto.args |     6 +-
 .../channel-virtio-autoadd.args               |     6 +-
 .../channel-virtio-autoassign.args            |     4 +-
 .../channel-virtio-default.args               |     4 +-
 .../channel-virtio-state.args                 |     2 +-
 .../qemuxml2argvdata/channel-virtio-unix.args |     2 +-
 tests/qemuxml2argvdata/channel-virtio.args    |     2 +-
 tests/qemuxml2argvdata/chardev-reconnect.args |     4 +-
 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 +-
 .../clock-timer-hyperv-rtc.args               |     2 +-
 tests/qemuxml2argvdata/clock-variable.args    |     2 +-
 .../qemuxml2argvdata/console-compat-auto.args |     2 +-
 .../console-compat-chardev.args               |     2 +-
 .../qemuxml2argvdata/console-virtio-many.args |     4 +-
 .../console-virtio-unix.x86_64-2.5.0.args     |    34 -
 tests/qemuxml2argvdata/console-virtio.args    |     4 +-
 tests/qemuxml2argvdata/controller-order.args  |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell.args       |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell2.args      |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell3.args      |     2 +-
 tests/qemuxml2argvdata/cpu-cache-disable.args |     2 +-
 .../qemuxml2argvdata/cpu-cache-disable2.args  |     2 +-
 .../qemuxml2argvdata/cpu-cache-disable3.args  |     2 +-
 .../cpu-cache-emulate-l3.args                 |     2 +-
 .../cpu-cache-passthrough.args                |     2 +-
 .../cpu-cache-passthrough2.args               |     2 +-
 .../cpu-check-default-none.args               |     2 +-
 .../cpu-check-default-none2.args              |     2 +-
 .../cpu-check-default-partial.args            |     2 +-
 .../cpu-check-default-partial2.args           |     2 +-
 tests/qemuxml2argvdata/cpu-check-none.args    |     2 +-
 tests/qemuxml2argvdata/cpu-eoi-disabled.args  |     2 +-
 tests/qemuxml2argvdata/cpu-eoi-enabled.args   |     2 +-
 tests/qemuxml2argvdata/cpu-exact1.args        |     2 +-
 .../cpu-exact2-nofallback.args                |     2 +-
 tests/qemuxml2argvdata/cpu-exact2.args        |     2 +-
 tests/qemuxml2argvdata/cpu-fallback.args      |     2 +-
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |     2 +-
 .../qemuxml2argvdata/cpu-host-model-cmt.args  |     2 +-
 .../cpu-host-model-fallback.args              |     2 +-
 .../cpu-host-model-vendor.args                |     2 +-
 tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
 .../cpu-host-passthrough-features.args        |     2 +-
 .../cpu-host-passthrough.args                 |     2 +-
 .../qemuxml2argvdata/cpu-hotplug-startup.args |     2 +-
 tests/qemuxml2argvdata/cpu-kvmclock.args      |     2 +-
 tests/qemuxml2argvdata/cpu-minimum1.args      |     2 +-
 tests/qemuxml2argvdata/cpu-minimum2.args      |     2 +-
 .../cpu-no-removed-features.args              |     2 +-
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |     2 +-
 .../qemuxml2argvdata/cpu-numa-memshared.args  |     2 +-
 .../cpu-numa-no-memory-element.args           |     2 +-
 tests/qemuxml2argvdata/cpu-numa1.args         |     2 +-
 tests/qemuxml2argvdata/cpu-numa2.args         |     2 +-
 tests/qemuxml2argvdata/cpu-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 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |     2 +-
 tests/qemuxml2argvdata/cputune.args           |     2 +-
 tests/qemuxml2argvdata/debug-threads.args     |     2 +-
 .../default-kvm-host-arch.args                |     2 +-
 .../default-qemu-host-arch.args               |     2 +-
 tests/qemuxml2argvdata/disk-aio.args          |     2 +-
 tests/qemuxml2argvdata/disk-blockio.args      |     2 +-
 .../disk-cache.x86_64-1.5.3.args              |    38 -
 .../disk-cache.x86_64-2.6.0.args              |    40 -
 .../disk-cache.x86_64-2.7.0.args              |    40 -
 .../qemuxml2argvdata/disk-cdrom-network.args  |     2 +-
 tests/qemuxml2argvdata/disk-cdrom-tray.args   |     2 +-
 tests/qemuxml2argvdata/disk-copy_on_read.args |     4 +-
 tests/qemuxml2argvdata/disk-floppy-tray.args  |     2 +-
 tests/qemuxml2argvdata/disk-geometry.args     |     2 +-
 tests/qemuxml2argvdata/disk-ide-split.args    |     2 +-
 tests/qemuxml2argvdata/disk-ide-wwn.args      |     2 +-
 tests/qemuxml2argvdata/disk-ioeventfd.args    |     4 +-
 .../disk-network-gluster.args                 |     6 +-
 .../disk-network-iscsi-modern.args            |    10 +-
 .../qemuxml2argvdata/disk-network-iscsi.args  |    10 +-
 tests/qemuxml2argvdata/disk-network-nbd.args  |    10 +-
 .../disk-network-rbd.x86_64-2.5.0.args        |    40 -
 .../disk-network-sheepdog.args                |     2 +-
 .../disk-network-source-auth.args             |     6 +-
 tests/qemuxml2argvdata/disk-order.args        |     6 +-
 .../qemuxml2argvdata/disk-readonly-disk.args  |     2 +-
 tests/qemuxml2argvdata/disk-sata-device.args  |     4 +-
 .../disk-scsi-device-auto.x86_64-1.5.3.args   |    33 -
 .../disk-scsi-disk-split.args                 |    10 +-
 .../qemuxml2argvdata/disk-scsi-disk-vpd.args  |     6 +-
 .../qemuxml2argvdata/disk-scsi-disk-wwn.args  |     6 +-
 .../disk-scsi-lun-passthrough.args            |     6 +-
 tests/qemuxml2argvdata/disk-serial.args       |     2 +-
 tests/qemuxml2argvdata/disk-snapshot.args     |     2 +-
 .../disk-source-pool-mode.args                |     2 +-
 tests/qemuxml2argvdata/disk-source-pool.args  |     4 +-
 .../disk-usb-device-removable.args            |     2 +-
 tests/qemuxml2argvdata/disk-usb-device.args   |     2 +-
 tests/qemuxml2argvdata/disk-virtio.args       |     4 +-
 tests/qemuxml2argvdata/encrypted-disk.args    |     2 +-
 .../eoi-disabled.x86_64-2.7.0.args            |    30 -
 .../eoi-enabled.x86_64-2.7.0.args             |    30 -
 tests/qemuxml2argvdata/event_idx.args         |     4 +-
 tests/qemuxml2argvdata/floppy-drive-fat.args  |     2 +-
 tests/qemuxml2argvdata/fs9p.args              |     6 +-
 .../graphics-egl-headless.args                |     2 +-
 .../graphics-sdl-fullscreen.args              |     2 +-
 tests/qemuxml2argvdata/graphics-sdl.args      |     2 +-
 .../graphics-spice-agent-file-xfer.args       |     4 +-
 .../graphics-spice-agentmouse.args            |     2 +-
 .../graphics-spice-auto-socket-cfg.args       |     2 +-
 .../graphics-spice-auto-socket.args           |     2 +-
 .../graphics-spice-compression.args           |     4 +-
 .../graphics-spice-egl-headless.args          |     4 +-
 .../graphics-spice-no-args.args               |     2 +-
 .../graphics-spice-qxl-vga.args               |     4 +-
 .../qemuxml2argvdata/graphics-spice-sasl.args |     4 +-
 .../graphics-spice-socket.args                |     2 +-
 .../graphics-spice-timeout.args               |     2 +-
 .../graphics-spice-usb-redir.args             |     2 +-
 tests/qemuxml2argvdata/graphics-spice.args    |     4 +-
 .../graphics-vnc-auto-socket-cfg.args         |     2 +-
 .../graphics-vnc-auto-socket.args             |     2 +-
 .../graphics-vnc-egl-headless.args            |     2 +-
 .../graphics-vnc-no-listen-attr.args          |     2 +-
 tests/qemuxml2argvdata/graphics-vnc-none.args |     2 +-
 .../qemuxml2argvdata/graphics-vnc-policy.args |     2 +-
 .../graphics-vnc-remove-generated-socket.args |     2 +-
 tests/qemuxml2argvdata/graphics-vnc-sasl.args |     2 +-
 .../graphics-vnc-socket-new-cmdline.args      |     2 +-
 .../qemuxml2argvdata/graphics-vnc-socket.args |     2 +-
 tests/qemuxml2argvdata/graphics-vnc-tls.args  |     2 +-
 .../graphics-vnc-tls.x86_64-2.4.0.args        |    30 -
 .../graphics-vnc-websocket.args               |     2 +-
 tests/qemuxml2argvdata/graphics-vnc.args      |     2 +-
 .../hostdev-mdev-precreated.args              |     2 +-
 .../hostdev-pci-address-device.args           |     4 +-
 .../hostdev-pci-address-unassigned.args       |     8 +-
 .../qemuxml2argvdata/hostdev-pci-address.args |     2 +-
 .../hostdev-pci-multifunction.args            |    16 +-
 .../hostdev-scsi-lsi.x86_64-2.8.0.args        |    45 -
 .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
 .../hostdev-scsi-vhost-scsi-pcie.args         |     4 +-
 ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args |    47 -
 .../hostdev-usb-address-device-boot.args      |     2 +-
 .../hostdev-usb-address-device.args           |     2 +-
 .../hostdev-vfio-multidomain.args             |     4 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |     4 +-
 tests/qemuxml2argvdata/hugepages-default.args |     2 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |     2 +-
 .../qemuxml2argvdata/input-usbmouse-addr.args |     2 +-
 .../intel-iommu.x86_64-2.6.0.args             |    29 -
 tests/qemuxml2argvdata/iothreads-disk.args    |     2 +-
 tests/qemuxml2argvdata/kvm-features-off.args  |     2 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |     2 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |     2 +-
 .../kvmclock+eoi-disabled.x86_64-2.7.0.args   |    30 -
 .../luks-disks-source-qcow2.args              |     8 +-
 tests/qemuxml2argvdata/luks-disks-source.args |     6 +-
 .../mach-virt-console-virtio.args             |     2 +-
 .../mach-virt-serial-native.args              |     2 +-
 .../mach-virt-serial-pci.args                 |     2 +-
 .../mach-virt-serial-usb.args                 |     2 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |     2 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |     2 +-
 tests/qemuxml2argvdata/machine-smm-opt.args   |     2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |     2 +-
 .../memory-hotplug-dimm-addr.args             |     2 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |     2 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |     2 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |     2 +-
 tests/qemuxml2argvdata/memtune.args           |     2 +-
 .../migrate-numa-unaligned.args               |     2 +-
 .../minimal-msg-timestamp.args                |     2 +-
 tests/qemuxml2argvdata/minimal-sandbox.args   |     2 +-
 tests/qemuxml2argvdata/minimal.args           |     2 +-
 tests/qemuxml2argvdata/monitor-json.args      |     2 +-
 .../multifunction-pci-device.args             |     2 +-
 tests/qemuxml2argvdata/net-client.args        |     4 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |     2 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |     2 +-
 tests/qemuxml2argvdata/net-eth-names.args     |     6 +-
 .../net-eth-unmanaged-tap.args                |     2 +-
 tests/qemuxml2argvdata/net-eth.args           |     2 +-
 .../net-hostdev-bootorder.args                |     2 +-
 .../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   |    12 +-
 tests/qemuxml2argvdata/net-mcast.args         |     4 +-
 tests/qemuxml2argvdata/net-server.args        |     4 +-
 tests/qemuxml2argvdata/net-udp.args           |     4 +-
 tests/qemuxml2argvdata/net-user.args          |     2 +-
 .../net-vhostuser-multiq.args                 |    10 +-
 .../qemuxml2argvdata/net-vhostuser-multiq.err |     1 -
 tests/qemuxml2argvdata/net-vhostuser.args     |     6 +-
 .../net-vhostuser.x86_64-2.5.0.args           |    36 -
 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 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |    10 +-
 tests/qemuxml2argvdata/net-virtio.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/panic-no-address.args  |     2 +-
 tests/qemuxml2argvdata/panic.args             |     2 +-
 .../parallel-parport-chardev.args             |     2 +-
 .../parallel-tcp-chardev.args                 |     2 +-
 .../parallel-unix-chardev.x86_64-2.5.0.args   |    33 -
 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                |   216 +-
 tests/qemuxml2argvdata/pci-bridge.args        |     2 +-
 tests/qemuxml2argvdata/pci-expander-bus.args  |    68 +-
 tests/qemuxml2argvdata/pci-many.args          |     2 +-
 tests/qemuxml2argvdata/pci-rom-disabled.args  |     2 +-
 tests/qemuxml2argvdata/pci-rom.args           |    10 +-
 .../pci-serial-dev-chardev.args               |     2 +-
 .../pcie-root-port-model-generic.args         |     6 +-
 .../pcie-root-port-model-ioh3420.args         |     4 +-
 tests/qemuxml2argvdata/pcihole64.args         |     2 +-
 .../pseries-cpu-compat-power9.args            |     4 +-
 .../qemuxml2argvdata/pseries-cpu-compat.args  |     4 +-
 .../pseries-features-htp-resize.err           |     1 -
 .../pseries-features-htp-resize.xml           |     1 -
 .../pv-spinlock-disabled.x86_64-2.7.0.args    |    30 -
 .../pv-spinlock-enabled.x86_64-2.7.0.args     |    30 -
 .../q35-pci-force-address.args                |     2 +-
 .../q35-pm-disable-fallback.args              |     2 +-
 tests/qemuxml2argvdata/q35-pm-disable.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/restore-v2-fd.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 +-
 .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
 .../qemuxml2argvdata/serial-pty-chardev.args  |     2 +-
 .../serial-spiceport-nospice.args             |     2 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |     2 +-
 .../serial-tcp-telnet-chardev.args            |     2 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |     2 +-
 .../serial-tcp-tlsx509-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                 |    14 +-
 tests/qemuxml2argvdata/shmem.args             |    14 +-
 .../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 +-
 ...artcard-passthrough-unix.x86_64-2.5.0.args |    32 -
 tests/qemuxml2argvdata/smbios.args            |     2 +-
 tests/qemuxml2argvdata/sound-device.args      |    14 +-
 tests/qemuxml2argvdata/sound.args             |     4 +-
 .../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  |    26 +-
 .../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 +-
 .../usb-redir-unix.x86_64-2.5.0.args          |    36 -
 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      |     2 +-
 .../qemuxml2argvdata/video-qxl-nodevice.args  |    32 -
 tests/qemuxml2argvdata/video-qxl-nodevice.xml |    29 -
 .../qemuxml2argvdata/video-vga-nodevice.args  |    30 -
 tests/qemuxml2argvdata/video-vga-nodevice.xml |    29 -
 .../qemuxml2argvdata/video-vga-qxl-heads.args |     5 +-
 .../virtio-input-passthrough.args             |     4 +-
 tests/qemuxml2argvdata/virtio-input.args      |     6 +-
 tests/qemuxml2argvdata/virtio-lun.args        |     4 +-
 .../qemuxml2argvdata/virtio-rng-default.args  |     2 +-
 .../virtio-rng-egd-unix.x86_64-2.5.0.args     |    32 -
 tests/qemuxml2argvdata/virtio-rng-egd.args    |     4 +-
 .../qemuxml2argvdata/virtio-rng-multiple.args |     4 +-
 tests/qemuxml2argvdata/virtio-rng-random.args |     4 +-
 tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
 tests/qemuxml2argvdata/watchdog-device.args   |     2 +-
 tests/qemuxml2argvdata/watchdog-dump.args     |     2 +-
 .../qemuxml2argvdata/watchdog-injectnmi.args  |     2 +-
 tests/qemuxml2argvtest.c                      |   155 +-
 tests/qemuxml2xmloutdata/autoindex.xml        |     4 +-
 .../balloon-device-auto.xml                   |     2 +-
 .../bios-nvram-os-interleave.xml              |     2 +-
 tests/qemuxml2xmloutdata/bios-nvram.xml       |     2 +-
 tests/qemuxml2xmloutdata/blkiotune-device.xml |     2 +-
 tests/qemuxml2xmloutdata/blkiotune.xml        |     2 +-
 .../boot-menu-disable-with-timeout.xml        |     2 +-
 .../qemuxml2xmloutdata/boot-menu-disable.xml  |     2 +-
 .../boot-menu-enable-with-timeout.xml         |     2 +-
 tests/qemuxml2xmloutdata/boot-multi.xml       |     2 +-
 tests/qemuxml2xmloutdata/boot-order.xml       |     6 +-
 tests/qemuxml2xmloutdata/channel-guestfwd.xml |     2 +-
 .../channel-unix-source-path-active.xml       |     2 +-
 .../channel-unix-source-path-inactive.xml     |     2 +-
 .../channel-virtio-auto.xml                   |     6 +-
 .../channel-virtio-state-active.xml           |     2 +-
 .../channel-virtio-state-inactive.xml         |     2 +-
 tests/qemuxml2xmloutdata/channel-virtio.xml   |     2 +-
 tests/qemuxml2xmloutdata/chardev-label.xml    |     4 +-
 tests/qemuxml2xmloutdata/clock-catchup.xml    |     2 +-
 .../clock-timer-hyperv-rtc.xml                |     2 +-
 .../console-compat-auto.xml                   |     2 +-
 tests/qemuxml2xmloutdata/console-compat2.xml  |     2 +-
 .../console-virtio-many.xml                   |     4 +-
 tests/qemuxml2xmloutdata/console-virtio.xml   |     4 +-
 .../controller-usb-order.xml                  |     2 +-
 .../controller-virtio-scsi.xml                |    12 +-
 .../cpu-check-default-none.xml                |     2 +-
 .../cpu-check-default-none2.xml               |     2 +-
 .../cpu-check-default-partial.xml             |     2 +-
 .../cpu-check-default-partial2.xml            |     2 +-
 tests/qemuxml2xmloutdata/cpu-check-full.xml   |     2 +-
 tests/qemuxml2xmloutdata/cpu-check-none.xml   |     2 +-
 .../qemuxml2xmloutdata/cpu-check-partial.xml  |     2 +-
 tests/qemuxml2xmloutdata/cpu-empty.xml        |     2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |     2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |     2 +-
 .../qemuxml2xmloutdata/cpu-host-kvmclock.xml  |     2 +-
 .../cpu-host-model-features.xml               |     2 +-
 .../cpu-host-model-vendor.xml                 |     2 +-
 .../cpu-host-passthrough-features.xml         |     2 +-
 tests/qemuxml2xmloutdata/cpu-kvmclock.xml     |     2 +-
 .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |     2 +-
 .../cpu-numa-disordered.xml                   |     2 +-
 .../qemuxml2xmloutdata/cpu-numa-memshared.xml |     2 +-
 .../cpu-numa-no-memory-element.xml            |     2 +-
 tests/qemuxml2xmloutdata/cpu-numa1.xml        |     2 +-
 tests/qemuxml2xmloutdata/cpu-numa2.xml        |     2 +-
 .../qemuxml2xmloutdata/cputune-iothreads.xml  |     2 +-
 .../cputune-iothreadsched-zeropriority.xml    |     2 +-
 .../cputune-iothreadsched.xml                 |     2 +-
 .../cputune-zero-shares.xml                   |     2 +-
 tests/qemuxml2xmloutdata/cputune.xml          |     2 +-
 .../default-kvm-host-arch.xml                 |     2 +-
 .../default-qemu-host-arch.xml                |     2 +-
 .../disk-active-commit-active.xml             |     2 +-
 .../disk-active-commit-inactive.xml           |     2 +-
 tests/qemuxml2xmloutdata/disk-aio.xml         |     2 +-
 .../disk-backing-chains-active.xml            |    12 +-
 .../disk-backing-chains-inactive.xml          |    12 +-
 .../disk-backing-chains-index-active.xml      |    14 +-
 .../disk-backing-chains-index-inactive.xml    |    14 +-
 .../disk-backing-chains-noindex.xml           |    14 +-
 .../disk-cache.x86_64-1.5.3.xml               |    61 -
 .../disk-cache.x86_64-2.6.0.xml               |    61 -
 .../disk-cache.x86_64-2.7.0.xml               |    61 -
 .../qemuxml2xmloutdata/disk-copy_on_read.xml  |     4 +-
 .../qemuxml2xmloutdata/disk-mirror-active.xml |     8 +-
 .../disk-mirror-inactive.xml                  |     8 +-
 .../disk-mirror-old-active.xml                |     6 +-
 .../disk-mirror-old-inactive.xml              |     6 +-
 .../disk-network-gluster.xml                  |     6 +-
 .../qemuxml2xmloutdata/disk-network-iscsi.xml |    10 +-
 tests/qemuxml2xmloutdata/disk-network-nbd.xml |    10 +-
 tests/qemuxml2xmloutdata/disk-network-rbd.xml |    12 +-
 .../disk-network-sheepdog.xml                 |     2 +-
 .../disk-network-source-auth.xml              |     6 +-
 .../disk-scsi-device-auto.xml                 |     4 +-
 .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml |     6 +-
 .../disk-scsi-lun-passthrough-sgio.xml        |     6 +-
 tests/qemuxml2xmloutdata/disk-serial.xml      |     2 +-
 .../disk-source-pool-mode.xml                 |     2 +-
 tests/qemuxml2xmloutdata/disk-source-pool.xml |     4 +-
 tests/qemuxml2xmloutdata/disk-usb-device.xml  |     2 +-
 tests/qemuxml2xmloutdata/disk-virtio.xml      |     4 +-
 tests/qemuxml2xmloutdata/encrypted-disk.xml   |     2 +-
 tests/qemuxml2xmloutdata/eoi-disabled.xml     |     2 +-
 tests/qemuxml2xmloutdata/eoi-enabled.xml      |     2 +-
 tests/qemuxml2xmloutdata/event_idx.xml        |     4 +-
 tests/qemuxml2xmloutdata/floppy-drive-fat.xml |     2 +-
 .../hostdev-mdev-precreated.xml               |     2 +-
 .../hostdev-pci-address-unassigned.xml        |     8 +-
 .../hostdev-pci-address.xml                   |     2 +-
 .../hostdev-pci-multifunction.xml             |    16 +-
 .../hostdev-scsi-autogen-address.xml          |     6 +-
 .../hostdev-scsi-large-unit.xml               |     4 +-
 tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml |     4 +-
 .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml |     4 +-
 .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml  |     4 +-
 .../hostdev-scsi-shareable.xml                |     4 +-
 .../hostdev-scsi-vhost-scsi-pci.xml           |     2 +-
 .../hostdev-scsi-vhost-scsi-pcie.xml          |     8 +-
 .../hostdev-scsi-virtio-scsi.xml              |     4 +-
 tests/qemuxml2xmloutdata/hostdev-vfio.xml     |     4 +-
 .../qemuxml2xmloutdata/hugepages-default.xml  |     2 +-
 tests/qemuxml2xmloutdata/hugepages-shared.xml |     2 +-
 tests/qemuxml2xmloutdata/hyperv-off.xml       |     2 +-
 .../intel-iommu.x86_64-2.6.0.xml              |    31 -
 tests/qemuxml2xmloutdata/interface-driver.xml |     4 +-
 tests/qemuxml2xmloutdata/iothreads-disk.xml   |     2 +-
 tests/qemuxml2xmloutdata/kvm-features-off.xml |     2 +-
 tests/qemuxml2xmloutdata/lease.xml            |     2 +-
 .../qemuxml2xmloutdata/luks-disks-source.xml  |     6 +-
 .../memory-hotplug-dimm.xml                   |     2 +-
 tests/qemuxml2xmloutdata/memory-hotplug.xml   |     2 +-
 .../qemuxml2xmloutdata/memorybacking-set.xml  |     2 +-
 .../memorybacking-unset.xml                   |     2 +-
 .../qemuxml2xmloutdata/memtune-unlimited.xml  |     2 +-
 tests/qemuxml2xmloutdata/memtune.xml          |     2 +-
 .../qemuxml2xmloutdata/metadata-duplicate.xml |     2 +-
 tests/qemuxml2xmloutdata/metadata.xml         |     2 +-
 tests/qemuxml2xmloutdata/minimal.xml          |     2 +-
 tests/qemuxml2xmloutdata/net-coalesce.xml     |     8 +-
 tests/qemuxml2xmloutdata/net-eth-hostip.xml   |     2 +-
 tests/qemuxml2xmloutdata/net-eth-ifname.xml   |     2 +-
 .../net-eth-unmanaged-tap.xml                 |     2 +-
 tests/qemuxml2xmloutdata/net-eth.xml          |     2 +-
 .../net-hostdev-bootorder.xml                 |     2 +-
 tests/qemuxml2xmloutdata/net-hostdev-vfio.xml |     4 +-
 tests/qemuxml2xmloutdata/net-hostdev.xml      |     4 +-
 tests/qemuxml2xmloutdata/net-many-models.xml  |    12 +-
 tests/qemuxml2xmloutdata/net-midonet.xml      |     4 +-
 tests/qemuxml2xmloutdata/net-mtu.xml          |     6 +-
 tests/qemuxml2xmloutdata/net-openvswitch.xml  |     4 +-
 tests/qemuxml2xmloutdata/net-udp.xml          |     4 +-
 tests/qemuxml2xmloutdata/net-user.xml         |     2 +-
 tests/qemuxml2xmloutdata/net-vdpa.xml         |     2 +-
 tests/qemuxml2xmloutdata/net-vhostuser.xml    |     6 +-
 .../qemuxml2xmloutdata/net-virtio-device.xml  |     4 +-
 .../net-virtio-disable-offloads.xml           |     4 +-
 .../net-virtio-network-portgroup.xml          |     8 +-
 .../net-virtio-rxtxqueuesize.xml              |     4 +-
 .../net-virtio-teaming-network.xml            |     6 +-
 .../qemuxml2xmloutdata/net-virtio-teaming.xml |    10 +-
 tests/qemuxml2xmloutdata/net-virtio.xml       |     2 +-
 .../numad-auto-memory-vcpu-cpuset.xml         |     2 +-
 ...to-memory-vcpu-no-cpuset-and-placement.xml |     2 +-
 .../numad-auto-vcpu-no-numatune.xml           |     2 +-
 .../numad-static-vcpu-no-numatune.xml         |     2 +-
 .../numatune-auto-prefer.xml                  |     2 +-
 .../qemuxml2xmloutdata/numatune-distances.xml |     2 +-
 .../numatune-memnode-no-memory.xml            |     2 +-
 tests/qemuxml2xmloutdata/numatune-memnode.xml |     2 +-
 tests/qemuxml2xmloutdata/panic-isa.xml        |     2 +-
 tests/qemuxml2xmloutdata/panic-no-address.xml |     2 +-
 tests/qemuxml2xmloutdata/panic.xml            |     2 +-
 .../pci-bridge-many-disks.xml                 |   216 +-
 tests/qemuxml2xmloutdata/pci-expander-bus.xml |    68 +-
 .../pci-rom-disabled-invalid.xml              |     2 +-
 tests/qemuxml2xmloutdata/pci-rom-disabled.xml |     2 +-
 tests/qemuxml2xmloutdata/pci-rom.xml          |    10 +-
 .../pci-serial-dev-chardev.xml                |     2 +-
 .../pcie-root-port-model-generic.xml          |    12 +-
 .../pcie-root-port-model-ioh3420.xml          |     8 +-
 tests/qemuxml2xmloutdata/pcihole64-gib.xml    |     2 +-
 tests/qemuxml2xmloutdata/pcihole64-none.xml   |     2 +-
 tests/qemuxml2xmloutdata/pcihole64.xml        |     2 +-
 .../pv-spinlock-disabled.xml                  |     2 +-
 .../pv-spinlock-enabled.xml                   |     2 +-
 .../q35-pci-force-address.xml                 |     4 +-
 .../qemuxml2xmloutdata/seclabel-dac-none.xml  |     2 +-
 .../seclabel-device-multiple.xml              |     2 +-
 .../seclabel-dynamic-baselabel-inactive.xml   |     2 +-
 .../seclabel-dynamic-labelskip-inactive.xml   |     2 +-
 .../seclabel-dynamic-none.xml                 |     2 +-
 .../seclabel-dynamic-override-inactive.xml    |     2 +-
 .../seclabel-dynamic-relabel-inactive.xml     |     2 +-
 tests/qemuxml2xmloutdata/seclabel-none.xml    |     2 +-
 .../seclabel-static-labelskip-active.xml      |     2 +-
 .../seclabel-static-labelskip-inactive.xml    |     2 +-
 tests/qemuxml2xmloutdata/seclabel-static.xml  |     2 +-
 .../serial-spiceport-nospice.xml              |     2 +-
 .../serial-target-port-auto.xml               |     2 +-
 .../serial-tcp-tlsx509-chardev.xml            |     2 +-
 .../shmem-plain-doorbell.xml                  |    14 +-
 tests/qemuxml2xmloutdata/shmem.xml            |    14 +-
 .../smartcard-controller.xml                  |     2 +-
 .../smartcard-host-certificates-database.xml  |     2 +-
 .../smartcard-host-certificates.xml           |     2 +-
 tests/qemuxml2xmloutdata/smartcard-host.xml   |     2 +-
 .../smartcard-passthrough-spicevmc.xml        |     2 +-
 .../smartcard-passthrough-tcp.xml             |     2 +-
 .../smbios-multiple-type2.xml                 |     2 +-
 tests/qemuxml2xmloutdata/smbios.xml           |     2 +-
 tests/qemuxml2xmloutdata/sound-device.xml     |    14 +-
 tests/qemuxml2xmloutdata/sound.xml            |     4 +-
 .../tap-vhost-incorrect.xml                   |     6 +-
 tests/qemuxml2xmloutdata/tap-vhost.xml        |     4 +-
 .../qemuxml2xmloutdata/tseg-explicit-size.xml |     4 +-
 tests/qemuxml2xmloutdata/usb-controller.xml   |     2 +-
 .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml |    26 +-
 tests/qemuxml2xmloutdata/usb-none.xml         |     2 +-
 .../usb-piix3-controller.xml                  |     2 +-
 tests/qemuxml2xmloutdata/usb-port-missing.xml |     2 +-
 .../usb-redir-filter-version.xml              |     2 +-
 tests/qemuxml2xmloutdata/usb-redir-filter.xml |     2 +-
 tests/qemuxml2xmloutdata/usb-redir.xml        |     2 +-
 tests/qemuxml2xmloutdata/vhost-vsock-auto.xml |     2 +-
 tests/qemuxml2xmloutdata/vhost_queues.xml     |     4 +-
 .../virtio-input-passthrough.xml              |     4 +-
 tests/qemuxml2xmloutdata/virtio-input.xml     |     6 +-
 tests/qemuxml2xmloutdata/virtio-lun.xml       |     4 +-
 tests/qemuxml2xmloutdata/virtio-rng-egd.xml   |     4 +-
 .../qemuxml2xmloutdata/virtio-rng-random.xml  |     4 +-
 tests/qemuxml2xmloutdata/vmcoreinfo.xml       |     2 +-
 tests/qemuxml2xmltest.c                       |    72 +-
 tests/testutilsqemu.c                         |     2 +-
 739 files changed, 588789 insertions(+), 853995 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
 delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
 delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
 delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
 delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
 delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
 delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
 delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
 delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
 delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
 delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
 delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
 delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
 delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
 delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
 delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
 delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml

-- 
2.30.2

Re: [RFC PATCH 00/43] qemu: Remove support for qemu-1.5 - qemu-2.10 and clean up capabilities
Posted by Pavel Hrdina 3 years ago
On Fri, Apr 09, 2021 at 04:56:36PM +0200, Peter Krempa wrote:
> May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we
> no longer have to support qemu-1.5.
> 
> Remove the capabilities and test data for the versions we no longer care
> about and clean up some capabilities related stuff:
> 
>  - remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>  - remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
>  support it
> 
> This is also a good opportunity to clean up few things regarding the
> capabilties test data, namely call 'query-qmp-schema' before
> 'query-commands' to prepare to retire query-commands.
> 
> This series is heavily truncated since there were massive (27MiB)
> patches resulting from some of the mechanical (and generated) changes
> and also depends on my previous command line wrapping cleanup.
> Fetch the full version at:
> 
>   git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2
> 
> The cleanups in patches 41, 42, and the massive move of commands in
> patch 43 was done using a tool based on pieces of our code which I've
> uploaded to:
> 
> https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool
> 
> The tool may come in handy for other things too in the future as it
> allows programatic modification of the capability replies files.
> 
> Peter Krempa (43):
>   docs/platforms: Drop separate link to qemu-kvm on repology.org
>   qemuxml2xmltest: testInfoSetPaths: Remove return value
>   qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
>     fails
>   qemu: Formally deprecate support for qemu < 2.11
>   NEWS: Mention that minimum supported qemu version was bumped to 2.11
>   qemuxml2argvtest: Remove versioned tests for qemu < 2.11
>   [fixup] qemuxml2argvdata: Remove unused output files
>   qemuxml2xmltest: Remove versioned tests for qemu < 2.11
>   [fixup] qemuxml2xmldata: Remove unused output files
>   qemucapabilitiesdata: Drop capability test data for qemu < 2.11
>   virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
>   qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
>   qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
>   virQEMUCapsInitProcessCaps: Remove obsolete version checks
>   virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
>   virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
>   qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
>   qemuxml2argvtest: Parse 'arch' from XML early
>   qemuxml2xmltest: Always include basic set of capabilities
>   qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test case
>     'pseries-features-htp-resize'
>   qemu: capabilities: Move setting of PPC specific flags to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test for gic v3/host
>   qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
>   qemuxml2argvtest: Remove tests for absence of
>     QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>   qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
>     virQEMUCapsInitQMPBasicArch
>   [fixup] Fix test fallout in tests/qemuxml2argvdata
>   [fixup] Fix test fallout in tests/qemuxml2xmloutdata
>   qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
>     tests
>   qemu: capabilities: Move rest of always present caps to
>     virQEMUCapsInitQMPArch
>   qemuhotplugtest: Add also always-present capabilities
>   qemu: command: Remove legacy '-vga' commandline formatter
>   qemu_domain_address: Drop compatibility with pre-device vga
>     specification for i440fx
>   qemu_domain_address: Drop compatibility with pre-device vga
>     specification for q35
>   qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
>   qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>   qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
>   qemu: monitor: Remove qemuMonitorGetEvents
>   qemu: monitor: Remove qemuMonitorSupportsActiveCommit
>   tests: qemucapabilitiesdata: Fix formatting of manually added hunk
>   tests: qemucapabilitiesdata: Fix wrong command identifier in
>     caps_4.0.0.riscv64.replies
>   qemu: capabilities: Probe QMP schema before probing commands

Some of the patches can be pushed now as they are not removing support
for any older QEMUs.

The QEMU deprecation patches looks good as well. With all the fixup
squashed to the respective patches:

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Re: [RFC PATCH 00/43] qemu: Remove support for qemu-1.5 - qemu-2.10 and clean up capabilities
Posted by Neal Gompa 3 years ago
On Fri, Apr 9, 2021 at 11:00 AM Peter Krempa <pkrempa@redhat.com> wrote:
>
> May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we
> no longer have to support qemu-1.5.
>
> Remove the capabilities and test data for the versions we no longer care
> about and clean up some capabilities related stuff:
>
>  - remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>  - remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
>  support it
>
> This is also a good opportunity to clean up few things regarding the
> capabilties test data, namely call 'query-qmp-schema' before
> 'query-commands' to prepare to retire query-commands.
>
> This series is heavily truncated since there were massive (27MiB)
> patches resulting from some of the mechanical (and generated) changes
> and also depends on my previous command line wrapping cleanup.
> Fetch the full version at:
>
>   git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2
>
> The cleanups in patches 41, 42, and the massive move of commands in
> patch 43 was done using a tool based on pieces of our code which I've
> uploaded to:
>
> https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool
>
> The tool may come in handy for other things too in the future as it
> allows programatic modification of the capability replies files.
>
> Peter Krempa (43):
>   docs/platforms: Drop separate link to qemu-kvm on repology.org
>   qemuxml2xmltest: testInfoSetPaths: Remove return value
>   qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
>     fails
>   qemu: Formally deprecate support for qemu < 2.11
>   NEWS: Mention that minimum supported qemu version was bumped to 2.11
>   qemuxml2argvtest: Remove versioned tests for qemu < 2.11
>   [fixup] qemuxml2argvdata: Remove unused output files
>   qemuxml2xmltest: Remove versioned tests for qemu < 2.11
>   [fixup] qemuxml2xmldata: Remove unused output files
>   qemucapabilitiesdata: Drop capability test data for qemu < 2.11
>   virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
>   qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
>   qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
>   virQEMUCapsInitProcessCaps: Remove obsolete version checks
>   virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
>   virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
>   qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
>   qemuxml2argvtest: Parse 'arch' from XML early
>   qemuxml2xmltest: Always include basic set of capabilities
>   qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test case
>     'pseries-features-htp-resize'
>   qemu: capabilities: Move setting of PPC specific flags to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test for gic v3/host
>   qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
>     virQEMUCapsInitQMPBasicArch
>   qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
>   qemuxml2argvtest: Remove tests for absence of
>     QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>   qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
>     virQEMUCapsInitQMPBasicArch
>   [fixup] Fix test fallout in tests/qemuxml2argvdata
>   [fixup] Fix test fallout in tests/qemuxml2xmloutdata
>   qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
>     tests
>   qemu: capabilities: Move rest of always present caps to
>     virQEMUCapsInitQMPArch
>   qemuhotplugtest: Add also always-present capabilities
>   qemu: command: Remove legacy '-vga' commandline formatter
>   qemu_domain_address: Drop compatibility with pre-device vga
>     specification for i440fx
>   qemu_domain_address: Drop compatibility with pre-device vga
>     specification for q35
>   qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
>   qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
>   qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
>   qemu: monitor: Remove qemuMonitorGetEvents
>   qemu: monitor: Remove qemuMonitorSupportsActiveCommit
>   tests: qemucapabilitiesdata: Fix formatting of manually added hunk
>   tests: qemucapabilitiesdata: Fix wrong command identifier in
>     caps_4.0.0.riscv64.replies
>   qemu: capabilities: Probe QMP schema before probing commands
>
>  NEWS.rst                                      |     7 +
>  docs/drvqemu.rst                              |     2 +-
>  docs/platforms.rst                            |     2 -
>  src/qemu/qemu_alias.c                         |     5 +-
>  src/qemu/qemu_alias.h                         |     1 -
>  src/qemu/qemu_capabilities.c                  |   237 +-
>  src/qemu/qemu_capabilities.h                  |     7 +-
>  src/qemu/qemu_command.c                       |   190 +-
>  src/qemu/qemu_domain_address.c                |    82 +-
>  src/qemu/qemu_hotplug.c                       |     2 +-
>  src/qemu/qemu_monitor.c                       |    23 -
>  src/qemu/qemu_monitor.h                       |     3 -
>  src/qemu/qemu_monitor_json.c                  |    90 -
>  src/qemu/qemu_monitor_json.h                  |     6 -
>  .../caps_1.5.3.x86_64.replies                 |  3327 --
>  .../caps_1.5.3.x86_64.xml                     |   176 -
>  .../caps_1.6.0.x86_64.replies                 |  3298 --
>  .../caps_1.6.0.x86_64.xml                     |   185 -
>  .../caps_1.7.0.x86_64.replies                 |  3521 --
>  .../caps_1.7.0.x86_64.xml                     |   191 -
>  .../caps_2.1.1.x86_64.replies                 |  4041 --
>  .../caps_2.1.1.x86_64.xml                     |   217 -
>  .../caps_2.10.0.aarch64.replies               | 16975 ------
>  .../caps_2.10.0.aarch64.xml                   |   325 -
>  .../caps_2.10.0.ppc64.replies                 | 20756 -------
>  .../caps_2.10.0.ppc64.xml                     |  1067 -
>  .../caps_2.10.0.s390x.replies                 | 16608 ------
>  .../caps_2.10.0.s390x.xml                     |  1277 -
>  .../caps_2.10.0.x86_64.replies                | 19329 -------
>  .../caps_2.10.0.x86_64.xml                    |   997 -
>  .../caps_2.11.0.s390x.replies                 | 24392 ++++----
>  .../caps_2.11.0.s390x.xml                     |     3 -
>  .../caps_2.11.0.x86_64.replies                | 25712 ++++-----
>  .../caps_2.11.0.x86_64.xml                    |     3 -
>  .../caps_2.12.0.aarch64.replies               | 29188 +++++-----
>  .../caps_2.12.0.aarch64.xml                   |     2 -
>  .../caps_2.12.0.ppc64.replies                 | 31502 +++++------
>  .../caps_2.12.0.ppc64.xml                     |     3 -
>  .../caps_2.12.0.s390x.replies                 | 27224 ++++-----
>  .../caps_2.12.0.s390x.xml                     |     3 -
>  .../caps_2.12.0.x86_64.replies                | 30352 +++++-----
>  .../caps_2.12.0.x86_64.xml                    |     3 -
>  .../caps_2.4.0.x86_64.replies                 |  4868 --
>  .../caps_2.4.0.x86_64.xml                     |   263 -
>  .../caps_2.5.0.x86_64.replies                 | 12506 -----
>  .../caps_2.5.0.x86_64.xml                     |   273 -
>  .../caps_2.6.0.aarch64.replies                | 13317 -----
>  .../caps_2.6.0.aarch64.xml                    |   283 -
>  .../caps_2.6.0.ppc64.replies                  | 15692 ------
>  .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  1026 -
>  .../caps_2.6.0.x86_64.replies                 | 13061 -----
>  .../caps_2.6.0.x86_64.xml                     |   273 -
>  .../caps_2.7.0.s390x.replies                  | 12137 ----
>  .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |   113 -
>  .../caps_2.7.0.x86_64.replies                 | 13680 -----
>  .../caps_2.7.0.x86_64.xml                     |   284 -
>  .../caps_2.8.0.s390x.replies                  | 13553 -----
>  .../qemucapabilitiesdata/caps_2.8.0.s390x.xml |   265 -
>  .../caps_2.8.0.x86_64.replies                 | 14594 -----
>  .../caps_2.8.0.x86_64.xml                     |   419 -
>  .../caps_2.9.0.ppc64.replies                  | 19514 -------
>  .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  1056 -
>  .../caps_2.9.0.s390x.replies                  | 14607 -----
>  .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |   273 -
>  .../caps_2.9.0.x86_64.replies                 | 18290 ------
>  .../caps_2.9.0.x86_64.xml                     |   910 -
>  .../caps_3.0.0.ppc64.replies                  | 32872 +++++------
>  .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |     3 -
>  .../caps_3.0.0.riscv32.replies                | 21760 ++++----
>  .../caps_3.0.0.riscv32.xml                    |     3 -
>  .../caps_3.0.0.riscv64.replies                | 21760 ++++----
>  .../caps_3.0.0.riscv64.xml                    |     3 -
>  .../caps_3.0.0.s390x.replies                  | 28066 +++++-----
>  .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |     3 -
>  .../caps_3.0.0.x86_64.replies                 | 31463 ++++++-----
>  .../caps_3.0.0.x86_64.xml                     |     3 -
>  .../caps_3.1.0.ppc64.replies                  | 32440 +++++------
>  .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |     3 -
>  .../caps_3.1.0.x86_64.replies                 | 32304 +++++------
>  .../caps_3.1.0.x86_64.xml                     |     3 -
>  .../caps_4.0.0.aarch64.replies                | 31294 +++++------
>  .../caps_4.0.0.aarch64.xml                    |     2 -
>  .../caps_4.0.0.ppc64.replies                  | 33422 +++++------
>  .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |     3 -
>  .../caps_4.0.0.riscv32.replies                | 29062 +++++-----
>  .../caps_4.0.0.riscv32.xml                    |     3 -
>  .../caps_4.0.0.riscv64.replies                | 29062 +++++-----
>  .../caps_4.0.0.riscv64.xml                    |     3 -
>  .../caps_4.0.0.s390x.replies                  | 29542 +++++-----
>  .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |     3 -
>  .../caps_4.0.0.x86_64.replies                 | 32932 +++++------
>  .../caps_4.0.0.x86_64.xml                     |     3 -
>  .../caps_4.1.0.x86_64.replies                 | 34454 ++++++------
>  .../caps_4.1.0.x86_64.xml                     |     3 -
>  .../caps_4.2.0.aarch64.replies                | 33732 ++++++------
>  .../caps_4.2.0.aarch64.xml                    |     2 -
>  .../caps_4.2.0.ppc64.replies                  | 34230 ++++++------
>  .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     3 -
>  .../caps_4.2.0.s390x.replies                  | 31044 +++++------
>  .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     3 -
>  .../caps_4.2.0.x86_64.replies                 | 36818 ++++++-------
>  .../caps_4.2.0.x86_64.xml                     |     3 -
>  .../caps_5.0.0.aarch64.replies                | 36336 ++++++------
>  .../caps_5.0.0.aarch64.xml                    |     2 -
>  .../caps_5.0.0.ppc64.replies                  | 37738 ++++++-------
>  .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     3 -
>  .../caps_5.0.0.riscv64.replies                | 32784 +++++------
>  .../caps_5.0.0.riscv64.xml                    |     3 -
>  .../caps_5.0.0.x86_64.replies                 | 39726 ++++++-------
>  .../caps_5.0.0.x86_64.xml                     |     3 -
>  .../caps_5.1.0.sparc.replies                  | 25244 ++++-----
>  .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     3 -
>  .../caps_5.1.0.x86_64.replies                 | 41066 +++++++-------
>  .../caps_5.1.0.x86_64.xml                     |     3 -
>  .../caps_5.2.0.aarch64.replies                | 38490 ++++++-------
>  .../caps_5.2.0.aarch64.xml                    |     2 -
>  .../caps_5.2.0.ppc64.replies                  | 40514 +++++++-------
>  .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     3 -
>  .../caps_5.2.0.riscv64.replies                | 34452 ++++++------
>  .../caps_5.2.0.riscv64.xml                    |     3 -
>  .../caps_5.2.0.s390x.replies                  | 35480 ++++++------
>  .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     3 -
>  .../caps_5.2.0.x86_64.replies                 | 42432 +++++++-------
>  .../caps_5.2.0.x86_64.xml                     |     3 -
>  .../caps_6.0.0.x86_64.replies                 | 45838 ++++++++--------
>  .../caps_6.0.0.x86_64.xml                     |     3 -
>  tests/qemuhotplugtest.c                       |     5 +
>  .../ppc64-modern-bulk-result-conf.xml         |     2 +-
>  .../ppc64-modern-bulk-result-live.xml         |     2 +-
>  .../ppc64-modern-individual-result-conf.xml   |     2 +-
>  .../ppc64-modern-individual-result-live.xml   |     2 +-
>  .../x86-modern-bulk-result-conf.xml           |     2 +-
>  .../x86-modern-bulk-result-live.xml           |     2 +-
>  .../x86-modern-individual-add-result-conf.xml |     2 +-
>  .../x86-modern-individual-add-result-live.xml |     2 +-
>  .../x86-old-bulk-result-conf.xml              |     2 +-
>  .../x86-old-bulk-result-live.xml              |     2 +-
>  .../qemuhotplug-ivshmem-doorbell-detach.xml   |     2 +-
>  .../qemuhotplug-ivshmem-plain-detach.xml      |     2 +-
>  .../qemuhotplug-watchdog-full.xml             |     2 +-
>  .../qemuhotplug-watchdog-user-alias-full.xml  |     2 +-
>  .../qemuhotplug-base-live+disk-virtio.xml     |     2 +-
>  .../qemuhotplug-base-live+hostdev-pci.xml     |     2 +-
>  .../qemuhotplug-base-live+interface-vdpa.xml  |     2 +-
>  ...qemuhotplug-base-live+ivshmem-doorbell.xml |     4 +-
>  .../qemuhotplug-base-live+ivshmem-plain.xml   |     2 +-
>  ...uhotplug-base-live+watchdog-user-alias.xml |     2 +-
>  .../qemuhotplug-base-live+watchdog.xml        |     2 +-
>  ...hotplug-base-with-scsi-controller-live.xml |     8 +-
>  ...thout-scsi-controller-live+disk-scsi-2.xml |     8 +-
>  tests/qemumonitorjsontest.c                   |    44 -
>  .../aarch64-aavmf-virtio-mmio.args            |     2 +-
>  tests/qemuxml2argvdata/aarch64-acpi-uefi.args |     2 +-
>  .../aarch64-cpu-passthrough.args              |     2 +-
>  tests/qemuxml2argvdata/aarch64-gic-host.err   |     1 -
>  tests/qemuxml2argvdata/aarch64-gic-v3.err     |     1 -
>  .../aarch64-noacpi-nouefi.args                |     2 +-
>  .../qemuxml2argvdata/aarch64-noacpi-uefi.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                |     2 +-
>  .../aarch64-video-virtio-gpu-pci.args         |     2 +-
>  .../aarch64-virt-2.6-virtio-pci-default.args  |     2 +-
>  .../aarch64-virt-default-nic.args             |     2 +-
>  .../qemuxml2argvdata/aarch64-virt-virtio.args |     2 +-
>  .../aarch64-virtio-pci-default.args           |     2 +-
>  .../aarch64-virtio-pci-manual-addresses.args  |     2 +-
>  tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
>  .../qemuxml2argvdata/audio-default-spice.args |     2 +-
>  tests/qemuxml2argvdata/audio-default-vnc.args |     2 +-
>  tests/qemuxml2argvdata/autoindex.args         |     2 +-
>  .../qemuxml2argvdata/balloon-device-auto.args |     2 +-
>  .../balloon-mmio-deflate.args                 |     2 +-
>  tests/qemuxml2argvdata/bios-nvram-secure.args |     2 +-
>  tests/qemuxml2argvdata/bios-nvram.args        |     2 +-
>  tests/qemuxml2argvdata/bios.args              |     2 +-
>  tests/qemuxml2argvdata/blkiotune-device.args  |     2 +-
>  tests/qemuxml2argvdata/blkiotune.args         |     2 +-
>  tests/qemuxml2argvdata/boot-complex.args      |     8 +-
>  .../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-order.args        |     6 +-
>  tests/qemuxml2argvdata/boot-strict.args       |     8 +-
>  tests/qemuxml2argvdata/channel-guestfwd.args  |     2 +-
>  tests/qemuxml2argvdata/channel-spicevmc.args  |     2 +-
>  .../channel-unix-guestfwd.x86_64-2.5.0.args   |    33 -
>  .../qemuxml2argvdata/channel-virtio-auto.args |     6 +-
>  .../channel-virtio-autoadd.args               |     6 +-
>  .../channel-virtio-autoassign.args            |     4 +-
>  .../channel-virtio-default.args               |     4 +-
>  .../channel-virtio-state.args                 |     2 +-
>  .../qemuxml2argvdata/channel-virtio-unix.args |     2 +-
>  tests/qemuxml2argvdata/channel-virtio.args    |     2 +-
>  tests/qemuxml2argvdata/chardev-reconnect.args |     4 +-
>  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 +-
>  .../clock-timer-hyperv-rtc.args               |     2 +-
>  tests/qemuxml2argvdata/clock-variable.args    |     2 +-
>  .../qemuxml2argvdata/console-compat-auto.args |     2 +-
>  .../console-compat-chardev.args               |     2 +-
>  .../qemuxml2argvdata/console-virtio-many.args |     4 +-
>  .../console-virtio-unix.x86_64-2.5.0.args     |    34 -
>  tests/qemuxml2argvdata/console-virtio.args    |     4 +-
>  tests/qemuxml2argvdata/controller-order.args  |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell.args       |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell2.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell3.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-cache-disable.args |     2 +-
>  .../qemuxml2argvdata/cpu-cache-disable2.args  |     2 +-
>  .../qemuxml2argvdata/cpu-cache-disable3.args  |     2 +-
>  .../cpu-cache-emulate-l3.args                 |     2 +-
>  .../cpu-cache-passthrough.args                |     2 +-
>  .../cpu-cache-passthrough2.args               |     2 +-
>  .../cpu-check-default-none.args               |     2 +-
>  .../cpu-check-default-none2.args              |     2 +-
>  .../cpu-check-default-partial.args            |     2 +-
>  .../cpu-check-default-partial2.args           |     2 +-
>  tests/qemuxml2argvdata/cpu-check-none.args    |     2 +-
>  tests/qemuxml2argvdata/cpu-eoi-disabled.args  |     2 +-
>  tests/qemuxml2argvdata/cpu-eoi-enabled.args   |     2 +-
>  tests/qemuxml2argvdata/cpu-exact1.args        |     2 +-
>  .../cpu-exact2-nofallback.args                |     2 +-
>  tests/qemuxml2argvdata/cpu-exact2.args        |     2 +-
>  tests/qemuxml2argvdata/cpu-fallback.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-host-kvmclock.args |     2 +-
>  .../qemuxml2argvdata/cpu-host-model-cmt.args  |     2 +-
>  .../cpu-host-model-fallback.args              |     2 +-
>  .../cpu-host-model-vendor.args                |     2 +-
>  tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
>  .../cpu-host-passthrough-features.args        |     2 +-
>  .../cpu-host-passthrough.args                 |     2 +-
>  .../qemuxml2argvdata/cpu-hotplug-startup.args |     2 +-
>  tests/qemuxml2argvdata/cpu-kvmclock.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-minimum1.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-minimum2.args      |     2 +-
>  .../cpu-no-removed-features.args              |     2 +-
>  tests/qemuxml2argvdata/cpu-numa-disjoint.args |     2 +-
>  .../qemuxml2argvdata/cpu-numa-memshared.args  |     2 +-
>  .../cpu-numa-no-memory-element.args           |     2 +-
>  tests/qemuxml2argvdata/cpu-numa1.args         |     2 +-
>  tests/qemuxml2argvdata/cpu-numa2.args         |     2 +-
>  tests/qemuxml2argvdata/cpu-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 +-
>  .../qemuxml2argvdata/cputune-zero-shares.args |     2 +-
>  tests/qemuxml2argvdata/cputune.args           |     2 +-
>  tests/qemuxml2argvdata/debug-threads.args     |     2 +-
>  .../default-kvm-host-arch.args                |     2 +-
>  .../default-qemu-host-arch.args               |     2 +-
>  tests/qemuxml2argvdata/disk-aio.args          |     2 +-
>  tests/qemuxml2argvdata/disk-blockio.args      |     2 +-
>  .../disk-cache.x86_64-1.5.3.args              |    38 -
>  .../disk-cache.x86_64-2.6.0.args              |    40 -
>  .../disk-cache.x86_64-2.7.0.args              |    40 -
>  .../qemuxml2argvdata/disk-cdrom-network.args  |     2 +-
>  tests/qemuxml2argvdata/disk-cdrom-tray.args   |     2 +-
>  tests/qemuxml2argvdata/disk-copy_on_read.args |     4 +-
>  tests/qemuxml2argvdata/disk-floppy-tray.args  |     2 +-
>  tests/qemuxml2argvdata/disk-geometry.args     |     2 +-
>  tests/qemuxml2argvdata/disk-ide-split.args    |     2 +-
>  tests/qemuxml2argvdata/disk-ide-wwn.args      |     2 +-
>  tests/qemuxml2argvdata/disk-ioeventfd.args    |     4 +-
>  .../disk-network-gluster.args                 |     6 +-
>  .../disk-network-iscsi-modern.args            |    10 +-
>  .../qemuxml2argvdata/disk-network-iscsi.args  |    10 +-
>  tests/qemuxml2argvdata/disk-network-nbd.args  |    10 +-
>  .../disk-network-rbd.x86_64-2.5.0.args        |    40 -
>  .../disk-network-sheepdog.args                |     2 +-
>  .../disk-network-source-auth.args             |     6 +-
>  tests/qemuxml2argvdata/disk-order.args        |     6 +-
>  .../qemuxml2argvdata/disk-readonly-disk.args  |     2 +-
>  tests/qemuxml2argvdata/disk-sata-device.args  |     4 +-
>  .../disk-scsi-device-auto.x86_64-1.5.3.args   |    33 -
>  .../disk-scsi-disk-split.args                 |    10 +-
>  .../qemuxml2argvdata/disk-scsi-disk-vpd.args  |     6 +-
>  .../qemuxml2argvdata/disk-scsi-disk-wwn.args  |     6 +-
>  .../disk-scsi-lun-passthrough.args            |     6 +-
>  tests/qemuxml2argvdata/disk-serial.args       |     2 +-
>  tests/qemuxml2argvdata/disk-snapshot.args     |     2 +-
>  .../disk-source-pool-mode.args                |     2 +-
>  tests/qemuxml2argvdata/disk-source-pool.args  |     4 +-
>  .../disk-usb-device-removable.args            |     2 +-
>  tests/qemuxml2argvdata/disk-usb-device.args   |     2 +-
>  tests/qemuxml2argvdata/disk-virtio.args       |     4 +-
>  tests/qemuxml2argvdata/encrypted-disk.args    |     2 +-
>  .../eoi-disabled.x86_64-2.7.0.args            |    30 -
>  .../eoi-enabled.x86_64-2.7.0.args             |    30 -
>  tests/qemuxml2argvdata/event_idx.args         |     4 +-
>  tests/qemuxml2argvdata/floppy-drive-fat.args  |     2 +-
>  tests/qemuxml2argvdata/fs9p.args              |     6 +-
>  .../graphics-egl-headless.args                |     2 +-
>  .../graphics-sdl-fullscreen.args              |     2 +-
>  tests/qemuxml2argvdata/graphics-sdl.args      |     2 +-
>  .../graphics-spice-agent-file-xfer.args       |     4 +-
>  .../graphics-spice-agentmouse.args            |     2 +-
>  .../graphics-spice-auto-socket-cfg.args       |     2 +-
>  .../graphics-spice-auto-socket.args           |     2 +-
>  .../graphics-spice-compression.args           |     4 +-
>  .../graphics-spice-egl-headless.args          |     4 +-
>  .../graphics-spice-no-args.args               |     2 +-
>  .../graphics-spice-qxl-vga.args               |     4 +-
>  .../qemuxml2argvdata/graphics-spice-sasl.args |     4 +-
>  .../graphics-spice-socket.args                |     2 +-
>  .../graphics-spice-timeout.args               |     2 +-
>  .../graphics-spice-usb-redir.args             |     2 +-
>  tests/qemuxml2argvdata/graphics-spice.args    |     4 +-
>  .../graphics-vnc-auto-socket-cfg.args         |     2 +-
>  .../graphics-vnc-auto-socket.args             |     2 +-
>  .../graphics-vnc-egl-headless.args            |     2 +-
>  .../graphics-vnc-no-listen-attr.args          |     2 +-
>  tests/qemuxml2argvdata/graphics-vnc-none.args |     2 +-
>  .../qemuxml2argvdata/graphics-vnc-policy.args |     2 +-
>  .../graphics-vnc-remove-generated-socket.args |     2 +-
>  tests/qemuxml2argvdata/graphics-vnc-sasl.args |     2 +-
>  .../graphics-vnc-socket-new-cmdline.args      |     2 +-
>  .../qemuxml2argvdata/graphics-vnc-socket.args |     2 +-
>  tests/qemuxml2argvdata/graphics-vnc-tls.args  |     2 +-
>  .../graphics-vnc-tls.x86_64-2.4.0.args        |    30 -
>  .../graphics-vnc-websocket.args               |     2 +-
>  tests/qemuxml2argvdata/graphics-vnc.args      |     2 +-
>  .../hostdev-mdev-precreated.args              |     2 +-
>  .../hostdev-pci-address-device.args           |     4 +-
>  .../hostdev-pci-address-unassigned.args       |     8 +-
>  .../qemuxml2argvdata/hostdev-pci-address.args |     2 +-
>  .../hostdev-pci-multifunction.args            |    16 +-
>  .../hostdev-scsi-lsi.x86_64-2.8.0.args        |    45 -
>  .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
>  .../hostdev-scsi-vhost-scsi-pcie.args         |     4 +-
>  ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args |    47 -
>  .../hostdev-usb-address-device-boot.args      |     2 +-
>  .../hostdev-usb-address-device.args           |     2 +-
>  .../hostdev-vfio-multidomain.args             |     4 +-
>  tests/qemuxml2argvdata/hostdev-vfio.args      |     4 +-
>  tests/qemuxml2argvdata/hugepages-default.args |     2 +-
>  tests/qemuxml2argvdata/hugepages-shared.args  |     2 +-
>  .../qemuxml2argvdata/input-usbmouse-addr.args |     2 +-
>  .../intel-iommu.x86_64-2.6.0.args             |    29 -
>  tests/qemuxml2argvdata/iothreads-disk.args    |     2 +-
>  tests/qemuxml2argvdata/kvm-features-off.args  |     2 +-
>  tests/qemuxml2argvdata/kvm-pit-delay.args     |     2 +-
>  tests/qemuxml2argvdata/kvm-pit-discard.args   |     2 +-
>  .../kvmclock+eoi-disabled.x86_64-2.7.0.args   |    30 -
>  .../luks-disks-source-qcow2.args              |     8 +-
>  tests/qemuxml2argvdata/luks-disks-source.args |     6 +-
>  .../mach-virt-console-virtio.args             |     2 +-
>  .../mach-virt-serial-native.args              |     2 +-
>  .../mach-virt-serial-pci.args                 |     2 +-
>  .../mach-virt-serial-usb.args                 |     2 +-
>  tests/qemuxml2argvdata/machine-aliases1.args  |     2 +-
>  tests/qemuxml2argvdata/machine-aliases2.args  |     2 +-
>  tests/qemuxml2argvdata/machine-smm-opt.args   |     2 +-
>  .../qemuxml2argvdata/machine-vmport-opt.args  |     2 +-
>  .../memory-hotplug-dimm-addr.args             |     2 +-
>  .../qemuxml2argvdata/memory-hotplug-dimm.args |     2 +-
>  tests/qemuxml2argvdata/memory-hotplug.args    |     2 +-
>  tests/qemuxml2argvdata/memtune-unlimited.args |     2 +-
>  tests/qemuxml2argvdata/memtune.args           |     2 +-
>  .../migrate-numa-unaligned.args               |     2 +-
>  .../minimal-msg-timestamp.args                |     2 +-
>  tests/qemuxml2argvdata/minimal-sandbox.args   |     2 +-
>  tests/qemuxml2argvdata/minimal.args           |     2 +-
>  tests/qemuxml2argvdata/monitor-json.args      |     2 +-
>  .../multifunction-pci-device.args             |     2 +-
>  tests/qemuxml2argvdata/net-client.args        |     4 +-
>  tests/qemuxml2argvdata/net-eth-hostip.args    |     2 +-
>  tests/qemuxml2argvdata/net-eth-ifname.args    |     2 +-
>  tests/qemuxml2argvdata/net-eth-names.args     |     6 +-
>  .../net-eth-unmanaged-tap.args                |     2 +-
>  tests/qemuxml2argvdata/net-eth.args           |     2 +-
>  .../net-hostdev-bootorder.args                |     2 +-
>  .../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   |    12 +-
>  tests/qemuxml2argvdata/net-mcast.args         |     4 +-
>  tests/qemuxml2argvdata/net-server.args        |     4 +-
>  tests/qemuxml2argvdata/net-udp.args           |     4 +-
>  tests/qemuxml2argvdata/net-user.args          |     2 +-
>  .../net-vhostuser-multiq.args                 |    10 +-
>  .../qemuxml2argvdata/net-vhostuser-multiq.err |     1 -
>  tests/qemuxml2argvdata/net-vhostuser.args     |     6 +-
>  .../net-vhostuser.x86_64-2.5.0.args           |    36 -
>  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 +-
>  .../qemuxml2argvdata/net-virtio-teaming.args  |    10 +-
>  tests/qemuxml2argvdata/net-virtio.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/panic-no-address.args  |     2 +-
>  tests/qemuxml2argvdata/panic.args             |     2 +-
>  .../parallel-parport-chardev.args             |     2 +-
>  .../parallel-tcp-chardev.args                 |     2 +-
>  .../parallel-unix-chardev.x86_64-2.5.0.args   |    33 -
>  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                |   216 +-
>  tests/qemuxml2argvdata/pci-bridge.args        |     2 +-
>  tests/qemuxml2argvdata/pci-expander-bus.args  |    68 +-
>  tests/qemuxml2argvdata/pci-many.args          |     2 +-
>  tests/qemuxml2argvdata/pci-rom-disabled.args  |     2 +-
>  tests/qemuxml2argvdata/pci-rom.args           |    10 +-
>  .../pci-serial-dev-chardev.args               |     2 +-
>  .../pcie-root-port-model-generic.args         |     6 +-
>  .../pcie-root-port-model-ioh3420.args         |     4 +-
>  tests/qemuxml2argvdata/pcihole64.args         |     2 +-
>  .../pseries-cpu-compat-power9.args            |     4 +-
>  .../qemuxml2argvdata/pseries-cpu-compat.args  |     4 +-
>  .../pseries-features-htp-resize.err           |     1 -
>  .../pseries-features-htp-resize.xml           |     1 -
>  .../pv-spinlock-disabled.x86_64-2.7.0.args    |    30 -
>  .../pv-spinlock-enabled.x86_64-2.7.0.args     |    30 -
>  .../q35-pci-force-address.args                |     2 +-
>  .../q35-pm-disable-fallback.args              |     2 +-
>  tests/qemuxml2argvdata/q35-pm-disable.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/restore-v2-fd.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 +-
>  .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
>  .../qemuxml2argvdata/serial-pty-chardev.args  |     2 +-
>  .../serial-spiceport-nospice.args             |     2 +-
>  .../qemuxml2argvdata/serial-tcp-chardev.args  |     2 +-
>  .../serial-tcp-telnet-chardev.args            |     2 +-
>  .../serial-tcp-tlsx509-chardev-verify.args    |     2 +-
>  .../serial-tcp-tlsx509-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                 |    14 +-
>  tests/qemuxml2argvdata/shmem.args             |    14 +-
>  .../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 +-
>  ...artcard-passthrough-unix.x86_64-2.5.0.args |    32 -
>  tests/qemuxml2argvdata/smbios.args            |     2 +-
>  tests/qemuxml2argvdata/sound-device.args      |    14 +-
>  tests/qemuxml2argvdata/sound.args             |     4 +-
>  .../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  |    26 +-
>  .../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 +-
>  .../usb-redir-unix.x86_64-2.5.0.args          |    36 -
>  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      |     2 +-
>  .../qemuxml2argvdata/video-qxl-nodevice.args  |    32 -
>  tests/qemuxml2argvdata/video-qxl-nodevice.xml |    29 -
>  .../qemuxml2argvdata/video-vga-nodevice.args  |    30 -
>  tests/qemuxml2argvdata/video-vga-nodevice.xml |    29 -
>  .../qemuxml2argvdata/video-vga-qxl-heads.args |     5 +-
>  .../virtio-input-passthrough.args             |     4 +-
>  tests/qemuxml2argvdata/virtio-input.args      |     6 +-
>  tests/qemuxml2argvdata/virtio-lun.args        |     4 +-
>  .../qemuxml2argvdata/virtio-rng-default.args  |     2 +-
>  .../virtio-rng-egd-unix.x86_64-2.5.0.args     |    32 -
>  tests/qemuxml2argvdata/virtio-rng-egd.args    |     4 +-
>  .../qemuxml2argvdata/virtio-rng-multiple.args |     4 +-
>  tests/qemuxml2argvdata/virtio-rng-random.args |     4 +-
>  tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
>  tests/qemuxml2argvdata/watchdog-device.args   |     2 +-
>  tests/qemuxml2argvdata/watchdog-dump.args     |     2 +-
>  .../qemuxml2argvdata/watchdog-injectnmi.args  |     2 +-
>  tests/qemuxml2argvtest.c                      |   155 +-
>  tests/qemuxml2xmloutdata/autoindex.xml        |     4 +-
>  .../balloon-device-auto.xml                   |     2 +-
>  .../bios-nvram-os-interleave.xml              |     2 +-
>  tests/qemuxml2xmloutdata/bios-nvram.xml       |     2 +-
>  tests/qemuxml2xmloutdata/blkiotune-device.xml |     2 +-
>  tests/qemuxml2xmloutdata/blkiotune.xml        |     2 +-
>  .../boot-menu-disable-with-timeout.xml        |     2 +-
>  .../qemuxml2xmloutdata/boot-menu-disable.xml  |     2 +-
>  .../boot-menu-enable-with-timeout.xml         |     2 +-
>  tests/qemuxml2xmloutdata/boot-multi.xml       |     2 +-
>  tests/qemuxml2xmloutdata/boot-order.xml       |     6 +-
>  tests/qemuxml2xmloutdata/channel-guestfwd.xml |     2 +-
>  .../channel-unix-source-path-active.xml       |     2 +-
>  .../channel-unix-source-path-inactive.xml     |     2 +-
>  .../channel-virtio-auto.xml                   |     6 +-
>  .../channel-virtio-state-active.xml           |     2 +-
>  .../channel-virtio-state-inactive.xml         |     2 +-
>  tests/qemuxml2xmloutdata/channel-virtio.xml   |     2 +-
>  tests/qemuxml2xmloutdata/chardev-label.xml    |     4 +-
>  tests/qemuxml2xmloutdata/clock-catchup.xml    |     2 +-
>  .../clock-timer-hyperv-rtc.xml                |     2 +-
>  .../console-compat-auto.xml                   |     2 +-
>  tests/qemuxml2xmloutdata/console-compat2.xml  |     2 +-
>  .../console-virtio-many.xml                   |     4 +-
>  tests/qemuxml2xmloutdata/console-virtio.xml   |     4 +-
>  .../controller-usb-order.xml                  |     2 +-
>  .../controller-virtio-scsi.xml                |    12 +-
>  .../cpu-check-default-none.xml                |     2 +-
>  .../cpu-check-default-none2.xml               |     2 +-
>  .../cpu-check-default-partial.xml             |     2 +-
>  .../cpu-check-default-partial2.xml            |     2 +-
>  tests/qemuxml2xmloutdata/cpu-check-full.xml   |     2 +-
>  tests/qemuxml2xmloutdata/cpu-check-none.xml   |     2 +-
>  .../qemuxml2xmloutdata/cpu-check-partial.xml  |     2 +-
>  tests/qemuxml2xmloutdata/cpu-empty.xml        |     2 +-
>  tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |     2 +-
>  tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |     2 +-
>  .../qemuxml2xmloutdata/cpu-host-kvmclock.xml  |     2 +-
>  .../cpu-host-model-features.xml               |     2 +-
>  .../cpu-host-model-vendor.xml                 |     2 +-
>  .../cpu-host-passthrough-features.xml         |     2 +-
>  tests/qemuxml2xmloutdata/cpu-kvmclock.xml     |     2 +-
>  .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |     2 +-
>  .../cpu-numa-disordered.xml                   |     2 +-
>  .../qemuxml2xmloutdata/cpu-numa-memshared.xml |     2 +-
>  .../cpu-numa-no-memory-element.xml            |     2 +-
>  tests/qemuxml2xmloutdata/cpu-numa1.xml        |     2 +-
>  tests/qemuxml2xmloutdata/cpu-numa2.xml        |     2 +-
>  .../qemuxml2xmloutdata/cputune-iothreads.xml  |     2 +-
>  .../cputune-iothreadsched-zeropriority.xml    |     2 +-
>  .../cputune-iothreadsched.xml                 |     2 +-
>  .../cputune-zero-shares.xml                   |     2 +-
>  tests/qemuxml2xmloutdata/cputune.xml          |     2 +-
>  .../default-kvm-host-arch.xml                 |     2 +-
>  .../default-qemu-host-arch.xml                |     2 +-
>  .../disk-active-commit-active.xml             |     2 +-
>  .../disk-active-commit-inactive.xml           |     2 +-
>  tests/qemuxml2xmloutdata/disk-aio.xml         |     2 +-
>  .../disk-backing-chains-active.xml            |    12 +-
>  .../disk-backing-chains-inactive.xml          |    12 +-
>  .../disk-backing-chains-index-active.xml      |    14 +-
>  .../disk-backing-chains-index-inactive.xml    |    14 +-
>  .../disk-backing-chains-noindex.xml           |    14 +-
>  .../disk-cache.x86_64-1.5.3.xml               |    61 -
>  .../disk-cache.x86_64-2.6.0.xml               |    61 -
>  .../disk-cache.x86_64-2.7.0.xml               |    61 -
>  .../qemuxml2xmloutdata/disk-copy_on_read.xml  |     4 +-
>  .../qemuxml2xmloutdata/disk-mirror-active.xml |     8 +-
>  .../disk-mirror-inactive.xml                  |     8 +-
>  .../disk-mirror-old-active.xml                |     6 +-
>  .../disk-mirror-old-inactive.xml              |     6 +-
>  .../disk-network-gluster.xml                  |     6 +-
>  .../qemuxml2xmloutdata/disk-network-iscsi.xml |    10 +-
>  tests/qemuxml2xmloutdata/disk-network-nbd.xml |    10 +-
>  tests/qemuxml2xmloutdata/disk-network-rbd.xml |    12 +-
>  .../disk-network-sheepdog.xml                 |     2 +-
>  .../disk-network-source-auth.xml              |     6 +-
>  .../disk-scsi-device-auto.xml                 |     4 +-
>  .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml |     6 +-
>  .../disk-scsi-lun-passthrough-sgio.xml        |     6 +-
>  tests/qemuxml2xmloutdata/disk-serial.xml      |     2 +-
>  .../disk-source-pool-mode.xml                 |     2 +-
>  tests/qemuxml2xmloutdata/disk-source-pool.xml |     4 +-
>  tests/qemuxml2xmloutdata/disk-usb-device.xml  |     2 +-
>  tests/qemuxml2xmloutdata/disk-virtio.xml      |     4 +-
>  tests/qemuxml2xmloutdata/encrypted-disk.xml   |     2 +-
>  tests/qemuxml2xmloutdata/eoi-disabled.xml     |     2 +-
>  tests/qemuxml2xmloutdata/eoi-enabled.xml      |     2 +-
>  tests/qemuxml2xmloutdata/event_idx.xml        |     4 +-
>  tests/qemuxml2xmloutdata/floppy-drive-fat.xml |     2 +-
>  .../hostdev-mdev-precreated.xml               |     2 +-
>  .../hostdev-pci-address-unassigned.xml        |     8 +-
>  .../hostdev-pci-address.xml                   |     2 +-
>  .../hostdev-pci-multifunction.xml             |    16 +-
>  .../hostdev-scsi-autogen-address.xml          |     6 +-
>  .../hostdev-scsi-large-unit.xml               |     4 +-
>  tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml |     4 +-
>  .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml |     4 +-
>  .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml  |     4 +-
>  .../hostdev-scsi-shareable.xml                |     4 +-
>  .../hostdev-scsi-vhost-scsi-pci.xml           |     2 +-
>  .../hostdev-scsi-vhost-scsi-pcie.xml          |     8 +-
>  .../hostdev-scsi-virtio-scsi.xml              |     4 +-
>  tests/qemuxml2xmloutdata/hostdev-vfio.xml     |     4 +-
>  .../qemuxml2xmloutdata/hugepages-default.xml  |     2 +-
>  tests/qemuxml2xmloutdata/hugepages-shared.xml |     2 +-
>  tests/qemuxml2xmloutdata/hyperv-off.xml       |     2 +-
>  .../intel-iommu.x86_64-2.6.0.xml              |    31 -
>  tests/qemuxml2xmloutdata/interface-driver.xml |     4 +-
>  tests/qemuxml2xmloutdata/iothreads-disk.xml   |     2 +-
>  tests/qemuxml2xmloutdata/kvm-features-off.xml |     2 +-
>  tests/qemuxml2xmloutdata/lease.xml            |     2 +-
>  .../qemuxml2xmloutdata/luks-disks-source.xml  |     6 +-
>  .../memory-hotplug-dimm.xml                   |     2 +-
>  tests/qemuxml2xmloutdata/memory-hotplug.xml   |     2 +-
>  .../qemuxml2xmloutdata/memorybacking-set.xml  |     2 +-
>  .../memorybacking-unset.xml                   |     2 +-
>  .../qemuxml2xmloutdata/memtune-unlimited.xml  |     2 +-
>  tests/qemuxml2xmloutdata/memtune.xml          |     2 +-
>  .../qemuxml2xmloutdata/metadata-duplicate.xml |     2 +-
>  tests/qemuxml2xmloutdata/metadata.xml         |     2 +-
>  tests/qemuxml2xmloutdata/minimal.xml          |     2 +-
>  tests/qemuxml2xmloutdata/net-coalesce.xml     |     8 +-
>  tests/qemuxml2xmloutdata/net-eth-hostip.xml   |     2 +-
>  tests/qemuxml2xmloutdata/net-eth-ifname.xml   |     2 +-
>  .../net-eth-unmanaged-tap.xml                 |     2 +-
>  tests/qemuxml2xmloutdata/net-eth.xml          |     2 +-
>  .../net-hostdev-bootorder.xml                 |     2 +-
>  tests/qemuxml2xmloutdata/net-hostdev-vfio.xml |     4 +-
>  tests/qemuxml2xmloutdata/net-hostdev.xml      |     4 +-
>  tests/qemuxml2xmloutdata/net-many-models.xml  |    12 +-
>  tests/qemuxml2xmloutdata/net-midonet.xml      |     4 +-
>  tests/qemuxml2xmloutdata/net-mtu.xml          |     6 +-
>  tests/qemuxml2xmloutdata/net-openvswitch.xml  |     4 +-
>  tests/qemuxml2xmloutdata/net-udp.xml          |     4 +-
>  tests/qemuxml2xmloutdata/net-user.xml         |     2 +-
>  tests/qemuxml2xmloutdata/net-vdpa.xml         |     2 +-
>  tests/qemuxml2xmloutdata/net-vhostuser.xml    |     6 +-
>  .../qemuxml2xmloutdata/net-virtio-device.xml  |     4 +-
>  .../net-virtio-disable-offloads.xml           |     4 +-
>  .../net-virtio-network-portgroup.xml          |     8 +-
>  .../net-virtio-rxtxqueuesize.xml              |     4 +-
>  .../net-virtio-teaming-network.xml            |     6 +-
>  .../qemuxml2xmloutdata/net-virtio-teaming.xml |    10 +-
>  tests/qemuxml2xmloutdata/net-virtio.xml       |     2 +-
>  .../numad-auto-memory-vcpu-cpuset.xml         |     2 +-
>  ...to-memory-vcpu-no-cpuset-and-placement.xml |     2 +-
>  .../numad-auto-vcpu-no-numatune.xml           |     2 +-
>  .../numad-static-vcpu-no-numatune.xml         |     2 +-
>  .../numatune-auto-prefer.xml                  |     2 +-
>  .../qemuxml2xmloutdata/numatune-distances.xml |     2 +-
>  .../numatune-memnode-no-memory.xml            |     2 +-
>  tests/qemuxml2xmloutdata/numatune-memnode.xml |     2 +-
>  tests/qemuxml2xmloutdata/panic-isa.xml        |     2 +-
>  tests/qemuxml2xmloutdata/panic-no-address.xml |     2 +-
>  tests/qemuxml2xmloutdata/panic.xml            |     2 +-
>  .../pci-bridge-many-disks.xml                 |   216 +-
>  tests/qemuxml2xmloutdata/pci-expander-bus.xml |    68 +-
>  .../pci-rom-disabled-invalid.xml              |     2 +-
>  tests/qemuxml2xmloutdata/pci-rom-disabled.xml |     2 +-
>  tests/qemuxml2xmloutdata/pci-rom.xml          |    10 +-
>  .../pci-serial-dev-chardev.xml                |     2 +-
>  .../pcie-root-port-model-generic.xml          |    12 +-
>  .../pcie-root-port-model-ioh3420.xml          |     8 +-
>  tests/qemuxml2xmloutdata/pcihole64-gib.xml    |     2 +-
>  tests/qemuxml2xmloutdata/pcihole64-none.xml   |     2 +-
>  tests/qemuxml2xmloutdata/pcihole64.xml        |     2 +-
>  .../pv-spinlock-disabled.xml                  |     2 +-
>  .../pv-spinlock-enabled.xml                   |     2 +-
>  .../q35-pci-force-address.xml                 |     4 +-
>  .../qemuxml2xmloutdata/seclabel-dac-none.xml  |     2 +-
>  .../seclabel-device-multiple.xml              |     2 +-
>  .../seclabel-dynamic-baselabel-inactive.xml   |     2 +-
>  .../seclabel-dynamic-labelskip-inactive.xml   |     2 +-
>  .../seclabel-dynamic-none.xml                 |     2 +-
>  .../seclabel-dynamic-override-inactive.xml    |     2 +-
>  .../seclabel-dynamic-relabel-inactive.xml     |     2 +-
>  tests/qemuxml2xmloutdata/seclabel-none.xml    |     2 +-
>  .../seclabel-static-labelskip-active.xml      |     2 +-
>  .../seclabel-static-labelskip-inactive.xml    |     2 +-
>  tests/qemuxml2xmloutdata/seclabel-static.xml  |     2 +-
>  .../serial-spiceport-nospice.xml              |     2 +-
>  .../serial-target-port-auto.xml               |     2 +-
>  .../serial-tcp-tlsx509-chardev.xml            |     2 +-
>  .../shmem-plain-doorbell.xml                  |    14 +-
>  tests/qemuxml2xmloutdata/shmem.xml            |    14 +-
>  .../smartcard-controller.xml                  |     2 +-
>  .../smartcard-host-certificates-database.xml  |     2 +-
>  .../smartcard-host-certificates.xml           |     2 +-
>  tests/qemuxml2xmloutdata/smartcard-host.xml   |     2 +-
>  .../smartcard-passthrough-spicevmc.xml        |     2 +-
>  .../smartcard-passthrough-tcp.xml             |     2 +-
>  .../smbios-multiple-type2.xml                 |     2 +-
>  tests/qemuxml2xmloutdata/smbios.xml           |     2 +-
>  tests/qemuxml2xmloutdata/sound-device.xml     |    14 +-
>  tests/qemuxml2xmloutdata/sound.xml            |     4 +-
>  .../tap-vhost-incorrect.xml                   |     6 +-
>  tests/qemuxml2xmloutdata/tap-vhost.xml        |     4 +-
>  .../qemuxml2xmloutdata/tseg-explicit-size.xml |     4 +-
>  tests/qemuxml2xmloutdata/usb-controller.xml   |     2 +-
>  .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml |    26 +-
>  tests/qemuxml2xmloutdata/usb-none.xml         |     2 +-
>  .../usb-piix3-controller.xml                  |     2 +-
>  tests/qemuxml2xmloutdata/usb-port-missing.xml |     2 +-
>  .../usb-redir-filter-version.xml              |     2 +-
>  tests/qemuxml2xmloutdata/usb-redir-filter.xml |     2 +-
>  tests/qemuxml2xmloutdata/usb-redir.xml        |     2 +-
>  tests/qemuxml2xmloutdata/vhost-vsock-auto.xml |     2 +-
>  tests/qemuxml2xmloutdata/vhost_queues.xml     |     4 +-
>  .../virtio-input-passthrough.xml              |     4 +-
>  tests/qemuxml2xmloutdata/virtio-input.xml     |     6 +-
>  tests/qemuxml2xmloutdata/virtio-lun.xml       |     4 +-
>  tests/qemuxml2xmloutdata/virtio-rng-egd.xml   |     4 +-
>  .../qemuxml2xmloutdata/virtio-rng-random.xml  |     4 +-
>  tests/qemuxml2xmloutdata/vmcoreinfo.xml       |     2 +-
>  tests/qemuxml2xmltest.c                       |    72 +-
>  tests/testutilsqemu.c                         |     2 +-
>  739 files changed, 588789 insertions(+), 853995 deletions(-)
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
>  delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
>  delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
>  delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
>  delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
>  delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
>  delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
>  delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
>  delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
>  delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
>  delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
>  delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
>  delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
>  delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
>  delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
>  delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
>  delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
>  delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
>  delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
>
> --
> 2.30.2
>

LGTM.

Reviewed-by: Neal Gompa <ngompa13@gmail.com>


-- 
真実はいつも一つ!/ Always, there's only one truth!