This series converts all outstanding test cases to use real
capabilities.

In the process few cases of pointless tests or features which are
supported by every version of qemu were identified and addressed.

To simplify the bulk of the conversion I've opted to simply set the most
common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what
the test asked for. This is done in a handful of patches and allows then
a bulk conversion of many tests with no changes in the output files.

I've payed special attention to CPU tests were I've ensured that they
are semantically testing what they were before.

Peter Krempa (51):
  qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and
    QEMU_CAPS_ICH9_DISABLE_S*
  qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and
    QEMU_CAPS_ICH9_DISABLE_S* capabilities
  qemu: capabilities: Preserve location of the default machine type when
    stripping aliases for tests
  qemuxml2argvtest: Clean up host CPU if overriden
  qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models
  qemuxml2argvtest: Drop 'monitor-json' case
  qemu: Always assume support for QEMU_CAPS_CPU_CACHE
  qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE
  qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI
  qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI
  qemuxml2argvtest: Add missing versioned test cases for
    'cpu-host-model'
  qemuxml2argvtest: Remove old chardev tests
  qemuxml2argvtest: Simplify invocation of GIC tests
  qemuxml2argvtest: Remove duplicated test invocations
  qemuxml2argvtest: Remove fake-caps invocations of tests which also
    real caps version
  qemuxml2argvtest: Use proper version in negative
    'virtio-options-memballoon-freepage-reporting' case
  qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test
    case
  qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test
    case
  qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS
  qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev
    for all fake-caps tests
  virQEMUCapsAddCPUDefinitions: Fill in cpu type in data and node it's
    used only in tests
  qemuxml2argvtest: Modernize negative testing for hugepages
  qemuxml2argvtest: Modernize 'numatune' tests
  testutilsqemu: Always populate default ram id, default cpu, ACPI
    support for fake machines
  qemuxml2argvtest: Enable 'seccomp' sandbox in all fake caps tests
  qemuxml2argvtest: Consolidate tests for usb controllers
  qemuxml2argvtest: Add tests for auto-added USB controllers
  qemuxml2argvtest: Improve default usb controller testing
  qemuxml2argvtest: Consolidate testing of 'xhci' controllers
  qemuxml2argvtest: Assume QEMU_CAPS_PIIX3_USB_UHCI for all fake-caps
    tests
  qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps
    tests
  qemuxml2argvtest: Assume QEMU_CAPS_CPU_MIGRATABLE and
    QEMU_CAPS_SMP_DIES for fake-caps tests
  qemuxml2argvtest: Assume QEMU_CAPS_USB_HOST_HOSTDEVICE and
    QEMU_CAPS_DEVICE_QEMU_XHCI for fake-caps tests
  qemuxml2argvtest: Assume QEMU_CAPS_QXL_VRAM64,
    QEMU_CAPS_(QXL|VGA)_VGAMEM for fake-caps tests
  qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case
  qemuxml2argvtest: Modernize migration/restore tests
  qemuxml2argvtest: Consolidate and modernize CPU topology testing
  qemuxml2argvtest: Modernize test cases using 'host-model' CPU
  qemuxml2argvtest: Modernize 'cpu-Haswell' test cases
  qemuxml2argvtest: Modernize 'cpu-minimum' cases
  qemuxml2argvtest: Modernize 'cpu-strict' case
  qemuxml2argvtest: Modernize 'cpu-(no)fallback' test
  qemuxml2argvtest: Modernize 'cpu-exact' cases
  qemuxml2argvtest: Modernize rest of the test cases
  testutilsqemu: Drop fake machine capability data for 'x86_64'
  qemustatusxml2xmltest: Remove capabilities infrastructure
  testutilsqemu: Drop infrastructure for fake-caps testing
  testutilsqemu: Unexport 'testQemuCapsInit'
  qemu: capabilities: Unexport 'virQEMUCapsAddMachine'
  qemuxml2argvtest: Remove cpu model faking for fake-caps tests
  qemu: capabilities: Remove 'virQEMUCapsAddCPUDefinitions'

 src/qemu/qemu_capabilities.c                  |   81 +-
 src/qemu/qemu_capabilities.h                  |   17 +-
 src/qemu/qemu_capspriv.h                      |   14 -
 src/qemu/qemu_command.c                       |   46 +-
 src/qemu/qemu_domain.c                        |   11 +-
 src/qemu/qemu_validate.c                      |   43 +-
 .../caps_4.2.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml |    1 -
 .../qemucapabilitiesdata/caps_4.2.0_s390x.xml |    1 -
 .../caps_4.2.0_x86_64.xml                     |    6 -
 .../caps_5.0.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml |    1 -
 .../caps_5.0.0_riscv64.xml                    |    1 -
 .../caps_5.0.0_x86_64.xml                     |    6 -
 .../caps_5.1.0_x86_64.xml                     |    6 -
 .../caps_5.2.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml |    1 -
 .../caps_5.2.0_riscv64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_5.2.0_s390x.xml |    1 -
 .../caps_5.2.0_x86_64.xml                     |    6 -
 .../caps_6.0.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_6.0.0_s390x.xml |    1 -
 .../caps_6.0.0_x86_64.xml                     |    6 -
 .../caps_6.1.0_x86_64.xml                     |    6 -
 .../caps_6.2.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml |    3 -
 .../caps_6.2.0_x86_64.xml                     |    6 -
 .../caps_7.0.0_aarch64+hvf.xml                |    1 -
 .../caps_7.0.0_aarch64.xml                    |    1 -
 .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml |    3 -
 .../caps_7.0.0_x86_64.xml                     |    6 -
 .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml |    3 -
 .../caps_7.1.0_x86_64.xml                     |    6 -
 tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml |    3 -
 .../caps_7.2.0_x86_64+hvf.xml                 |    6 -
 .../caps_7.2.0_x86_64.xml                     |    6 -
 .../caps_8.0.0_riscv64.xml                    |    1 -
 .../caps_8.0.0_x86_64.xml                     |    6 -
 .../qemucapabilitiesdata/caps_8.1.0_s390x.xml |    1 -
 .../caps_8.1.0_x86_64.xml                     |    6 -
 tests/qemustatusxml2xmltest.c                 |   17 +-
 ...fx-ide-address-conflict.x86_64-latest.err} |    0
 ...err => 440fx-wrong-root.x86_64-latest.err} |    0
 ...ch64-gic-default-both.aarch64-latest.args} |    0
 ...arch64-gic-default-v2.aarch64-latest.args} |    0
 ...arch64-gic-default-v3.aarch64-latest.args} |    0
 ...s => aarch64-gic-host.aarch64-latest.args} |    0
 ...aarch64-gic-none-both.aarch64-latest.args} |    0
 ... aarch64-gic-none-tcg.aarch64-latest.args} |    0
 ...> aarch64-gic-none-v2.aarch64-latest.args} |    0
 ...> aarch64-gic-none-v3.aarch64-latest.args} |    0
 ...rgs => aarch64-gic-v2.aarch64-latest.args} |    0
 ...rgs => aarch64-gic-v3.aarch64-latest.args} |    0
 ...off.args => acpi-table.x86_64-latest.args} |   14 +-
 tests/qemuxml2argvdata/autoindex.args         |   63 -
 .../autoindex.x86_64-latest.args              |   65 +
 .../balloon-device-auto.x86_64-latest.args    |   36 +
 ...loon-device-deflate-off.x86_64-latest.args |   36 +
 .../balloon-device-deflate.x86_64-latest.args |   36 +
 .../balloon-device-period.x86_64-latest.args  |   36 +
 .../balloon-device.x86_64-latest.args         |   36 +
 tests/qemuxml2argvdata/blkiotune-device.args  |   34 -
 .../blkiotune-device.x86_64-latest.args       |   36 +
 tests/qemuxml2argvdata/blkiotune.args         |   34 -
 .../blkiotune.x86_64-latest.args              |   36 +
 ...gs => channel-guestfwd.x86_64-latest.args} |   16 +-
 ...gs => channel-spicevmc.x86_64-latest.args} |   20 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |   49 -
 .../channel-virtio-auto.x86_64-latest.args    |   51 +
 .../channel-virtio-autoadd.args               |   48 -
 .../channel-virtio-autoadd.x86_64-latest.args |   50 +
 .../channel-virtio-autoassign.args            |   48 -
 ...annel-virtio-autoassign.x86_64-latest.args |   50 +
 .../channel-virtio-default.args               |   41 -
 .../channel-virtio-default.x86_64-latest.args |   43 +
 .../channel-virtio-state.x86_64-latest.args   |   43 +
 ...=> channel-virtio-unix.x86_64-latest.args} |   24 +-
 tests/qemuxml2argvdata/channel-virtio.args    |   37 -
 ...args => channel-virtio.x86_64-latest.args} |   22 +-
 ...econnect-generated-path.x86_64-latest.err} |    0
 ...connect-invalid-timeout.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/chardev-reconnect.args |   44 -
 .../chardev-reconnect.x86_64-latest.args      |   46 +
 ....args => clock-catchup.x86_64-latest.args} |   14 +-
 ...e.args => clock-france.x86_64-latest.args} |   14 +-
 ....args => clock-hpet-off.x86_64-7.2.0.args} |   14 +-
 .../clock-hpet-off.x86_64-latest.args         |   37 +
 ...altime-basis-localtime.x86_64-latest.args} |   14 +-
 ...rgs => clock-localtime.x86_64-latest.args} |   14 +-
 ...clock-timer-hyperv-rtc.x86_64-latest.args} |   11 +-
 ...-off.args => clock-utc.x86_64-latest.args} |   13 +-
 ...args => clock-variable.x86_64-latest.args} |   14 +-
 .../qemuxml2argvdata/console-compat-auto.args |   36 -
 .../console-compat-chardev.args               |   36 -
 tests/qemuxml2argvdata/console-compat.args    |   35 -
 ...=> console-virtio-many.x86_64-latest.args} |   24 +-
 ...args => console-virtio.x86_64-latest.args} |   18 +-
 tests/qemuxml2argvdata/controller-order.args  |   52 -
 .../controller-order.x86_64-latest.args       |   55 +
 ...s => cpu-Haswell-noTSX.x86_64-latest.args} |   11 +-
 ...ll.args => cpu-Haswell.x86_64-latest.args} |   11 +-
 ...2.args => cpu-Haswell2.x86_64-latest.args} |   11 +-
 ...3.args => cpu-Haswell3.x86_64-latest.args} |   11 +-
 .../cpu-cache-disable.x86_64-latest.args      |   33 +
 tests/qemuxml2argvdata/cpu-cache-disable2.xml |   20 -
 .../cpu-cache-disable3.x86_64-latest.args     |   33 +
 ...=> cpu-cache-emulate-l2.x86_64-latest.err} |    0
 ...> cpu-cache-emulate-l3.x86_64-latest.args} |   13 +-
 ...pu-cache-passthrough-l3.x86_64-latest.err} |    0
 .../cpu-cache-passthrough.args                |   32 -
 ... cpu-cache-passthrough.x86_64-latest.args} |   13 +-
 .../cpu-cache-passthrough2.args               |   32 -
 .../cpu-cache-passthrough2.xml                |   20 -
 ... cpu-cache-passthrough3.x86_64-latest.err} |    0
 .../cpu-check-default-none.args               |   32 -
 .../cpu-check-default-none.x86_64-latest.args |   33 +
 ...pu-check-default-none2.x86_64-latest.args} |   11 +-
 .../cpu-check-default-partial.args            |   32 -
 ...u-check-default-partial.x86_64-latest.args |   33 +
 ...check-default-partial2.x86_64-latest.args} |   11 +-
 tests/qemuxml2argvdata/cpu-check-full.args    |    1 -
 .../cpu-check-full.x86_64-latest.args         |    1 +
 ...args => cpu-check-none.x86_64-latest.args} |   11 +-
 tests/qemuxml2argvdata/cpu-check-partial.args |    1 -
 .../cpu-check-partial.x86_64-latest.args      |    1 +
 ...ct1.args => cpu-exact1.x86_64-latest.args} |   11 +-
 ... cpu-exact2-nofallback.x86_64-latest.args} |   11 +-
 ...ct2.args => cpu-exact2.x86_64-latest.args} |   11 +-
 tests/qemuxml2argvdata/cpu-fallback.args      |   32 -
 ...er.args => cpu-fallback.x86_64-5.2.0.args} |    9 +-
 .../cpu-fallback.x86_64-8.0.0.args            |   33 +
 tests/qemuxml2argvdata/cpu-fallback.xml       |   15 +-
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |   32 -
 .../cpu-host-kvmclock.x86_64-latest.args      |   33 +
 ... => cpu-host-model-cmt.x86_64-latest.args} |   11 +-
 ...cpu-host-model-fallback.x86_64-4.2.0.args} |    7 +-
 ...cpu-host-model-fallback.x86_64-5.0.0.args} |    7 +-
 .../cpu-host-model-fallback.x86_64-5.1.0.args |   33 +
 .../cpu-host-model-fallback.x86_64-5.2.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-6.0.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-6.1.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-6.2.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-7.0.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-7.1.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-7.2.0.args |   34 +
 .../cpu-host-model-fallback.x86_64-8.0.0.args |   33 +
 ...cpu-host-model-fallback.x86_64-latest.args |   33 +
 .../cpu-host-model-nofallback.err             |    1 -
 ...pu-host-model-nofallback.x86_64-4.2.0.args |   33 +
 ...pu-host-model-nofallback.x86_64-5.0.0.args |   33 +
 ...pu-host-model-nofallback.x86_64-5.1.0.args |   33 +
 ...pu-host-model-nofallback.x86_64-5.2.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-6.0.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-6.1.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-6.2.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-7.0.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-7.1.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-7.2.0.args |   34 +
 ...pu-host-model-nofallback.x86_64-8.0.0.args |   33 +
 ...u-host-model-nofallback.x86_64-latest.args |   33 +
 .../cpu-host-model-vendor.x86_64-latest.args  |   33 +
 tests/qemuxml2argvdata/cpu-host-model.args    |   40 -
 .../cpu-host-model.x86_64-6.2.0.args          |   39 +
 .../cpu-host-model.x86_64-7.0.0.args          |   39 +
 .../cpu-host-model.x86_64-7.1.0.args          |   39 +
 .../cpu-host-model.x86_64-7.2.0.args          |   39 +
 .../cpu-host-model.x86_64-8.0.0.args          |   38 +
 ...t-passthrough-features.x86_64-latest.args} |   14 +-
 .../cpu-host-passthrough.args                 |   32 -
 .../cpu-host-passthrough.x86_64-latest.args   |   33 +
 ...k.args => cpu-kvmclock.x86_64-latest.args} |   11 +-
 tests/qemuxml2argvdata/cpu-minimum1.args      |   32 -
 .../cpu-minimum1.x86_64-latest.args           |   33 +
 tests/qemuxml2argvdata/cpu-minimum2.args      |   32 -
 .../cpu-minimum2.x86_64-latest.args           |   33 +
 ...pu-no-removed-features.x86_64-latest.args} |   11 +-
 tests/qemuxml2argvdata/cpu-nofallback.err     |    1 -
 .../cpu-nofallback.x86_64-5.2.0.err           |    1 +
 .../cpu-nofallback.x86_64-8.0.0.args          |   33 +
 tests/qemuxml2argvdata/cpu-nofallback.xml     |   15 +-
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |   33 -
 .../cpu-numa-disjoint.x86_64-latest.args      |   36 +
 .../cpu-numa-memshared.x86_64-latest.args     |   36 +
 .../cpu-numa-no-memory-element.args           |   33 -
 ...numa-no-memory-element.x86_64-latest.args} |   17 +-
 tests/qemuxml2argvdata/cpu-numa1.args         |   33 -
 .../cpu-numa1.x86_64-latest.args              |   36 +
 tests/qemuxml2argvdata/cpu-numa2.args         |   33 -
 .../cpu-numa2.x86_64-latest.args              |   36 +
 ...-numa3.err => cpu-numa3.x86_64-latest.err} |    0
 .../cpu-phys-bits-emulate.args                |   32 -
 ... cpu-phys-bits-emulate.x86_64-latest.args} |   13 +-
 .../cpu-phys-bits-emulate2.args               |   32 -
 .../cpu-phys-bits-emulate2.x86_64-latest.args |   33 +
 .../cpu-phys-bits-passthrough.args            |   32 -
 ...-phys-bits-passthrough.x86_64-latest.args} |   13 +-
 ...-phys-bits-passthrough2.x86_64-latest.err} |    0
 ...u-qemu-host-passthrough.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/cpu-strict1.args       |   32 -
 .../cpu-strict1.x86_64-latest.args            |   33 +
 tests/qemuxml2argvdata/cpu-strict1.xml        |   12 +-
 tests/qemuxml2argvdata/cpu-topology1.args     |   31 -
 ....args => cpu-topology1.x86_64-latest.args} |   17 +-
 tests/qemuxml2argvdata/cpu-topology1.xml      |    4 +-
 tests/qemuxml2argvdata/cpu-topology2.args     |   32 -
 .../cpu-topology2.x86_64-latest.args          |   33 +
 tests/qemuxml2argvdata/cpu-topology2.xml      |    5 +-
 tests/qemuxml2argvdata/cpu-topology3.args     |   31 -
 .../cpu-topology3.x86_64-latest.args          |   33 +
 tests/qemuxml2argvdata/cpu-topology3.xml      |    2 +-
 .../cpu-topology4.x86_64-latest.args          |   33 +
 .../{monitor-json.xml => cpu-topology4.xml}   |   18 +-
 ...s => cpu-tsc-frequency.x86_64-latest.args} |   11 +-
 ... default-kvm-host-arch.x86_64-latest.args} |   12 +-
 ...default-qemu-host-arch.x86_64-latest.args} |   12 +-
 .../graphics-egl-headless.args                |   33 -
 ...raphics-sdl-fullscreen.x86_64-latest.args} |   14 +-
 ...l.args => graphics-sdl.x86_64-latest.args} |   14 +-
 ...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} |   12 +-
 ...dev-src-address-invalid.x86_64-latest.err} |    0
 .../hostdev-pci-address-unassigned.args       |   34 -
 ...-pci-address-unassigned.x86_64-latest.args |   36 +
 ...> hostdev-pci-duplicate.x86_64-latest.err} |    0
 .../hostdev-pci-multifunction.args            |   38 -
 ...stdev-pci-multifunction.x86_64-latest.args |   40 +
 ... hostdev-scsi-duplicate.x86_64-latest.err} |    0
 ...ev-scsi-vhost-scsi-pci.x86_64-latest.args} |   22 +-
 ...> hostdev-usb-duplicate.x86_64-latest.err} |    0
 ...stdev-vfio-multidomain.x86_64-latest.args} |   17 +-
 ...ev-vfio-zpci-wrong-arch.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/hostdev-vfio.args      |   35 -
 ...n.args => hostdev-vfio.x86_64-latest.args} |   16 +-
 ...e.args => hotplug-base.x86_64-latest.args} |   13 +-
 ...s-default-1G-nodeset-2M.x86_64-latest.err} |    0
 ...pages-memaccess-invalid.x86_64-latest.err} |    0
 ... => hugepages-memaccess3.x86_64-5.1.0.err} |    0
 .../qemuxml2argvdata/input-usbmouse-addr.args |   35 -
 .../input-usbmouse-addr.x86_64-latest.args    |   37 +
 .../input-usbmouse.x86_64-latest.args         |   36 +
 tests/qemuxml2argvdata/input-usbtablet.args   |   34 -
 .../input-usbtablet.x86_64-latest.args        |   36 +
 ....args => kvm-pit-delay.x86_64-latest.args} |   14 +-
 ...rgs => kvm-pit-discard.x86_64-latest.args} |   14 +-
 ...clock.args => kvmclock.x86_64-latest.args} |    9 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |   34 -
 .../machine-aliases1.x86_64-latest.args       |   36 +
 ...gs => machine-aliases2.x86_64-latest.args} |   15 +-
 .../machine-core-off.x86_64-latest.args       |   35 +
 tests/qemuxml2argvdata/machine-core-on.args   |   33 -
 ...rgs => machine-core-on.x86_64-latest.args} |   13 +-
 ...dparm-s390-char-invalid.x86_64-latest.err} |    0
 ...adparm-s390-len-invalid.x86_64-latest.err} |    0
 .../qemuxml2argvdata/machine-vmport-opt.args  |   34 -
 .../machine-vmport-opt.x86_64-latest.args     |   36 +
 ...rr => memory-align-fail.x86_64-latest.err} |    0
 .../memory-hotplug-dimm.x86_64-latest.args    |   41 +
 ...plug-invalid-targetnode.x86_64-latest.err} |    0
 ...> memory-hotplug-nonuma.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/memory-hotplug.args    |   35 -
 ...args => memory-hotplug.x86_64-latest.args} |   22 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |   34 -
 .../memtune-unlimited.x86_64-latest.args      |   36 +
 tests/qemuxml2argvdata/memtune.args           |   34 -
 .../memtune.x86_64-latest.args                |   36 +
 ...migrate-numa-unaligned.x86_64-latest.args} |   17 +-
 ...igrate.args => migrate.x86_64-latest.args} |   12 +-
 ...rr => minimal-no-memory.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/minimal.args           |   34 -
 .../minimal.x86_64-latest.args                |   36 +
 tests/qemuxml2argvdata/misc-acpi.args         |   32 -
 ...late.args => misc-acpi.x86_64-latest.args} |   13 +-
 ...rgs => misc-disable-s3.x86_64-latest.args} |   12 +-
 ... misc-disable-suspends.x86_64-latest.args} |   12 +-
 tests/qemuxml2argvdata/misc-enable-s4.err     |    1 -
 ...args => misc-enable-s4.x86_64-latest.args} |   12 +-
 tests/qemuxml2argvdata/misc-uuid.args         |   32 -
 ...auto.args => misc-uuid.x86_64-latest.args} |   13 +-
 tests/qemuxml2argvdata/monitor-json.args      |   34 -
 .../multifunction-pci-device.args             |   43 -
 ...ultifunction-pci-device.x86_64-latest.args |   45 +
 ...s.args => nosharepages.x86_64-latest.args} |   12 +-
 .../numad-auto-memory-vcpu-cpuset.args        |   34 -
 ...auto-memory-vcpu-cpuset.x86_64-latest.args |   36 +
 ...o-memory-vcpu-no-cpuset-and-placement.args |   34 -
 ...no-cpuset-and-placement.x86_64-latest.args |   36 +
 ...tic-numatune-no-nodeset.x86_64-latest.err} |    0
 .../numad-auto-vcpu-static-numatune.args      |   34 -
 ...to-vcpu-static-numatune.x86_64-latest.args |   36 +
 .../numad-static-memory-auto-vcpu.args        |   34 -
 ...static-memory-auto-vcpu.x86_64-latest.args |   36 +
 tests/qemuxml2argvdata/numad.args             |   34 -
 .../qemuxml2argvdata/numad.x86_64-latest.args |   36 +
 .../numatune-auto-nodeset-invalid.args        |   34 -
 ...ne-auto-nodeset-invalid.x86_64-latest.args |   36 +
 ...> numatune-auto-prefer.x86_64-latest.args} |   14 +-
 ... => numatune-distances.x86_64-latest.args} |   28 +-
 ...ne-memnode-invalid-mode.x86_64-latest.err} |    0
 ...tune-memnode-no-memory.x86_64-latest.args} |   15 +-
 ... numatune-memnode-nocpu.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/numatune-memnode.args  |   37 -
 ...ne-memnodes-problematic.x86_64-latest.err} |    0
 ...-memory-invalid-nodeset.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/numatune-memory.args   |   34 -
 tests/qemuxml2argvdata/numatune-memory.xml    |   31 -
 ...nodeset-exceed-hostnode.x86_64-latest.err} |    0
 .../parallel-parport-chardev.args             |   36 -
 .../parallel-tcp-chardev.args                 |   36 -
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |   41 -
 .../pci-autoadd-addr.x86_64-latest.args       |   44 +
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |   42 -
 .../pci-autoadd-idx.x86_64-latest.args        |   45 +
 ...s => pci-autofill-addr.x86_64-latest.args} |   16 +-
 ...-bridge-duplicate-index.x86_64-latest.err} |    0
 ... pci-bridge-many-disks.x86_64-latest.args} |  224 ++--
 ...-negative-index-invalid.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/pci-bridge.args        |  101 --
 .../pci-bridge.x86_64-latest.args             |  104 ++
 ....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
 tests/qemuxml2argvdata/pci-expander-bus.args  |   98 --
 .../pci-expander-bus.x86_64-latest.args       |  101 ++
 ...=> pci-function-invalid.x86_64-latest.err} |    0
 ...-many.args => pci-many.x86_64-latest.args} |   71 +-
 .../pci-rom-disabled-invalid.args             |    1 -
 ...ci-rom-disabled-invalid.x86_64-latest.args |    1 +
 ...gs => pci-rom-disabled.x86_64-latest.args} |   12 +-
 .../pci-rom.x86_64-latest.args                |   42 +
 ...err => pci-root-address.x86_64-latest.err} |    0
 ... pci-root-nonzero-index.x86_64-latest.err} |    0
 .../pci-serial-dev-chardev.args               |   36 -
 ...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
 tests/qemuxml2argvdata/pcie-expander-bus.args |  135 --
 .../pcie-expander-bus.x86_64-latest.args      |  140 ++
 ...oot-port-model-generic.x86_64-latest.args} |   14 +-
 ...oot-port-model-ioh3420.x86_64-latest.args} |   14 +-
 ...pcie-root-port-too-many.x86_64-latest.err} |    0
 ...args => pcie-root-port.x86_64-latest.args} |   17 +-
 ...root.args => pcie-root.x86_64-latest.args} |   11 +-
 .../pcie-switch-downstream-port.args          |   45 -
 ...-switch-downstream-port.x86_64-latest.args |   48 +
 .../pcie-switch-upstream-port.args            |   39 -
 ...ie-switch-upstream-port.x86_64-latest.args |   43 +
 ....args => pcihole64-q35.x86_64-latest.args} |   15 +-
 ...le64.args => pcihole64.x86_64-latest.args} |   12 +-
 ...rgs => pmu-feature-off.x86_64-latest.args} |    8 +-
 ...re.args => pmu-feature.x86_64-latest.args} |    8 +-
 ...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.args                |   38 -
 .../q35-pci-force-address.x86_64-latest.args  |   40 +
 .../q35-pm-disable-fallback.args              |   37 -
 .../q35-pm-disable-fallback.xml               |   18 -
 tests/qemuxml2argvdata/q35-pm-disable.args    |   37 -
 tests/qemuxml2argvdata/q35-pm-disable.xml     |   18 -
 tests/qemuxml2argvdata/q35-usb2-multi.args    |   49 -
 .../q35-usb2-multi.x86_64-latest.args         |   51 +
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |   49 -
 .../q35-usb2-reorder.x86_64-latest.args       |   51 +
 .../q35-usb2.x86_64-latest.args               |   43 +
 ...t.err => q35-wrong-root.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/q35.args               |   39 -
 .../{q35-usb2.args => q35.x86_64-latest.args} |   23 +-
 tests/qemuxml2argvdata/q35.xml                |    4 +
 ...nv.args => qemu-ns-alt.x86_64-latest.args} |   15 +-
 .../qemu-ns-commandline-ns0.args              |   34 -
 ...qemu-ns-commandline-ns0.x86_64-latest.args |   36 +
 .../qemu-ns-commandline-ns1.args              |   34 -
 ...qemu-ns-commandline-ns1.x86_64-latest.args |   36 +
 .../qemuxml2argvdata/qemu-ns-commandline.args |   34 -
 .../qemu-ns-commandline.x86_64-latest.args    |   36 +
 .../qemu-ns-domain-commandline-ns0.args       |   34 -
 ...-domain-commandline-ns0.x86_64-latest.args |   36 +
 .../qemu-ns-domain-commandline.args           |   34 -
 ...u-ns-domain-commandline.x86_64-latest.args |   36 +
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |   34 -
 .../qemu-ns-domain-ns0.x86_64-latest.args     |   36 +
 ...args => qemu-ns-no-env.x86_64-latest.args} |   15 +-
 ...eboot-timeout-disabled.x86_64-latest.args} |   10 +-
 ...reboot-timeout-enabled.x86_64-latest.args} |   10 +-
 ....args => restore-v2-fd.x86_64-latest.args} |   14 +-
 ...-v2.args => restore-v2.x86_64-latest.args} |   12 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |   34 -
 .../seclabel-dac-none.x86_64-latest.args      |   36 +
 ...label-device-duplicates.x86_64-latest.err} |    0
 ...-device-relabel-invalid.x86_64-latest.err} |    0
 .../seclabel-dynamic-baselabel.args           |   34 -
 ...label-dynamic-baselabel.x86_64-latest.args |   36 +
 .../seclabel-dynamic-labelskip.args           |   34 -
 ...label-dynamic-labelskip.x86_64-latest.args |   36 +
 ...label-dynamic-override.x86_64-latest.args} |   16 +-
 .../seclabel-dynamic-relabel.args             |   34 -
 ...eclabel-dynamic-relabel.x86_64-latest.args |   36 +
 tests/qemuxml2argvdata/seclabel-dynamic.args  |   34 -
 .../seclabel-dynamic.x86_64-latest.args       |   36 +
 ...rr => seclabel-multiple.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/seclabel-none.args     |   34 -
 .../seclabel-none.x86_64-latest.args          |   36 +
 .../seclabel-static-labelskip.args            |   34 -
 ...clabel-static-labelskip.x86_64-latest.args |   36 +
 .../seclabel-static-relabel.args              |   34 -
 ...seclabel-static-relabel.x86_64-latest.args |   36 +
 tests/qemuxml2argvdata/seclabel-static.args   |   34 -
 .../seclabel-static.x86_64-latest.args        |   36 +
 .../serial-dev-chardev-iobase.args            |   36 -
 .../qemuxml2argvdata/serial-dev-chardev.args  |   36 -
 .../qemuxml2argvdata/serial-file-chardev.args |   37 -
 tests/qemuxml2argvdata/serial-file-log.args   |   37 -
 .../qemuxml2argvdata/serial-many-chardev.args |   39 -
 .../qemuxml2argvdata/serial-pty-chardev.args  |   36 -
 tests/qemuxml2argvdata/serial-spiceport.args  |   38 -
 .../qemuxml2argvdata/serial-tcp-chardev.args  |   36 -
 .../serial-tcp-telnet-chardev.args            |   36 -
 .../serial-tcp-tlsx509-chardev-verify.args    |   39 -
 .../serial-tcp-tlsx509-chardev.args           |   39 -
 .../serial-tcp-tlsx509-secret-chardev.args    |   40 -
 .../qemuxml2argvdata/serial-udp-chardev.args  |   38 -
 tests/qemuxml2argvdata/serial-vc-chardev.args |   36 -
 .../smartcard-controller.x86_64-latest.args   |   35 +
 ...t-certificates-database.x86_64-latest.args |   35 +
 .../smartcard-host-certificates.args          |   33 -
 ...tcard-host-certificates.x86_64-latest.args |   35 +
 tests/qemuxml2argvdata/smartcard-host.args    |   33 -
 .../smartcard-host.x86_64-latest.args         |   35 +
 ...d-passthrough-spicevmc.x86_64-latest.args} |   18 +-
 ...rtcard-passthrough-tcp.x86_64-latest.args} |   16 +-
 ...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} |   14 +-
 tests/qemuxml2argvdata/smp-dies.args          |   33 -
 tests/qemuxml2argvdata/smp.args               |   33 -
 ... tpm-no-backend-invalid.x86_64-latest.err} |    0
 ....err => usb-bus-missing.x86_64-latest.err} |    0
 ...troller-default-i440fx.x86_64-latest.args} |   14 +-
 ....xml => usb-controller-default-i440fx.xml} |    0
 ...controller-default-isapc.x86_64-latest.err |    1 +
 .../usb-controller-default-isapc.xml          |   16 +
 ...controller-default-q35.x86_64-latest.args} |   10 +-
 ...ult-unavailable-i440fx.x86_64-latest.args} |   12 +-
 ...-controller-default-unavailable-i440fx.xml |    1 +
 ...default-unavailable-q35.x86_64-latest.err} |    0
 ...sb-controller-explicit-unavailable-q35.xml |    1 -
 ...troller-ich9-autoassign.x86_64-latest.args |   41 +
 ...xml => usb-controller-ich9-autoassign.xml} |    0
 ...ntroller-ich9-companion.x86_64-latest.args |   36 +
 ....xml => usb-controller-ich9-companion.xml} |    0
 ...ntroller-ich9-ehci-addr.x86_64-latest.args |   44 +
 ....xml => usb-controller-ich9-ehci-addr.xml} |    0
 ...oller-ich9-no-companion.x86_64-latest.err} |    0
 ...l => usb-controller-ich9-no-companion.xml} |    0
 ...roller-implicit-i440fx.x86_64-latest.args} |   13 +-
 ...xml => usb-controller-implicit-i440fx.xml} |    1 -
 ...troller-implicit-isapc.x86_64-latest.args} |    8 +-
 .../usb-controller-implicit-isapc.xml         |   15 +
 ...controller-implicit-q35.x86_64-latest.args |   36 +
 .../usb-controller-implicit-q35.xml           |   15 +
 ...ntroller-nec-xhci-limit.x86_64-latest.err} |    0
 ....xml => usb-controller-nec-xhci-limit.xml} |    0
 ...er-nec-xhci-unavailable.x86_64-latest.err} |    0
 .../usb-controller-nec-xhci-unavailable.xml   |    1 +
 ...sb-controller-nec-xhci.x86_64-latest.args} |   10 +-
 ...it-q35.xml => usb-controller-nec-xhci.xml} |    0
 ...ler-nex-xhci-autoassign.x86_64-latest.args |   37 +
 ...=> usb-controller-nex-xhci-autoassign.xml} |    0
 ...> usb-controller-piix3.x86_64-latest.args} |   15 +-
 ...ontroller.xml => usb-controller-piix3.xml} |    0
 ...troller-qemu-xhci-limit.x86_64-latest.err} |    0
 .../usb-controller-qemu-xhci-unavailable.err  |    1 -
 .../usb-controller-qemu-xhci-unavailable.xml  |    1 -
 .../usb-controller-qemu-xhci.args             |   30 -
 ...b-controller-qemu-xhci.x86_64-latest.args} |   15 +-
 .../qemuxml2argvdata/usb-controller-xhci.args |   30 -
 tests/qemuxml2argvdata/usb-controller.args    |   31 -
 .../usb-hub-autoadd-deluxe.args               |   50 -
 .../usb-hub-autoadd-deluxe.x86_64-latest.args |   52 +
 tests/qemuxml2argvdata/usb-hub-autoadd.args   |   36 -
 .../usb-hub-autoadd.x86_64-latest.args        |   38 +
 ...err => usb-hub-conflict.x86_64-latest.err} |    0
 ... => usb-hub-nonexistent.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/usb-hub.args           |   32 -
 .../usb-hub.x86_64-latest.args                |   34 +
 .../qemuxml2argvdata/usb-ich9-autoassign.args |   39 -
 .../qemuxml2argvdata/usb-ich9-companion.args  |   34 -
 .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |   42 -
 .../qemuxml2argvdata/usb-long-port-path.args  |   35 -
 .../usb-long-port-path.x86_64-latest.args     |   37 +
 ...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
 tests/qemuxml2argvdata/usb-none.args          |   30 -
 .../usb-none.x86_64-latest.args               |   32 +
 .../qemuxml2argvdata/usb-port-autoassign.args |   36 -
 .../usb-port-autoassign.x86_64-latest.args    |   38 +
 tests/qemuxml2argvdata/usb-port-missing.args  |   34 -
 .../usb-port-missing.x86_64-latest.args       |   36 +
 ... usb-ports-out-of-range.x86_64-latest.err} |    0
 tests/qemuxml2argvdata/usb-ports.args         |   36 -
 .../usb-ports.x86_64-latest.args              |   38 +
 tests/qemuxml2argvdata/usb-redir-boot.args    |   39 -
 .../usb-redir-boot.x86_64-latest.args         |   41 +
 .../usb-redir-filter-version.args             |   36 -
 ...sb-redir-filter-version.x86_64-latest.args |   38 +
 tests/qemuxml2argvdata/usb-redir-filter.args  |   39 -
 .../usb-redir-filter.x86_64-latest.args       |   41 +
 tests/qemuxml2argvdata/usb-redir.args         |   39 -
 .../usb-redir.x86_64-latest.args              |   41 +
 ...-long-port-path-invalid.x86_64-latest.err} |    0
 .../qemuxml2argvdata/usb-xhci-autoassign.args |   35 -
 tests/qemuxml2argvdata/usb1-usb2.args         |   43 -
 .../usb1-usb2.x86_64-latest.args              |   45 +
 ...=> vhost_queues-invalid.x86_64-latest.err} |    0
 .../virtio-input-passthrough.args             |   32 -
 ...irtio-input-passthrough.x86_64-latest.args |   34 +
 tests/qemuxml2argvdata/virtio-input.args      |   34 -
 .../virtio-input.x86_64-latest.args           |   36 +
 ...lloon-freepage-reporting.x86_64-5.0.0.err} |    0
 .../qemuxml2argvdata/virtio-rng-default.args  |   33 -
 .../virtio-rng-default.x86_64-latest.args     |   35 +
 ...=> virtio-rng-egd-crash.x86_64-latest.err} |    0
 ...args => virtio-rng-egd.x86_64-latest.args} |   16 +-
 .../qemuxml2argvdata/virtio-rng-multiple.args |   36 -
 .../virtio-rng-multiple.x86_64-latest.args    |   38 +
 tests/qemuxml2argvdata/virtio-rng-random.args |   33 -
 .../virtio-rng-random.x86_64-latest.args      |   35 +
 tests/qemuxml2argvdata/vmcoreinfo.args        |   35 -
 .../vmcoreinfo.x86_64-latest.args             |   37 +
 tests/qemuxml2argvtest.c                      | 1189 ++++++-----------
 .../default-kvm-host-arch.x86_64-latest.xml   |    2 +-
 .../default-qemu-host-arch.x86_64-latest.xml  |    2 +-
 .../qemuxml2xmloutdata/q35.x86_64-latest.xml  |    4 +
 ...ntroller-default-i440fx.x86_64-latest.xml} |    0
 ...ault-unavailable-i440fx.x86_64-latest.xml} |   22 +-
 ...ntroller-ich9-ehci-addr.x86_64-latest.xml} |    0
 ...troller-implicit-i440fx.x86_64-latest.xml} |   12 +-
 ...ntroller-implicit-isapc.x86_64-latest.xml} |   18 +-
 ...-controller-implicit-q35.x86_64-latest.xml |   43 +
 ...usb-controller-nec-xhci.x86_64-latest.xml} |    0
 ...=> usb-controller-piix3.x86_64-latest.xml} |    0
 tests/qemuxml2xmltest.c                       |   14 +-
 tests/testutilsqemu.c                         |  159 +--
 tests/testutilsqemu.h                         |    6 +-
 550 files changed, 6870 insertions(+), 7188 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/{aarch64-gic-default-both.args => aarch64-gic-default-both.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args => aarch64-gic-default-v2.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args => aarch64-gic-default-v3.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-host.args => aarch64-gic-host.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args => aarch64-gic-none-both.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args => aarch64-gic-none-v2.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args => aarch64-gic-none-v3.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-v2.args => aarch64-gic-v2.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{aarch64-gic-v3.args => aarch64-gic-v3.aarch64-latest.args} (100%)
 rename tests/qemuxml2argvdata/{machine-core-off.args => acpi-table.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/autoindex.args
 create mode 100644 tests/qemuxml2argvdata/autoindex.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/balloon-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/blkiotune-device.args
 create mode 100644 tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/blkiotune.args
 create mode 100644 tests/qemuxml2argvdata/blkiotune.x86_64-latest.args
 rename tests/qemuxml2argvdata/{channel-guestfwd.args => channel-guestfwd.x86_64-latest.args} (58%)
 rename tests/qemuxml2argvdata/{channel-spicevmc.args => channel-spicevmc.x86_64-latest.args} (55%)
 delete mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.args
 create mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.args
 create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.args
 create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/channel-virtio-default.args
 create mode 100644 tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args
 rename tests/qemuxml2argvdata/{channel-virtio-unix.args => channel-virtio-unix.x86_64-latest.args} (50%)
 delete mode 100644 tests/qemuxml2argvdata/channel-virtio.args
 rename tests/qemuxml2argvdata/{channel-virtio-state.args => channel-virtio.x86_64-latest.args} (54%)
 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%)
 delete mode 100644 tests/qemuxml2argvdata/chardev-reconnect.args
 create mode 100644 tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args
 rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args} (61%)
 rename tests/qemuxml2argvdata/{clock-localtime.args => clock-france.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{clock-hpet-off.args => clock-hpet-off.x86_64-7.2.0.args} (60%)
 create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args
 rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.x86_64-latest.args} (61%)
 rename tests/qemuxml2argvdata/{clock-france.args => clock-localtime.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args => clock-utc.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{clock-variable.args => clock-variable.x86_64-latest.args} (61%)
 delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args
 delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/console-compat.args
 rename tests/qemuxml2argvdata/{console-virtio-many.args => console-virtio-many.x86_64-latest.args} (52%)
 rename tests/qemuxml2argvdata/{console-virtio.args => console-virtio.x86_64-latest.args} (56%)
 delete mode 100644 tests/qemuxml2argvdata/controller-order.args
 create mode 100644 tests/qemuxml2argvdata/controller-order.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args} (60%)
 create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err => cpu-cache-emulate-l2.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{cpu-cache-disable.args => cpu-cache-emulate-l3.x86_64-latest.args} (56%)
 rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err => cpu-cache-passthrough-l3.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough.args
 rename tests/qemuxml2argvdata/{cpu-cache-disable2.args => cpu-cache-passthrough.x86_64-latest.args} (56%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
 rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err => cpu-cache-passthrough3.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.args
 create mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-check-default-none2.args => cpu-check-default-none2.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.args
 create mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args => cpu-check-default-partial2.x86_64-latest.args} (60%)
 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} (60%)
 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-exact1.args => cpu-exact1.x86_64-latest.args} (62%)
 rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args => cpu-exact2-nofallback.x86_64-latest.args} (63%)
 rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args} (63%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-fallback.args
 rename tests/qemuxml2argvdata/{usb-piix3-controller.args => cpu-fallback.x86_64-5.2.0.args} (73%)
 create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args => cpu-host-model-cmt.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args => cpu-host-model-fallback.x86_64-4.2.0.args} (63%)
 rename tests/qemuxml2argvdata/{cpu-host-model-vendor.args => cpu-host-model-fallback.x86_64-5.0.0.args} (63%)
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
 rename tests/qemuxml2argvdata/{machine-aliases2.args => cpu-host-passthrough-features.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.args
 create mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-minimum1.args
 create mode 100644 tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-minimum2.args
 create mode 100644 tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-no-removed-features.args => cpu-no-removed-features.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err
 create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err
 create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.args
 create mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
 rename tests/qemuxml2argvdata/{cpu-numa-memshared.args => cpu-numa-no-memory-element.x86_64-latest.args} (56%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-numa1.args
 create mode 100644 tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-numa2.args
 create mode 100644 tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
 rename tests/qemuxml2argvdata/{cpu-cache-disable3.args => cpu-phys-bits-emulate.x86_64-latest.args} (57%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
 rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args => cpu-phys-bits-passthrough.x86_64-latest.args} (57%)
 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%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-strict1.args
 create mode 100644 tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-topology1.args
 rename tests/qemuxml2argvdata/{balloon-device.args => cpu-topology1.x86_64-latest.args} (55%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-topology2.args
 create mode 100644 tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-topology3.args
 create mode 100644 tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args
 rename tests/qemuxml2argvdata/{monitor-json.xml => cpu-topology4.xml} (51%)
 rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-frequency.x86_64-latest.args} (65%)
 rename tests/qemuxml2argvdata/{default-kvm-host-arch.args => default-kvm-host-arch.x86_64-latest.args} (58%)
 rename tests/qemuxml2argvdata/{default-qemu-host-arch.args => default-qemu-host-arch.x86_64-latest.args} (59%)
 delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args
 rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.x86_64-latest.args} (62%)
 rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args} (61%)
 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} (55%)
 rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err => hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args
 rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err => hostdev-pci-duplicate.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args
 rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err => hostdev-scsi-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{pci-rom.args => hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (54%)
 rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err => hostdev-usb-duplicate.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args => hostdev-vfio-multidomain.x86_64-latest.args} (58%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err => hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio.args
 rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args => hostdev-vfio.x86_64-latest.args} (58%)
 rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args} (55%)
 rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err => hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err => hugepages-memaccess-invalid.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hugepages-memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.args
 create mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/input-usbtablet.args
 create mode 100644 tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args
 rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args} (62%)
 rename tests/qemuxml2argvdata/{kvm-pit-discard.args => kvm-pit-discard.x86_64-latest.args} (62%)
 rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (64%)
 delete mode 100644 tests/qemuxml2argvdata/machine-aliases1.args
 create mode 100644 tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args
 rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args => machine-aliases2.x86_64-latest.args} (61%)
 create mode 100644 tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/machine-core-on.args
 rename tests/qemuxml2argvdata/{balloon-device-period.args => machine-core-on.x86_64-latest.args} (64%)
 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%)
 delete mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.args
 create mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args
 rename tests/qemuxml2argvdata/{memory-align-fail.err => memory-align-fail.x86_64-latest.err} (100%)
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/memory-hotplug.args
 rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args => memory-hotplug.x86_64-latest.args} (58%)
 delete mode 100644 tests/qemuxml2argvdata/memtune-unlimited.args
 create mode 100644 tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/memtune.args
 create mode 100644 tests/qemuxml2argvdata/memtune.x86_64-latest.args
 rename tests/qemuxml2argvdata/{migrate-numa-unaligned.args => migrate-numa-unaligned.x86_64-latest.args} (54%)
 rename tests/qemuxml2argvdata/{migrate.args => migrate.x86_64-latest.args} (65%)
 rename tests/qemuxml2argvdata/{minimal-no-memory.err => minimal-no-memory.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/minimal.args
 create mode 100644 tests/qemuxml2argvdata/minimal.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/misc-acpi.args
 rename tests/qemuxml2argvdata/{balloon-device-deflate.args => misc-acpi.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{misc-disable-s3.args => misc-disable-s3.x86_64-latest.args} (65%)
 rename tests/qemuxml2argvdata/{misc-disable-suspends.args => misc-disable-suspends.x86_64-latest.args} (65%)
 delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err
 rename tests/qemuxml2argvdata/{misc-enable-s4.args => misc-enable-s4.x86_64-latest.args} (65%)
 delete mode 100644 tests/qemuxml2argvdata/misc-uuid.args
 rename tests/qemuxml2argvdata/{balloon-device-auto.args => misc-uuid.x86_64-latest.args} (64%)
 delete mode 100644 tests/qemuxml2argvdata/monitor-json.args
 delete mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.args
 create mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args
 rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args} (64%)
 delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
 create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
 create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
 rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err => numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
 create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
 create mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/numad.args
 create mode 100644 tests/qemuxml2argvdata/numad.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
 create mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args
 rename tests/qemuxml2argvdata/{numatune-auto-prefer.args => numatune-auto-prefer.x86_64-latest.args} (56%)
 rename tests/qemuxml2argvdata/{numatune-distances.args => numatune-distances.x86_64-latest.args} (60%)
 rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err => numatune-memnode-invalid-mode.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args => numatune-memnode-no-memory.x86_64-latest.args} (57%)
 rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err => numatune-memnode-nocpu.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args
 rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err => numatune-memnodes-problematic.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err => numatune-memory-invalid-nodeset.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args
 delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml
 rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err => numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.args
 create mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.args
 create mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pci-autofill-addr.args => pci-autofill-addr.x86_64-latest.args} (57%)
 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} (68%)
 rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err => pci-bridge-negative-index-invalid.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/pci-bridge.args
 create mode 100644 tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/pci-expander-bus.args
 create mode 100644 tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
 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} (67%)
 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} (58%)
 create mode 100644 tests/qemuxml2argvdata/pci-rom.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.args
 create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args => pcie-root-port-model-generic.x86_64-latest.args} (51%)
 rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args => pcie-root-port-model-ioh3420.x86_64-latest.args} (55%)
 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} (53%)
 rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (55%)
 delete mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.args
 create mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.args
 create mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args} (54%)
 rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (59%)
 rename tests/qemuxml2argvdata/{pmu-feature-off.args => pmu-feature-off.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args} (64%)
 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%)
 delete mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.args
 create mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args
 delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
 delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args
 delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml
 delete mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.args
 create mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.args
 create mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args
 rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/q35.args
 rename tests/qemuxml2argvdata/{q35-usb2.args => q35.x86_64-latest.args} (51%)
 rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-alt.x86_64-latest.args} (61%)
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
 create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args
 rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-no-env.x86_64-latest.args} (65%)
 rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args => reboot-timeout-disabled.x86_64-latest.args} (63%)
 rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args => reboot-timeout-enabled.x86_64-latest.args} (63%)
 rename tests/qemuxml2argvdata/{restore-v2-fd.args => restore-v2-fd.x86_64-latest.args} (61%)
 rename tests/qemuxml2argvdata/{restore-v2.args => restore-v2.x86_64-latest.args} (65%)
 delete mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args
 rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args => seclabel-dynamic-override.x86_64-latest.args} (63%)
 delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args
 rename tests/qemuxml2argvdata/{seclabel-multiple.err => seclabel-multiple.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/seclabel-none.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/seclabel-static.args
 create mode 100644 tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
 delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args
 delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args
 delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
 delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args
 delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args
 create mode 100644 tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.args
 create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/smartcard-host.args
 create mode 100644 tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args
 rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.x86_64-latest.args} (52%)
 rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.x86_64-latest.args} (54%)
 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} (70%)
 delete mode 100644 tests/qemuxml2argvdata/smp-dies.args
 delete mode 100644 tests/qemuxml2argvdata/smp.args
 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/{clock-utc.args => usb-controller-default-i440fx.x86_64-latest.args} (59%)
 rename tests/qemuxml2argvdata/{usb-controller.xml => usb-controller-default-i440fx.xml} (100%)
 create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.xml
 rename tests/qemuxml2argvdata/{usb-controller-default-q35.args => usb-controller-default-q35.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{smartcard-controller.args => usb-controller-default-unavailable-i440fx.x86_64-latest.args} (63%)
 create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml
 rename tests/qemuxml2argvdata/{usb-controller-default-unavailable-q35.err => usb-controller-default-unavailable-q35.x86_64-latest.err} (100%)
 delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml
 create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml => usb-controller-ich9-autoassign.xml} (100%)
 create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-ich9-companion.xml => usb-controller-ich9-companion.xml} (100%)
 create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml => usb-controller-ich9-ehci-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err => usb-controller-ich9-no-companion.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml => usb-controller-ich9-no-companion.xml} (100%)
 rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args => usb-controller-implicit-i440fx.x86_64-latest.args} (63%)
 rename tests/qemuxml2argvdata/{usb-controller-xhci.xml => usb-controller-implicit-i440fx.xml} (86%)
 rename tests/qemuxml2argvdata/{acpi-table.args => usb-controller-implicit-isapc.x86_64-latest.args} (67%)
 create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml
 create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml
 rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err => usb-controller-nec-xhci-limit.x86_64-latest.err} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml => usb-controller-nec-xhci-limit.xml} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err => usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%)
 create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml
 rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args => usb-controller-nec-xhci.x86_64-latest.args} (64%)
 rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml => usb-controller-nec-xhci.xml} (100%)
 create mode 100644 tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml => usb-controller-nex-xhci-autoassign.xml} (100%)
 rename tests/qemuxml2argvdata/{input-usbmouse.args => usb-controller-piix3.x86_64-latest.args} (59%)
 rename tests/qemuxml2argvdata/{usb-piix3-controller.xml => usb-controller-piix3.xml} (100%)
 rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err => usb-controller-qemu-xhci-limit.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err
 delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml
 delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
 rename tests/qemuxml2argvdata/{serial-unix-chardev.args => usb-controller-qemu-xhci.x86_64-latest.args} (63%)
 delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args
 delete mode 100644 tests/qemuxml2argvdata/usb-controller.args
 delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
 create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.args
 create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/usb-hub.args
 create mode 100644 tests/qemuxml2argvdata/usb-hub.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-ich9-autoassign.args
 delete mode 100644 tests/qemuxml2argvdata/usb-ich9-companion.args
 delete mode 100644 tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
 delete mode 100644 tests/qemuxml2argvdata/usb-long-port-path.args
 create mode 100644 tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args
 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%)
 delete mode 100644 tests/qemuxml2argvdata/usb-none.args
 create mode 100644 tests/qemuxml2argvdata/usb-none.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.args
 create mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-port-missing.args
 create mode 100644 tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err => usb-ports-out-of-range.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/usb-ports.args
 create mode 100644 tests/qemuxml2argvdata/usb-ports.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-redir-boot.args
 create mode 100644 tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.args
 create mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter.args
 create mode 100644 tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/usb-redir.args
 create mode 100644 tests/qemuxml2argvdata/usb-redir.x86_64-latest.args
 rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err => usb-too-long-port-path-invalid.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/usb-xhci-autoassign.args
 delete mode 100644 tests/qemuxml2argvdata/usb1-usb2.args
 create mode 100644 tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args
 rename tests/qemuxml2argvdata/{vhost_queues-invalid.err => vhost_queues-invalid.x86_64-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.args
 create mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-input.args
 create mode 100644 tests/qemuxml2argvdata/virtio-input.x86_64-latest.args
 rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err => virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/virtio-rng-default.args
 create mode 100644 tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args
 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} (54%)
 delete mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.args
 create mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-rng-random.args
 create mode 100644 tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/vmcoreinfo.args
 create mode 100644 tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{usb-controller.x86_64-latest.xml => usb-controller-default-i440fx.x86_64-latest.xml} (100%)
 rename tests/{qemuxml2argvdata/smp.xml => qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml} (57%)
 rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml => usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{smp.x86_64-latest.xml => usb-controller-implicit-i440fx.x86_64-latest.xml} (65%)
 rename tests/{qemuxml2argvdata/smp-dies.xml => qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml} (50%)
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml
 rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%)

-- 
2.41.0

On a Tuesday in 2023, Peter Krempa wrote:
>This series converts all outstanding test cases to use real
>capabilities.
>
>In the process few cases of pointless tests or features which are
>supported by every version of qemu were identified and addressed.
>
>To simplify the bulk of the conversion I've opted to simply set the most
>common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what
>the test asked for. This is done in a handful of patches and allows then
>a bulk conversion of many tests with no changes in the output files.
>
>I've payed special attention to CPU tests were I've ensured that they
>are semantically testing what they were before.
>

[...]

> tests/qemuxml2xmltest.c                       |   14 +-
> tests/testutilsqemu.c                         |  159 +--
> tests/testutilsqemu.h                         |    6 +-
> 550 files changed, 6870 insertions(+), 7188 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/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%)
> rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%)
>

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

Jano

On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:
> This series converts all outstanding test cases to use real
> capabilities.
> 
> In the process few cases of pointless tests or features which are
> supported by every version of qemu were identified and addressed.
> 
> To simplify the bulk of the conversion I've opted to simply set the most
> common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what
> the test asked for. This is done in a handful of patches and allows then
> a bulk conversion of many tests with no changes in the output files.
> 
> I've payed special attention to CPU tests were I've ensured that they
> are semantically testing what they were before.


Note: As is this breaks 'securityselinuxlabellingtest' as that test is
skipped on filesystems not supporting xattr and I'm building libvirt in
tmpfs to save wear on the SSD. I'll update with what changes are
necessary.

On 9/5/23 16:54, Peter Krempa wrote:
> On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:
>> This series converts all outstanding test cases to use real
>> capabilities.
>>
>> In the process few cases of pointless tests or features which are
>> supported by every version of qemu were identified and addressed.
>>
>> To simplify the bulk of the conversion I've opted to simply set the most
>> common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what
>> the test asked for. This is done in a handful of patches and allows then
>> a bulk conversion of many tests with no changes in the output files.
>>
>> I've payed special attention to CPU tests were I've ensured that they
>> are semantically testing what they were before.
> 
> 
> Note: As is this breaks 'securityselinuxlabellingtest' as that test is
> skipped on filesystems not supporting xattr and I'm building libvirt in
> tmpfs to save wear on the SSD. I'll update with what changes are
> necessary.
> 

With kernel-6.6 tmpfs gains support for user.* XATTRs too (among other things):

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ecd7db20474c3859d4d01f34aaabf41bd28c7d84

Michal

On Wed, Sep 06, 2023 at 10:01:22 +0200, Michal Prívozník wrote:
> On 9/5/23 16:54, Peter Krempa wrote:
> > On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:

[...]

> > Note: As is this breaks 'securityselinuxlabellingtest' as that test is
> > skipped on filesystems not supporting xattr and I'm building libvirt in
> > tmpfs to save wear on the SSD. I'll update with what changes are
> > necessary.
> > 
> 
> With kernel-6.6 tmpfs gains support for user.* XATTRs too (among other things):
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ecd7db20474c3859d4d01f34aaabf41bd28c7d84

Oh, cool! That means that I'll be also testing image relabelling
regularly because I put throwaway images on tmpfs too.

I'll have to wait a bit still though: kernel-6.4.13-200.fc38