From 54257ed51b5132032cedb7e1e7b8c34b9ae52115 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 4 Sep 2023 14:15:35 +0200
Subject: [PATCH] qemuxml2argvtest: Modernize rest of the test cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The rest of the test cases has no change in the output now that we've
assumed some flags.

Remove the fake-caps test macros after conversion.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 ...fx-ide-address-conflict.x86_64-latest.err} |   0
 ...err => 440fx-wrong-root.x86_64-latest.err} |   0
 ...ble.args => acpi-table.x86_64-latest.args} |   0
 ...ndex.args => autoindex.x86_64-latest.args} |   0
 ...=> balloon-device-auto.x86_64-latest.args} |   0
 ...oon-device-deflate-off.x86_64-latest.args} |   0
 ...balloon-device-deflate.x86_64-latest.args} |   0
 ... balloon-device-period.x86_64-latest.args} |   0
 ...args => balloon-device.x86_64-latest.args} |   0
 ...gs => blkiotune-device.x86_64-latest.args} |   0
 ...tune.args => blkiotune.x86_64-latest.args} |   0
 ...gs => channel-guestfwd.x86_64-latest.args} |   0
 ...gs => channel-spicevmc.x86_64-latest.args} |   0
 ...=> channel-virtio-auto.x86_64-latest.args} |   0
 ...channel-virtio-autoadd.x86_64-latest.args} |   0
 ...nnel-virtio-autoassign.x86_64-latest.args} |   0
 ...channel-virtio-default.x86_64-latest.args} |   0
 ...> channel-virtio-state.x86_64-latest.args} |   0
 ...=> channel-virtio-unix.x86_64-latest.args} |   0
 ...args => channel-virtio.x86_64-latest.args} |   0
 ...econnect-generated-path.x86_64-latest.err} |   0
 ...connect-invalid-timeout.x86_64-latest.err} |   0
 ...s => chardev-reconnect.x86_64-latest.args} |   0
 ....args => clock-catchup.x86_64-latest.args} |   0
 ...e.args => clock-france.x86_64-latest.args} |   0
 ...altime-basis-localtime.x86_64-latest.args} |   0
 ...rgs => clock-localtime.x86_64-latest.args} |   0
 ...clock-timer-hyperv-rtc.x86_64-latest.args} |   0
 ...-utc.args => clock-utc.x86_64-latest.args} |   0
 ...args => clock-variable.x86_64-latest.args} |   0
 ...=> console-virtio-many.x86_64-latest.args} |   0
 ...args => console-virtio.x86_64-latest.args} |   0
 ...gs => controller-order.x86_64-latest.args} |   0
 ...s => cpu-cache-disable.x86_64-latest.args} |   0
 ...=> cpu-cache-emulate-l2.x86_64-latest.err} |   0
 ...> cpu-cache-emulate-l3.x86_64-latest.args} |   0
 ...pu-cache-passthrough-l3.x86_64-latest.err} |   0
 ... cpu-cache-passthrough.x86_64-latest.args} |   0
 ... cpu-cache-passthrough3.x86_64-latest.err} |   0
 ...cpu-check-default-none.x86_64-latest.args} |   0
 ...pu-check-default-none2.x86_64-latest.args} |   0
 ...check-default-partial2.x86_64-latest.args} |   0
 tests/qemuxml2argvdata/cpu-check-full.args    |   1 -
 .../cpu-check-full.x86_64-latest.args         |   1 +
 ...args => cpu-check-none.x86_64-latest.args} |   0
 tests/qemuxml2argvdata/cpu-check-partial.args |   1 -
 .../cpu-check-partial.x86_64-latest.args      |   1 +
 ...s => cpu-host-kvmclock.x86_64-latest.args} |   0
 ...t-passthrough-features.x86_64-latest.args} |   0
 ...> cpu-host-passthrough.x86_64-latest.args} |   0
 ...k.args => cpu-kvmclock.x86_64-latest.args} |   0
 ...s => cpu-numa-disjoint.x86_64-latest.args} |   0
 ... => cpu-numa-memshared.x86_64-latest.args} |   0
 ...numa-no-memory-element.x86_64-latest.args} |   0
 ...uma1.args => cpu-numa1.x86_64-latest.args} |   0
 ...uma2.args => cpu-numa2.x86_64-latest.args} |   0
 ...-numa3.err => cpu-numa3.x86_64-latest.err} |   0
 ... cpu-phys-bits-emulate.x86_64-latest.args} |   0
 ...-phys-bits-passthrough.x86_64-latest.args} |   0
 ...-phys-bits-passthrough2.x86_64-latest.err} |   0
 ...u-qemu-host-passthrough.x86_64-latest.err} |   0
 ... default-kvm-host-arch.x86_64-latest.args} |   0
 ...default-qemu-host-arch.x86_64-latest.args} |   0
 ...raphics-sdl-fullscreen.x86_64-latest.args} |   0
 ...l.args => graphics-sdl.x86_64-latest.args} |   0
 ...isplay-missing-graphics.x86_64-latest.err} |   0
 ... hostdev-mdev-duplicate.x86_64-latest.err} |   0
 ...-invalid-target-address.x86_64-latest.err} |   0
 ...ostdev-mdev-precreated.x86_64-latest.args} |   0
 ...dev-src-address-invalid.x86_64-latest.err} |   0
 ...pci-address-unassigned.x86_64-latest.args} |   0
 ...> hostdev-pci-duplicate.x86_64-latest.err} |   0
 ...tdev-pci-multifunction.x86_64-latest.args} |   0
 ... hostdev-scsi-duplicate.x86_64-latest.err} |   0
 ...ev-scsi-vhost-scsi-pci.x86_64-latest.args} |   0
 ...> hostdev-usb-duplicate.x86_64-latest.err} |   0
 ...stdev-vfio-multidomain.x86_64-latest.args} |   0
 ...ev-vfio-zpci-wrong-arch.x86_64-latest.err} |   0
 ...o.args => hostdev-vfio.x86_64-latest.args} |   0
 ...e.args => hotplug-base.x86_64-latest.args} |   0
 ...=> input-usbmouse-addr.x86_64-latest.args} |   0
 ...args => input-usbmouse.x86_64-latest.args} |   0
 ...rgs => input-usbtablet.x86_64-latest.args} |   0
 ....args => kvm-pit-delay.x86_64-latest.args} |   0
 ...rgs => kvm-pit-discard.x86_64-latest.args} |   0
 ...clock.args => kvmclock.x86_64-latest.args} |   0
 ...gs => machine-aliases1.x86_64-latest.args} |   0
 ...gs => machine-aliases2.x86_64-latest.args} |   0
 ...gs => machine-core-off.x86_64-latest.args} |   0
 ...rgs => machine-core-on.x86_64-latest.args} |   0
 ...dparm-s390-char-invalid.x86_64-latest.err} |   0
 ...adparm-s390-len-invalid.x86_64-latest.err} |   0
 ... => machine-vmport-opt.x86_64-latest.args} |   0
 ...rr => memory-align-fail.x86_64-latest.err} |   0
 ...=> memory-hotplug-dimm.x86_64-latest.args} |   0
 ...plug-invalid-targetnode.x86_64-latest.err} |   0
 ...> memory-hotplug-nonuma.x86_64-latest.err} |   0
 ...args => memory-hotplug.x86_64-latest.args} |   0
 ...s => memtune-unlimited.x86_64-latest.args} |   0
 ...emtune.args => memtune.x86_64-latest.args} |   0
 ...rr => minimal-no-memory.x86_64-latest.err} |   0
 ...inimal.args => minimal.x86_64-latest.args} |   0
 ...acpi.args => misc-acpi.x86_64-latest.args} |   0
 ...rgs => misc-disable-s3.x86_64-latest.args} |   0
 ... misc-disable-suspends.x86_64-latest.args} |   0
 ...args => misc-enable-s4.x86_64-latest.args} |   0
 ...uuid.args => misc-uuid.x86_64-latest.args} |   0
 ...ltifunction-pci-device.x86_64-latest.args} |   0
 ...s.args => nosharepages.x86_64-latest.args} |   0
 ...uto-memory-vcpu-cpuset.x86_64-latest.args} |   0
 ...o-cpuset-and-placement.x86_64-latest.args} |   0
 ...tic-numatune-no-nodeset.x86_64-latest.err} |   0
 ...o-vcpu-static-numatune.x86_64-latest.args} |   0
 ...tatic-memory-auto-vcpu.x86_64-latest.args} |   0
 .../{numad.args => numad.x86_64-latest.args}  |   0
 ...gs => pci-autoadd-addr.x86_64-latest.args} |   0
 ...rgs => pci-autoadd-idx.x86_64-latest.args} |   0
 ...s => pci-autofill-addr.x86_64-latest.args} |   0
 ...-bridge-duplicate-index.x86_64-latest.err} |   0
 ... pci-bridge-many-disks.x86_64-latest.args} |   0
 ...-negative-index-invalid.x86_64-latest.err} |   0
 ...dge.args => pci-bridge.x86_64-latest.args} |   0
 ....err => pci-bus-invalid.x86_64-latest.err} |   0
 ...r => pci-domain-invalid.x86_64-latest.err} |   0
 ...ci-expander-bus-bad-bus.x86_64-latest.err} |   0
 ...xpander-bus-bad-machine.x86_64-latest.err} |   0
 ...i-expander-bus-bad-node.x86_64-latest.err} |   0
 ...gs => pci-expander-bus.x86_64-latest.args} |   0
 ...=> pci-function-invalid.x86_64-latest.err} |   0
 ...-many.args => pci-many.x86_64-latest.args} |   0
 .../pci-rom-disabled-invalid.args             |   1 -
 ...ci-rom-disabled-invalid.x86_64-latest.args |   1 +
 ...gs => pci-rom-disabled.x86_64-latest.args} |   0
 ...ci-rom.args => pci-rom.x86_64-latest.args} |   0
 ...err => pci-root-address.x86_64-latest.err} |   0
 ... pci-root-nonzero-index.x86_64-latest.err} |   0
 ...err => pci-slot-invalid.x86_64-latest.err} |   0
 ...ie-expander-bus-bad-bus.x86_64-latest.err} |   0
 ...xpander-bus-bad-machine.x86_64-latest.err} |   0
 ...s => pcie-expander-bus.x86_64-latest.args} |   0
 ...oot-port-model-generic.x86_64-latest.args} |   0
 ...oot-port-model-ioh3420.x86_64-latest.args} |   0
 ...pcie-root-port-too-many.x86_64-latest.err} |   0
 ...args => pcie-root-port.x86_64-latest.args} |   0
 ...root.args => pcie-root.x86_64-latest.args} |   0
 ...switch-downstream-port.x86_64-latest.args} |   0
 ...e-switch-upstream-port.x86_64-latest.args} |   0
 ....args => pcihole64-q35.x86_64-latest.args} |   0
 ...le64.args => pcihole64.x86_64-latest.args} |   0
 ...rgs => pmu-feature-off.x86_64-latest.args} |   0
 ...re.args => pmu-feature.x86_64-latest.args} |   0
 ...eatures-invalid-machine.x86_64-latest.err} |   0
 ...-serial-invalid-machine.x86_64-latest.err} |   0
 ...=> q35-dmi-bad-address1.x86_64-latest.err} |   0
 ...=> q35-dmi-bad-address2.x86_64-latest.err} |   0
 ... q35-pci-force-address.x86_64-latest.args} |   0
 ...args => q35-usb2-multi.x86_64-latest.args} |   0
 ...gs => q35-usb2-reorder.x86_64-latest.args} |   0
 ...-usb2.args => q35-usb2.x86_64-latest.args} |   0
 ...t.err => q35-wrong-root.x86_64-latest.err} |   0
 .../{q35.args => q35.x86_64-latest.args}      |   0
 ...lt.args => qemu-ns-alt.x86_64-latest.args} |   0
 ...emu-ns-commandline-ns0.x86_64-latest.args} |   0
 ...emu-ns-commandline-ns1.x86_64-latest.args} |   0
 ...=> qemu-ns-commandline.x86_64-latest.args} |   0
 ...domain-commandline-ns0.x86_64-latest.args} |   0
 ...-ns-domain-commandline.x86_64-latest.args} |   0
 ... => qemu-ns-domain-ns0.x86_64-latest.args} |   0
 ...args => qemu-ns-no-env.x86_64-latest.args} |   0
 ...eboot-timeout-disabled.x86_64-latest.args} |   0
 ...reboot-timeout-enabled.x86_64-latest.args} |   0
 ...s => seclabel-dac-none.x86_64-latest.args} |   0
 ...label-device-duplicates.x86_64-latest.err} |   0
 ...-device-relabel-invalid.x86_64-latest.err} |   0
 ...abel-dynamic-baselabel.x86_64-latest.args} |   0
 ...abel-dynamic-labelskip.x86_64-latest.args} |   0
 ...label-dynamic-override.x86_64-latest.args} |   0
 ...clabel-dynamic-relabel.x86_64-latest.args} |   0
 ...gs => seclabel-dynamic.x86_64-latest.args} |   0
 ...rr => seclabel-multiple.x86_64-latest.err} |   0
 ....args => seclabel-none.x86_64-latest.args} |   0
 ...label-static-labelskip.x86_64-latest.args} |   0
 ...eclabel-static-relabel.x86_64-latest.args} |   0
 ...rgs => seclabel-static.x86_64-latest.args} |   0
 ...> smartcard-controller.x86_64-latest.args} |   0
 ...-certificates-database.x86_64-latest.args} |   0
 ...card-host-certificates.x86_64-latest.args} |   0
 ...args => smartcard-host.x86_64-latest.args} |   0
 ...d-passthrough-spicevmc.x86_64-latest.args} |   0
 ...rtcard-passthrough-tcp.x86_64-latest.args} |   0
 ...date.err => smbios-date.x86_64-latest.err} |   0
 ...rr => smbios-uuid-match.x86_64-latest.err} |   0
 ...{smbios.args => smbios.x86_64-latest.args} |   0
 ... tpm-no-backend-invalid.x86_64-latest.err} |   0
 ....err => usb-bus-missing.x86_64-latest.err} |   0
 ...roller-ich9-autoassign.x86_64-latest.args} |   0
 ...troller-ich9-companion.x86_64-latest.args} |   0
 ...troller-ich9-ehci-addr.x86_64-latest.args} |   0
 ...oller-ich9-no-companion.x86_64-latest.err} |   0
 ...> usb-controller-piix3.x86_64-latest.args} |   0
 ...usb-hub-autoadd-deluxe.x86_64-latest.args} |   0
 ...rgs => usb-hub-autoadd.x86_64-latest.args} |   0
 ...err => usb-hub-conflict.x86_64-latest.err} |   0
 ... => usb-hub-nonexistent.x86_64-latest.err} |   0
 ...sb-hub.args => usb-hub.x86_64-latest.args} |   0
 ... => usb-long-port-path.x86_64-latest.args} |   0
 ...hub.err => usb-none-hub.x86_64-latest.err} |   0
 ...r.err => usb-none-other.x86_64-latest.err} |   0
 ...r => usb-none-usbtablet.x86_64-latest.err} |   0
 ...-none.args => usb-none.x86_64-latest.args} |   0
 ...=> usb-port-autoassign.x86_64-latest.args} |   0
 ...gs => usb-port-missing.x86_64-latest.args} |   0
 ... usb-ports-out-of-range.x86_64-latest.err} |   0
 ...orts.args => usb-ports.x86_64-latest.args} |   0
 ...args => usb-redir-boot.x86_64-latest.args} |   0
 ...b-redir-filter-version.x86_64-latest.args} |   0
 ...gs => usb-redir-filter.x86_64-latest.args} |   0
 ...edir.args => usb-redir.x86_64-latest.args} |   0
 ...-long-port-path-invalid.x86_64-latest.err} |   0
 ...usb2.args => usb1-usb2.x86_64-latest.args} |   0
 ...=> vhost_queues-invalid.x86_64-latest.err} |   0
 ...rtio-input-passthrough.x86_64-latest.args} |   0
 ...t.args => virtio-input.x86_64-latest.args} |   0
 ... => virtio-rng-default.x86_64-latest.args} |   0
 ...=> virtio-rng-egd-crash.x86_64-latest.err} |   0
 ...args => virtio-rng-egd.x86_64-latest.args} |   0
 ...=> virtio-rng-multiple.x86_64-latest.args} |   0
 ...s => virtio-rng-random.x86_64-latest.args} |   0
 ...nfo.args => vmcoreinfo.x86_64-latest.args} |   0
 tests/qemuxml2argvtest.c                      | 715 ++++++------------
 230 files changed, 233 insertions(+), 488 deletions(-)
 rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err => 440fx-ide-address-conflict.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{440fx-wrong-root.err => 440fx-wrong-root.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{acpi-table.args => acpi-table.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{autoindex.args => autoindex.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{balloon-device-auto.args => balloon-device-auto.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args => balloon-device-deflate-off.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{balloon-device-deflate.args => balloon-device-deflate.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{balloon-device-period.args => balloon-device-period.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{balloon-device.args => balloon-device.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{blkiotune-device.args => blkiotune-device.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{blkiotune.args => blkiotune.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-guestfwd.args => channel-guestfwd.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-spicevmc.args => channel-spicevmc.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-auto.args => channel-virtio-auto.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-autoadd.args => channel-virtio-autoadd.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-autoassign.args => channel-virtio-autoassign.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-default.args => channel-virtio-default.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-state.args => channel-virtio-state.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio-unix.args => channel-virtio-unix.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{channel-virtio.args => channel-virtio.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{chardev-reconnect-generated-path.err => chardev-reconnect-generated-path.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{chardev-reconnect-invalid-timeout.err => chardev-reconnect-invalid-timeout.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{chardev-reconnect.args => chardev-reconnect.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-france.args => clock-france.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-localtime.args => clock-localtime.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-utc.args => clock-utc.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{clock-variable.args => clock-variable.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{console-virtio-many.args => console-virtio-many.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{console-virtio.args => console-virtio.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{controller-order.args => controller-order.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-disable.args => cpu-cache-disable.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err => cpu-cache-emulate-l2.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args => cpu-cache-emulate-l3.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err => cpu-cache-passthrough-l3.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-passthrough.args => cpu-cache-passthrough.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err => cpu-cache-passthrough3.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-check-default-none.args => cpu-check-default-none.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-check-default-none2.args => cpu-check-default-none2.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args => cpu-check-default-partial2.x86_64-latest.args} (100%)
 delete mode 120000 tests/qemuxml2argvdata/cpu-check-full.args
 create mode 120000 tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-check-none.args => cpu-check-none.x86_64-latest.args} (100%)
 delete mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args
 create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-host-kvmclock.args => cpu-host-kvmclock.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args => cpu-host-passthrough-features.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-host-passthrough.args => cpu-host-passthrough.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa-disjoint.args => cpu-numa-disjoint.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa-memshared.args => cpu-numa-memshared.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa-no-memory-element.args => cpu-numa-no-memory-element.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa1.args => cpu-numa1.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa2.args => cpu-numa2.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-phys-bits-emulate.args => cpu-phys-bits-emulate.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough.args => cpu-phys-bits-passthrough.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough2.err => cpu-phys-bits-passthrough2.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-qemu-host-passthrough.err => cpu-qemu-host-passthrough.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{default-kvm-host-arch.args => default-kvm-host-arch.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{default-qemu-host-arch.args => default-qemu-host-arch.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-display-missing-graphics.err => hostdev-mdev-display-missing-graphics.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-duplicate.err => hostdev-mdev-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-invalid-target-address.err => hostdev-mdev-invalid-target-address.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-precreated.args => hostdev-mdev-precreated.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err => hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-pci-address-unassigned.args => hostdev-pci-address-unassigned.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err => hostdev-pci-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-pci-multifunction.args => hostdev-pci-multifunction.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err => hostdev-scsi-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args => hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err => hostdev-usb-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args => hostdev-vfio-multidomain.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err => hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-vfio.args => hostdev-vfio.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{input-usbmouse-addr.args => input-usbmouse-addr.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{input-usbmouse.args => input-usbmouse.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{input-usbtablet.args => input-usbtablet.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{kvm-pit-discard.args => kvm-pit-discard.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-aliases1.args => machine-aliases1.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-aliases2.args => machine-aliases2.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-core-off.args => machine-core-off.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-core-on.args => machine-core-on.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-loadparm-s390-char-invalid.err => machine-loadparm-s390-char-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{machine-loadparm-s390-len-invalid.err => machine-loadparm-s390-len-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{machine-vmport-opt.args => machine-vmport-opt.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{memory-align-fail.err => memory-align-fail.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args => memory-hotplug-dimm.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{memory-hotplug-invalid-targetnode.err => memory-hotplug-invalid-targetnode.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{memory-hotplug-nonuma.err => memory-hotplug-nonuma.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{memory-hotplug.args => memory-hotplug.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{memtune-unlimited.args => memtune-unlimited.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{memtune.args => memtune.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{minimal-no-memory.err => minimal-no-memory.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{minimal.args => minimal.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{misc-acpi.args => misc-acpi.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{misc-disable-s3.args => misc-disable-s3.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{misc-disable-suspends.args => misc-disable-suspends.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{misc-enable-s4.args => misc-enable-s4.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{misc-uuid.args => misc-uuid.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{multifunction-pci-device.args => multifunction-pci-device.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{numad-auto-memory-vcpu-cpuset.args => numad-auto-memory-vcpu-cpuset.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{numad-auto-memory-vcpu-no-cpuset-and-placement.args => numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err => numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune.args => numad-auto-vcpu-static-numatune.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{numad-static-memory-auto-vcpu.args => numad-static-memory-auto-vcpu.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{numad.args => numad.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-autoadd-addr.args => pci-autoadd-addr.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-autoadd-idx.args => pci-autoadd-idx.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-autofill-addr.args => pci-autofill-addr.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-bridge-duplicate-index.err => pci-bridge-duplicate-index.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-bridge-many-disks.args => pci-bridge-many-disks.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err => pci-bridge-negative-index-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-bridge.args => pci-bridge.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-bus-invalid.err => pci-bus-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-domain-invalid.err => pci-domain-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-expander-bus-bad-bus.err => pci-expander-bus-bad-bus.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-expander-bus-bad-machine.err => pci-expander-bus-bad-machine.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-expander-bus-bad-node.err => pci-expander-bus-bad-node.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-expander-bus.args => pci-expander-bus.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-function-invalid.err => pci-function-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-many.args => pci-many.x86_64-latest.args} (100%)
 delete mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
 create mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pci-rom-disabled.args => pci-rom-disabled.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-rom.args => pci-rom.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pci-root-address.err => pci-root-address.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-root-nonzero-index.err => pci-root-nonzero-index.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-slot-invalid.err => pci-slot-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-bus.err => pcie-expander-bus-bad-bus.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-machine.err => pcie-expander-bus-bad-machine.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pcie-expander-bus.args => pcie-expander-bus.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args => pcie-root-port-model-generic.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args => pcie-root-port-model-ioh3420.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-root-port-too-many.err => pcie-root-port-too-many.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pcie-root-port.args => pcie-root-port.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-switch-downstream-port.args => pcie-switch-downstream-port.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcie-switch-upstream-port.args => pcie-switch-upstream-port.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pmu-feature-off.args => pmu-feature-off.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{pseries-features-invalid-machine.err => pseries-features-invalid-machine.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pseries-serial-invalid-machine.err => pseries-serial-invalid-machine.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{q35-dmi-bad-address1.err => q35-dmi-bad-address1.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{q35-dmi-bad-address2.err => q35-dmi-bad-address2.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{q35-pci-force-address.args => q35-pci-force-address.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{q35-usb2-multi.args => q35-usb2-multi.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{q35-usb2-reorder.args => q35-usb2-reorder.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{q35-usb2.args => q35-usb2.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{q35.args => q35.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-alt.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-commandline-ns0.args => qemu-ns-commandline-ns0.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-commandline-ns1.args => qemu-ns-commandline-ns1.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-commandline.args => qemu-ns-commandline.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-domain-commandline-ns0.args => qemu-ns-domain-commandline-ns0.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-domain-commandline.args => qemu-ns-domain-commandline.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-domain-ns0.args => qemu-ns-domain-ns0.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-no-env.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args => reboot-timeout-disabled.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args => reboot-timeout-enabled.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dac-none.args => seclabel-dac-none.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-device-duplicates.err => seclabel-device-duplicates.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{seclabel-device-relabel-invalid.err => seclabel-device-relabel-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dynamic-baselabel.args => seclabel-dynamic-baselabel.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dynamic-labelskip.args => seclabel-dynamic-labelskip.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args => seclabel-dynamic-override.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dynamic-relabel.args => seclabel-dynamic-relabel.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-dynamic.args => seclabel-dynamic.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-multiple.err => seclabel-multiple.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{seclabel-none.args => seclabel-none.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-static-labelskip.args => seclabel-static-labelskip.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-static-relabel.args => seclabel-static-relabel.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{seclabel-static.args => seclabel-static.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-controller.args => smartcard-controller.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args => smartcard-host-certificates-database.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-host-certificates.args => smartcard-host-certificates.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-host.args => smartcard-host.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{smbios-date.err => smbios-date.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{smbios-uuid-match.err => smbios-uuid-match.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{smbios.args => smbios.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{tpm-no-backend-invalid.err => tpm-no-backend-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-bus-missing.err => usb-bus-missing.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-ich9-autoassign.args => usb-controller-ich9-autoassign.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-ich9-companion.args => usb-controller-ich9-companion.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-ich9-ehci-addr.args => usb-controller-ich9-ehci-addr.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-ich9-no-companion.err => usb-controller-ich9-no-companion.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-piix3.args => usb-controller-piix3.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-hub-autoadd-deluxe.args => usb-hub-autoadd-deluxe.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-hub-autoadd.args => usb-hub-autoadd.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-hub-conflict.err => usb-hub-conflict.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-hub-nonexistent.err => usb-hub-nonexistent.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-hub.args => usb-hub.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-long-port-path.args => usb-long-port-path.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-none-hub.err => usb-none-hub.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-none-other.err => usb-none-other.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-none-usbtablet.err => usb-none-usbtablet.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-none.args => usb-none.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-port-autoassign.args => usb-port-autoassign.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-port-missing.args => usb-port-missing.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err => usb-ports-out-of-range.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-ports.args => usb-ports.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-redir-boot.args => usb-redir-boot.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-redir-filter-version.args => usb-redir-filter-version.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-redir-filter.args => usb-redir-filter.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-redir.args => usb-redir.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err => usb-too-long-port-path-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb1-usb2.args => usb1-usb2.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{vhost_queues-invalid.err => vhost_queues-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{virtio-input-passthrough.args => virtio-input-passthrough.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{virtio-input.args => virtio-input.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{virtio-rng-default.args => virtio-rng-default.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{virtio-rng-egd-crash.err => virtio-rng-egd-crash.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{virtio-rng-egd.args => virtio-rng-egd.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{virtio-rng-multiple.args => virtio-rng-multiple.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{virtio-rng-random.args => virtio-rng-random.x86_64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{vmcoreinfo.args => vmcoreinfo.x86_64-latest.args} (100%)

diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.err b/tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/440fx-ide-address-conflict.err
rename to tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.err b/tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/440fx-wrong-root.err
rename to tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/acpi-table.args
rename to tests/qemuxml2argvdata/acpi-table.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/autoindex.args
rename to tests/qemuxml2argvdata/autoindex.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/balloon-device-auto.args
rename to tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/balloon-device-deflate-off.args
rename to tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/balloon-device-deflate.args
rename to tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/balloon-device-period.args
rename to tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/balloon-device.args
rename to tests/qemuxml2argvdata/balloon-device.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/blkiotune-device.args
rename to tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/blkiotune.args
rename to tests/qemuxml2argvdata/blkiotune.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-guestfwd.args
rename to tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-spicevmc.args
rename to tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-auto.args
rename to tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-autoadd.args
rename to tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-autoassign.args
rename to tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-default.args
rename to tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-state.args
rename to tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio-unix.args
rename to tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/channel-virtio.args
rename to tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.err b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/chardev-reconnect-generated-path.err
rename to tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.err b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.err
rename to tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/chardev-reconnect.args
rename to tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-catchup.args
rename to tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-france.args
rename to tests/qemuxml2argvdata/clock-france.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
rename to tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-localtime.args
rename to tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
rename to tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-utc.args
rename to tests/qemuxml2argvdata/clock-utc.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/clock-variable.args
rename to tests/qemuxml2argvdata/clock-variable.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/console-virtio-many.args
rename to tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/console-virtio.args
rename to tests/qemuxml2argvdata/console-virtio.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/controller-order.args
rename to tests/qemuxml2argvdata/controller-order.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-disable.args
rename to tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l2.err b/tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-emulate-l2.err
rename to tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
rename to tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.err b/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-passthrough-l3.err
rename to tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-passthrough.args
rename to tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough3.err b/tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-cache-passthrough3.err
rename to tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-check-default-none.args
rename to tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-check-default-none2.args
rename to tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-check-default-partial2.args
rename to tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args
deleted file mode 120000
index e280ccb23d..0000000000
--- a/tests/qemuxml2argvdata/cpu-check-full.args
+++ /dev/null
@@ -1 +0,0 @@
-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args
new file mode 120000
index 0000000000..b7577a2c43
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args
@@ -0,0 +1 @@
+cpu-check-none.x86_64-latest.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-check-none.args
rename to tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args
deleted file mode 120000
index e280ccb23d..0000000000
--- a/tests/qemuxml2argvdata/cpu-check-partial.args
+++ /dev/null
@@ -1 +0,0 @@
-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args
new file mode 120000
index 0000000000..b7577a2c43
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args
@@ -0,0 +1 @@
+cpu-check-none.x86_64-latest.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-host-kvmclock.args
rename to tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-host-passthrough-features.args
rename to tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-host-passthrough.args
rename to tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-kvmclock.args
rename to tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa-disjoint.args
rename to tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa-memshared.args
rename to tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
rename to tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa1.args
rename to tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa2.args
rename to tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-numa3.err b/tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-numa3.err
rename to tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
rename to tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
rename to tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err
rename to tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.err b/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-qemu-host-passthrough.err
rename to tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/default-kvm-host-arch.args
rename to tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/default-qemu-host-arch.args
rename to tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
rename to tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/graphics-sdl.args
rename to tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.err b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.err
rename to tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-mdev-duplicate.err
rename to tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.err b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.err
rename to tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-mdev-precreated.args
rename to tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.err b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.err
rename to tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
rename to tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.err b/tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-pci-duplicate.err
rename to tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-pci-multifunction.args
rename to tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-scsi-duplicate.err
rename to tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.err b/tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-usb-duplicate.err
rename to tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
rename to tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.err
rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hostdev-vfio.args
rename to tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/hotplug-base.args
rename to tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/input-usbmouse-addr.args
rename to tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/input-usbmouse.args
rename to tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/input-usbtablet.args
rename to tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/kvm-pit-delay.args
rename to tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/kvm-pit-discard.args
rename to tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/kvmclock.args
rename to tests/qemuxml2argvdata/kvmclock.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/machine-aliases1.args
rename to tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/machine-aliases2.args
rename to tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/machine-core-off.args
rename to tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/machine-core-on.args
rename to tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.err b/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.err
rename to tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err b/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err
rename to tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/machine-vmport-opt.args
rename to tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/memory-align-fail.err b/tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/memory-align-fail.err
rename to tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/memory-hotplug-dimm.args
rename to tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
rename to tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.err b/tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/memory-hotplug-nonuma.err
rename to tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/memory-hotplug.args
rename to tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/memtune-unlimited.args
rename to tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/memtune.args
rename to tests/qemuxml2argvdata/memtune.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/minimal-no-memory.err b/tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/minimal-no-memory.err
rename to tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/minimal.args
rename to tests/qemuxml2argvdata/minimal.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/misc-acpi.args
rename to tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/misc-disable-s3.args
rename to tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/misc-disable-suspends.args
rename to tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/misc-enable-s4.args
rename to tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/misc-uuid.args
rename to tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/multifunction-pci-device.args
rename to tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/nosharepages.args
rename to tests/qemuxml2argvdata/nosharepages.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.err b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.err
rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
rename to tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/numad.args
rename to tests/qemuxml2argvdata/numad.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-autoadd-addr.args
rename to tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-autoadd-idx.args
rename to tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-autofill-addr.args
rename to tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.err b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-bridge-duplicate-index.err
rename to tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-bridge-many-disks.args
rename to tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.err b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.err
rename to tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-bridge.args
rename to tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.err b/tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-bus-invalid.err
rename to tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.err b/tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-domain-invalid.err
rename to tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-expander-bus-bad-bus.err
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-expander-bus-bad-machine.err
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-expander-bus-bad-node.err
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-expander-bus.args
rename to tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-function-invalid.err b/tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-function-invalid.err
rename to tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-many.args
rename to tests/qemuxml2argvdata/pci-many.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
deleted file mode 120000
index 0dffe3c624..0000000000
--- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
+++ /dev/null
@@ -1 +0,0 @@
-pci-rom-disabled.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args
new file mode 120000
index 0000000000..e17e6682bc
--- /dev/null
+++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args
@@ -0,0 +1 @@
+pci-rom-disabled.x86_64-latest.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-rom-disabled.args
rename to tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pci-rom.args
rename to tests/qemuxml2argvdata/pci-rom.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pci-root-address.err b/tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-root-address.err
rename to tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.err b/tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-root-nonzero-index.err
rename to tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.err b/tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pci-slot-invalid.err
rename to tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.err b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.err
rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err
rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-expander-bus.args
rename to tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-root-port-model-generic.args
rename to tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
rename to tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-root-port-too-many.err b/tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-root-port-too-many.err
rename to tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-root-port.args
rename to tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-root.args
rename to tests/qemuxml2argvdata/pcie-root.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-switch-downstream-port.args
rename to tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcie-switch-upstream-port.args
rename to tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcihole64-q35.args
rename to tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pcihole64.args
rename to tests/qemuxml2argvdata/pcihole64.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pmu-feature-off.args
rename to tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/pmu-feature.args
rename to tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/pseries-features-invalid-machine.err b/tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-features-invalid-machine.err
rename to tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/pseries-serial-invalid-machine.err b/tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-serial-invalid-machine.err
rename to tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address1.err b/tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/q35-dmi-bad-address1.err
rename to tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address2.err b/tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/q35-dmi-bad-address2.err
rename to tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-pci-force-address.args
rename to tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-usb2-multi.args
rename to tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-usb2-reorder.args
rename to tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-usb2.args
rename to tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/q35-wrong-root.err b/tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/q35-wrong-root.err
rename to tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35.args
rename to tests/qemuxml2argvdata/q35.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-alt.args
rename to tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-commandline.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemu-ns-no-env.args
rename to tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/reboot-timeout-disabled.args
rename to tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/reboot-timeout-enabled.args
rename to tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dac-none.args
rename to tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.err b/tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-device-duplicates.err
rename to tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err
rename to tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dynamic-override.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-dynamic.args
rename to tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-multiple.err b/tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-multiple.err
rename to tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-none.args
rename to tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-static-labelskip.args
rename to tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-static-relabel.args
rename to tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/seclabel-static.args
rename to tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-controller.args
rename to tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-host-certificates-database.args
rename to tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-host-certificates.args
rename to tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-host.args
rename to tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
rename to tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
rename to tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/smbios-date.err b/tests/qemuxml2argvdata/smbios-date.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/smbios-date.err
rename to tests/qemuxml2argvdata/smbios-date.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.err b/tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/smbios-uuid-match.err
rename to tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/smbios.args
rename to tests/qemuxml2argvdata/smbios.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/tpm-no-backend-invalid.err b/tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/tpm-no-backend-invalid.err
rename to tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-bus-missing.err b/tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-bus-missing.err
rename to tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-companion.args b/tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-controller-ich9-companion.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args
rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err
rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-controller-piix3.args b/tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-controller-piix3.args
rename to tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
rename to tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-hub-autoadd.args
rename to tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.err b/tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-hub-conflict.err
rename to tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.err b/tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-hub-nonexistent.err
rename to tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-hub.args
rename to tests/qemuxml2argvdata/usb-hub.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-long-port-path.args
rename to tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-none-hub.err b/tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-none-hub.err
rename to tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-none-other.err b/tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-none-other.err
rename to tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.err b/tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-none-usbtablet.err
rename to tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-none.args
rename to tests/qemuxml2argvdata/usb-none.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-port-autoassign.args
rename to tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-port-missing.args
rename to tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.err b/tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ports-out-of-range.err
rename to tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-ports.args
rename to tests/qemuxml2argvdata/usb-ports.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-redir-boot.args
rename to tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-redir-filter-version.args
rename to tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-redir-filter.args
rename to tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb-redir.args
rename to tests/qemuxml2argvdata/usb-redir.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.err b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/usb-too-long-port-path-invalid.err
rename to tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/usb1-usb2.args
rename to tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/vhost_queues-invalid.err b/tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/vhost_queues-invalid.err
rename to tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-input-passthrough.args
rename to tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-input.args
rename to tests/qemuxml2argvdata/virtio-input.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-rng-default.args
rename to tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.err b/tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-rng-egd-crash.err
rename to tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-rng-egd.args
rename to tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-rng-multiple.args
rename to tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-rng-random.args
rename to tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/vmcoreinfo.args
rename to tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cea936518e..99e0d3aa0d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -852,66 +852,9 @@ mymain(void)
 # define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \
     DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver)
 
-/* All the following macros require an explicit QEMU_CAPS_* list
- * at the end of the argument list, or the NONE placeholder.
- * */
-# define DO_TEST(name, ...) \
-    DO_TEST_FULL(name, "", \
-                 ARG_QEMU_CAPS, \
-                 QEMU_CAPS_DEVICE_JSON, \
-                 QEMU_CAPS_OBJECT_JSON, \
-                 QEMU_CAPS_NETDEV_JSON, \
-                 QEMU_CAPS_SECCOMP_SANDBOX, \
-                 QEMU_CAPS_PIIX3_USB_UHCI, \
-                 QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \
-                 QEMU_CAPS_CPU_MIGRATABLE, \
-                 QEMU_CAPS_SMP_DIES, \
-                 QEMU_CAPS_USB_HOST_HOSTDEVICE, \
-                 QEMU_CAPS_DEVICE_QEMU_XHCI, \
-                 QEMU_CAPS_QXL_VRAM64,\
-                 QEMU_CAPS_QXL_VGAMEM, \
-                 QEMU_CAPS_VGA_VGAMEM, \
-                 __VA_ARGS__, \
-                 QEMU_CAPS_LAST, \
-                 ARG_END)
-# define DO_TEST_NOCAPS(name) \
-    DO_TEST_FULL(name, "", \
-                 ARG_QEMU_CAPS, \
-                 QEMU_CAPS_DEVICE_JSON, \
-                 QEMU_CAPS_OBJECT_JSON, \
-                 QEMU_CAPS_NETDEV_JSON, \
-                 QEMU_CAPS_SECCOMP_SANDBOX, \
-                 QEMU_CAPS_PIIX3_USB_UHCI, \
-                 QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \
-                 QEMU_CAPS_CPU_MIGRATABLE, \
-                 QEMU_CAPS_SMP_DIES, \
-                 QEMU_CAPS_USB_HOST_HOSTDEVICE, \
-                 QEMU_CAPS_DEVICE_QEMU_XHCI, \
-                 QEMU_CAPS_QXL_VRAM64,\
-                 QEMU_CAPS_QXL_VGAMEM, \
-                 QEMU_CAPS_VGA_VGAMEM, \
-                 QEMU_CAPS_LAST, \
-                 ARG_END)
-
 # define DO_TEST_GIC(name, ver, gic) \
     DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END)
 
-# define DO_TEST_FAILURE(name, ...) \
-    DO_TEST_FULL(name, "", \
-                 ARG_FLAGS, FLAG_EXPECT_FAILURE, \
-                 ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
-# define DO_TEST_FAILURE_NOCAPS(name) \
-    DO_TEST_FULL(name, "", ARG_FLAGS, FLAG_EXPECT_FAILURE, ARG_END)
-
-# define DO_TEST_PARSE_ERROR(name, ...) \
-    DO_TEST_FULL(name, "", \
-                 ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \
-                 ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
-# define DO_TEST_PARSE_ERROR_NOCAPS(name) \
-    DO_TEST_FULL(name, "", \
-                 ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \
-                 ARG_END)
-
     /* Unset or set all envvars here that are copied in qemudBuildCommandLine
      * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
      * values for these envvars */
@@ -928,24 +871,23 @@ mymain(void)
     g_unsetenv("QEMU_AUDIO_DRV");
     g_unsetenv("SDL_AUDIODRIVER");
 
-    DO_TEST_NOCAPS("minimal");
-    DO_TEST_PARSE_ERROR_NOCAPS("minimal-no-memory");
+    DO_TEST_CAPS_LATEST("minimal");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("minimal-no-memory");
 
     DO_TEST_CAPS_LATEST("genid");
     DO_TEST_CAPS_LATEST("genid-auto");
 
-    DO_TEST_NOCAPS("machine-aliases1");
-    DO_TEST("machine-aliases2", QEMU_CAPS_KVM);
-    DO_TEST_NOCAPS("machine-core-on");
+    DO_TEST_CAPS_LATEST("machine-aliases1");
+    DO_TEST_CAPS_LATEST("machine-aliases2");
+    DO_TEST_CAPS_LATEST("machine-core-on");
     driver.config->dumpGuestCore = true;
-    DO_TEST_NOCAPS("machine-core-off");
+    DO_TEST_CAPS_LATEST("machine-core-off");
     driver.config->dumpGuestCore = false;
     DO_TEST_CAPS_LATEST("machine-smm-on");
     DO_TEST_CAPS_LATEST("machine-smm-off");
-    DO_TEST("machine-vmport-opt",
-            QEMU_CAPS_MACHINE_VMPORT_OPT);
-    DO_TEST_NOCAPS("default-kvm-host-arch");
-    DO_TEST_NOCAPS("default-qemu-host-arch");
+    DO_TEST_CAPS_LATEST("machine-vmport-opt");
+    DO_TEST_CAPS_LATEST("default-kvm-host-arch");
+    DO_TEST_CAPS_LATEST("default-qemu-host-arch");
     DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
     DO_TEST_CAPS_LATEST("boot-cdrom");
     DO_TEST_CAPS_LATEST("boot-network");
@@ -1017,8 +959,8 @@ mymain(void)
     driver.config->nogfxAllowHostAudio = false;
     g_unsetenv("QEMU_AUDIO_DRV");
 
-    DO_TEST_NOCAPS("reboot-timeout-disabled");
-    DO_TEST_NOCAPS("reboot-timeout-enabled");
+    DO_TEST_CAPS_LATEST("reboot-timeout-disabled");
+    DO_TEST_CAPS_LATEST("reboot-timeout-enabled");
 
     DO_TEST_CAPS_LATEST("firmware-manual-bios");
     DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless");
@@ -1102,32 +1044,24 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-raw-abi-update", "aarch64");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-format-mismatch");
 
-    DO_TEST_NOCAPS("clock-utc");
-    DO_TEST_NOCAPS("clock-localtime");
-    DO_TEST_NOCAPS("clock-localtime-basis-localtime");
-    DO_TEST_NOCAPS("clock-variable");
-    DO_TEST_NOCAPS("clock-france");
+    DO_TEST_CAPS_LATEST("clock-utc");
+    DO_TEST_CAPS_LATEST("clock-localtime");
+    DO_TEST_CAPS_LATEST("clock-localtime-basis-localtime");
+    DO_TEST_CAPS_LATEST("clock-variable");
+    DO_TEST_CAPS_LATEST("clock-france");
     DO_TEST_CAPS_VER("clock-hpet-off", "7.2.0");
     DO_TEST_CAPS_LATEST("clock-hpet-off");
-    DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
-    DO_TEST_NOCAPS("cpu-kvmclock");
-    DO_TEST_NOCAPS("cpu-host-kvmclock");
-    DO_TEST("kvmclock", QEMU_CAPS_KVM);
-    DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("clock-catchup");
+    DO_TEST_CAPS_LATEST("cpu-kvmclock");
+    DO_TEST_CAPS_LATEST("cpu-host-kvmclock");
+    DO_TEST_CAPS_LATEST("kvmclock");
+    DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
     DO_TEST_CAPS_LATEST("clock-realtime");
     DO_TEST_CAPS_LATEST("clock-absolute");
 
     DO_TEST_CAPS_LATEST("controller-usb-order");
 
-    DO_TEST("controller-order",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_CCID_PASSTHRU,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_HDA_DUPLEX,
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    DO_TEST_CAPS_LATEST("controller-order");
     /* 'eoi' cpu feature with an explicit CPU defined */
     DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
     DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
@@ -1148,8 +1082,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("kvm-features");
     DO_TEST_CAPS_LATEST("kvm-features-off");
 
-    DO_TEST_NOCAPS("pmu-feature");
-    DO_TEST_NOCAPS("pmu-feature-off");
+    DO_TEST_CAPS_LATEST("pmu-feature");
+    DO_TEST_CAPS_LATEST("pmu-feature-off");
 
     DO_TEST_CAPS_LATEST("pages-discard");
     DO_TEST_CAPS_LATEST("pages-discard-hugepages");
@@ -1174,7 +1108,7 @@ mymain(void)
     DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0");
     DO_TEST_CAPS_LATEST("hugepages-memaccess3");
     DO_TEST_CAPS_LATEST("hugepages-nvdimm");
-    DO_TEST_NOCAPS("nosharepages");
+    DO_TEST_CAPS_LATEST("nosharepages");
 
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("non-x86_64-timer-error", "s390x");
 
@@ -1338,11 +1272,9 @@ mymain(void)
     driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0;
     DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless");
 
-    DO_TEST("graphics-sdl",
-            QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL);
+    DO_TEST_CAPS_LATEST("graphics-sdl");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-sdl-egl-headless");
-    DO_TEST("graphics-sdl-fullscreen",
-            QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL);
+    DO_TEST_CAPS_LATEST("graphics-sdl-fullscreen");
 
     driver.config->spiceTLS = 1;
     DO_TEST_CAPS_LATEST("graphics-spice");
@@ -1373,17 +1305,17 @@ mymain(void)
     DO_TEST_CAPS_LATEST("graphics-dbus-chardev");
     DO_TEST_CAPS_LATEST("graphics-dbus-usbredir");
 
-    DO_TEST_NOCAPS("input-usbmouse");
-    DO_TEST_NOCAPS("input-usbtablet");
-    DO_TEST_NOCAPS("misc-acpi");
-    DO_TEST_NOCAPS("misc-disable-s3");
-    DO_TEST_NOCAPS("misc-disable-suspends");
-    DO_TEST_NOCAPS("misc-enable-s4");
+    DO_TEST_CAPS_LATEST("input-usbmouse");
+    DO_TEST_CAPS_LATEST("input-usbtablet");
+    DO_TEST_CAPS_LATEST("misc-acpi");
+    DO_TEST_CAPS_LATEST("misc-disable-s3");
+    DO_TEST_CAPS_LATEST("misc-disable-suspends");
+    DO_TEST_CAPS_LATEST("misc-enable-s4");
     DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0");
     DO_TEST_CAPS_LATEST("misc-no-reboot");
-    DO_TEST_NOCAPS("misc-uuid");
+    DO_TEST_CAPS_LATEST("misc-uuid");
 
-    DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost_queues-invalid");
 
     DO_TEST_CAPS_LATEST("net-vhostuser");
     DO_TEST_CAPS_LATEST("net-vhostuser-multiq");
@@ -1423,13 +1355,9 @@ mymain(void)
     DO_TEST_CAPS_LATEST("net-vdpa-multiqueue");
     DO_TEST_CAPS_LATEST("net-virtio-rss");
 
-    DO_TEST("hostdev-pci-multifunction",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST("hostdev-pci-multifunction");
 
-    DO_TEST("hostdev-pci-address-unassigned",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST("hostdev-pci-address-unassigned");
 
     DO_TEST_CAPS_LATEST("serial-file-log");
     driver.config->spiceTLS = 1;
@@ -1460,64 +1388,44 @@ mymain(void)
     DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev");
     VIR_FREE(driver.config->chardevTLSx509secretUUID);
     driver.config->chardevTLS = 0;
+    DO_TEST_CAPS_LATEST("parallel-tcp-chardev");
+    DO_TEST_CAPS_LATEST("parallel-parport-chardev");
     DO_TEST_CAPS_LATEST("serial-many-chardev");
     DO_TEST_CAPS_LATEST("parallel-tcp-chardev");
     DO_TEST_CAPS_LATEST("parallel-parport-chardev");
     DO_TEST_CAPS_LATEST("parallel-unix-chardev");
-    DO_TEST_CAPS_LATEST("console-compat-chardev");
-    DO_TEST_CAPS_LATEST("pci-serial-dev-chardev");
 
-    DO_TEST_NOCAPS("channel-guestfwd");
+    DO_TEST_CAPS_LATEST("channel-guestfwd");
     DO_TEST_CAPS_LATEST("channel-unix-guestfwd");
-    DO_TEST_NOCAPS("channel-virtio");
-    DO_TEST_NOCAPS("channel-virtio-state");
-    DO_TEST_NOCAPS("channel-virtio-auto");
-    DO_TEST_NOCAPS("channel-virtio-autoassign");
-    DO_TEST_NOCAPS("channel-virtio-autoadd");
-    DO_TEST_NOCAPS("console-virtio");
-    DO_TEST("console-virtio-many",
-            QEMU_CAPS_DEVICE_ISA_SERIAL);
+    DO_TEST_CAPS_LATEST("channel-virtio");
+    DO_TEST_CAPS_LATEST("channel-virtio-state");
+    DO_TEST_CAPS_LATEST("channel-virtio-auto");
+    DO_TEST_CAPS_LATEST("channel-virtio-autoassign");
+    DO_TEST_CAPS_LATEST("channel-virtio-autoadd");
+    DO_TEST_CAPS_LATEST("console-virtio");
+    DO_TEST_CAPS_LATEST("console-virtio-many");
     DO_TEST_CAPS_ARCH_LATEST("console-virtio-ccw", "s390x");
     DO_TEST_CAPS_LATEST("console-virtio-unix");
     DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x");
     driver.config->spiceTLS = 1;
-    DO_TEST("channel-spicevmc",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    DO_TEST_CAPS_LATEST("channel-spicevmc");
     driver.config->spiceTLS = 0;
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent");
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features");
-    DO_TEST("channel-virtio-default",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("channel-virtio-unix");
+    DO_TEST_CAPS_LATEST("channel-virtio-default");
+    DO_TEST_CAPS_LATEST("channel-virtio-unix");
 
-    DO_TEST("smartcard-host",
-            QEMU_CAPS_CCID_EMULATED);
-    DO_TEST("smartcard-host-certificates",
-            QEMU_CAPS_CCID_EMULATED);
-    DO_TEST("smartcard-host-certificates-database",
-            QEMU_CAPS_CCID_EMULATED);
-    DO_TEST("smartcard-passthrough-tcp",
-            QEMU_CAPS_CCID_PASSTHRU);
-    DO_TEST("smartcard-passthrough-spicevmc",
-            QEMU_CAPS_CCID_PASSTHRU,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("smartcard-controller",
-            QEMU_CAPS_CCID_EMULATED);
+    DO_TEST_CAPS_LATEST("smartcard-host");
+    DO_TEST_CAPS_LATEST("smartcard-host-certificates");
+    DO_TEST_CAPS_LATEST("smartcard-host-certificates-database");
+    DO_TEST_CAPS_LATEST("smartcard-passthrough-tcp");
+    DO_TEST_CAPS_LATEST("smartcard-passthrough-spicevmc");
+    DO_TEST_CAPS_LATEST("smartcard-controller");
     DO_TEST_CAPS_LATEST("smartcard-passthrough-unix");
 
-    DO_TEST("chardev-reconnect",
-            QEMU_CAPS_CHARDEV_RECONNECT,
-            QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_EGD,
-            QEMU_CAPS_CCID_PASSTHRU);
-    DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout",
-                        QEMU_CAPS_CHARDEV_RECONNECT);
-    DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path",
-                        QEMU_CAPS_CHARDEV_RECONNECT);
+    DO_TEST_CAPS_LATEST("chardev-reconnect");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-invalid-timeout");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-generated-path");
 
     DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc");
     DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx");
@@ -1538,23 +1446,14 @@ mymain(void)
                  ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST,
                  ARG_END);
 
-    DO_TEST_NOCAPS("usb-none");
+    DO_TEST_CAPS_LATEST("usb-none");
 
-    DO_TEST("usb-controller-piix3",
-            QEMU_CAPS_PIIX3_USB_UHCI);
-    DO_TEST("usb-controller-ich9-ehci-addr",
-            QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST("usb-controller-ich9-companion",
-            QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion",
-            QEMU_CAPS_ICH9_USB_EHCI1);
-    DO_TEST("usb-controller-ich9-autoassign",
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb1-usb2",
-            QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_ICH9_USB_EHCI1);
+    DO_TEST_CAPS_LATEST("usb-controller-piix3");
+    DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr");
+    DO_TEST_CAPS_LATEST("usb-controller-ich9-companion");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-ich9-no-companion");
+    DO_TEST_CAPS_LATEST("usb-controller-ich9-autoassign");
+    DO_TEST_CAPS_LATEST("usb1-usb2");
 
     DO_TEST_CAPS_LATEST("usb-controller-nec-xhci");
     DO_TEST_FULL("usb-controller-nec-xhci-unavailable", ".x86_64-latest",
@@ -1568,60 +1467,30 @@ mymain(void)
     DO_TEST_CAPS_LATEST("usb-controller-qemu-xhci");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-qemu-xhci-limit");
 
-    DO_TEST_NOCAPS("input-usbmouse-addr");
-    DO_TEST("usb-hub",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-hub-autoadd",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-hub-autoadd-deluxe",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-hub-conflict",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-hub-nonexistent",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-port-missing",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_FAILURE("usb-bus-missing",
-                    QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-ports",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-ports-out-of-range",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-port-autoassign",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST("usb-redir",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("usb-redir-boot",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("usb-redir-filter",
-            QEMU_CAPS_USB_HUB,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_USB_REDIR_FILTER,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("usb-redir-filter-version",
-            QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_USB_REDIR_FILTER,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    DO_TEST_CAPS_LATEST("input-usbmouse-addr");
+    DO_TEST_CAPS_LATEST("usb-hub");
+    DO_TEST_CAPS_LATEST("usb-hub-autoadd");
+    DO_TEST_CAPS_LATEST("usb-hub-autoadd-deluxe");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-hub-conflict");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-hub-nonexistent");
+    DO_TEST_CAPS_LATEST("usb-port-missing");
+    DO_TEST_CAPS_LATEST_FAILURE("usb-bus-missing");
+    DO_TEST_CAPS_LATEST("usb-ports");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-ports-out-of-range");
+    DO_TEST_CAPS_LATEST("usb-port-autoassign");
+    DO_TEST_CAPS_LATEST("usb-redir");
+    DO_TEST_CAPS_LATEST("usb-redir-boot");
+    DO_TEST_CAPS_LATEST("usb-redir-filter");
+    DO_TEST_CAPS_LATEST("usb-redir-filter-version");
     DO_TEST_CAPS_LATEST("usb-redir-unix");
-    DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other");
-    DO_TEST_PARSE_ERROR("usb-none-hub",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-other");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-hub");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-usbtablet");
+    DO_TEST_CAPS_LATEST("usb-long-port-path");
 
-    DO_TEST_NOCAPS("smbios");
-    DO_TEST_PARSE_ERROR_NOCAPS("smbios-date");
-    DO_TEST_PARSE_ERROR_NOCAPS("smbios-uuid-match");
+    DO_TEST_CAPS_LATEST("smbios");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("smbios-date");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("smbios-uuid-match");
     DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
 
     DO_TEST_CAPS_LATEST("watchdog");
@@ -1630,9 +1499,9 @@ mymain(void)
     DO_TEST_CAPS_LATEST("watchdog-injectnmi");
     DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
     DO_TEST_CAPS_ARCH_LATEST("watchdog-diag288", "s390x");
-    DO_TEST_NOCAPS("balloon-device");
-    DO_TEST("balloon-device-deflate",
-            QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
+
+    DO_TEST_CAPS_LATEST("balloon-device");
+    DO_TEST_CAPS_LATEST("balloon-device-deflate");
     DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x");
     DO_TEST_FULL("balloon-mmio-deflate", ".aarch64-latest",
                  ARG_CAPS_ARCH, "aarch64",
@@ -1641,10 +1510,10 @@ mymain(void)
                  QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
                  QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
                  QEMU_CAPS_LAST, ARG_END);
-    DO_TEST("balloon-device-deflate-off",
-            QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
-    DO_TEST_NOCAPS("balloon-device-auto");
-    DO_TEST_NOCAPS("balloon-device-period");
+    DO_TEST_CAPS_LATEST("balloon-device-deflate-off");
+    DO_TEST_CAPS_LATEST("balloon-device-auto");
+    DO_TEST_CAPS_LATEST("balloon-device-period");
+
     DO_TEST_CAPS_VER("sound-device", "4.2.0");
     DO_TEST_CAPS_LATEST("sound-device");
     DO_TEST_CAPS_LATEST("fs9p");
@@ -1653,33 +1522,24 @@ mymain(void)
     DO_TEST_CAPS_LATEST("hostdev-usb-address");
     DO_TEST_CAPS_LATEST("hostdev-usb-address-device");
     DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot");
-    DO_TEST_PARSE_ERROR_NOCAPS("hostdev-usb-duplicate");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-usb-duplicate");
     DO_TEST_CAPS_LATEST("hostdev-pci-address");
     DO_TEST_CAPS_LATEST("hostdev-pci-address-device");
-    DO_TEST_PARSE_ERROR("hostdev-pci-duplicate",
-                        QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("hostdev-vfio",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("hostdev-vfio-multidomain",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("hostdev-mdev-precreated",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_PARSE_ERROR("hostdev-mdev-duplicate",
-                        QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-pci-duplicate");
+    DO_TEST_CAPS_LATEST("hostdev-vfio");
+    DO_TEST_CAPS_LATEST("hostdev-vfio-multidomain");
+    DO_TEST_CAPS_LATEST("hostdev-mdev-precreated");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-src-address-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-invalid-target-address");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-duplicate");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless");
-    DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
-            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple");
-    DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch",
-                        QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch");
     DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x");
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x");
@@ -1692,9 +1552,9 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x");
 
-    DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_NOCAPS("pci-rom-disabled");
-    DO_TEST_NOCAPS("pci-rom-disabled-invalid");
+    DO_TEST_CAPS_LATEST("pci-rom");
+    DO_TEST_CAPS_LATEST("pci-rom-disabled");
+    DO_TEST_CAPS_LATEST("pci-rom-disabled-invalid");
 
     DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x");
@@ -1720,8 +1580,8 @@ mymain(void)
                                   ARG_MIGRATE_FD, 7);
 
     DO_TEST_CAPS_LATEST("qemu-ns");
-    DO_TEST_NOCAPS("qemu-ns-no-env");
-    DO_TEST_NOCAPS("qemu-ns-alt");
+    DO_TEST_CAPS_LATEST("qemu-ns-no-env");
+    DO_TEST_CAPS_LATEST("qemu-ns-alt");
 
     DO_TEST_CAPS_LATEST("iothreads-ids");
     DO_TEST_CAPS_LATEST("iothreads-ids-partial");
@@ -1751,12 +1611,12 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-fallback", "5.2.0");
     DO_TEST_CAPS_VER("cpu-fallback", "8.0.0");
 
-    DO_TEST_NOCAPS("cpu-numa1");
-    DO_TEST_NOCAPS("cpu-numa2");
-    DO_TEST_NOCAPS("cpu-numa-no-memory-element");
-    DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3");
-    DO_TEST_NOCAPS("cpu-numa-disjoint");
-    DO_TEST_NOCAPS("cpu-numa-memshared");
+    DO_TEST_CAPS_LATEST("cpu-numa1");
+    DO_TEST_CAPS_LATEST("cpu-numa2");
+    DO_TEST_CAPS_LATEST("cpu-numa-no-memory-element");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-numa3");
+    DO_TEST_CAPS_LATEST("cpu-numa-disjoint");
+    DO_TEST_CAPS_LATEST("cpu-numa-memshared");
 
     /* host-model cpu expansion depends on the cpu reported by qemu and thus
      * we invoke it for all real capability dumps we have */
@@ -1804,8 +1664,8 @@ mymain(void)
 
     /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-vendor", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM);
-    DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("cpu-host-passthrough");
+    DO_TEST_CAPS_LATEST_FAILURE("cpu-qemu-host-passthrough");
 
     DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x");
@@ -1819,10 +1679,10 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("cpu-translation");
 
-    DO_TEST_NOCAPS("memtune");
-    DO_TEST_NOCAPS("memtune-unlimited");
-    DO_TEST_NOCAPS("blkiotune");
-    DO_TEST_NOCAPS("blkiotune-device");
+    DO_TEST_CAPS_LATEST("memtune");
+    DO_TEST_CAPS_LATEST("memtune-unlimited");
+    DO_TEST_CAPS_LATEST("blkiotune");
+    DO_TEST_CAPS_LATEST("blkiotune-device");
     DO_TEST_CAPS_LATEST("cputune");
     DO_TEST_CAPS_LATEST("cputune-zero-shares");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("cputune-iothreadsched-toomuch");
@@ -1854,33 +1714,32 @@ mymain(void)
     DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict");
     DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive");
 
-    DO_TEST_NOCAPS("numad");
-    DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune");
-    DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset");
-    DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset");
-    DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
-    DO_TEST_NOCAPS("numad-static-memory-auto-vcpu");
+    DO_TEST_CAPS_LATEST("numad");
+    DO_TEST_CAPS_LATEST("numad-auto-vcpu-static-numatune");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("numad-auto-vcpu-static-numatune-no-nodeset");
+    DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
+    DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
+    DO_TEST_CAPS_LATEST("numad-static-memory-auto-vcpu");
     DO_TEST_CAPS_LATEST("blkdeviotune");
     DO_TEST_CAPS_LATEST("blkdeviotune-max");
     DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
     DO_TEST_CAPS_LATEST("blkdeviotune-max-length");
 
-    DO_TEST("multifunction-pci-device",
-            QEMU_CAPS_SCSI_LSI);
+    DO_TEST_CAPS_LATEST("multifunction-pci-device");
 
-    DO_TEST_NOCAPS("seclabel-dynamic");
-    DO_TEST_NOCAPS("seclabel-dynamic-baselabel");
-    DO_TEST_NOCAPS("seclabel-dynamic-override");
-    DO_TEST_NOCAPS("seclabel-dynamic-labelskip");
-    DO_TEST_NOCAPS("seclabel-dynamic-relabel");
-    DO_TEST_NOCAPS("seclabel-static");
-    DO_TEST_NOCAPS("seclabel-static-relabel");
-    DO_TEST_NOCAPS("seclabel-static-labelskip");
-    DO_TEST_NOCAPS("seclabel-none");
-    DO_TEST_NOCAPS("seclabel-dac-none");
-    DO_TEST_PARSE_ERROR_NOCAPS("seclabel-multiple");
-    DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-duplicates");
-    DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-relabel-invalid");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic-baselabel");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic-override");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic-labelskip");
+    DO_TEST_CAPS_LATEST("seclabel-dynamic-relabel");
+    DO_TEST_CAPS_LATEST("seclabel-static");
+    DO_TEST_CAPS_LATEST("seclabel-static-relabel");
+    DO_TEST_CAPS_LATEST("seclabel-static-labelskip");
+    DO_TEST_CAPS_LATEST("seclabel-none");
+    DO_TEST_CAPS_LATEST("seclabel-dac-none");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-multiple");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-device-duplicates");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-device-relabel-invalid");
 
     DO_TEST_CAPS_LATEST_PPC64("pseries-basic");
     DO_TEST_CAPS_LATEST_PPC64("pseries-vio");
@@ -1930,7 +1789,7 @@ mymain(void)
     DO_TEST_CAPS_ARCH_VER("pseries-features", "ppc64", "4.2.0");
     DO_TEST_CAPS_LATEST_PPC64("pseries-features");
 
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-invalid-machine");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pseries-features-invalid-machine");
 
     DO_TEST_CAPS_LATEST_PPC64("pseries-serial-native");
     DO_TEST_CAPS_LATEST_PPC64("pseries-serial+console-native");
@@ -1939,7 +1798,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PPC64("pseries-serial-usb");
     DO_TEST_CAPS_LATEST_PPC64("pseries-console-native");
     DO_TEST_CAPS_LATEST_PPC64("pseries-console-virtio");
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-serial-invalid-machine");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pseries-serial-invalid-machine");
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-spaprvio-invalid", "ppc64");
 
     DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-native", "aarch64");
@@ -1987,26 +1846,15 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST_PARSE_ERROR("video-multiple-primaries");
 
-    DO_TEST("virtio-rng-default",
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST("virtio-rng-random",
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST("virtio-rng-egd",
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_EGD);
+    DO_TEST_CAPS_LATEST("virtio-rng-default");
+    DO_TEST_CAPS_LATEST("virtio-rng-random");
+    DO_TEST_CAPS_LATEST("virtio-rng-egd");
     DO_TEST_CAPS_VER("virtio-rng-builtin", "5.2.0");
     DO_TEST_CAPS_LATEST("virtio-rng-builtin");
     DO_TEST_CAPS_VER("virtio-rng-egd-unix", "5.2.0");
     DO_TEST_CAPS_LATEST("virtio-rng-egd-unix");
-    DO_TEST("virtio-rng-multiple",
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_EGD,
-            QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST_PARSE_ERROR("virtio-rng-egd-crash",
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_EGD);
+    DO_TEST_CAPS_LATEST("virtio-rng-multiple");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash");
     DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x");
 
     DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x");
@@ -2025,8 +1873,7 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
-    DO_TEST_PARSE_ERROR("tpm-no-backend-invalid",
-                        QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-no-backend-invalid");
     DO_TEST_CAPS_LATEST("tpm-emulator");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc");
@@ -2042,70 +1889,28 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-emulator-tpm2");
     unsetenv(TEST_TPM_ENV_VAR);
 
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-domain-invalid");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-bus-invalid");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-slot-invalid");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-function-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-domain-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bus-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-slot-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-function-invalid");
 
-    DO_TEST("pci-bridge",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_VNC,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("pci-autoadd-addr",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("pci-autoadd-idx",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("pci-autofill-addr", QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("pci-many",
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("pci-bridge-many-disks",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE);
-    DO_TEST("pcie-root",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("q35",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST_PARSE_ERROR("q35-dmi-bad-address1",
-                        QEMU_CAPS_DEVICE_PCI_BRIDGE,
-                        QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-                        QEMU_CAPS_DEVICE_IOH3420);
-    DO_TEST_PARSE_ERROR("q35-dmi-bad-address2",
-                        QEMU_CAPS_DEVICE_PCI_BRIDGE,
-                        QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-                        QEMU_CAPS_DEVICE_IOH3420);
+    DO_TEST_CAPS_LATEST("pci-bridge");
+    DO_TEST_CAPS_LATEST("pci-autoadd-addr");
+    DO_TEST_CAPS_LATEST("pci-autoadd-idx");
+    DO_TEST_CAPS_LATEST("pci-autofill-addr");
+    DO_TEST_CAPS_LATEST("pci-many");
+    DO_TEST_CAPS_LATEST("pci-bridge-many-disks");
+    DO_TEST_CAPS_LATEST("pcie-root");
+    DO_TEST_CAPS_LATEST("q35");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-dmi-bad-address1");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-dmi-bad-address2");
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
     DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5.1.0");
     DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.1.0");
-    DO_TEST("q35-usb2",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("q35-usb2-multi",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("q35-usb2-reorder",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_DEVICE_QXL);
+    DO_TEST_CAPS_LATEST("q35-usb2");
+    DO_TEST_CAPS_LATEST("q35-usb2-multi");
+    DO_TEST_CAPS_LATEST("q35-usb2-reorder");
 
     /* Note: The real caps versions of the following tests based on qemu-4.2.0
      * were added as a comparison point between fake caps testing and real caps
@@ -2124,117 +1929,61 @@ mymain(void)
     DO_TEST_CAPS_LATEST("q35-virt-manager-basic");
 
     /* Test automatic and manual setting of pcie-root-port attributes */
-    DO_TEST("pcie-root-port",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
+    DO_TEST_CAPS_LATEST("pcie-root-port");
 
     /* Make sure the default model for PCIe Root Ports is picked correctly
      * based on QEMU binary capabilities. We use x86/q35 for the test, but
      * any PCIe machine type (such as aarch64/virt) will behave the same */
-    DO_TEST("pcie-root-port-model-generic",
-            QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
-            QEMU_CAPS_DEVICE_IOH3420);
-    DO_TEST("pcie-root-port-model-ioh3420",
-            QEMU_CAPS_DEVICE_IOH3420);
+    DO_TEST_CAPS_LATEST("pcie-root-port-model-generic");
+    DO_TEST_CAPS_LATEST("pcie-root-port-model-ioh3420");
     DO_TEST_CAPS_LATEST("pcie-root-port-nohotplug");
 
-    DO_TEST("autoindex",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-            QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_NEC_USB_XHCI);
+    DO_TEST_CAPS_LATEST("autoindex");
     /* Make sure the user can always override libvirt's default device
      * placement policy by providing an explicit PCI address */
-    DO_TEST("q35-pci-force-address",
-            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_HDA_DUPLEX);
+    DO_TEST_CAPS_LATEST("q35-pci-force-address");
 
-    DO_TEST_PARSE_ERROR("q35-wrong-root",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST_PARSE_ERROR_NOCAPS("440fx-wrong-root");
-    DO_TEST_PARSE_ERROR_NOCAPS("440fx-ide-address-conflict");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-wrong-root");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("440fx-wrong-root");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("440fx-ide-address-conflict");
 
-    DO_TEST_PARSE_ERROR("pcie-root-port-too-many",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-root-port-too-many");
 
-    DO_TEST("pcie-switch-upstream-port",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("pcie-switch-downstream-port",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-            QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
+    DO_TEST_CAPS_LATEST("pcie-switch-upstream-port");
+    DO_TEST_CAPS_LATEST("pcie-switch-downstream-port");
 
-    DO_TEST("pci-expander-bus",
-            QEMU_CAPS_DEVICE_PXB);
-    DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node",
-                        QEMU_CAPS_DEVICE_PXB);
-    DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine",
-                        QEMU_CAPS_DEVICE_PXB);
-    DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus",
-                        QEMU_CAPS_DEVICE_PXB);
+    DO_TEST_CAPS_LATEST("pci-expander-bus");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-node");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-machine");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-bus");
 
-    DO_TEST("pcie-expander-bus",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-            QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
-            QEMU_CAPS_DEVICE_PXB_PCIE);
-    DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine",
-                        QEMU_CAPS_DEVICE_IOH3420,
-                        QEMU_CAPS_DEVICE_X3130_UPSTREAM,
-                        QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
-                        QEMU_CAPS_DEVICE_PXB_PCIE);
-    DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus",
-                        QEMU_CAPS_DEVICE_IOH3420,
-                        QEMU_CAPS_DEVICE_PXB_PCIE);
+    DO_TEST_CAPS_LATEST("pcie-expander-bus");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-expander-bus-bad-machine");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-expander-bus-bad-bus");
     DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64");
 
     DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
     DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");
 
     DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x");
-    DO_TEST("hostdev-scsi-vhost-scsi-pci",
-            QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_DEVICE_VHOST_SCSI);
+    DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pci");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-scsi-pci-boot-fail");
     DO_TEST_CAPS_VER("hostdev-scsi-vhost-scsi-pcie", "4.2.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie");
-    DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate",
-                        QEMU_CAPS_VIRTIO_SCSI,
-                        QEMU_CAPS_DEVICE_VHOST_SCSI);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-duplicate");
 
     DO_TEST_CAPS_LATEST("mlock-on");
     DO_TEST_CAPS_LATEST("mlock-off");
 
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-bridge-negative-index-invalid");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-bridge-duplicate-index");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-root-nonzero-index");
-    DO_TEST_PARSE_ERROR_NOCAPS("pci-root-address");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bridge-negative-index-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bridge-duplicate-index");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-root-nonzero-index");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-root-address");
 
-    DO_TEST("hotplug-base",
-            QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST_CAPS_LATEST("hotplug-base");
 
-    DO_TEST_NOCAPS("pcihole64");
-    DO_TEST("pcihole64-q35",
-            QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI,
-            QEMU_CAPS_DEVICE_QXL);
+    DO_TEST_CAPS_LATEST("pcihole64");
+    DO_TEST_CAPS_LATEST("pcihole64-q35");
 
     DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64");
@@ -2311,8 +2060,8 @@ mymain(void)
 
     qemuTestSetHostArch(&driver, VIR_ARCH_NONE);
 
-    DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY);
-    DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+    DO_TEST_CAPS_LATEST("kvm-pit-delay");
+    DO_TEST_CAPS_LATEST("kvm-pit-discard");
 
     DO_TEST_CAPS_LATEST("panic");
     DO_TEST_CAPS_LATEST("panic-double");
@@ -2331,13 +2080,13 @@ mymain(void)
     DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-address");
     DO_TEST_CAPS_LATEST_FAILURE("shmem-small-size");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("shmem-msi-only");
-    DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
 
-    DO_TEST_FAILURE_NOCAPS("memory-align-fail");
-    DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM);
-    DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode");
-    DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM);
-    DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
+    DO_TEST_CAPS_LATEST_FAILURE("memory-align-fail");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("memory-hotplug-nonuma");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("memory-hotplug-invalid-targetnode");
+    DO_TEST_CAPS_LATEST("memory-hotplug");
+    DO_TEST_CAPS_LATEST("memory-hotplug-dimm");
     DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
     DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-update", "ppc64");
@@ -2373,19 +2122,18 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-net-s390", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x");
-    DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid");
-    DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("machine-loadparm-s390-char-invalid");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("machine-loadparm-s390-len-invalid");
 
-    DO_TEST_NOCAPS("qemu-ns-domain-ns0");
-    DO_TEST_NOCAPS("qemu-ns-domain-commandline");
-    DO_TEST_NOCAPS("qemu-ns-domain-commandline-ns0");
-    DO_TEST_NOCAPS("qemu-ns-commandline");
-    DO_TEST_NOCAPS("qemu-ns-commandline-ns0");
-    DO_TEST_NOCAPS("qemu-ns-commandline-ns1");
+    DO_TEST_CAPS_LATEST("qemu-ns-domain-ns0");
+    DO_TEST_CAPS_LATEST("qemu-ns-domain-commandline");
+    DO_TEST_CAPS_LATEST("qemu-ns-domain-commandline-ns0");
+    DO_TEST_CAPS_LATEST("qemu-ns-commandline");
+    DO_TEST_CAPS_LATEST("qemu-ns-commandline-ns0");
+    DO_TEST_CAPS_LATEST("qemu-ns-commandline-ns1");
 
-    DO_TEST("virtio-input", QEMU_CAPS_VIRTIO_KEYBOARD,
-            QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET);
-    DO_TEST("virtio-input-passthrough", QEMU_CAPS_VIRTIO_INPUT_HOST);
+    DO_TEST_CAPS_LATEST("virtio-input");
+    DO_TEST_CAPS_LATEST("virtio-input-passthrough");
 
     DO_TEST_CAPS_LATEST("input-linux");
 
@@ -2407,12 +2155,9 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("name-escape");
 
-    DO_TEST("usb-long-port-path",
-            QEMU_CAPS_USB_HUB);
-    DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid",
-                        QEMU_CAPS_USB_HUB);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-too-long-port-path-invalid");
 
-    DO_TEST_NOCAPS("acpi-table");
+    DO_TEST_CAPS_LATEST("acpi-table");
 
     DO_TEST_CAPS_LATEST("intel-iommu");
     DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
@@ -2470,24 +2215,24 @@ mymain(void)
     DO_TEST_CAPS_LATEST("memfd-memory-numa");
     DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage");
 
-    DO_TEST("cpu-check-none", QEMU_CAPS_KVM);
-    DO_TEST("cpu-check-partial", QEMU_CAPS_KVM);
-    DO_TEST("cpu-check-full", QEMU_CAPS_KVM);
-    DO_TEST("cpu-check-default-none", QEMU_CAPS_KVM);
-    DO_TEST_NOCAPS("cpu-check-default-none2");
+    DO_TEST_CAPS_LATEST("cpu-check-none");
+    DO_TEST_CAPS_LATEST("cpu-check-partial");
+    DO_TEST_CAPS_LATEST("cpu-check-full");
+    DO_TEST_CAPS_LATEST("cpu-check-default-none");
+    DO_TEST_CAPS_LATEST("cpu-check-default-none2");
     /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-default-partial", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("cpu-check-default-partial2");
 
-    DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("cpu-cache-disable");
     /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-cache-disable3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM);
-    DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM);
-    DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM);
-    DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM);
-    DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM);
-    DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO);
+    DO_TEST_CAPS_LATEST("cpu-cache-passthrough");
+    DO_TEST_CAPS_LATEST("cpu-cache-emulate-l3");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-emulate-l2");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-passthrough3");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-passthrough-l3");
+    DO_TEST_CAPS_LATEST("vmcoreinfo");
 
     DO_TEST_CAPS_LATEST("user-aliases");
     DO_TEST_CAPS_LATEST("user-aliases2");
@@ -2580,11 +2325,11 @@ mymain(void)
     /* HVF guests should not work on Linux with KVM */
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless");
 
-    DO_TEST("cpu-phys-bits-passthrough", QEMU_CAPS_KVM);
-    DO_TEST("cpu-phys-bits-emulate", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST("cpu-phys-bits-passthrough");
+    DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate");
     /* this test case uses 'cpu="host"', run it with Haswell host cpu to prevent test case churn */
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-phys-bits-emulate2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-phys-bits-passthrough2");
     DO_TEST_CAPS_LATEST("cpu-phys-bits-limit");
     DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare");