From 2e02f2b2df45e314f7be5d7e651e1d9fa44ebd44 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 1 Dec 2017 15:18:49 +0100
Subject: [PATCH] tests: Drop qemuxml2argv- prefix for qemuxml2argv-*.xml test
 cases

These XMLs live in a separate directory, there's no need for them
to have a special prefix in addition. It also doesn't play nicely
with ':e' completion in Vim, finding proper file based on
qemuxml2argvtest.c is also needlessly complicated.

The files were renamed using the following commands. From
qemuxml2argvdata:

  for i in qemuxml2argv-*.xml; do mv $i ${i#qemuxml2argv-}; done

and then (to fix broken symlinks) from qemuxml2argvdata and
qemuxml2xmloutdata:

  for i in $(find . -xtype l); do \
      ln -sf $(readlink $i | sed 's/qemuxml2argv-//') $i;
  done

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 ...-ide-address-conflict.xml => 440fx-ide-address-conflict.xml} | 0
 .../{qemuxml2argv-440fx-wrong-root.xml => 440fx-wrong-root.xml} | 0
 ...ch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} | 0
 ...xml2argv-aarch64-acpi-nouefi.xml => aarch64-acpi-nouefi.xml} | 0
 ...qemuxml2argv-aarch64-acpi-uefi.xml => aarch64-acpi-uefi.xml} | 0
 ...-aarch64-cpu-passthrough.xml => aarch64-cpu-passthrough.xml} | 0
 ...xml2argv-aarch64-gic-default.xml => aarch64-gic-default.xml} | 0
 .../{qemuxml2argv-aarch64-gic-host.xml => aarch64-gic-host.xml} | 0
 ...xml2argv-aarch64-gic-invalid.xml => aarch64-gic-invalid.xml} | 0
 tests/qemuxml2argvdata/aarch64-gic-none-both.xml                | 1 +
 ...l2argv-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} | 0
 tests/qemuxml2argvdata/aarch64-gic-none-v2.xml                  | 1 +
 tests/qemuxml2argvdata/aarch64-gic-none-v3.xml                  | 1 +
 .../{qemuxml2argv-aarch64-gic-none.xml => aarch64-gic-none.xml} | 0
 ...xml2argv-aarch64-gic-not-arm.xml => aarch64-gic-not-arm.xml} | 0
 ...l2argv-aarch64-gic-not-virt.xml => aarch64-gic-not-virt.xml} | 0
 .../{qemuxml2argv-aarch64-gic-v2.xml => aarch64-gic-v2.xml}     | 0
 .../{qemuxml2argv-aarch64-gic-v3.xml => aarch64-gic-v3.xml}     | 0
 ...l2argv-aarch64-kvm-32-on-64.xml => aarch64-kvm-32-on-64.xml} | 0
 ...argv-aarch64-noacpi-nouefi.xml => aarch64-noacpi-nouefi.xml} | 0
 ...xml2argv-aarch64-noacpi-uefi.xml => aarch64-noacpi-uefi.xml} | 0
 ...muxml2argv-aarch64-pci-serial.xml => aarch64-pci-serial.xml} | 0
 ...troller-nec-xhci.xml => aarch64-usb-controller-nec-xhci.xml} | 0
 ...oller-qemu-xhci.xml => aarch64-usb-controller-qemu-xhci.xml} | 0
 ...argv-aarch64-video-default.xml => aarch64-video-default.xml} | 0
 ...ideo-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} | 0
 ...-pci-default.xml => aarch64-virt-2.6-virtio-pci-default.xml} | 0
 ...arch64-virt-default-nic.xml => aarch64-virt-default-nic.xml} | 0
 ...xml2argv-aarch64-virt-virtio.xml => aarch64-virt-virtio.xml} | 0
 ...64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} | 0
 ...al-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} | 0
 .../{qemuxml2argv-acpi-table.xml => acpi-table.xml}             | 0
 ...l2argv-arm-vexpressa9-basic.xml => arm-vexpressa9-basic.xml} | 0
 ...argv-arm-vexpressa9-nodevs.xml => arm-vexpressa9-nodevs.xml} | 0
 ...argv-arm-vexpressa9-virtio.xml => arm-vexpressa9-virtio.xml} | 0
 .../{qemuxml2argv-arm-virt-virtio.xml => arm-virt-virtio.xml}   | 0
 .../{qemuxml2argv-autoindex.xml => autoindex.xml}               | 0
 ...xml2argv-balloon-ccw-deflate.xml => balloon-ccw-deflate.xml} | 0
 ...xml2argv-balloon-device-auto.xml => balloon-device-auto.xml} | 0
 ...on-device-deflate-off.xml => balloon-device-deflate-off.xml} | 0
 ...gv-balloon-device-deflate.xml => balloon-device-deflate.xml} | 0
 ...argv-balloon-device-period.xml => balloon-device-period.xml} | 0
 .../{qemuxml2argv-balloon-device.xml => balloon-device.xml}     | 0
 ...l2argv-balloon-mmio-deflate.xml => balloon-mmio-deflate.xml} | 0
 ...ios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} | 0
 ...qemuxml2argv-bios-nvram-secure.xml => bios-nvram-secure.xml} | 0
 .../{qemuxml2argv-bios-nvram.xml => bios-nvram.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-bios.xml => bios.xml}      | 0
 ...gv-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} | 0
 ...-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} | 0
 .../{qemuxml2argv-blkdeviotune-max.xml => blkdeviotune-max.xml} | 0
 .../{qemuxml2argv-blkdeviotune.xml => blkdeviotune.xml}         | 0
 .../{qemuxml2argv-blkiotune-device.xml => blkiotune-device.xml} | 0
 .../{qemuxml2argv-blkiotune.xml => blkiotune.xml}               | 0
 .../{qemuxml2argv-boot-cdrom.xml => boot-cdrom.xml}             | 0
 ...gv-boot-complex-bootindex.xml => boot-complex-bootindex.xml} | 0
 .../{qemuxml2argv-boot-complex.xml => boot-complex.xml}         | 0
 .../{qemuxml2argv-boot-dev+order.xml => boot-dev+order.xml}     | 0
 .../{qemuxml2argv-boot-floppy-q35.xml => boot-floppy-q35.xml}   | 0
 .../{qemuxml2argv-boot-floppy.xml => boot-floppy.xml}           | 0
 ...rive-bootindex.xml => boot-menu-disable-drive-bootindex.xml} | 0
 ...-boot-menu-disable-drive.xml => boot-menu-disable-drive.xml} | 0
 ...able-with-timeout.xml => boot-menu-disable-with-timeout.xml} | 0
 ...qemuxml2argv-boot-menu-disable.xml => boot-menu-disable.xml} | 0
 ...menu-enable-bootindex.xml => boot-menu-enable-bootindex.xml} | 0
 ...ut-invalid.xml => boot-menu-enable-with-timeout-invalid.xml} | 0
 ...nable-with-timeout.xml => boot-menu-enable-with-timeout.xml} | 0
 .../{qemuxml2argv-boot-menu-enable.xml => boot-menu-enable.xml} | 0
 .../{qemuxml2argv-boot-multi.xml => boot-multi.xml}             | 0
 .../{qemuxml2argv-boot-network.xml => boot-network.xml}         | 0
 .../{qemuxml2argv-boot-order.xml => boot-order.xml}             | 0
 .../{qemuxml2argv-boot-strict.xml => boot-strict.xml}           | 0
 ...l2argv-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} | 0
 .../{qemuxml2argv-channel-guestfwd.xml => channel-guestfwd.xml} | 0
 ...l2argv-channel-spicevmc-old.xml => channel-spicevmc-old.xml} | 0
 .../{qemuxml2argv-channel-spicevmc.xml => channel-spicevmc.xml} | 0
 ...hannel-unix-source-path.xml => channel-unix-source-path.xml} | 0
 ...xml2argv-channel-virtio-auto.xml => channel-virtio-auto.xml} | 0
 ...gv-channel-virtio-autoadd.xml => channel-virtio-autoadd.xml} | 0
 ...nnel-virtio-autoassign.xml => channel-virtio-autoassign.xml} | 0
 ...gv-channel-virtio-default.xml => channel-virtio-default.xml} | 0
 ...l2argv-channel-virtio-state.xml => channel-virtio-state.xml} | 0
 ...xml2argv-channel-virtio-unix.xml => channel-virtio-unix.xml} | 0
 .../{qemuxml2argv-channel-virtio.xml => channel-virtio.xml}     | 0
 .../{qemuxml2argv-chardev-label.xml => chardev-label.xml}       | 0
 ...-generated-path.xml => chardev-reconnect-generated-path.xml} | 0
 ...nvalid-timeout.xml => chardev-reconnect-invalid-timeout.xml} | 0
 ...qemuxml2argv-chardev-reconnect.xml => chardev-reconnect.xml} | 0
 .../{qemuxml2argv-clock-catchup.xml => clock-catchup.xml}       | 0
 .../{qemuxml2argv-clock-france.xml => clock-france.xml}         | 0
 .../{qemuxml2argv-clock-hpet-off.xml => clock-hpet-off.xml}     | 0
 ...-basis-localtime.xml => clock-localtime-basis-localtime.xml} | 0
 .../{qemuxml2argv-clock-localtime.xml => clock-localtime.xml}   | 0
 ...gv-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} | 0
 .../{qemuxml2argv-clock-utc.xml => clock-utc.xml}               | 0
 .../{qemuxml2argv-clock-variable.xml => clock-variable.xml}     | 0
 .../{qemuxml2argv-console-compat-2.xml => console-compat-2.xml} | 0
 ...xml2argv-console-compat-auto.xml => console-compat-auto.xml} | 0
 ...gv-console-compat-chardev.xml => console-compat-chardev.xml} | 0
 .../{qemuxml2argv-console-compat.xml => console-compat.xml}     | 0
 .../{qemuxml2argv-console-compat2.xml => console-compat2.xml}   | 0
 .../{qemuxml2argv-console-sclp.xml => console-sclp.xml}         | 0
 ...muxml2argv-console-virtio-ccw.xml => console-virtio-ccw.xml} | 0
 ...xml2argv-console-virtio-many.xml => console-virtio-many.xml} | 0
 ...xml2argv-console-virtio-s390.xml => console-virtio-s390.xml} | 0
 .../{qemuxml2argv-console-virtio.xml => console-virtio.xml}     | 0
 .../{qemuxml2argv-controller-order.xml => controller-order.xml} | 0
 ...l2argv-controller-usb-order.xml => controller-usb-order.xml} | 0
 ...qemuxml2argv-cpu-Haswell-noTSX.xml => cpu-Haswell-noTSX.xml} | 0
 .../{qemuxml2argv-cpu-Haswell.xml => cpu-Haswell.xml}           | 0
 .../{qemuxml2argv-cpu-Haswell2.xml => cpu-Haswell2.xml}         | 0
 .../{qemuxml2argv-cpu-Haswell3.xml => cpu-Haswell3.xml}         | 0
 ...qemuxml2argv-cpu-cache-disable.xml => cpu-cache-disable.xml} | 0
 ...muxml2argv-cpu-cache-disable2.xml => cpu-cache-disable2.xml} | 0
 ...muxml2argv-cpu-cache-disable3.xml => cpu-cache-disable3.xml} | 0
 ...l2argv-cpu-cache-emulate-l2.xml => cpu-cache-emulate-l2.xml} | 0
 ...l2argv-cpu-cache-emulate-l3.xml => cpu-cache-emulate-l3.xml} | 0
 ...pu-cache-passthrough-l3.xml => cpu-cache-passthrough-l3.xml} | 0
 ...argv-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} | 0
 ...gv-cpu-cache-passthrough2.xml => cpu-cache-passthrough2.xml} | 0
 ...gv-cpu-cache-passthrough3.xml => cpu-cache-passthrough3.xml} | 0
 ...gv-cpu-check-default-none.xml => cpu-check-default-none.xml} | 0
 ...-cpu-check-default-none2.xml => cpu-check-default-none2.xml} | 0
 ...-check-default-partial.xml => cpu-check-default-partial.xml} | 0
 ...heck-default-partial2.xml => cpu-check-default-partial2.xml} | 0
 .../{qemuxml2argv-cpu-check-full.xml => cpu-check-full.xml}     | 0
 .../{qemuxml2argv-cpu-check-none.xml => cpu-check-none.xml}     | 0
 ...qemuxml2argv-cpu-check-partial.xml => cpu-check-partial.xml} | 0
 .../{qemuxml2argv-cpu-empty.xml => cpu-empty.xml}               | 0
 .../{qemuxml2argv-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} | 0
 .../{qemuxml2argv-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml}   | 0
 .../{qemuxml2argv-cpu-exact1.xml => cpu-exact1.xml}             | 0
 ...argv-cpu-exact2-nofallback.xml => cpu-exact2-nofallback.xml} | 0
 .../{qemuxml2argv-cpu-exact2.xml => cpu-exact2.xml}             | 0
 .../{qemuxml2argv-cpu-fallback.xml => cpu-fallback.xml}         | 0
 ...qemuxml2argv-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} | 0
 ...muxml2argv-cpu-host-model-cmt.xml => cpu-host-model-cmt.xml} | 0
 ...-cpu-host-model-fallback.xml => cpu-host-model-fallback.xml} | 0
 ...-cpu-host-model-features.xml => cpu-host-model-features.xml} | 0
 ...-host-model-nofallback.xml => cpu-host-model-nofallback.xml} | 0
 ...argv-cpu-host-model-vendor.xml => cpu-host-model-vendor.xml} | 0
 .../{qemuxml2argv-cpu-host-model.xml => cpu-host-model.xml}     | 0
 ...ssthrough-features.xml => cpu-host-passthrough-features.xml} | 0
 ...l2argv-cpu-host-passthrough.xml => cpu-host-passthrough.xml} | 0
 ...xml2argv-cpu-hotplug-startup.xml => cpu-hotplug-startup.xml} | 0
 .../{qemuxml2argv-cpu-kvmclock.xml => cpu-kvmclock.xml}         | 0
 .../{qemuxml2argv-cpu-minimum1.xml => cpu-minimum1.xml}         | 0
 .../{qemuxml2argv-cpu-minimum2.xml => cpu-minimum2.xml}         | 0
 .../{qemuxml2argv-cpu-nofallback.xml => cpu-nofallback.xml}     | 0
 ...qemuxml2argv-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} | 0
 ...xml2argv-cpu-numa-disordered.xml => cpu-numa-disordered.xml} | 0
 ...muxml2argv-cpu-numa-memshared.xml => cpu-numa-memshared.xml} | 0
 ...uma-no-memory-element.xml => cpu-numa-no-memory-element.xml} | 0
 .../{qemuxml2argv-cpu-numa1.xml => cpu-numa1.xml}               | 0
 .../{qemuxml2argv-cpu-numa2.xml => cpu-numa2.xml}               | 0
 .../{qemuxml2argv-cpu-numa3.xml => cpu-numa3.xml}               | 0
 ...-qemu-host-passthrough.xml => cpu-qemu-host-passthrough.xml} | 0
 ...qemuxml2argv-cpu-s390-features.xml => cpu-s390-features.xml} | 0
 .../{qemuxml2argv-cpu-s390-zEC12.xml => cpu-s390-zEC12.xml}     | 0
 .../{qemuxml2argv-cpu-strict1.xml => cpu-strict1.xml}           | 0
 .../{qemuxml2argv-cpu-topology1.xml => cpu-topology1.xml}       | 0
 .../{qemuxml2argv-cpu-topology2.xml => cpu-topology2.xml}       | 0
 .../{qemuxml2argv-cpu-topology3.xml => cpu-topology3.xml}       | 0
 ...qemuxml2argv-cpu-tsc-frequency.xml => cpu-tsc-frequency.xml} | 0
 ...qemuxml2argv-cputune-iothreads.xml => cputune-iothreads.xml} | 0
 ...hreadsched-toomuch.xml => cputune-iothreadsched-toomuch.xml} | 0
 ...-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} | 0
 ...argv-cputune-iothreadsched.xml => cputune-iothreadsched.xml} | 0
 .../{qemuxml2argv-cputune-numatune.xml => cputune-numatune.xml} | 0
 ...tune-vcpusched-overlap.xml => cputune-vcpusched-overlap.xml} | 0
 ...xml2argv-cputune-zero-shares.xml => cputune-zero-shares.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-cputune.xml => cputune.xml}  | 0
 .../{qemuxml2argv-debug-threads.xml => debug-threads.xml}       | 0
 ...argv-default-kvm-host-arch.xml => default-kvm-host-arch.xml} | 0
 ...gv-default-qemu-host-arch.xml => default-qemu-host-arch.xml} | 0
 ...muxml2argv-disk-active-commit.xml => disk-active-commit.xml} | 0
 .../{qemuxml2argv-disk-aio.xml => disk-aio.xml}                 | 0
 ...xml2argv-disk-backing-chains.xml => disk-backing-chains.xml} | 0
 .../{qemuxml2argv-disk-blockio.xml => disk-blockio.xml}         | 0
 .../{qemuxml2argv-disk-cdrom-empty.xml => disk-cdrom-empty.xml} | 0
 ...gv-disk-cdrom-network-ftp.xml => disk-cdrom-network-ftp.xml} | 0
 ...-disk-cdrom-network-ftps.xml => disk-cdrom-network-ftps.xml} | 0
 ...-disk-cdrom-network-http.xml => disk-cdrom-network-http.xml} | 0
 ...isk-cdrom-network-https.xml => disk-cdrom-network-https.xml} | 0
 ...-disk-cdrom-network-tftp.xml => disk-cdrom-network-tftp.xml} | 0
 ...tray-no-device-cap.xml => disk-cdrom-tray-no-device-cap.xml} | 0
 .../{qemuxml2argv-disk-cdrom-tray.xml => disk-cdrom-tray.xml}   | 0
 .../{qemuxml2argv-disk-cdrom.xml => disk-cdrom.xml}             | 0
 ...qemuxml2argv-disk-copy_on_read.xml => disk-copy_on_read.xml} | 0
 ...ce-lun-type-invalid.xml => disk-device-lun-type-invalid.xml} | 0
 ...ive-address-conflict.xml => disk-drive-address-conflict.xml} | 0
 ...argv-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} | 0
 ...l2argv-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} | 0
 ...ive-cache-directsync.xml => disk-drive-cache-directsync.xml} | 0
 ...-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} | 0
 ...isk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} | 0
 ...gv-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} | 0
 ...gv-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} | 0
 ...-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} | 0
 ...isk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} | 0
 ...muxml2argv-disk-drive-discard.xml => disk-drive-discard.xml} | 0
 ...policy-enospace.xml => disk-drive-error-policy-enospace.xml} | 0
 ...e-error-policy-stop.xml => disk-drive-error-policy-stop.xml} | 0
 ...-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} | 0
 ...xml2argv-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} | 0
 ...drive-network-gluster.xml => disk-drive-network-gluster.xml} | 0
 ...xml => disk-drive-network-iscsi-auth-secrettype-invalid.xml} | 0
 ...e.xml => disk-drive-network-iscsi-auth-wrong-secrettype.xml} | 0
 ...network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} | 0
 ...e-network-iscsi-lun.xml => disk-drive-network-iscsi-lun.xml} | 0
 ...isk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} | 0
 ...network-nbd-export.xml => disk-drive-network-nbd-export.xml} | 0
 ...d-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} | 0
 ...ive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} | 0
 ...ive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} | 0
 ...gv-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} | 0
 ...ork-rbd-auth-AES.xml => disk-drive-network-rbd-auth-AES.xml} | 0
 ...ive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} | 0
 ...ork-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} | 0
 ...ive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} | 0
 ...ork-rbd-no-colon.xml => disk-drive-network-rbd-no-colon.xml} | 0
 ...gv-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} | 0
 ...ive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} | 0
 ...ce-auth-both.xml => disk-drive-network-source-auth-both.xml} | 0
 ...twork-source-auth.xml => disk-drive-network-source-auth.xml} | 0
 ...ork-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} | 0
 ...-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} | 0
 ...muxml2argv-disk-drive-no-boot.xml => disk-drive-no-boot.xml} | 0
 ...isk-drive-readonly-disk.xml => disk-drive-readonly-disk.xml} | 0
 ...readonly-no-device.xml => disk-drive-readonly-no-device.xml} | 0
 ...k-drive-shared-locking.xml => disk-drive-shared-locking.xml} | 0
 ...gv-disk-drive-shared-qcow.xml => disk-drive-shared-qcow.xml} | 0
 ...qemuxml2argv-disk-drive-shared.xml => disk-drive-shared.xml} | 0
 ...compatible-address.xml => disk-fdc-incompatible-address.xml} | 0
 ...xml2argv-disk-floppy-pseries.xml => disk-floppy-pseries.xml} | 0
 ...ray-no-device-cap.xml => disk-floppy-tray-no-device-cap.xml} | 0
 .../{qemuxml2argv-disk-floppy-tray.xml => disk-floppy-tray.xml} | 0
 .../{qemuxml2argv-disk-floppy.xml => disk-floppy.xml}           | 0
 .../{qemuxml2argv-disk-geometry.xml => disk-geometry.xml}       | 0
 ...ress-conflict.xml => disk-hostdev-scsi-address-conflict.xml} | 0
 ...auth-AES.xml => disk-hostdev-scsi-virtio-iscsi-auth-AES.xml} | 0
 ...l2argv-disk-ide-drive-split.xml => disk-ide-drive-split.xml} | 0
 ...compatible-address.xml => disk-ide-incompatible-address.xml} | 0
 .../{qemuxml2argv-disk-ide-wwn.xml => disk-ide-wwn.xml}         | 0
 .../{qemuxml2argv-disk-ioeventfd.xml => disk-ioeventfd.xml}     | 0
 .../{qemuxml2argv-disk-iscsi.xml => disk-iscsi.xml}             | 0
 .../{qemuxml2argv-disk-many.xml => disk-many.xml}               | 0
 .../{qemuxml2argv-disk-mirror-old.xml => disk-mirror-old.xml}   | 0
 .../{qemuxml2argv-disk-mirror.xml => disk-mirror.xml}           | 0
 .../{qemuxml2argv-disk-order.xml => disk-order.xml}             | 0
 ...qemuxml2argv-disk-same-targets.xml => disk-same-targets.xml} | 0
 .../{qemuxml2argv-disk-sata-device.xml => disk-sata-device.xml} | 0
 ...ompatible-address.xml => disk-sata-incompatible-address.xml} | 0
 ...argv-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} | 0
 .../{qemuxml2argv-disk-scsi-device.xml => disk-scsi-device.xml} | 0
 ...l2argv-disk-scsi-disk-split.xml => disk-scsi-disk-split.xml} | 0
 ...k-vpd-build-error.xml => disk-scsi-disk-vpd-build-error.xml} | 0
 ...muxml2argv-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} | 0
 ...muxml2argv-disk-scsi-disk-wwn.xml => disk-scsi-disk-wwn.xml} | 0
 ...ompatible-address.xml => disk-scsi-incompatible-address.xml} | 0
 ...-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} | 0
 ...k-scsi-lun-passthrough.xml => disk-scsi-lun-passthrough.xml} | 0
 ...qemuxml2argv-disk-scsi-megasas.xml => disk-scsi-megasas.xml} | 0
 ...l2argv-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} | 0
 ...argv-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} | 0
 .../{qemuxml2argv-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml}   | 0
 .../{qemuxml2argv-disk-serial.xml => disk-serial.xml}           | 0
 .../{qemuxml2argv-disk-snapshot.xml => disk-snapshot.xml}       | 0
 ...argv-disk-source-pool-mode.xml => disk-source-pool-mode.xml} | 0
 .../{qemuxml2argv-disk-source-pool.xml => disk-source-pool.xml} | 0
 .../{qemuxml2argv-disk-transient.xml => disk-transient.xml}     | 0
 ...k-usb-device-removable.xml => disk-usb-device-removable.xml} | 0
 .../{qemuxml2argv-disk-usb-device.xml => disk-usb-device.xml}   | 0
 ...muxml2argv-disk-usb-nosupport.xml => disk-usb-nosupport.xml} | 0
 .../{qemuxml2argv-disk-usb-pci.xml => disk-usb-pci.xml}         | 0
 ...l2argv-disk-virtio-ccw-many.xml => disk-virtio-ccw-many.xml} | 0
 .../{qemuxml2argv-disk-virtio-ccw.xml => disk-virtio-ccw.xml}   | 0
 ...isk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} | 0
 .../{qemuxml2argv-disk-virtio-s390.xml => disk-virtio-s390.xml} | 0
 ...l2argv-disk-virtio-scsi-ccw.xml => disk-virtio-scsi-ccw.xml} | 0
 ...io-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} | 0
 ...virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} | 0
 ...io-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} | 0
 ...rtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} | 0
 .../{qemuxml2argv-disk-virtio.xml => disk-virtio.xml}           | 0
 ...l2argv-encrypted-disk-usage.xml => encrypted-disk-usage.xml} | 0
 .../{qemuxml2argv-encrypted-disk.xml => encrypted-disk.xml}     | 0
 .../{qemuxml2argv-eoi-disabled.xml => eoi-disabled.xml}         | 0
 .../{qemuxml2argv-eoi-enabled.xml => eoi-enabled.xml}           | 0
 .../{qemuxml2argv-event_idx.xml => event_idx.xml}               | 0
 ...mory-no-numa-topology.xml => fd-memory-no-numa-topology.xml} | 0
 ...-fd-memory-numa-topology.xml => fd-memory-numa-topology.xml} | 0
 ...d-memory-numa-topology2.xml => fd-memory-numa-topology2.xml} | 0
 ...d-memory-numa-topology3.xml => fd-memory-numa-topology3.xml} | 0
 .../{qemuxml2argv-fips-enabled.xml => fips-enabled.xml}         | 0
 .../{qemuxml2argv-floppy-drive-fat.xml => floppy-drive-fat.xml} | 0
 .../{qemuxml2argv-fs9p-ccw.xml => fs9p-ccw.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-fs9p.xml => fs9p.xml}      | 0
 ...-graphics-listen-network.xml => graphics-listen-network.xml} | 0
 ...raphics-listen-network2.xml => graphics-listen-network2.xml} | 0
 ...-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} | 0
 .../{qemuxml2argv-graphics-sdl.xml => graphics-sdl.xml}         | 0
 ...e-agent-file-xfer.xml => graphics-spice-agent-file-xfer.xml} | 0
 ...phics-spice-agentmouse.xml => graphics-spice-agentmouse.xml} | 0
 ...e-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} | 0
 ...ics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} | 0
 ...ics-spice-compression.xml => graphics-spice-compression.xml} | 0
 ...gv-graphics-spice-no-args.xml => graphics-spice-no-args.xml} | 0
 ...gv-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} | 0
 ...xml2argv-graphics-spice-sasl.xml => graphics-spice-sasl.xml} | 0
 ...argv-graphics-spice-socket.xml => graphics-spice-socket.xml} | 0
 ...gv-graphics-spice-timeout.xml => graphics-spice-timeout.xml} | 0
 ...raphics-spice-usb-redir.xml => graphics-spice-usb-redir.xml} | 0
 .../{qemuxml2argv-graphics-spice.xml => graphics-spice.xml}     | 0
 ...vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} | 0
 ...raphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} | 0
 ...s-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} | 0
 ...qemuxml2argv-graphics-vnc-none.xml => graphics-vnc-none.xml} | 0
 ...xml2argv-graphics-vnc-policy.xml => graphics-vnc-policy.xml} | 0
 ...ated-socket.xml => graphics-vnc-remove-generated-socket.xml} | 0
 ...qemuxml2argv-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} | 0
 ...cket-new-cmdline.xml => graphics-vnc-socket-new-cmdline.xml} | 0
 ...xml2argv-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0
 .../{qemuxml2argv-graphics-vnc-tls.xml => graphics-vnc-tls.xml} | 0
 ...gv-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} | 0
 .../{qemuxml2argv-graphics-vnc.xml => graphics-vnc.xml}         | 0
 ...rget-address.xml => hostdev-mdev-invalid-target-address.xml} | 0
 ...-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} | 0
 ...address-invalid.xml => hostdev-mdev-src-address-invalid.xml} | 0
 ...ev-pci-address-device.xml => hostdev-pci-address-device.xml} | 0
 ...xml2argv-hostdev-pci-address.xml => hostdev-pci-address.xml} | 0
 ...csi-autogen-address.xml => hostdev-scsi-autogen-address.xml} | 0
 ...qemuxml2argv-hostdev-scsi-boot.xml => hostdev-scsi-boot.xml} | 0
 ...-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} | 0
 ...-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} | 0
 ...gv-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} | 0
 .../{qemuxml2argv-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} | 0
 ...muxml2argv-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} | 0
 ...argv-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} | 0
 ...qemuxml2argv-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} | 0
 ...gv-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} | 0
 ...-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} | 0
 ...-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} | 0
 ...virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} | 0
 ...tdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} | 0
 ...ostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} | 0
 ...ress-device-boot.xml => hostdev-usb-address-device-boot.xml} | 0
 ...ev-usb-address-device.xml => hostdev-usb-address-device.xml} | 0
 ...xml2argv-hostdev-usb-address.xml => hostdev-usb-address.xml} | 0
 ...ostdev-vfio-multidomain.xml => hostdev-vfio-multidomain.xml} | 0
 .../{qemuxml2argv-hostdev-vfio.xml => hostdev-vfio.xml}         | 0
 ...address-conflict.xml => hostdevs-drive-address-conflict.xml} | 0
 .../{qemuxml2argv-hotplug-base.xml => hotplug-base.xml}         | 0
 ...es-memaccess-invalid.xml => hugepages-memaccess-invalid.xml} | 0
 ...xml2argv-hugepages-memaccess.xml => hugepages-memaccess.xml} | 0
 ...l2argv-hugepages-memaccess2.xml => hugepages-memaccess2.xml} | 0
 .../{qemuxml2argv-hugepages-numa.xml => hugepages-numa.xml}     | 0
 .../{qemuxml2argv-hugepages-pages.xml => hugepages-pages.xml}   | 0
 .../{qemuxml2argv-hugepages-pages2.xml => hugepages-pages2.xml} | 0
 .../{qemuxml2argv-hugepages-pages3.xml => hugepages-pages3.xml} | 0
 .../{qemuxml2argv-hugepages-pages4.xml => hugepages-pages4.xml} | 0
 .../{qemuxml2argv-hugepages-pages5.xml => hugepages-pages5.xml} | 0
 .../{qemuxml2argv-hugepages-pages6.xml => hugepages-pages6.xml} | 0
 .../{qemuxml2argv-hugepages-pages7.xml => hugepages-pages7.xml} | 0
 .../{qemuxml2argv-hugepages-shared.xml => hugepages-shared.xml} | 0
 .../{qemuxml2argv-hugepages.xml => hugepages.xml}               | 0
 .../{qemuxml2argv-hyperv-off.xml => hyperv-off.xml}             | 0
 .../{qemuxml2argv-hyperv-panic.xml => hyperv-panic.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-hyperv.xml => hyperv.xml}  | 0
 ...xml2argv-input-usbmouse-addr.xml => input-usbmouse-addr.xml} | 0
 .../{qemuxml2argv-input-usbmouse.xml => input-usbmouse.xml}     | 0
 .../{qemuxml2argv-input-usbtablet.xml => input-usbtablet.xml}   | 0
 ...ntel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} | 0
 ...ntel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} | 0
 .../{qemuxml2argv-intel-iommu-eim.xml => intel-iommu-eim.xml}   | 0
 ...xml2argv-intel-iommu-machine.xml => intel-iommu-machine.xml} | 0
 .../{qemuxml2argv-intel-iommu.xml => intel-iommu.xml}           | 0
 .../{qemuxml2argv-interface-driver.xml => interface-driver.xml} | 0
 .../{qemuxml2argv-interface-server.xml => interface-server.xml} | 0
 ...hreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} | 0
 .../{qemuxml2argv-iothreads-disk.xml => iothreads-disk.xml}     | 0
 ...argv-iothreads-ids-partial.xml => iothreads-ids-partial.xml} | 0
 .../{qemuxml2argv-iothreads-ids.xml => iothreads-ids.xml}       | 0
 .../{qemuxml2argv-iothreads-nocap.xml => iothreads-nocap.xml}   | 0
 ...hreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} | 0
 ...hreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} | 0
 .../{qemuxml2argv-iothreads.xml => iothreads.xml}               | 0
 .../{qemuxml2argv-kvm-features-off.xml => kvm-features-off.xml} | 0
 .../{qemuxml2argv-kvm-features.xml => kvm-features.xml}         | 0
 .../{qemuxml2argv-kvm-pit-delay.xml => kvm-pit-delay.xml}       | 0
 .../{qemuxml2argv-kvm-pit-discard.xml => kvm-pit-discard.xml}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-kvm.xml => kvm.xml}        | 0
 ...argv-kvmclock+eoi-disabled.xml => kvmclock+eoi-disabled.xml} | 0
 .../{qemuxml2argv-kvmclock.xml => kvmclock.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-lease.xml => lease.xml}    | 0
 ...qemuxml2argv-luks-disk-invalid.xml => luks-disk-invalid.xml} | 0
 ...gv-luks-disks-source-both.xml => luks-disks-source-both.xml} | 0
 ...qemuxml2argv-luks-disks-source.xml => luks-disks-source.xml} | 0
 .../{qemuxml2argv-luks-disks.xml => luks-disks.xml}             | 0
 ...ach-virt-console-native.xml => mach-virt-console-native.xml} | 0
 ...ach-virt-console-virtio.xml => mach-virt-console-virtio.xml} | 0
 ...l+console-native.xml => mach-virt-serial+console-native.xml} | 0
 ...-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} | 0
 ...invalid-machine.xml => mach-virt-serial-invalid-machine.xml} | 0
 ...-mach-virt-serial-native.xml => mach-virt-serial-native.xml} | 0
 ...l2argv-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} | 0
 ...l2argv-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} | 0
 ...-aeskeywrap-off-argv.xml => machine-aeskeywrap-off-argv.xml} | 0
 ...ne-aeskeywrap-off-cap.xml => machine-aeskeywrap-off-cap.xml} | 0
 ...-aeskeywrap-off-caps.xml => machine-aeskeywrap-off-caps.xml} | 0
 ...ne-aeskeywrap-on-argv.xml => machine-aeskeywrap-on-argv.xml} | 0
 ...hine-aeskeywrap-on-cap.xml => machine-aeskeywrap-on-cap.xml} | 0
 ...ne-aeskeywrap-on-caps.xml => machine-aeskeywrap-on-caps.xml} | 0
 .../{qemuxml2argv-machine-aliases1.xml => machine-aliases1.xml} | 0
 .../{qemuxml2argv-machine-aliases2.xml => machine-aliases2.xml} | 0
 ...l2argv-machine-core-cfg-off.xml => machine-core-cfg-off.xml} | 0
 .../{qemuxml2argv-machine-core-off.xml => machine-core-off.xml} | 0
 .../{qemuxml2argv-machine-core-on.xml => machine-core-on.xml}   | 0
 ...-deakeywrap-off-argv.xml => machine-deakeywrap-off-argv.xml} | 0
 ...ne-deakeywrap-off-cap.xml => machine-deakeywrap-off-cap.xml} | 0
 ...-deakeywrap-off-caps.xml => machine-deakeywrap-off-caps.xml} | 0
 ...ne-deakeywrap-on-argv.xml => machine-deakeywrap-on-argv.xml} | 0
 ...hine-deakeywrap-on-cap.xml => machine-deakeywrap-on-cap.xml} | 0
 ...ne-deakeywrap-on-caps.xml => machine-deakeywrap-on-caps.xml} | 0
 ...hine-keywrap-none-argv.xml => machine-keywrap-none-argv.xml} | 0
 ...hine-keywrap-none-caps.xml => machine-keywrap-none-caps.xml} | 0
 ...l2argv-machine-keywrap-none.xml => machine-keywrap-none.xml} | 0
 ...s-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} | 0
 ...hine-loadparm-net-s390.xml => machine-loadparm-net-s390.xml} | 0
 ...-char-invalid.xml => machine-loadparm-s390-char-invalid.xml} | 0
 ...90-len-invalid.xml => machine-loadparm-s390-len-invalid.xml} | 0
 ...argv-machine-loadparm-s390.xml => machine-loadparm-s390.xml} | 0
 .../{qemuxml2argv-machine-smm-opt.xml => machine-smm-opt.xml}   | 0
 .../{qemuxml2argv-machine-usb-opt.xml => machine-usb-opt.xml}   | 0
 ...muxml2argv-machine-vmport-opt.xml => machine-vmport-opt.xml} | 0
 .../{qemuxml2argv-master-key.xml => master-key.xml}             | 0
 ...qemuxml2argv-memory-align-fail.xml => memory-align-fail.xml} | 0
 ...emory-hotplug-dimm-addr.xml => memory-hotplug-dimm-addr.xml} | 0
 ...xml2argv-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} | 0
 ...argv-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} | 0
 ...tplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} | 0
 ...hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} | 0
 ...argv-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} | 0
 ...hotplug-ppc64-nonuma.xml => memory-hotplug-ppc64-nonuma.xml} | 0
 .../{qemuxml2argv-memory-hotplug.xml => memory-hotplug.xml}     | 0
 ...qemuxml2argv-memorybacking-set.xml => memorybacking-set.xml} | 0
 ...xml2argv-memorybacking-unset.xml => memorybacking-unset.xml} | 0
 ...qemuxml2argv-memtune-unlimited.xml => memtune-unlimited.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-memtune.xml => memtune.xml}  | 0
 ...muxml2argv-metadata-duplicate.xml => metadata-duplicate.xml} | 0
 .../{qemuxml2argv-metadata.xml => metadata.xml}                 | 0
 ...gv-migrate-numa-unaligned.xml => migrate-numa-unaligned.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-migrate.xml => migrate.xml}  | 0
 ...argv-minimal-msg-timestamp.xml => minimal-msg-timestamp.xml} | 0
 ...qemuxml2argv-minimal-no-memory.xml => minimal-no-memory.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-minimal.xml => minimal.xml}  | 0
 .../{qemuxml2argv-misc-acpi.xml => misc-acpi.xml}               | 0
 .../{qemuxml2argv-misc-disable-s3.xml => misc-disable-s3.xml}   | 0
 ...argv-misc-disable-suspends.xml => misc-disable-suspends.xml} | 0
 .../{qemuxml2argv-misc-enable-s4.xml => misc-enable-s4.xml}     | 0
 .../{qemuxml2argv-misc-no-reboot.xml => misc-no-reboot.xml}     | 0
 .../{qemuxml2argv-misc-uuid.xml => misc-uuid.xml}               | 0
 .../{qemuxml2argv-missing-machine.xml => missing-machine.xml}   | 0
 .../{qemuxml2argv-mlock-off.xml => mlock-off.xml}               | 0
 .../{qemuxml2argv-mlock-on.xml => mlock-on.xml}                 | 0
 ...qemuxml2argv-mlock-unsupported.xml => mlock-unsupported.xml} | 0
 .../{qemuxml2argv-monitor-json.xml => monitor-json.xml}         | 0
 ...ultifunction-pci-device.xml => multifunction-pci-device.xml} | 0
 .../{qemuxml2argv-name-escape.xml => name-escape.xml}           | 0
 .../{qemuxml2argv-net-bandwidth.xml => net-bandwidth.xml}       | 0
 .../{qemuxml2argv-net-bandwidth2.xml => net-bandwidth2.xml}     | 0
 .../{qemuxml2argv-net-client.xml => net-client.xml}             | 0
 .../{qemuxml2argv-net-coalesce.xml => net-coalesce.xml}         | 0
 .../{qemuxml2argv-net-eth-hostip.xml => net-eth-hostip.xml}     | 0
 .../{qemuxml2argv-net-eth-ifname.xml => net-eth-ifname.xml}     | 0
 .../{qemuxml2argv-net-eth-names.xml => net-eth-names.xml}       | 0
 .../qemuxml2argvdata/{qemuxml2argv-net-eth.xml => net-eth.xml}  | 0
 .../{qemuxml2argv-net-hostdev-fail.xml => net-hostdev-fail.xml} | 0
 ...-net-hostdev-multidomain.xml => net-hostdev-multidomain.xml} | 0
 ...ev-vfio-multidomain.xml => net-hostdev-vfio-multidomain.xml} | 0
 .../{qemuxml2argv-net-hostdev-vfio.xml => net-hostdev-vfio.xml} | 0
 .../{qemuxml2argv-net-hostdev.xml => net-hostdev.xml}           | 0
 .../{qemuxml2argv-net-mcast.xml => net-mcast.xml}               | 0
 .../{qemuxml2argv-net-midonet.xml => net-midonet.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-net-mtu.xml => net-mtu.xml}  | 0
 .../{qemuxml2argv-net-openvswitch.xml => net-openvswitch.xml}   | 0
 .../{qemuxml2argv-net-server.xml => net-server.xml}             | 0
 .../qemuxml2argvdata/{qemuxml2argv-net-udp.xml => net-udp.xml}  | 0
 .../{qemuxml2argv-net-user-addr.xml => net-user-addr.xml}       | 0
 .../{qemuxml2argv-net-user.xml => net-user.xml}                 | 0
 ...muxml2argv-net-vhostuser-fail.xml => net-vhostuser-fail.xml} | 0
 ...l2argv-net-vhostuser-multiq.xml => net-vhostuser-multiq.xml} | 0
 .../{qemuxml2argv-net-vhostuser.xml => net-vhostuser.xml}       | 0
 .../{qemuxml2argv-net-virtio-ccw.xml => net-virtio-ccw.xml}     | 0
 ...qemuxml2argv-net-virtio-device.xml => net-virtio-device.xml} | 0
 ...tio-disable-offloads.xml => net-virtio-disable-offloads.xml} | 0
 ...qemuxml2argv-net-virtio-netdev.xml => net-virtio-netdev.xml} | 0
 ...o-network-portgroup.xml => net-virtio-network-portgroup.xml} | 0
 ...invalid-size.xml => net-virtio-rxqueuesize-invalid-size.xml} | 0
 ...et-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} | 0
 .../{qemuxml2argv-net-virtio-s390.xml => net-virtio-s390.xml}   | 0
 .../{qemuxml2argv-net-virtio.xml => net-virtio.xml}             | 0
 ...qemuxml2argv-no-kvm-pit-device.xml => no-kvm-pit-device.xml} | 0
 .../{qemuxml2argv-no-shutdown.xml => no-shutdown.xml}           | 0
 ...muxml2argv-nographics-display.xml => nographics-display.xml} | 0
 .../{qemuxml2argv-nographics-vga.xml => nographics-vga.xml}     | 0
 .../{qemuxml2argv-nographics.xml => nographics.xml}             | 0
 .../{qemuxml2argv-nosharepages.xml => nosharepages.xml}         | 0
 ...memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} | 0
 ...t.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} | 0
 ...uto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} | 0
 ...deset.xml => numad-auto-vcpu-static-numatune-no-nodeset.xml} | 0
 ...-static-numatune.xml => numad-auto-vcpu-static-numatune.xml} | 0
 ...c-memory-auto-vcpu.xml => numad-static-memory-auto-vcpu.xml} | 0
 ...c-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-numad.xml => numad.xml}    | 0
 ...to-nodeset-invalid.xml => numatune-auto-nodeset-invalid.xml} | 0
 ...l2argv-numatune-auto-prefer.xml => numatune-auto-prefer.xml} | 0
 ...muxml2argv-numatune-distances.xml => numatune-distances.xml} | 0
 ...une-memnode-no-memory.xml => numatune-memnode-no-memory.xml} | 0
 ...gv-numatune-memnode-nocpu.xml => numatune-memnode-nocpu.xml} | 0
 .../{qemuxml2argv-numatune-memnode.xml => numatune-memnode.xml} | 0
 ...mnodes-problematic.xml => numatune-memnodes-problematic.xml} | 0
 ...-invalid-nodeset.xml => numatune-memory-invalid-nodeset.xml} | 0
 .../{qemuxml2argv-numatune-memory.xml => numatune-memory.xml}   | 0
 ...hostnode.xml => numatune-static-nodeset-exceed-hostnode.xml} | 0
 .../{qemuxml2argv-panic-double.xml => panic-double.xml}         | 0
 .../{qemuxml2argv-panic-isa.xml => panic-isa.xml}               | 0
 .../{qemuxml2argv-panic-no-address.xml => panic-no-address.xml} | 0
 .../{qemuxml2argv-panic-pseries.xml => panic-pseries.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-panic.xml => panic.xml}    | 0
 ...arallel-parport-chardev.xml => parallel-parport-chardev.xml} | 0
 ...l2argv-parallel-tcp-chardev.xml => parallel-tcp-chardev.xml} | 0
 .../{qemuxml2argv-pci-autoadd-addr.xml => pci-autoadd-addr.xml} | 0
 .../{qemuxml2argv-pci-autoadd-idx.xml => pci-autoadd-idx.xml}   | 0
 ...qemuxml2argv-pci-autofill-addr.xml => pci-autofill-addr.xml} | 0
 ...ridge-duplicate-index.xml => pci-bridge-duplicate-index.xml} | 0
 ...argv-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} | 0
 ...-index-invalid.xml => pci-bridge-negative-index-invalid.xml} | 0
 .../{qemuxml2argv-pci-bridge.xml => pci-bridge.xml}             | 0
 .../{qemuxml2argv-pci-bus-invalid.xml => pci-bus-invalid.xml}   | 0
 ...muxml2argv-pci-domain-invalid.xml => pci-domain-invalid.xml} | 0
 ...ci-expander-bus-bad-bus.xml => pci-expander-bus-bad-bus.xml} | 0
 ...der-bus-bad-machine.xml => pci-expander-bus-bad-machine.xml} | 0
 ...-expander-bus-bad-node.xml => pci-expander-bus-bad-node.xml} | 0
 .../{qemuxml2argv-pci-expander-bus.xml => pci-expander-bus.xml} | 0
 ...l2argv-pci-function-invalid.xml => pci-function-invalid.xml} | 0
 .../{qemuxml2argv-pci-many.xml => pci-many.xml}                 | 0
 .../qemuxml2argvdata/{qemuxml2argv-pci-rom.xml => pci-rom.xml}  | 0
 .../{qemuxml2argv-pci-root-address.xml => pci-root-address.xml} | 0
 ...gv-pci-root-nonzero-index.xml => pci-root-nonzero-index.xml} | 0
 ...gv-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} | 0
 .../{qemuxml2argv-pci-slot-invalid.xml => pci-slot-invalid.xml} | 0
 ...e-expander-bus-bad-bus.xml => pcie-expander-bus-bad-bus.xml} | 0
 ...er-bus-bad-machine.xml => pcie-expander-bus-bad-machine.xml} | 0
 ...qemuxml2argv-pcie-expander-bus.xml => pcie-expander-bus.xml} | 0
 ...-port-model-generic.xml => pcie-root-port-model-generic.xml} | 0
 ...-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} | 0
 ...-pcie-root-port-too-many.xml => pcie-root-port-too-many.xml} | 0
 .../{qemuxml2argv-pcie-root-port.xml => pcie-root-port.xml}     | 0
 .../{qemuxml2argv-pcie-root.xml => pcie-root.xml}               | 0
 ...itch-downstream-port.xml => pcie-switch-downstream-port.xml} | 0
 ...e-switch-upstream-port.xml => pcie-switch-upstream-port.xml} | 0
 .../{qemuxml2argv-pcihole64-gib.xml => pcihole64-gib.xml}       | 0
 .../{qemuxml2argv-pcihole64-none.xml => pcihole64-none.xml}     | 0
 .../{qemuxml2argv-pcihole64-q35.xml => pcihole64-q35.xml}       | 0
 .../{qemuxml2argv-pcihole64.xml => pcihole64.xml}               | 0
 .../{qemuxml2argv-pmu-feature-off.xml => pmu-feature-off.xml}   | 0
 .../{qemuxml2argv-pmu-feature.xml => pmu-feature.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-ppc-dtb.xml => ppc-dtb.xml}  | 0
 tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml          | 1 +
 tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml       | 1 +
 ...l2argv-ppc64-usb-controller.xml => ppc64-usb-controller.xml} | 0
 .../{qemuxml2argv-ppce500-serial.xml => ppce500-serial.xml}     | 0
 .../{qemuxml2argv-pseries-basic.xml => pseries-basic.xml}       | 0
 ...gv-pseries-console-native.xml => pseries-console-native.xml} | 0
 ...gv-pseries-console-virtio.xml => pseries-console-virtio.xml} | 0
 ...ries-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} | 0
 ...muxml2argv-pseries-cpu-compat.xml => pseries-cpu-compat.xml} | 0
 ...qemuxml2argv-pseries-cpu-exact.xml => pseries-cpu-exact.xml} | 0
 .../{qemuxml2argv-pseries-cpu-le.xml => pseries-cpu-le.xml}     | 0
 ...ault-phb-numa-node.xml => pseries-default-phb-numa-node.xml} | 0
 .../{qemuxml2argv-pseries-disk.xml => pseries-disk.xml}         | 0
 ...muxml2argv-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} | 0
 ...muxml2argv-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} | 0
 ...muxml2argv-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} | 0
 ...lid-machine.xml => pseries-hpt-resizing-invalid-machine.xml} | 0
 ...l2argv-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} | 0
 ...l2argv-pseries-many-buses-1.xml => pseries-many-buses-1.xml} | 0
 ...l2argv-pseries-many-buses-2.xml => pseries-many-buses-2.xml} | 0
 ...l2argv-pseries-many-devices.xml => pseries-many-devices.xml} | 0
 ...xml2argv-pseries-no-parallel.xml => pseries-no-parallel.xml} | 0
 .../{qemuxml2argv-pseries-nvram.xml => pseries-nvram.xml}       | 0
 ...argv-pseries-panic-address.xml => pseries-panic-address.xml} | 0
 ...argv-pseries-panic-missing.xml => pseries-panic-missing.xml} | 0
 ...series-panic-no-address.xml => pseries-panic-no-address.xml} | 0
 ...-phb-default-missing.xml => pseries-phb-default-missing.xml} | 0
 ...arget-index-1.xml => pseries-phb-invalid-target-index-1.xml} | 0
 ...arget-index-2.xml => pseries-phb-invalid-target-index-2.xml} | 0
 ...arget-index-3.xml => pseries-phb-invalid-target-index-3.xml} | 0
 ...argv-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} | 0
 ...muxml2argv-pseries-phb-simple.xml => pseries-phb-simple.xml} | 0
 ...ial+console-native.xml => pseries-serial+console-native.xml} | 0
 ...argv-pseries-serial-compat.xml => pseries-serial-compat.xml} | 0
 ...l-invalid-machine.xml => pseries-serial-invalid-machine.xml} | 0
 ...argv-pseries-serial-native.xml => pseries-serial-native.xml} | 0
 ...muxml2argv-pseries-serial-pci.xml => pseries-serial-pci.xml} | 0
 ...muxml2argv-pseries-serial-usb.xml => pseries-serial-usb.xml} | 0
 ...xml2argv-pseries-usb-default.xml => pseries-usb-default.xml} | 0
 .../{qemuxml2argv-pseries-usb-kbd.xml => pseries-usb-kbd.xml}   | 0
 ...qemuxml2argv-pseries-usb-multi.xml => pseries-usb-multi.xml} | 0
 ...ries-vio-address-clash.xml => pseries-vio-address-clash.xml} | 0
 ...ries-vio-user-assigned.xml => pseries-vio-user-assigned.xml} | 0
 .../{qemuxml2argv-pseries-vio.xml => pseries-vio.xml}           | 0
 ...l2argv-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} | 0
 ...xml2argv-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} | 0
 .../{qemuxml2argv-q35-acpi-nouefi.xml => q35-acpi-nouefi.xml}   | 0
 .../{qemuxml2argv-q35-acpi-uefi.xml => q35-acpi-uefi.xml}       | 0
 ...35-default-devices-only.xml => q35-default-devices-only.xml} | 0
 ...l2argv-q35-dmi-bad-address1.xml => q35-dmi-bad-address1.xml} | 0
 ...l2argv-q35-dmi-bad-address2.xml => q35-dmi-bad-address2.xml} | 0
 ...qemuxml2argv-q35-multifunction.xml => q35-multifunction.xml} | 0
 ...qemuxml2argv-q35-noacpi-nouefi.xml => q35-noacpi-nouefi.xml} | 0
 .../{qemuxml2argv-q35-noacpi-uefi.xml => q35-noacpi-uefi.xml}   | 0
 ...argv-q35-pci-force-address.xml => q35-pci-force-address.xml} | 0
 .../{qemuxml2argv-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} | 0
 .../{qemuxml2argv-q35-pcie.xml => q35-pcie.xml}                 | 0
 ...-q35-pm-disable-fallback.xml => q35-pm-disable-fallback.xml} | 0
 .../{qemuxml2argv-q35-pm-disable.xml => q35-pm-disable.xml}     | 0
 .../{qemuxml2argv-q35-usb2-multi.xml => q35-usb2-multi.xml}     | 0
 .../{qemuxml2argv-q35-usb2-reorder.xml => q35-usb2-reorder.xml} | 0
 .../{qemuxml2argv-q35-usb2.xml => q35-usb2.xml}                 | 0
 ...gv-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} | 0
 tests/qemuxml2argvdata/q35-virtio-pci.xml                       | 1 +
 .../{qemuxml2argv-q35-wrong-root.xml => q35-wrong-root.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-q35.xml => q35.xml}        | 0
 .../{qemuxml2argv-qemu-ns-alt.xml => qemu-ns-alt.xml}           | 0
 ...-qemu-ns-commandline-ns0.xml => qemu-ns-commandline-ns0.xml} | 0
 ...-qemu-ns-commandline-ns1.xml => qemu-ns-commandline-ns1.xml} | 0
 ...xml2argv-qemu-ns-commandline.xml => qemu-ns-commandline.xml} | 0
 ...n-commandline-ns0.xml => qemu-ns-domain-commandline-ns0.xml} | 0
 ...ns-domain-commandline.xml => qemu-ns-domain-commandline.xml} | 0
 ...muxml2argv-qemu-ns-domain-ns0.xml => qemu-ns-domain-ns0.xml} | 0
 .../{qemuxml2argv-qemu-ns-no-env.xml => qemu-ns-no-env.xml}     | 0
 .../qemuxml2argvdata/{qemuxml2argv-qemu-ns.xml => qemu-ns.xml}  | 0
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml   | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml     | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml     | 1 -
 .../qemuxml2argv-ppc64-usb-controller-legacy.xml                | 1 -
 .../qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml             | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml          | 1 -
 .../qemuxml2argv-usb-controller-default-unavailable-q35.xml     | 1 -
 .../qemuxml2argv-usb-controller-explicit-unavailable-q35.xml    | 1 -
 .../qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml       | 1 -
 ...-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} | 0
 ...gv-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} | 0
 .../{qemuxml2argv-restore-v2-fd.xml => restore-v2-fd.xml}       | 0
 .../{qemuxml2argv-restore-v2.xml => restore-v2.xml}             | 0
 ...s-usb-controller.xml => s390-allow-bogus-usb-controller.xml} | 0
 ...0-allow-bogus-usb-none.xml => s390-allow-bogus-usb-none.xml} | 0
 ...xml2argv-s390-defaultconsole.xml => s390-defaultconsole.xml} | 0
 .../{qemuxml2argv-s390-no-parallel.xml => s390-no-parallel.xml} | 0
 ...muxml2argv-s390-panic-address.xml => s390-panic-address.xml} | 0
 ...muxml2argv-s390-panic-missing.xml => s390-panic-missing.xml} | 0
 ...argv-s390-panic-no-address.xml => s390-panic-no-address.xml} | 0
 .../{qemuxml2argv-s390-panic.xml => s390-panic.xml}             | 0
 .../{qemuxml2argv-s390-serial-2.xml => s390-serial-2.xml}       | 0
 ...xml2argv-s390-serial-console.xml => s390-serial-console.xml} | 0
 .../{qemuxml2argv-s390-serial.xml => s390-serial.xml}           | 0
 ...qemuxml2argv-seclabel-dac-none.xml => seclabel-dac-none.xml} | 0
 ...bel-device-duplicates.xml => seclabel-device-duplicates.xml} | 0
 ...eclabel-device-multiple.xml => seclabel-device-multiple.xml} | 0
 ...bel-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} | 0
 ...bel-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} | 0
 ...namic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} | 0
 ...argv-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} | 0
 ...label-dynamic-override.xml => seclabel-dynamic-override.xml} | 0
 ...eclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} | 0
 .../{qemuxml2argv-seclabel-dynamic.xml => seclabel-dynamic.xml} | 0
 ...qemuxml2argv-seclabel-multiple.xml => seclabel-multiple.xml} | 0
 .../{qemuxml2argv-seclabel-none.xml => seclabel-none.xml}       | 0
 ...label-static-labelskip.xml => seclabel-static-labelskip.xml} | 0
 ...-seclabel-static-relabel.xml => seclabel-static-relabel.xml} | 0
 .../{qemuxml2argv-seclabel-static.xml => seclabel-static.xml}   | 0
 ...ial-dev-chardev-iobase.xml => serial-dev-chardev-iobase.xml} | 0
 ...muxml2argv-serial-dev-chardev.xml => serial-dev-chardev.xml} | 0
 ...xml2argv-serial-file-chardev.xml => serial-file-chardev.xml} | 0
 .../{qemuxml2argv-serial-file-log.xml => serial-file-log.xml}   | 0
 ...xml2argv-serial-many-chardev.xml => serial-many-chardev.xml} | 0
 ...muxml2argv-serial-pty-chardev.xml => serial-pty-chardev.xml} | 0
 .../{qemuxml2argv-serial-pty.xml => serial-pty.xml}             | 0
 ...erial-spiceport-nospice.xml => serial-spiceport-nospice.xml} | 0
 .../{qemuxml2argv-serial-spiceport.xml => serial-spiceport.xml} | 0
 ...-serial-target-port-auto.xml => serial-target-port-auto.xml} | 0
 ...muxml2argv-serial-tcp-chardev.xml => serial-tcp-chardev.xml} | 0
 ...ial-tcp-telnet-chardev.xml => serial-tcp-telnet-chardev.xml} | 0
 ...9-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} | 0
 ...chardev-verify.xml => serial-tcp-tlsx509-chardev-verify.xml} | 0
 ...l-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} | 0
 ...secret-chardev.xml => serial-tcp-tlsx509-secret-chardev.xml} | 0
 ...muxml2argv-serial-udp-chardev.xml => serial-udp-chardev.xml} | 0
 ...xml2argv-serial-unix-chardev.xml => serial-unix-chardev.xml} | 0
 ...qemuxml2argv-serial-vc-chardev.xml => serial-vc-chardev.xml} | 0
 ...argv-shmem-invalid-address.xml => shmem-invalid-address.xml} | 0
 ...muxml2argv-shmem-invalid-size.xml => shmem-invalid-size.xml} | 0
 .../{qemuxml2argv-shmem-msi-only.xml => shmem-msi-only.xml}     | 0
 ...l2argv-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} | 0
 .../{qemuxml2argv-shmem-small-size.xml => shmem-small-size.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => shmem.xml}    | 0
 ...l2argv-smartcard-controller.xml => smartcard-controller.xml} | 0
 ...rd-host-certificates.xml => smartcard-host-certificates.xml} | 0
 .../{qemuxml2argv-smartcard-host.xml => smartcard-host.xml}     | 0
 ...sthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} | 0
 ...rtcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} | 0
 .../{qemuxml2argv-smbios-date.xml => smbios-date.xml}           | 0
 ...argv-smbios-multiple-type2.xml => smbios-multiple-type2.xml} | 0
 ...qemuxml2argv-smbios-uuid-match.xml => smbios-uuid-match.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-smbios.xml => smbios.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-smp.xml => smp.xml}        | 0
 .../{qemuxml2argv-sound-device.xml => sound-device.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-sound.xml => sound.xml}    | 0
 ...xml2argv-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} | 0
 .../{qemuxml2argv-tap-vhost.xml => tap-vhost.xml}               | 0
 ...gv-tpm-no-backend-invalid.xml => tpm-no-backend-invalid.xml} | 0
 .../{qemuxml2argv-tpm-passthrough.xml => tpm-passthrough.xml}   | 0
 .../{qemuxml2argv-usb-bus-missing.xml => usb-bus-missing.xml}   | 0
 ...ontroller-default-q35.xml => usb-controller-default-q35.xml} | 0
 .../qemuxml2argvdata/usb-controller-default-unavailable-q35.xml | 1 +
 ...troller-explicit-q35.xml => usb-controller-explicit-q35.xml} | 0
 .../usb-controller-explicit-unavailable-q35.xml                 | 1 +
 ...r-qemu-xhci-limit.xml => usb-controller-qemu-xhci-limit.xml} | 0
 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml | 1 +
 ...sb-controller-qemu-xhci.xml => usb-controller-qemu-xhci.xml} | 0
 ...-controller-xhci-limit.xml => usb-controller-xhci-limit.xml} | 0
 ...xml2argv-usb-controller-xhci.xml => usb-controller-xhci.xml} | 0
 .../{qemuxml2argv-usb-controller.xml => usb-controller.xml}     | 0
 ...gv-usb-hub-autoadd-deluxe.xml => usb-hub-autoadd-deluxe.xml} | 0
 .../{qemuxml2argv-usb-hub-autoadd.xml => usb-hub-autoadd.xml}   | 0
 .../{qemuxml2argv-usb-hub-conflict.xml => usb-hub-conflict.xml} | 0
 ...xml2argv-usb-hub-nonexistent.xml => usb-hub-nonexistent.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-usb-hub.xml => usb-hub.xml}  | 0
 ...xml2argv-usb-ich9-autoassign.xml => usb-ich9-autoassign.xml} | 0
 ...muxml2argv-usb-ich9-companion.xml => usb-ich9-companion.xml} | 0
 ...muxml2argv-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} | 0
 ...argv-usb-ich9-no-companion.xml => usb-ich9-no-companion.xml} | 0
 ...muxml2argv-usb-long-port-path.xml => usb-long-port-path.xml} | 0
 .../{qemuxml2argv-usb-none-hub.xml => usb-none-hub.xml}         | 0
 .../{qemuxml2argv-usb-none-other.xml => usb-none-other.xml}     | 0
 ...muxml2argv-usb-none-usbtablet.xml => usb-none-usbtablet.xml} | 0
 .../{qemuxml2argv-usb-none.xml => usb-none.xml}                 | 0
 ...l2argv-usb-piix3-controller.xml => usb-piix3-controller.xml} | 0
 ...xml2argv-usb-port-autoassign.xml => usb-port-autoassign.xml} | 0
 .../{qemuxml2argv-usb-port-missing.xml => usb-port-missing.xml} | 0
 ...gv-usb-ports-out-of-range.xml => usb-ports-out-of-range.xml} | 0
 .../{qemuxml2argv-usb-ports.xml => usb-ports.xml}               | 0
 .../{qemuxml2argv-usb-redir-boot.xml => usb-redir-boot.xml}     | 0
 ...sb-redir-filter-version.xml => usb-redir-filter-version.xml} | 0
 .../{qemuxml2argv-usb-redir-filter.xml => usb-redir-filter.xml} | 0
 .../{qemuxml2argv-usb-redir.xml => usb-redir.xml}               | 0
 ...port-path-invalid.xml => usb-too-long-port-path-invalid.xml} | 0
 ...xml2argv-usb-xhci-autoassign.xml => usb-xhci-autoassign.xml} | 0
 .../{qemuxml2argv-usb1-usb2.xml => usb1-usb2.xml}               | 0
 .../{qemuxml2argv-user-aliases.xml => user-aliases.xml}         | 0
 .../{qemuxml2argv-user-aliases2.xml => user-aliases2.xml}       | 0
 ...argv-vcpu-placement-static.xml => vcpu-placement-static.xml} | 0
 ...l2argv-vhost_queues-invalid.xml => vhost_queues-invalid.xml} | 0
 .../{qemuxml2argv-vhost_queues.xml => vhost_queues.xml}         | 0
 ...ice-pciaddr-default.xml => video-device-pciaddr-default.xml} | 0
 .../{qemuxml2argv-video-invalid.xml => video-invalid.xml}       | 0
 ...-video-qxl-device-vgamem.xml => video-qxl-device-vgamem.xml} | 0
 ...-video-qxl-device-vram64.xml => video-qxl-device-vram64.xml} | 0
 .../{qemuxml2argv-video-qxl-device.xml => video-qxl-device.xml} | 0
 .../{qemuxml2argv-video-qxl-heads.xml => video-qxl-heads.xml}   | 0
 ...muxml2argv-video-qxl-nodevice.xml => video-qxl-nodevice.xml} | 0
 ...qemuxml2argv-video-qxl-noheads.xml => video-qxl-noheads.xml} | 0
 ...xl-sec-device-vgamem.xml => video-qxl-sec-device-vgamem.xml} | 0
 ...xl-sec-device-vram64.xml => video-qxl-sec-device-vram64.xml} | 0
 ...l2argv-video-qxl-sec-device.xml => video-qxl-sec-device.xml} | 0
 ...-video-vga-device-vgamem.xml => video-vga-device-vgamem.xml} | 0
 .../{qemuxml2argv-video-vga-device.xml => video-vga-device.xml} | 0
 ...muxml2argv-video-vga-nodevice.xml => video-vga-nodevice.xml} | 0
 ...xml2argv-video-vga-qxl-heads.xml => video-vga-qxl-heads.xml} | 0
 ...-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} | 0
 ...-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} | 0
 ...eo-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} | 0
 ...gv-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} | 0
 .../{qemuxml2argv-video-virtio-vga.xml => video-virtio-vga.xml} | 0
 ...irtio-input-passthrough.xml => virtio-input-passthrough.xml} | 0
 .../{qemuxml2argv-virtio-input.xml => virtio-input.xml}         | 0
 .../{qemuxml2argv-virtio-lun.xml => virtio-lun.xml}             | 0
 .../{qemuxml2argv-virtio-options.xml => virtio-options.xml}     | 0
 .../{qemuxml2argv-virtio-rng-ccw.xml => virtio-rng-ccw.xml}     | 0
 ...muxml2argv-virtio-rng-default.xml => virtio-rng-default.xml} | 0
 ...l2argv-virtio-rng-egd-crash.xml => virtio-rng-egd-crash.xml} | 0
 .../{qemuxml2argv-virtio-rng-egd.xml => virtio-rng-egd.xml}     | 0
 ...xml2argv-virtio-rng-multiple.xml => virtio-rng-multiple.xml} | 0
 ...qemuxml2argv-virtio-rng-random.xml => virtio-rng-random.xml} | 0
 .../{qemuxml2argv-vmcoreinfo.xml => vmcoreinfo.xml}             | 0
 .../{qemuxml2argv-watchdog-device.xml => watchdog-device.xml}   | 0
 .../{qemuxml2argv-watchdog-diag288.xml => watchdog-diag288.xml} | 0
 .../{qemuxml2argv-watchdog-dump.xml => watchdog-dump.xml}       | 0
 ...muxml2argv-watchdog-injectnmi.xml => watchdog-injectnmi.xml} | 0
 .../{qemuxml2argv-watchdog.xml => watchdog.xml}                 | 0
 .../{qemuxml2argv-x86-kvm-32-on-64.xml => x86-kvm-32-on-64.xml} | 0
 tests/qemuxml2argvtest.c                                        | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml    | 2 +-
 .../qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml      | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml      | 2 +-
 .../qemuxml2xmlout-blkdeviotune-group-num.xml                   | 2 +-
 .../qemuxml2xmlout-blkdeviotune-max-length.xml                  | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml    | 2 +-
 .../qemuxml2xmlout-disk-drive-detect-zeroes.xml                 | 2 +-
 .../qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml  | 2 +-
 .../qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml              | 2 +-
 .../qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml              | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml | 2 +-
 .../qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml  | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml    | 2 +-
 .../qemuxml2xmlout-intel-iommu-caching-mode.xml                 | 2 +-
 .../qemuxml2xmlout-intel-iommu-device-iotlb.xml                 | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml     | 2 +-
 .../qemuxml2xmlout-memory-hotplug-nvdimm-access.xml             | 2 +-
 .../qemuxml2xmlout-memory-hotplug-nvdimm-label.xml              | 2 +-
 .../qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml       | 2 +-
 .../qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml         | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml        | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml      | 2 +-
 tests/qemuxml2xmltest.c                                         | 2 +-
 837 files changed, 42 insertions(+), 42 deletions(-)
 rename tests/qemuxml2argvdata/{qemuxml2argv-440fx-ide-address-conflict.xml => 440fx-ide-address-conflict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-440fx-wrong-root.xml => 440fx-wrong-root.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-acpi-nouefi.xml => aarch64-acpi-nouefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-acpi-uefi.xml => aarch64-acpi-uefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-cpu-passthrough.xml => aarch64-cpu-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-default.xml => aarch64-gic-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-host.xml => aarch64-gic-host.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-invalid.xml => aarch64-gic-invalid.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-both.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-v2.xml
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-v3.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-none.xml => aarch64-gic-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-not-arm.xml => aarch64-gic-not-arm.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-not-virt.xml => aarch64-gic-not-virt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-v2.xml => aarch64-gic-v2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-v3.xml => aarch64-gic-v3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-kvm-32-on-64.xml => aarch64-kvm-32-on-64.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-noacpi-nouefi.xml => aarch64-noacpi-nouefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-noacpi-uefi.xml => aarch64-noacpi-uefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-pci-serial.xml => aarch64-pci-serial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-usb-controller-nec-xhci.xml => aarch64-usb-controller-nec-xhci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-usb-controller-qemu-xhci.xml => aarch64-usb-controller-qemu-xhci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-video-default.xml => aarch64-video-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml => aarch64-virt-2.6-virtio-pci-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-default-nic.xml => aarch64-virt-default-nic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-virtio.xml => aarch64-virt-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-acpi-table.xml => acpi-table.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-basic.xml => arm-vexpressa9-basic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-nodevs.xml => arm-vexpressa9-nodevs.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-virtio.xml => arm-vexpressa9-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-virt-virtio.xml => arm-virt-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-autoindex.xml => autoindex.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-ccw-deflate.xml => balloon-ccw-deflate.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-auto.xml => balloon-device-auto.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-deflate-off.xml => balloon-device-deflate-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-deflate.xml => balloon-device-deflate.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-period.xml => balloon-device-period.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device.xml => balloon-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-mmio-deflate.xml => balloon-mmio-deflate.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram-secure.xml => bios-nvram-secure.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram.xml => bios-nvram.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios.xml => bios.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-max.xml => blkdeviotune-max.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune.xml => blkdeviotune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkiotune-device.xml => blkiotune-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkiotune.xml => blkiotune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-cdrom.xml => boot-cdrom.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-complex-bootindex.xml => boot-complex-bootindex.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-complex.xml => boot-complex.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-dev+order.xml => boot-dev+order.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-floppy-q35.xml => boot-floppy-q35.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-floppy.xml => boot-floppy.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable-drive-bootindex.xml => boot-menu-disable-drive-bootindex.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable-drive.xml => boot-menu-disable-drive.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable-with-timeout.xml => boot-menu-disable-with-timeout.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable.xml => boot-menu-disable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable-bootindex.xml => boot-menu-enable-bootindex.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml => boot-menu-enable-with-timeout-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable-with-timeout.xml => boot-menu-enable-with-timeout.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable.xml => boot-menu-enable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-multi.xml => boot-multi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-network.xml => boot-network.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-order.xml => boot-order.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-strict.xml => boot-strict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-guestfwd.xml => channel-guestfwd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-spicevmc-old.xml => channel-spicevmc-old.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-spicevmc.xml => channel-spicevmc.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-unix-source-path.xml => channel-unix-source-path.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-auto.xml => channel-virtio-auto.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-autoadd.xml => channel-virtio-autoadd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-autoassign.xml => channel-virtio-autoassign.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-default.xml => channel-virtio-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-state.xml => channel-virtio-state.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-unix.xml => channel-virtio-unix.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio.xml => channel-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-chardev-label.xml => chardev-label.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-chardev-reconnect-generated-path.xml => chardev-reconnect-generated-path.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-chardev-reconnect-invalid-timeout.xml => chardev-reconnect-invalid-timeout.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-chardev-reconnect.xml => chardev-reconnect.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-catchup.xml => clock-catchup.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-france.xml => clock-france.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-hpet-off.xml => clock-hpet-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-localtime-basis-localtime.xml => clock-localtime-basis-localtime.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-localtime.xml => clock-localtime.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-utc.xml => clock-utc.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-variable.xml => clock-variable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat-2.xml => console-compat-2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat-auto.xml => console-compat-auto.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat-chardev.xml => console-compat-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat.xml => console-compat.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat2.xml => console-compat2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-sclp.xml => console-sclp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-ccw.xml => console-virtio-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-many.xml => console-virtio-many.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-s390.xml => console-virtio-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio.xml => console-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-controller-order.xml => controller-order.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-controller-usb-order.xml => controller-usb-order.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell-noTSX.xml => cpu-Haswell-noTSX.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell.xml => cpu-Haswell.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell2.xml => cpu-Haswell2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell3.xml => cpu-Haswell3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable.xml => cpu-cache-disable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable2.xml => cpu-cache-disable2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable3.xml => cpu-cache-disable3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-emulate-l2.xml => cpu-cache-emulate-l2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-emulate-l3.xml => cpu-cache-emulate-l3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough-l3.xml => cpu-cache-passthrough-l3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough2.xml => cpu-cache-passthrough2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough3.xml => cpu-cache-passthrough3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-none.xml => cpu-check-default-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-none2.xml => cpu-check-default-none2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-partial.xml => cpu-check-default-partial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-partial2.xml => cpu-check-default-partial2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-full.xml => cpu-check-full.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-none.xml => cpu-check-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-partial.xml => cpu-check-partial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-empty.xml => cpu-empty.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact1.xml => cpu-exact1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact2-nofallback.xml => cpu-exact2-nofallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact2.xml => cpu-exact2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-fallback.xml => cpu-fallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-cmt.xml => cpu-host-model-cmt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-fallback.xml => cpu-host-model-fallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-features.xml => cpu-host-model-features.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-nofallback.xml => cpu-host-model-nofallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-vendor.xml => cpu-host-model-vendor.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model.xml => cpu-host-model.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-passthrough-features.xml => cpu-host-passthrough-features.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-passthrough.xml => cpu-host-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-hotplug-startup.xml => cpu-hotplug-startup.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-kvmclock.xml => cpu-kvmclock.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-minimum1.xml => cpu-minimum1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-minimum2.xml => cpu-minimum2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-nofallback.xml => cpu-nofallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-disordered.xml => cpu-numa-disordered.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-memshared.xml => cpu-numa-memshared.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-no-memory-element.xml => cpu-numa-no-memory-element.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa1.xml => cpu-numa1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa2.xml => cpu-numa2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa3.xml => cpu-numa3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-qemu-host-passthrough.xml => cpu-qemu-host-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-s390-features.xml => cpu-s390-features.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-s390-zEC12.xml => cpu-s390-zEC12.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-strict1.xml => cpu-strict1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology1.xml => cpu-topology1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology2.xml => cpu-topology2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology3.xml => cpu-topology3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-tsc-frequency.xml => cpu-tsc-frequency.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-iothreads.xml => cputune-iothreads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-iothreadsched-toomuch.xml => cputune-iothreadsched-toomuch.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-iothreadsched-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-iothreadsched.xml => cputune-iothreadsched.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-numatune.xml => cputune-numatune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-vcpusched-overlap.xml => cputune-vcpusched-overlap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-zero-shares.xml => cputune-zero-shares.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune.xml => cputune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-debug-threads.xml => debug-threads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-default-kvm-host-arch.xml => default-kvm-host-arch.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-default-qemu-host-arch.xml => default-qemu-host-arch.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-active-commit.xml => disk-active-commit.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-aio.xml => disk-aio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-backing-chains.xml => disk-backing-chains.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-blockio.xml => disk-blockio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-empty.xml => disk-cdrom-empty.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-ftp.xml => disk-cdrom-network-ftp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-ftps.xml => disk-cdrom-network-ftps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-http.xml => disk-cdrom-network-http.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-https.xml => disk-cdrom-network-https.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-tftp.xml => disk-cdrom-network-tftp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-tray-no-device-cap.xml => disk-cdrom-tray-no-device-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-tray.xml => disk-cdrom-tray.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom.xml => disk-cdrom.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-copy_on_read.xml => disk-copy_on_read.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-device-lun-type-invalid.xml => disk-device-lun-type-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-address-conflict.xml => disk-drive-address-conflict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-directsync.xml => disk-drive-cache-directsync.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-discard.xml => disk-drive-discard.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-enospace.xml => disk-drive-error-policy-enospace.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-gluster.xml => disk-drive-network-gluster.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-drive-network-iscsi-auth-secrettype-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-drive-network-iscsi-auth-wrong-secrettype.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-lun.xml => disk-drive-network-iscsi-lun.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-export.xml => disk-drive-network-nbd-export.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-auth-AES.xml => disk-drive-network-rbd-auth-AES.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-no-colon.xml => disk-drive-network-rbd-no-colon.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-source-auth-both.xml => disk-drive-network-source-auth-both.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-source-auth.xml => disk-drive-network-source-auth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-no-boot.xml => disk-drive-no-boot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-readonly-disk.xml => disk-drive-readonly-disk.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-readonly-no-device.xml => disk-drive-readonly-no-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-shared-locking.xml => disk-drive-shared-locking.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-shared-qcow.xml => disk-drive-shared-qcow.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-shared.xml => disk-drive-shared.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-fdc-incompatible-address.xml => disk-fdc-incompatible-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-pseries.xml => disk-floppy-pseries.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-tray-no-device-cap.xml => disk-floppy-tray-no-device-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-tray.xml => disk-floppy-tray.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy.xml => disk-floppy.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-geometry.xml => disk-geometry.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-hostdev-scsi-address-conflict.xml => disk-hostdev-scsi-address-conflict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.xml => disk-hostdev-scsi-virtio-iscsi-auth-AES.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ide-drive-split.xml => disk-ide-drive-split.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ide-incompatible-address.xml => disk-ide-incompatible-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ide-wwn.xml => disk-ide-wwn.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ioeventfd.xml => disk-ioeventfd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-iscsi.xml => disk-iscsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-many.xml => disk-many.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-mirror-old.xml => disk-mirror-old.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-mirror.xml => disk-mirror.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-order.xml => disk-order.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-same-targets.xml => disk-same-targets.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-sata-device.xml => disk-sata-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-sata-incompatible-address.xml => disk-sata-incompatible-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-device.xml => disk-scsi-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-split.xml => disk-scsi-disk-split.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-vpd-build-error.xml => disk-scsi-disk-vpd-build-error.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-wwn.xml => disk-scsi-disk-wwn.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-incompatible-address.xml => disk-scsi-incompatible-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-lun-passthrough.xml => disk-scsi-lun-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-megasas.xml => disk-scsi-megasas.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-serial.xml => disk-serial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-snapshot.xml => disk-snapshot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-source-pool-mode.xml => disk-source-pool-mode.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-source-pool.xml => disk-source-pool.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-transient.xml => disk-transient.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-device-removable.xml => disk-usb-device-removable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-device.xml => disk-usb-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-nosupport.xml => disk-usb-nosupport.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-pci.xml => disk-usb-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-ccw-many.xml => disk-virtio-ccw-many.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-ccw.xml => disk-virtio-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-s390.xml => disk-virtio-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-ccw.xml => disk-virtio-scsi-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio.xml => disk-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-encrypted-disk-usage.xml => encrypted-disk-usage.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-encrypted-disk.xml => encrypted-disk.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-eoi-disabled.xml => eoi-disabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-eoi-enabled.xml => eoi-enabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-event_idx.xml => event_idx.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-no-numa-topology.xml => fd-memory-no-numa-topology.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology.xml => fd-memory-numa-topology.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology2.xml => fd-memory-numa-topology2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology3.xml => fd-memory-numa-topology3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fips-enabled.xml => fips-enabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-floppy-drive-fat.xml => floppy-drive-fat.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fs9p-ccw.xml => fs9p-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fs9p.xml => fs9p.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-listen-network.xml => graphics-listen-network.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-listen-network2.xml => graphics-listen-network2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-sdl.xml => graphics-sdl.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-agent-file-xfer.xml => graphics-spice-agent-file-xfer.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-agentmouse.xml => graphics-spice-agentmouse.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-compression.xml => graphics-spice-compression.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-no-args.xml => graphics-spice-no-args.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-sasl.xml => graphics-spice-sasl.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-socket.xml => graphics-spice-socket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-timeout.xml => graphics-spice-timeout.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-usb-redir.xml => graphics-spice-usb-redir.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice.xml => graphics-spice.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-none.xml => graphics-vnc-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-policy.xml => graphics-vnc-policy.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-remove-generated-socket.xml => graphics-vnc-remove-generated-socket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-socket-new-cmdline.xml => graphics-vnc-socket-new-cmdline.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-socket.xml => graphics-vnc-socket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-tls.xml => graphics-vnc-tls.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc.xml => graphics-vnc.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-mdev-invalid-target-address.xml => hostdev-mdev-invalid-target-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-mdev-src-address-invalid.xml => hostdev-mdev-src-address-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-pci-address-device.xml => hostdev-pci-address-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-pci-address.xml => hostdev-pci-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-autogen-address.xml => hostdev-scsi-autogen-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-boot.xml => hostdev-scsi-boot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address-device-boot.xml => hostdev-usb-address-device-boot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address-device.xml => hostdev-usb-address-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address.xml => hostdev-usb-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-vfio-multidomain.xml => hostdev-vfio-multidomain.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-vfio.xml => hostdev-vfio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdevs-drive-address-conflict.xml => hostdevs-drive-address-conflict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hotplug-base.xml => hotplug-base.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-memaccess-invalid.xml => hugepages-memaccess-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-memaccess.xml => hugepages-memaccess.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-memaccess2.xml => hugepages-memaccess2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-numa.xml => hugepages-numa.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages.xml => hugepages-pages.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages2.xml => hugepages-pages2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages3.xml => hugepages-pages3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages4.xml => hugepages-pages4.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages5.xml => hugepages-pages5.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages6.xml => hugepages-pages6.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages7.xml => hugepages-pages7.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-shared.xml => hugepages-shared.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages.xml => hugepages.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv-off.xml => hyperv-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv-panic.xml => hyperv-panic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv.xml => hyperv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbmouse-addr.xml => input-usbmouse-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbmouse.xml => input-usbmouse.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbtablet.xml => input-usbtablet.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-eim.xml => intel-iommu-eim.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-machine.xml => intel-iommu-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu.xml => intel-iommu.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-interface-driver.xml => interface-driver.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-interface-server.xml => interface-server.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-disk.xml => iothreads-disk.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-ids-partial.xml => iothreads-ids-partial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-ids.xml => iothreads-ids.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-nocap.xml => iothreads-nocap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads.xml => iothreads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-features-off.xml => kvm-features-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-features.xml => kvm-features.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-pit-delay.xml => kvm-pit-delay.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-pit-discard.xml => kvm-pit-discard.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm.xml => kvm.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvmclock+eoi-disabled.xml => kvmclock+eoi-disabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvmclock.xml => kvmclock.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-lease.xml => lease.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disk-invalid.xml => luks-disk-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disks-source-both.xml => luks-disks-source-both.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disks-source.xml => luks-disks-source.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disks.xml => luks-disks.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-console-native.xml => mach-virt-console-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-console-virtio.xml => mach-virt-console-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial+console-native.xml => mach-virt-serial+console-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-invalid-machine.xml => mach-virt-serial-invalid-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-native.xml => mach-virt-serial-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-argv.xml => machine-aeskeywrap-off-argv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-cap.xml => machine-aeskeywrap-off-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-caps.xml => machine-aeskeywrap-off-caps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-argv.xml => machine-aeskeywrap-on-argv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-cap.xml => machine-aeskeywrap-on-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-caps.xml => machine-aeskeywrap-on-caps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aliases1.xml => machine-aliases1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aliases2.xml => machine-aliases2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-cfg-off.xml => machine-core-cfg-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-off.xml => machine-core-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-on.xml => machine-core-on.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-argv.xml => machine-deakeywrap-off-argv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-cap.xml => machine-deakeywrap-off-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-caps.xml => machine-deakeywrap-off-caps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-argv.xml => machine-deakeywrap-on-argv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-cap.xml => machine-deakeywrap-on-cap.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-caps.xml => machine-deakeywrap-on-caps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none-argv.xml => machine-keywrap-none-argv.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none-caps.xml => machine-keywrap-none-caps.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none.xml => machine-keywrap-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-net-s390.xml => machine-loadparm-net-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-s390-char-invalid.xml => machine-loadparm-s390-char-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-s390-len-invalid.xml => machine-loadparm-s390-len-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-s390.xml => machine-loadparm-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-smm-opt.xml => machine-smm-opt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-usb-opt.xml => machine-usb-opt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-vmport-opt.xml => machine-vmport-opt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-master-key.xml => master-key.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-align-fail.xml => memory-align-fail.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-dimm-addr.xml => memory-hotplug-dimm-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-ppc64-nonuma.xml => memory-hotplug-ppc64-nonuma.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug.xml => memory-hotplug.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memorybacking-set.xml => memorybacking-set.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memorybacking-unset.xml => memorybacking-unset.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memtune-unlimited.xml => memtune-unlimited.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memtune.xml => memtune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-metadata-duplicate.xml => metadata-duplicate.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-metadata.xml => metadata.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-migrate-numa-unaligned.xml => migrate-numa-unaligned.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-migrate.xml => migrate.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-minimal-msg-timestamp.xml => minimal-msg-timestamp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-minimal-no-memory.xml => minimal-no-memory.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-minimal.xml => minimal.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-acpi.xml => misc-acpi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-disable-s3.xml => misc-disable-s3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-disable-suspends.xml => misc-disable-suspends.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-enable-s4.xml => misc-enable-s4.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-no-reboot.xml => misc-no-reboot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-uuid.xml => misc-uuid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-missing-machine.xml => missing-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-off.xml => mlock-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-on.xml => mlock-on.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-unsupported.xml => mlock-unsupported.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-monitor-json.xml => monitor-json.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-multifunction-pci-device.xml => multifunction-pci-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-name-escape.xml => name-escape.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-bandwidth.xml => net-bandwidth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-bandwidth2.xml => net-bandwidth2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-client.xml => net-client.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-coalesce.xml => net-coalesce.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-hostip.xml => net-eth-hostip.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-ifname.xml => net-eth-ifname.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-names.xml => net-eth-names.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth.xml => net-eth.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-fail.xml => net-hostdev-fail.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-multidomain.xml => net-hostdev-multidomain.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-vfio-multidomain.xml => net-hostdev-vfio-multidomain.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-vfio.xml => net-hostdev-vfio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev.xml => net-hostdev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-mcast.xml => net-mcast.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-midonet.xml => net-midonet.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-mtu.xml => net-mtu.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-openvswitch.xml => net-openvswitch.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-server.xml => net-server.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-udp.xml => net-udp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-user-addr.xml => net-user-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-user.xml => net-user.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-vhostuser-fail.xml => net-vhostuser-fail.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-vhostuser-multiq.xml => net-vhostuser-multiq.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-vhostuser.xml => net-vhostuser.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-ccw.xml => net-virtio-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-device.xml => net-virtio-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-disable-offloads.xml => net-virtio-disable-offloads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-netdev.xml => net-virtio-netdev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-network-portgroup.xml => net-virtio-network-portgroup.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize-invalid-size.xml => net-virtio-rxqueuesize-invalid-size.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-s390.xml => net-virtio-s390.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio.xml => net-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-no-kvm-pit-device.xml => no-kvm-pit-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-no-shutdown.xml => no-shutdown.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics-display.xml => nographics-display.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics-vga.xml => nographics-vga.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics.xml => nographics.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nosharepages.xml => nosharepages.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml => numad-auto-vcpu-static-numatune-no-nodeset.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-vcpu-static-numatune.xml => numad-auto-vcpu-static-numatune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-static-memory-auto-vcpu.xml => numad-static-memory-auto-vcpu.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-static-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad.xml => numad.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-auto-nodeset-invalid.xml => numatune-auto-nodeset-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-auto-prefer.xml => numatune-auto-prefer.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-distances.xml => numatune-distances.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnode-no-memory.xml => numatune-memnode-no-memory.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnode-nocpu.xml => numatune-memnode-nocpu.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnode.xml => numatune-memnode.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnodes-problematic.xml => numatune-memnodes-problematic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memory-invalid-nodeset.xml => numatune-memory-invalid-nodeset.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memory.xml => numatune-memory.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml => numatune-static-nodeset-exceed-hostnode.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-double.xml => panic-double.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-isa.xml => panic-isa.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-no-address.xml => panic-no-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-pseries.xml => panic-pseries.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic.xml => panic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-parallel-parport-chardev.xml => parallel-parport-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-parallel-tcp-chardev.xml => parallel-tcp-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autoadd-addr.xml => pci-autoadd-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autoadd-idx.xml => pci-autoadd-idx.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autofill-addr.xml => pci-autofill-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge-duplicate-index.xml => pci-bridge-duplicate-index.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge-negative-index-invalid.xml => pci-bridge-negative-index-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge.xml => pci-bridge.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bus-invalid.xml => pci-bus-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-domain-invalid.xml => pci-domain-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-expander-bus-bad-bus.xml => pci-expander-bus-bad-bus.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-expander-bus-bad-machine.xml => pci-expander-bus-bad-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-expander-bus-bad-node.xml => pci-expander-bus-bad-node.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-expander-bus.xml => pci-expander-bus.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-function-invalid.xml => pci-function-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-many.xml => pci-many.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-rom.xml => pci-rom.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-root-address.xml => pci-root-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-root-nonzero-index.xml => pci-root-nonzero-index.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-slot-invalid.xml => pci-slot-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-expander-bus-bad-bus.xml => pcie-expander-bus-bad-bus.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-expander-bus-bad-machine.xml => pcie-expander-bus-bad-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-expander-bus.xml => pcie-expander-bus.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port-model-generic.xml => pcie-root-port-model-generic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port-too-many.xml => pcie-root-port-too-many.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port.xml => pcie-root-port.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root.xml => pcie-root.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-switch-downstream-port.xml => pcie-switch-downstream-port.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-switch-upstream-port.xml => pcie-switch-upstream-port.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64-gib.xml => pcihole64-gib.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64-none.xml => pcihole64-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64-q35.xml => pcihole64-q35.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64.xml => pcihole64.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pmu-feature-off.xml => pmu-feature-off.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pmu-feature.xml => pmu-feature.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc-dtb.xml => ppc-dtb.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml
 create mode 120000 tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc64-usb-controller.xml => ppc64-usb-controller.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppce500-serial.xml => ppce500-serial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.xml => pseries-basic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-console-native.xml => pseries-console-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-console-virtio.xml => pseries-console-virtio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat.xml => pseries-cpu-compat.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-exact.xml => pseries-cpu-exact.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-le.xml => pseries-cpu-le.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-default-phb-numa-node.xml => pseries-default-phb-numa-node.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-disk.xml => pseries-disk.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hpt-resizing-invalid-machine.xml => pseries-hpt-resizing-invalid-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-buses-1.xml => pseries-many-buses-1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-buses-2.xml => pseries-many-buses-2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-devices.xml => pseries-many-devices.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-no-parallel.xml => pseries-no-parallel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-nvram.xml => pseries-nvram.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-panic-address.xml => pseries-panic-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-panic-missing.xml => pseries-panic-missing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-panic-no-address.xml => pseries-panic-no-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-default-missing.xml => pseries-phb-default-missing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-invalid-target-index-1.xml => pseries-phb-invalid-target-index-1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-invalid-target-index-2.xml => pseries-phb-invalid-target-index-2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-invalid-target-index-3.xml => pseries-phb-invalid-target-index-3.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-simple.xml => pseries-phb-simple.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial+console-native.xml => pseries-serial+console-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-compat.xml => pseries-serial-compat.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-invalid-machine.xml => pseries-serial-invalid-machine.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-native.xml => pseries-serial-native.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-pci.xml => pseries-serial-pci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-usb.xml => pseries-serial-usb.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-default.xml => pseries-usb-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-kbd.xml => pseries-usb-kbd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-multi.xml => pseries-usb-multi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-vio-address-clash.xml => pseries-vio-address-clash.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-vio-user-assigned.xml => pseries-vio-user-assigned.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-vio.xml => pseries-vio.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-acpi-nouefi.xml => q35-acpi-nouefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-acpi-uefi.xml => q35-acpi-uefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-default-devices-only.xml => q35-default-devices-only.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-dmi-bad-address1.xml => q35-dmi-bad-address1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-dmi-bad-address2.xml => q35-dmi-bad-address2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-multifunction.xml => q35-multifunction.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-noacpi-nouefi.xml => q35-noacpi-nouefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-noacpi-uefi.xml => q35-noacpi-uefi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pci-force-address.xml => q35-pci-force-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pcie.xml => q35-pcie.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pm-disable-fallback.xml => q35-pm-disable-fallback.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pm-disable.xml => q35-pm-disable.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2-multi.xml => q35-usb2-multi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2-reorder.xml => q35-usb2-reorder.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2.xml => q35-usb2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/q35-virtio-pci.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-wrong-root.xml => q35-wrong-root.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35.xml => q35.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-alt.xml => qemu-ns-alt.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline-ns0.xml => qemu-ns-commandline-ns0.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline-ns1.xml => qemu-ns-commandline-ns1.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline.xml => qemu-ns-commandline.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-commandline-ns0.xml => qemu-ns-domain-commandline-ns0.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-commandline.xml => qemu-ns-domain-commandline.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-ns0.xml => qemu-ns-domain-ns0.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-no-env.xml => qemu-ns-no-env.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns.xml => qemu-ns.xml} (100%)
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-restore-v2-fd.xml => restore-v2-fd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-restore-v2.xml => restore-v2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-allow-bogus-usb-controller.xml => s390-allow-bogus-usb-controller.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-allow-bogus-usb-none.xml => s390-allow-bogus-usb-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-defaultconsole.xml => s390-defaultconsole.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-no-parallel.xml => s390-no-parallel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic-address.xml => s390-panic-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic-missing.xml => s390-panic-missing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic-no-address.xml => s390-panic-no-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic.xml => s390-panic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial-2.xml => s390-serial-2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial-console.xml => s390-serial-console.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial.xml => s390-serial.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dac-none.xml => seclabel-dac-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-device-duplicates.xml => seclabel-device-duplicates.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-device-multiple.xml => seclabel-device-multiple.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-override.xml => seclabel-dynamic-override.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic.xml => seclabel-dynamic.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-multiple.xml => seclabel-multiple.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-none.xml => seclabel-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static-labelskip.xml => seclabel-static-labelskip.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static-relabel.xml => seclabel-static-relabel.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static.xml => seclabel-static.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-dev-chardev-iobase.xml => serial-dev-chardev-iobase.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-dev-chardev.xml => serial-dev-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-file-chardev.xml => serial-file-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-file-log.xml => serial-file-log.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-many-chardev.xml => serial-many-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-pty-chardev.xml => serial-pty-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-pty.xml => serial-pty.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-spiceport-nospice.xml => serial-spiceport-nospice.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-spiceport.xml => serial-spiceport.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-target-port-auto.xml => serial-target-port-auto.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-chardev.xml => serial-tcp-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-telnet-chardev.xml => serial-tcp-telnet-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev-verify.xml => serial-tcp-tlsx509-chardev-verify.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml => serial-tcp-tlsx509-secret-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-udp-chardev.xml => serial-udp-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-unix-chardev.xml => serial-unix-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-vc-chardev.xml => serial-vc-chardev.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-invalid-address.xml => shmem-invalid-address.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-invalid-size.xml => shmem-invalid-size.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-msi-only.xml => shmem-msi-only.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-small-size.xml => shmem-small-size.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => shmem.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-controller.xml => smartcard-controller.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-host-certificates.xml => smartcard-host-certificates.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-host.xml => smartcard-host.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-passthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smbios-date.xml => smbios-date.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smbios-multiple-type2.xml => smbios-multiple-type2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smbios-uuid-match.xml => smbios-uuid-match.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smbios.xml => smbios.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smp.xml => smp.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-sound-device.xml => sound-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-sound.xml => sound.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-tap-vhost.xml => tap-vhost.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-tpm-no-backend-invalid.xml => tpm-no-backend-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-tpm-passthrough.xml => tpm-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-bus-missing.xml => usb-bus-missing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-default-q35.xml => usb-controller-default-q35.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-explicit-q35.xml => usb-controller-explicit-q35.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-qemu-xhci-limit.xml => usb-controller-qemu-xhci-limit.xml} (100%)
 create mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-qemu-xhci.xml => usb-controller-qemu-xhci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-xhci-limit.xml => usb-controller-xhci-limit.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-xhci.xml => usb-controller-xhci.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller.xml => usb-controller.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-autoadd-deluxe.xml => usb-hub-autoadd-deluxe.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-autoadd.xml => usb-hub-autoadd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-conflict.xml => usb-hub-conflict.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-nonexistent.xml => usb-hub-nonexistent.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub.xml => usb-hub.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-autoassign.xml => usb-ich9-autoassign.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-companion.xml => usb-ich9-companion.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-no-companion.xml => usb-ich9-no-companion.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-long-port-path.xml => usb-long-port-path.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-none-hub.xml => usb-none-hub.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-none-other.xml => usb-none-other.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-none-usbtablet.xml => usb-none-usbtablet.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-none.xml => usb-none.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-piix3-controller.xml => usb-piix3-controller.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-port-autoassign.xml => usb-port-autoassign.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-port-missing.xml => usb-port-missing.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ports-out-of-range.xml => usb-ports-out-of-range.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ports.xml => usb-ports.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-boot.xml => usb-redir-boot.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-filter-version.xml => usb-redir-filter-version.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-filter.xml => usb-redir-filter.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir.xml => usb-redir.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-too-long-port-path-invalid.xml => usb-too-long-port-path-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-xhci-autoassign.xml => usb-xhci-autoassign.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb1-usb2.xml => usb1-usb2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-user-aliases.xml => user-aliases.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-user-aliases2.xml => user-aliases2.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-vcpu-placement-static.xml => vcpu-placement-static.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-vhost_queues-invalid.xml => vhost_queues-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-vhost_queues.xml => vhost_queues.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-device-pciaddr-default.xml => video-device-pciaddr-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-invalid.xml => video-invalid.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device-vgamem.xml => video-qxl-device-vgamem.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device-vram64.xml => video-qxl-device-vram64.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device.xml => video-qxl-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-heads.xml => video-qxl-heads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-nodevice.xml => video-qxl-nodevice.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-noheads.xml => video-qxl-noheads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device-vgamem.xml => video-qxl-sec-device-vgamem.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device-vram64.xml => video-qxl-sec-device-vram64.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device.xml => video-qxl-sec-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-device-vgamem.xml => video-vga-device-vgamem.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-device.xml => video-vga-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-nodevice.xml => video-vga-nodevice.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-qxl-heads.xml => video-vga-qxl-heads.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-vga.xml => video-virtio-vga.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-input-passthrough.xml => virtio-input-passthrough.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-input.xml => virtio-input.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-lun.xml => virtio-lun.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-options.xml => virtio-options.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-ccw.xml => virtio-rng-ccw.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-default.xml => virtio-rng-default.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-egd-crash.xml => virtio-rng-egd-crash.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-egd.xml => virtio-rng-egd.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-multiple.xml => virtio-rng-multiple.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-random.xml => virtio-rng-random.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-vmcoreinfo.xml => vmcoreinfo.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-device.xml => watchdog-device.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-diag288.xml => watchdog-diag288.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-dump.xml => watchdog-dump.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-injectnmi.xml => watchdog-injectnmi.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog.xml => watchdog.xml} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-x86-kvm-32-on-64.xml => x86-kvm-32-on-64.xml} (100%)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-440fx-ide-address-conflict.xml
rename to tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml b/tests/qemuxml2argvdata/440fx-wrong-root.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml
rename to tests/qemuxml2argvdata/440fx-wrong-root.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.xml
rename to tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.xml b/tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.xml
rename to tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.xml b/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.xml
rename to tests/qemuxml2argvdata/aarch64-acpi-uefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml
rename to tests/qemuxml2argvdata/aarch64-cpu-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.xml b/tests/qemuxml2argvdata/aarch64-gic-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.xml
rename to tests/qemuxml2argvdata/aarch64-gic-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml b/tests/qemuxml2argvdata/aarch64-gic-host.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml
rename to tests/qemuxml2argvdata/aarch64-gic-host.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-invalid.xml b/tests/qemuxml2argvdata/aarch64-gic-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-invalid.xml
rename to tests/qemuxml2argvdata/aarch64-gic-invalid.xml
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.xml b/tests/qemuxml2argvdata/aarch64-gic-none-both.xml
new file mode 120000
index 0000000000..6108e04018
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.xml
@@ -0,0 +1 @@
+aarch64-gic-none.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-none-v2.xml
new file mode 120000
index 0000000000..6108e04018
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.xml
@@ -0,0 +1 @@
+aarch64-gic-none.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-none-v3.xml
new file mode 120000
index 0000000000..93a0febf51
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.xml
@@ -0,0 +1 @@
+aarch64-gic-none-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.xml b/tests/qemuxml2argvdata/aarch64-gic-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.xml
rename to tests/qemuxml2argvdata/aarch64-gic-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-arm.xml b/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-arm.xml
rename to tests/qemuxml2argvdata/aarch64-gic-not-arm.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-virt.xml b/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-virt.xml
rename to tests/qemuxml2argvdata/aarch64-gic-not-virt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-v2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml
rename to tests/qemuxml2argvdata/aarch64-gic-v2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-v3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml
rename to tests/qemuxml2argvdata/aarch64-gic-v3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml
rename to tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.xml b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.xml
rename to tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.xml b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.xml
rename to tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml b/tests/qemuxml2argvdata/aarch64-pci-serial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml
rename to tests/qemuxml2argvdata/aarch64-pci-serial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.xml b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.xml
rename to tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.xml b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.xml
rename to tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.xml b/tests/qemuxml2argvdata/aarch64-video-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.xml
rename to tests/qemuxml2argvdata/aarch64-video-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml
rename to tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
rename to tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml b/tests/qemuxml2argvdata/aarch64-virt-default-nic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml
rename to tests/qemuxml2argvdata/aarch64-virt-default-nic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml b/tests/qemuxml2argvdata/aarch64-virt-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml
rename to tests/qemuxml2argvdata/aarch64-virt-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.xml b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.xml
rename to tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml
rename to tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml b/tests/qemuxml2argvdata/acpi-table.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
rename to tests/qemuxml2argvdata/acpi-table.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml
rename to tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml
rename to tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml
rename to tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml b/tests/qemuxml2argvdata/arm-virt-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml
rename to tests/qemuxml2argvdata/arm-virt-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml b/tests/qemuxml2argvdata/autoindex.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml
rename to tests/qemuxml2argvdata/autoindex.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml
rename to tests/qemuxml2argvdata/balloon-ccw-deflate.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml b/tests/qemuxml2argvdata/balloon-device-auto.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml
rename to tests/qemuxml2argvdata/balloon-device-auto.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml
rename to tests/qemuxml2argvdata/balloon-device-deflate-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml b/tests/qemuxml2argvdata/balloon-device-deflate.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml
rename to tests/qemuxml2argvdata/balloon-device-deflate.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml b/tests/qemuxml2argvdata/balloon-device-period.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml
rename to tests/qemuxml2argvdata/balloon-device-period.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml b/tests/qemuxml2argvdata/balloon-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml
rename to tests/qemuxml2argvdata/balloon-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml
rename to tests/qemuxml2argvdata/balloon-mmio-deflate.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml b/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml
rename to tests/qemuxml2argvdata/bios-nvram-os-interleave.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml b/tests/qemuxml2argvdata/bios-nvram-secure.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
rename to tests/qemuxml2argvdata/bios-nvram-secure.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml b/tests/qemuxml2argvdata/bios-nvram.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
rename to tests/qemuxml2argvdata/bios-nvram.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/bios.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios.xml
rename to tests/qemuxml2argvdata/bios.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml
rename to tests/qemuxml2argvdata/blkdeviotune-group-num.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
rename to tests/qemuxml2argvdata/blkdeviotune-max-length.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
rename to tests/qemuxml2argvdata/blkdeviotune-max.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/blkdeviotune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
rename to tests/qemuxml2argvdata/blkdeviotune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/blkiotune-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml
rename to tests/qemuxml2argvdata/blkiotune-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml
rename to tests/qemuxml2argvdata/blkiotune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
rename to tests/qemuxml2argvdata/boot-cdrom.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml b/tests/qemuxml2argvdata/boot-complex-bootindex.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml
rename to tests/qemuxml2argvdata/boot-complex-bootindex.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml b/tests/qemuxml2argvdata/boot-complex.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml
rename to tests/qemuxml2argvdata/boot-complex.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml
rename to tests/qemuxml2argvdata/boot-dev+order.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml b/tests/qemuxml2argvdata/boot-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml
rename to tests/qemuxml2argvdata/boot-floppy-q35.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/boot-floppy.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
rename to tests/qemuxml2argvdata/boot-floppy.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive-bootindex.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml
rename to tests/qemuxml2argvdata/boot-menu-disable-drive-bootindex.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml
rename to tests/qemuxml2argvdata/boot-menu-disable-drive.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/boot-menu-disable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml
rename to tests/qemuxml2argvdata/boot-menu-disable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml b/tests/qemuxml2argvdata/boot-menu-enable-bootindex.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml
rename to tests/qemuxml2argvdata/boot-menu-enable-bootindex.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml
rename to tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml b/tests/qemuxml2argvdata/boot-menu-enable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml
rename to tests/qemuxml2argvdata/boot-menu-enable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/boot-multi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml
rename to tests/qemuxml2argvdata/boot-multi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/boot-network.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
rename to tests/qemuxml2argvdata/boot-network.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml
rename to tests/qemuxml2argvdata/boot-order.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml b/tests/qemuxml2argvdata/boot-strict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
rename to tests/qemuxml2argvdata/boot-strict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml b/tests/qemuxml2argvdata/bootindex-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml
rename to tests/qemuxml2argvdata/bootindex-floppy-q35.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/channel-guestfwd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml
rename to tests/qemuxml2argvdata/channel-guestfwd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml b/tests/qemuxml2argvdata/channel-spicevmc-old.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml
rename to tests/qemuxml2argvdata/channel-spicevmc-old.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml b/tests/qemuxml2argvdata/channel-spicevmc.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml
rename to tests/qemuxml2argvdata/channel-spicevmc.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml b/tests/qemuxml2argvdata/channel-unix-source-path.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml
rename to tests/qemuxml2argvdata/channel-unix-source-path.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/channel-virtio-auto.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml
rename to tests/qemuxml2argvdata/channel-virtio-auto.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml
rename to tests/qemuxml2argvdata/channel-virtio-autoadd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml
rename to tests/qemuxml2argvdata/channel-virtio-autoassign.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml b/tests/qemuxml2argvdata/channel-virtio-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml
rename to tests/qemuxml2argvdata/channel-virtio-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml b/tests/qemuxml2argvdata/channel-virtio-state.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml
rename to tests/qemuxml2argvdata/channel-virtio-state.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml b/tests/qemuxml2argvdata/channel-virtio-unix.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml
rename to tests/qemuxml2argvdata/channel-virtio-unix.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/channel-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml
rename to tests/qemuxml2argvdata/channel-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml b/tests/qemuxml2argvdata/chardev-label.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml
rename to tests/qemuxml2argvdata/chardev-label.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect-generated-path.xml b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect-generated-path.xml
rename to tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect-invalid-timeout.xml b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect-invalid-timeout.xml
rename to tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml b/tests/qemuxml2argvdata/chardev-reconnect.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml
rename to tests/qemuxml2argvdata/chardev-reconnect.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml b/tests/qemuxml2argvdata/clock-catchup.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml
rename to tests/qemuxml2argvdata/clock-catchup.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml b/tests/qemuxml2argvdata/clock-france.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml
rename to tests/qemuxml2argvdata/clock-france.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml b/tests/qemuxml2argvdata/clock-hpet-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml
rename to tests/qemuxml2argvdata/clock-hpet-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml
rename to tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/clock-localtime.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
rename to tests/qemuxml2argvdata/clock-localtime.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml
rename to tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
rename to tests/qemuxml2argvdata/clock-utc.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/clock-variable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml
rename to tests/qemuxml2argvdata/clock-variable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml b/tests/qemuxml2argvdata/console-compat-2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
rename to tests/qemuxml2argvdata/console-compat-2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml b/tests/qemuxml2argvdata/console-compat-auto.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml
rename to tests/qemuxml2argvdata/console-compat-auto.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/console-compat-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml
rename to tests/qemuxml2argvdata/console-compat-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/console-compat.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
rename to tests/qemuxml2argvdata/console-compat.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml b/tests/qemuxml2argvdata/console-compat2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml
rename to tests/qemuxml2argvdata/console-compat2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml b/tests/qemuxml2argvdata/console-sclp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml
rename to tests/qemuxml2argvdata/console-sclp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml b/tests/qemuxml2argvdata/console-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml
rename to tests/qemuxml2argvdata/console-virtio-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml b/tests/qemuxml2argvdata/console-virtio-many.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml
rename to tests/qemuxml2argvdata/console-virtio-many.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml b/tests/qemuxml2argvdata/console-virtio-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml
rename to tests/qemuxml2argvdata/console-virtio-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/console-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml
rename to tests/qemuxml2argvdata/console-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml b/tests/qemuxml2argvdata/controller-order.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
rename to tests/qemuxml2argvdata/controller-order.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-usb-order.xml b/tests/qemuxml2argvdata/controller-usb-order.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-controller-usb-order.xml
rename to tests/qemuxml2argvdata/controller-usb-order.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml
rename to tests/qemuxml2argvdata/cpu-Haswell-noTSX.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml b/tests/qemuxml2argvdata/cpu-Haswell.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml
rename to tests/qemuxml2argvdata/cpu-Haswell.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml b/tests/qemuxml2argvdata/cpu-Haswell2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
rename to tests/qemuxml2argvdata/cpu-Haswell2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml b/tests/qemuxml2argvdata/cpu-Haswell3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml
rename to tests/qemuxml2argvdata/cpu-Haswell3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml b/tests/qemuxml2argvdata/cpu-cache-disable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml
rename to tests/qemuxml2argvdata/cpu-cache-disable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml b/tests/qemuxml2argvdata/cpu-cache-disable2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml
rename to tests/qemuxml2argvdata/cpu-cache-disable2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml b/tests/qemuxml2argvdata/cpu-cache-disable3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml
rename to tests/qemuxml2argvdata/cpu-cache-disable3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml b/tests/qemuxml2argvdata/cpu-cache-emulate-l2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml
rename to tests/qemuxml2argvdata/cpu-cache-emulate-l2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml
rename to tests/qemuxml2argvdata/cpu-cache-emulate-l3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml b/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml
rename to tests/qemuxml2argvdata/cpu-cache-passthrough-l3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml b/tests/qemuxml2argvdata/cpu-cache-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml
rename to tests/qemuxml2argvdata/cpu-cache-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml b/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml
rename to tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml b/tests/qemuxml2argvdata/cpu-cache-passthrough3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml
rename to tests/qemuxml2argvdata/cpu-cache-passthrough3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml b/tests/qemuxml2argvdata/cpu-check-default-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml
rename to tests/qemuxml2argvdata/cpu-check-default-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml b/tests/qemuxml2argvdata/cpu-check-default-none2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml
rename to tests/qemuxml2argvdata/cpu-check-default-none2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml b/tests/qemuxml2argvdata/cpu-check-default-partial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml
rename to tests/qemuxml2argvdata/cpu-check-default-partial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml b/tests/qemuxml2argvdata/cpu-check-default-partial2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml
rename to tests/qemuxml2argvdata/cpu-check-default-partial2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml b/tests/qemuxml2argvdata/cpu-check-full.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml
rename to tests/qemuxml2argvdata/cpu-check-full.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml b/tests/qemuxml2argvdata/cpu-check-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml
rename to tests/qemuxml2argvdata/cpu-check-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml b/tests/qemuxml2argvdata/cpu-check-partial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml
rename to tests/qemuxml2argvdata/cpu-check-partial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml b/tests/qemuxml2argvdata/cpu-empty.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml
rename to tests/qemuxml2argvdata/cpu-empty.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml
rename to tests/qemuxml2argvdata/cpu-eoi-disabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml
rename to tests/qemuxml2argvdata/cpu-eoi-enabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/cpu-exact1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
rename to tests/qemuxml2argvdata/cpu-exact1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml b/tests/qemuxml2argvdata/cpu-exact2-nofallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/cpu-exact2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
rename to tests/qemuxml2argvdata/cpu-exact2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml b/tests/qemuxml2argvdata/cpu-fallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml
rename to tests/qemuxml2argvdata/cpu-fallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml b/tests/qemuxml2argvdata/cpu-host-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml
rename to tests/qemuxml2argvdata/cpu-host-kvmclock.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml b/tests/qemuxml2argvdata/cpu-host-model-cmt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml
rename to tests/qemuxml2argvdata/cpu-host-model-cmt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml b/tests/qemuxml2argvdata/cpu-host-model-fallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml
rename to tests/qemuxml2argvdata/cpu-host-model-fallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml b/tests/qemuxml2argvdata/cpu-host-model-features.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml
rename to tests/qemuxml2argvdata/cpu-host-model-features.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml b/tests/qemuxml2argvdata/cpu-host-model-nofallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml
rename to tests/qemuxml2argvdata/cpu-host-model-nofallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml b/tests/qemuxml2argvdata/cpu-host-model-vendor.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml
rename to tests/qemuxml2argvdata/cpu-host-model-vendor.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml b/tests/qemuxml2argvdata/cpu-host-model.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml
rename to tests/qemuxml2argvdata/cpu-host-model.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml
rename to tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml b/tests/qemuxml2argvdata/cpu-host-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml
rename to tests/qemuxml2argvdata/cpu-host-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml b/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml
rename to tests/qemuxml2argvdata/cpu-hotplug-startup.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml b/tests/qemuxml2argvdata/cpu-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml
rename to tests/qemuxml2argvdata/cpu-kvmclock.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml b/tests/qemuxml2argvdata/cpu-minimum1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml
rename to tests/qemuxml2argvdata/cpu-minimum1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/cpu-minimum2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
rename to tests/qemuxml2argvdata/cpu-minimum2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml b/tests/qemuxml2argvdata/cpu-nofallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml
rename to tests/qemuxml2argvdata/cpu-nofallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml b/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml
rename to tests/qemuxml2argvdata/cpu-numa-disjoint.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml b/tests/qemuxml2argvdata/cpu-numa-disordered.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml
rename to tests/qemuxml2argvdata/cpu-numa-disordered.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml b/tests/qemuxml2argvdata/cpu-numa-memshared.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
rename to tests/qemuxml2argvdata/cpu-numa-memshared.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml
rename to tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml b/tests/qemuxml2argvdata/cpu-numa1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml
rename to tests/qemuxml2argvdata/cpu-numa1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml b/tests/qemuxml2argvdata/cpu-numa2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml
rename to tests/qemuxml2argvdata/cpu-numa2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml b/tests/qemuxml2argvdata/cpu-numa3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml
rename to tests/qemuxml2argvdata/cpu-numa3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml b/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml
rename to tests/qemuxml2argvdata/cpu-qemu-host-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml b/tests/qemuxml2argvdata/cpu-s390-features.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml
rename to tests/qemuxml2argvdata/cpu-s390-features.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml b/tests/qemuxml2argvdata/cpu-s390-zEC12.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml
rename to tests/qemuxml2argvdata/cpu-s390-zEC12.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/cpu-strict1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
rename to tests/qemuxml2argvdata/cpu-strict1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml b/tests/qemuxml2argvdata/cpu-topology1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml
rename to tests/qemuxml2argvdata/cpu-topology1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml b/tests/qemuxml2argvdata/cpu-topology2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml
rename to tests/qemuxml2argvdata/cpu-topology2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml b/tests/qemuxml2argvdata/cpu-topology3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml
rename to tests/qemuxml2argvdata/cpu-topology3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml b/tests/qemuxml2argvdata/cpu-tsc-frequency.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml
rename to tests/qemuxml2argvdata/cpu-tsc-frequency.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml b/tests/qemuxml2argvdata/cputune-iothreads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
rename to tests/qemuxml2argvdata/cputune-iothreads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml
rename to tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml
rename to tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml b/tests/qemuxml2argvdata/cputune-iothreadsched.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml
rename to tests/qemuxml2argvdata/cputune-iothreadsched.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/cputune-numatune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml
rename to tests/qemuxml2argvdata/cputune-numatune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml
rename to tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml b/tests/qemuxml2argvdata/cputune-zero-shares.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml
rename to tests/qemuxml2argvdata/cputune-zero-shares.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml b/tests/qemuxml2argvdata/cputune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune.xml
rename to tests/qemuxml2argvdata/cputune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml b/tests/qemuxml2argvdata/debug-threads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml
rename to tests/qemuxml2argvdata/debug-threads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml b/tests/qemuxml2argvdata/default-kvm-host-arch.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml
rename to tests/qemuxml2argvdata/default-kvm-host-arch.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml b/tests/qemuxml2argvdata/default-qemu-host-arch.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml
rename to tests/qemuxml2argvdata/default-qemu-host-arch.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml b/tests/qemuxml2argvdata/disk-active-commit.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml
rename to tests/qemuxml2argvdata/disk-active-commit.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/disk-aio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml
rename to tests/qemuxml2argvdata/disk-aio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml b/tests/qemuxml2argvdata/disk-backing-chains.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml
rename to tests/qemuxml2argvdata/disk-backing-chains.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml b/tests/qemuxml2argvdata/disk-blockio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml
rename to tests/qemuxml2argvdata/disk-blockio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/disk-cdrom-empty.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
rename to tests/qemuxml2argvdata/disk-cdrom-empty.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml b/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
rename to tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml b/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
rename to tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml b/tests/qemuxml2argvdata/disk-cdrom-network-http.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
rename to tests/qemuxml2argvdata/disk-cdrom-network-http.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml b/tests/qemuxml2argvdata/disk-cdrom-network-https.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
rename to tests/qemuxml2argvdata/disk-cdrom-network-https.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml b/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
rename to tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml b/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml
rename to tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml b/tests/qemuxml2argvdata/disk-cdrom-tray.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml
rename to tests/qemuxml2argvdata/disk-cdrom-tray.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/disk-cdrom.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
rename to tests/qemuxml2argvdata/disk-cdrom.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/disk-copy_on_read.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
rename to tests/qemuxml2argvdata/disk-copy_on_read.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-device-lun-type-invalid.xml b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-device-lun-type-invalid.xml
rename to tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-address-conflict.xml b/tests/qemuxml2argvdata/disk-drive-address-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-address-conflict.xml
rename to tests/qemuxml2argvdata/disk-drive-address-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
rename to tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/disk-drive-boot-disk.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
rename to tests/qemuxml2argvdata/disk-drive-boot-disk.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/disk-drive-cache-directsync.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
rename to tests/qemuxml2argvdata/disk-drive-cache-directsync.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
rename to tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml b/tests/qemuxml2argvdata/disk-drive-copy-on-read.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml
rename to tests/qemuxml2argvdata/disk-drive-copy-on-read.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml
rename to tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/disk-drive-discard.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
rename to tests/qemuxml2argvdata/disk-drive-discard.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/disk-drive-error-policy-enospace.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
rename to tests/qemuxml2argvdata/disk-drive-error-policy-enospace.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/disk-drive-error-policy-stop.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
rename to tests/qemuxml2argvdata/disk-drive-error-policy-stop.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/disk-drive-error-policy-wreport-rignore.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
rename to tests/qemuxml2argvdata/disk-drive-error-policy-wreport-rignore.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
rename to tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml b/tests/qemuxml2argvdata/disk-drive-network-gluster.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
rename to tests/qemuxml2argvdata/disk-drive-network-gluster.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettype-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-secrettype-invalid.xml
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettype-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secrettype.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-wrong-secrettype.xml
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secrettype.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.xml b/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.xml
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml b/tests/qemuxml2argvdata/disk-drive-network-iscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml b/tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml b/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/disk-drive-network-nbd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
rename to tests/qemuxml2argvdata/disk-drive-network-nbd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-no-colon.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-no-colon.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/disk-drive-network-rbd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
rename to tests/qemuxml2argvdata/disk-drive-network-rbd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
rename to tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth-both.xml b/tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth-both.xml
rename to tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-source-auth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.xml
rename to tests/qemuxml2argvdata/disk-drive-network-source-auth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml b/tests/qemuxml2argvdata/disk-drive-network-vxhs.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml
rename to tests/qemuxml2argvdata/disk-drive-network-vxhs.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml b/tests/qemuxml2argvdata/disk-drive-no-boot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml
rename to tests/qemuxml2argvdata/disk-drive-no-boot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml b/tests/qemuxml2argvdata/disk-drive-readonly-disk.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml
rename to tests/qemuxml2argvdata/disk-drive-readonly-disk.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml b/tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml
rename to tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.xml b/tests/qemuxml2argvdata/disk-drive-shared-locking.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.xml
rename to tests/qemuxml2argvdata/disk-drive-shared-locking.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-qcow.xml b/tests/qemuxml2argvdata/disk-drive-shared-qcow.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-qcow.xml
rename to tests/qemuxml2argvdata/disk-drive-shared-qcow.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml b/tests/qemuxml2argvdata/disk-drive-shared.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml
rename to tests/qemuxml2argvdata/disk-drive-shared.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-fdc-incompatible-address.xml b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-fdc-incompatible-address.xml
rename to tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml b/tests/qemuxml2argvdata/disk-floppy-pseries.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml
rename to tests/qemuxml2argvdata/disk-floppy-pseries.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml b/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml
rename to tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml b/tests/qemuxml2argvdata/disk-floppy-tray.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml
rename to tests/qemuxml2argvdata/disk-floppy-tray.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/disk-floppy.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
rename to tests/qemuxml2argvdata/disk-floppy.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml b/tests/qemuxml2argvdata/disk-geometry.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml
rename to tests/qemuxml2argvdata/disk-geometry.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-address-conflict.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-address-conflict.xml
rename to tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
rename to tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml b/tests/qemuxml2argvdata/disk-ide-drive-split.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml
rename to tests/qemuxml2argvdata/disk-ide-drive-split.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-incompatible-address.xml b/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ide-incompatible-address.xml
rename to tests/qemuxml2argvdata/disk-ide-incompatible-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml b/tests/qemuxml2argvdata/disk-ide-wwn.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml
rename to tests/qemuxml2argvdata/disk-ide-wwn.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/disk-ioeventfd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
rename to tests/qemuxml2argvdata/disk-ioeventfd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml b/tests/qemuxml2argvdata/disk-iscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml
rename to tests/qemuxml2argvdata/disk-iscsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/disk-many.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
rename to tests/qemuxml2argvdata/disk-many.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror-old.xml b/tests/qemuxml2argvdata/disk-mirror-old.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-mirror-old.xml
rename to tests/qemuxml2argvdata/disk-mirror-old.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml b/tests/qemuxml2argvdata/disk-mirror.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml
rename to tests/qemuxml2argvdata/disk-mirror.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml b/tests/qemuxml2argvdata/disk-order.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml
rename to tests/qemuxml2argvdata/disk-order.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml b/tests/qemuxml2argvdata/disk-same-targets.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml
rename to tests/qemuxml2argvdata/disk-same-targets.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml b/tests/qemuxml2argvdata/disk-sata-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml
rename to tests/qemuxml2argvdata/disk-sata-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-incompatible-address.xml b/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-sata-incompatible-address.xml
rename to tests/qemuxml2argvdata/disk-sata-incompatible-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/disk-scsi-device-auto.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml
rename to tests/qemuxml2argvdata/disk-scsi-device-auto.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml b/tests/qemuxml2argvdata/disk-scsi-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml
rename to tests/qemuxml2argvdata/disk-scsi-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml b/tests/qemuxml2argvdata/disk-scsi-disk-split.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml
rename to tests/qemuxml2argvdata/disk-scsi-disk-split.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml
rename to tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml
rename to tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml
rename to tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-incompatible-address.xml b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-incompatible-address.xml
rename to tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml
rename to tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml
rename to tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml b/tests/qemuxml2argvdata/disk-scsi-megasas.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml
rename to tests/qemuxml2argvdata/disk-scsi-megasas.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml b/tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml
rename to tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml
rename to tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml b/tests/qemuxml2argvdata/disk-scsi-vscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml
rename to tests/qemuxml2argvdata/disk-scsi-vscsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml
rename to tests/qemuxml2argvdata/disk-serial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml b/tests/qemuxml2argvdata/disk-snapshot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml
rename to tests/qemuxml2argvdata/disk-snapshot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml b/tests/qemuxml2argvdata/disk-source-pool-mode.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
rename to tests/qemuxml2argvdata/disk-source-pool-mode.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml b/tests/qemuxml2argvdata/disk-source-pool.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml
rename to tests/qemuxml2argvdata/disk-source-pool.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml b/tests/qemuxml2argvdata/disk-transient.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml
rename to tests/qemuxml2argvdata/disk-transient.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml b/tests/qemuxml2argvdata/disk-usb-device-removable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml
rename to tests/qemuxml2argvdata/disk-usb-device-removable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml b/tests/qemuxml2argvdata/disk-usb-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml
rename to tests/qemuxml2argvdata/disk-usb-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml b/tests/qemuxml2argvdata/disk-usb-nosupport.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml
rename to tests/qemuxml2argvdata/disk-usb-nosupport.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-pci.xml b/tests/qemuxml2argvdata/disk-usb-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-pci.xml
rename to tests/qemuxml2argvdata/disk-usb-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.xml b/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.xml
rename to tests/qemuxml2argvdata/disk-virtio-ccw-many.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.xml b/tests/qemuxml2argvdata/disk-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.xml
rename to tests/qemuxml2argvdata/disk-virtio-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.xml b/tests/qemuxml2argvdata/disk-virtio-drive-queues.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.xml
rename to tests/qemuxml2argvdata/disk-virtio-drive-queues.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml b/tests/qemuxml2argvdata/disk-virtio-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml
rename to tests/qemuxml2argvdata/disk-virtio-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.xml
rename to tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml
rename to tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml
rename to tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml
rename to tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml
rename to tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/disk-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
rename to tests/qemuxml2argvdata/disk-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml
rename to tests/qemuxml2argvdata/encrypted-disk-usage.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml b/tests/qemuxml2argvdata/encrypted-disk.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml
rename to tests/qemuxml2argvdata/encrypted-disk.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml b/tests/qemuxml2argvdata/eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml
rename to tests/qemuxml2argvdata/eoi-disabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml b/tests/qemuxml2argvdata/eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml
rename to tests/qemuxml2argvdata/eoi-enabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/event_idx.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
rename to tests/qemuxml2argvdata/event_idx.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml
rename to tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml
rename to tests/qemuxml2argvdata/fd-memory-numa-topology.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml
rename to tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml
rename to tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.xml b/tests/qemuxml2argvdata/fips-enabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.xml
rename to tests/qemuxml2argvdata/fips-enabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/floppy-drive-fat.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml
rename to tests/qemuxml2argvdata/floppy-drive-fat.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.xml b/tests/qemuxml2argvdata/fs9p-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.xml
rename to tests/qemuxml2argvdata/fs9p-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/fs9p.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml
rename to tests/qemuxml2argvdata/fs9p.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml b/tests/qemuxml2argvdata/graphics-listen-network.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
rename to tests/qemuxml2argvdata/graphics-listen-network.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml b/tests/qemuxml2argvdata/graphics-listen-network2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
rename to tests/qemuxml2argvdata/graphics-listen-network2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
rename to tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/graphics-sdl.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
rename to tests/qemuxml2argvdata/graphics-sdl.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
rename to tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
rename to tests/qemuxml2argvdata/graphics-spice-agentmouse.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.xml
rename to tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml
rename to tests/qemuxml2argvdata/graphics-spice-auto-socket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/graphics-spice-compression.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
rename to tests/qemuxml2argvdata/graphics-spice-compression.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.xml b/tests/qemuxml2argvdata/graphics-spice-no-args.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.xml
rename to tests/qemuxml2argvdata/graphics-spice-no-args.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
rename to tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml b/tests/qemuxml2argvdata/graphics-spice-sasl.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
rename to tests/qemuxml2argvdata/graphics-spice-sasl.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.xml b/tests/qemuxml2argvdata/graphics-spice-socket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.xml
rename to tests/qemuxml2argvdata/graphics-spice-socket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
rename to tests/qemuxml2argvdata/graphics-spice-timeout.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml b/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml
rename to tests/qemuxml2argvdata/graphics-spice-usb-redir.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/graphics-spice.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
rename to tests/qemuxml2argvdata/graphics-spice.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.xml
rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml
rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml
rename to tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.xml b/tests/qemuxml2argvdata/graphics-vnc-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.xml
rename to tests/qemuxml2argvdata/graphics-vnc-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/graphics-vnc-policy.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
rename to tests/qemuxml2argvdata/graphics-vnc-policy.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.xml
rename to tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/graphics-vnc-sasl.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
rename to tests/qemuxml2argvdata/graphics-vnc-sasl.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml
rename to tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-socket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
rename to tests/qemuxml2argvdata/graphics-vnc-socket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
rename to tests/qemuxml2argvdata/graphics-vnc-tls.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/graphics-vnc-websocket.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
rename to tests/qemuxml2argvdata/graphics-vnc-websocket.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/graphics-vnc.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
rename to tests/qemuxml2argvdata/graphics-vnc.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-invalid-target-address.xml b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-invalid-target-address.xml
rename to tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.xml b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.xml
rename to tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-src-address-invalid.xml b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-src-address-invalid.xml
rename to tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml
rename to tests/qemuxml2argvdata/hostdev-pci-address-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/hostdev-pci-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
rename to tests/qemuxml2argvdata/hostdev-pci-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-boot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-large-unit.xml b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-large-unit.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-sgio.xml b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-sgio.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-shareable.xml b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-shareable.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.xml
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.xml
rename to tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml
rename to tests/qemuxml2argvdata/hostdev-usb-address-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
rename to tests/qemuxml2argvdata/hostdev-usb-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.xml
rename to tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml b/tests/qemuxml2argvdata/hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml
rename to tests/qemuxml2argvdata/hostdev-vfio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdevs-drive-address-conflict.xml b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdevs-drive-address-conflict.xml
rename to tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.xml b/tests/qemuxml2argvdata/hotplug-base.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.xml
rename to tests/qemuxml2argvdata/hotplug-base.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess-invalid.xml b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess-invalid.xml
rename to tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml
rename to tests/qemuxml2argvdata/hugepages-memaccess.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.xml
rename to tests/qemuxml2argvdata/hugepages-memaccess2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml b/tests/qemuxml2argvdata/hugepages-numa.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
rename to tests/qemuxml2argvdata/hugepages-numa.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml b/tests/qemuxml2argvdata/hugepages-pages.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml
rename to tests/qemuxml2argvdata/hugepages-pages.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml b/tests/qemuxml2argvdata/hugepages-pages2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml
rename to tests/qemuxml2argvdata/hugepages-pages2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml b/tests/qemuxml2argvdata/hugepages-pages3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml
rename to tests/qemuxml2argvdata/hugepages-pages3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml b/tests/qemuxml2argvdata/hugepages-pages4.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml
rename to tests/qemuxml2argvdata/hugepages-pages4.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml b/tests/qemuxml2argvdata/hugepages-pages5.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml
rename to tests/qemuxml2argvdata/hugepages-pages5.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml b/tests/qemuxml2argvdata/hugepages-pages6.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml
rename to tests/qemuxml2argvdata/hugepages-pages6.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml b/tests/qemuxml2argvdata/hugepages-pages7.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml
rename to tests/qemuxml2argvdata/hugepages-pages7.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml b/tests/qemuxml2argvdata/hugepages-shared.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
rename to tests/qemuxml2argvdata/hugepages-shared.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml b/tests/qemuxml2argvdata/hugepages.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml
rename to tests/qemuxml2argvdata/hugepages.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml
rename to tests/qemuxml2argvdata/hyperv-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml b/tests/qemuxml2argvdata/hyperv-panic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml
rename to tests/qemuxml2argvdata/hyperv-panic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
rename to tests/qemuxml2argvdata/hyperv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml b/tests/qemuxml2argvdata/input-usbmouse-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml
rename to tests/qemuxml2argvdata/input-usbmouse-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/input-usbmouse.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
rename to tests/qemuxml2argvdata/input-usbmouse.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/input-usbtablet.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
rename to tests/qemuxml2argvdata/input-usbtablet.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml b/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml
rename to tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.xml b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.xml
rename to tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.xml b/tests/qemuxml2argvdata/intel-iommu-eim.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.xml
rename to tests/qemuxml2argvdata/intel-iommu-eim.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml b/tests/qemuxml2argvdata/intel-iommu-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml
rename to tests/qemuxml2argvdata/intel-iommu-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml b/tests/qemuxml2argvdata/intel-iommu.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml
rename to tests/qemuxml2argvdata/intel-iommu.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml b/tests/qemuxml2argvdata/interface-driver.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml
rename to tests/qemuxml2argvdata/interface-driver.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml b/tests/qemuxml2argvdata/interface-server.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml
rename to tests/qemuxml2argvdata/interface-server.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.xml b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.xml
rename to tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.xml b/tests/qemuxml2argvdata/iothreads-disk.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.xml
rename to tests/qemuxml2argvdata/iothreads-disk.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml b/tests/qemuxml2argvdata/iothreads-ids-partial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml
rename to tests/qemuxml2argvdata/iothreads-ids-partial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml b/tests/qemuxml2argvdata/iothreads-ids.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml
rename to tests/qemuxml2argvdata/iothreads-ids.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-nocap.xml b/tests/qemuxml2argvdata/iothreads-nocap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-nocap.xml
rename to tests/qemuxml2argvdata/iothreads-nocap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.xml
rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.xml
rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml b/tests/qemuxml2argvdata/iothreads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml
rename to tests/qemuxml2argvdata/iothreads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml
rename to tests/qemuxml2argvdata/kvm-features-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml
rename to tests/qemuxml2argvdata/kvm-features.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml b/tests/qemuxml2argvdata/kvm-pit-delay.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml
rename to tests/qemuxml2argvdata/kvm-pit-delay.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.xml b/tests/qemuxml2argvdata/kvm-pit-discard.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.xml
rename to tests/qemuxml2argvdata/kvm-pit-discard.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.xml b/tests/qemuxml2argvdata/kvm.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm.xml
rename to tests/qemuxml2argvdata/kvm.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml
rename to tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/kvmclock.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
rename to tests/qemuxml2argvdata/kvmclock.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml b/tests/qemuxml2argvdata/lease.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-lease.xml
rename to tests/qemuxml2argvdata/lease.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disk-invalid.xml b/tests/qemuxml2argvdata/luks-disk-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disk-invalid.xml
rename to tests/qemuxml2argvdata/luks-disk-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml b/tests/qemuxml2argvdata/luks-disks-source-both.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml
rename to tests/qemuxml2argvdata/luks-disks-source-both.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml b/tests/qemuxml2argvdata/luks-disks-source.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml
rename to tests/qemuxml2argvdata/luks-disks-source.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml b/tests/qemuxml2argvdata/luks-disks.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml
rename to tests/qemuxml2argvdata/luks-disks.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml b/tests/qemuxml2argvdata/mach-virt-console-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml
rename to tests/qemuxml2argvdata/mach-virt-console-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml b/tests/qemuxml2argvdata/mach-virt-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml
rename to tests/qemuxml2argvdata/mach-virt-console-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml b/tests/qemuxml2argvdata/mach-virt-serial+console-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml
rename to tests/qemuxml2argvdata/mach-virt-serial+console-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml b/tests/qemuxml2argvdata/mach-virt-serial-compat.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml
rename to tests/qemuxml2argvdata/mach-virt-serial-compat.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml b/tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml
rename to tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml b/tests/qemuxml2argvdata/mach-virt-serial-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml
rename to tests/qemuxml2argvdata/mach-virt-serial-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml b/tests/qemuxml2argvdata/mach-virt-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml
rename to tests/qemuxml2argvdata/mach-virt-serial-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml b/tests/qemuxml2argvdata/mach-virt-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml
rename to tests/qemuxml2argvdata/mach-virt-serial-usb.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.xml
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml b/tests/qemuxml2argvdata/machine-aliases1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml
rename to tests/qemuxml2argvdata/machine-aliases1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml b/tests/qemuxml2argvdata/machine-aliases2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
rename to tests/qemuxml2argvdata/machine-aliases2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.xml b/tests/qemuxml2argvdata/machine-core-cfg-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.xml
rename to tests/qemuxml2argvdata/machine-core-cfg-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml b/tests/qemuxml2argvdata/machine-core-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
rename to tests/qemuxml2argvdata/machine-core-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml b/tests/qemuxml2argvdata/machine-core-on.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
rename to tests/qemuxml2argvdata/machine-core-on.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.xml b/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.xml b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.xml b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-caps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.xml b/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.xml b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-cap.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.xml b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.xml
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-caps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.xml b/tests/qemuxml2argvdata/machine-keywrap-none-argv.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.xml
rename to tests/qemuxml2argvdata/machine-keywrap-none-argv.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.xml b/tests/qemuxml2argvdata/machine-keywrap-none-caps.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.xml
rename to tests/qemuxml2argvdata/machine-keywrap-none-caps.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.xml b/tests/qemuxml2argvdata/machine-keywrap-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.xml
rename to tests/qemuxml2argvdata/machine-keywrap-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml
rename to tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml b/tests/qemuxml2argvdata/machine-loadparm-net-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml
rename to tests/qemuxml2argvdata/machine-loadparm-net-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml b/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml
rename to tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml b/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml
rename to tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml b/tests/qemuxml2argvdata/machine-loadparm-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml
rename to tests/qemuxml2argvdata/machine-loadparm-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.xml b/tests/qemuxml2argvdata/machine-smm-opt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.xml
rename to tests/qemuxml2argvdata/machine-smm-opt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml b/tests/qemuxml2argvdata/machine-usb-opt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml
rename to tests/qemuxml2argvdata/machine-usb-opt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml b/tests/qemuxml2argvdata/machine-vmport-opt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml
rename to tests/qemuxml2argvdata/machine-vmport-opt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-master-key.xml b/tests/qemuxml2argvdata/master-key.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-master-key.xml
rename to tests/qemuxml2argvdata/master-key.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-align-fail.xml
rename to tests/qemuxml2argvdata/memory-align-fail.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml
rename to tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml
rename to tests/qemuxml2argvdata/memory-hotplug-dimm.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml
rename to tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.xml
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.xml
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml
rename to tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml
rename to tests/qemuxml2argvdata/memory-hotplug.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml b/tests/qemuxml2argvdata/memorybacking-set.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml
rename to tests/qemuxml2argvdata/memorybacking-set.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml b/tests/qemuxml2argvdata/memorybacking-unset.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml
rename to tests/qemuxml2argvdata/memorybacking-unset.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml b/tests/qemuxml2argvdata/memtune-unlimited.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml
rename to tests/qemuxml2argvdata/memtune-unlimited.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml b/tests/qemuxml2argvdata/memtune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memtune.xml
rename to tests/qemuxml2argvdata/memtune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml b/tests/qemuxml2argvdata/metadata-duplicate.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml
rename to tests/qemuxml2argvdata/metadata-duplicate.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/metadata.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-metadata.xml
rename to tests/qemuxml2argvdata/metadata.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.xml b/tests/qemuxml2argvdata/migrate-numa-unaligned.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.xml
rename to tests/qemuxml2argvdata/migrate-numa-unaligned.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/migrate.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
rename to tests/qemuxml2argvdata/migrate.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml b/tests/qemuxml2argvdata/minimal-msg-timestamp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml
rename to tests/qemuxml2argvdata/minimal-msg-timestamp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-no-memory.xml b/tests/qemuxml2argvdata/minimal-no-memory.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-minimal-no-memory.xml
rename to tests/qemuxml2argvdata/minimal-no-memory.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml b/tests/qemuxml2argvdata/minimal.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-minimal.xml
rename to tests/qemuxml2argvdata/minimal.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/misc-acpi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
rename to tests/qemuxml2argvdata/misc-acpi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/misc-disable-s3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
rename to tests/qemuxml2argvdata/misc-disable-s3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/misc-disable-suspends.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
rename to tests/qemuxml2argvdata/misc-disable-suspends.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml b/tests/qemuxml2argvdata/misc-enable-s4.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
rename to tests/qemuxml2argvdata/misc-enable-s4.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/misc-no-reboot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
rename to tests/qemuxml2argvdata/misc-no-reboot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/misc-uuid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
rename to tests/qemuxml2argvdata/misc-uuid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-missing-machine.xml b/tests/qemuxml2argvdata/missing-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-missing-machine.xml
rename to tests/qemuxml2argvdata/missing-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml b/tests/qemuxml2argvdata/mlock-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml
rename to tests/qemuxml2argvdata/mlock-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/mlock-on.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml
rename to tests/qemuxml2argvdata/mlock-on.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml b/tests/qemuxml2argvdata/mlock-unsupported.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml
rename to tests/qemuxml2argvdata/mlock-unsupported.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml
rename to tests/qemuxml2argvdata/monitor-json.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml b/tests/qemuxml2argvdata/multifunction-pci-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml
rename to tests/qemuxml2argvdata/multifunction-pci-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml b/tests/qemuxml2argvdata/name-escape.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml
rename to tests/qemuxml2argvdata/name-escape.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/net-bandwidth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
rename to tests/qemuxml2argvdata/net-bandwidth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth2.xml b/tests/qemuxml2argvdata/net-bandwidth2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth2.xml
rename to tests/qemuxml2argvdata/net-bandwidth2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml b/tests/qemuxml2argvdata/net-client.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-client.xml
rename to tests/qemuxml2argvdata/net-client.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml b/tests/qemuxml2argvdata/net-coalesce.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml
rename to tests/qemuxml2argvdata/net-coalesce.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml b/tests/qemuxml2argvdata/net-eth-hostip.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml
rename to tests/qemuxml2argvdata/net-eth-hostip.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/net-eth-ifname.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
rename to tests/qemuxml2argvdata/net-eth-ifname.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml b/tests/qemuxml2argvdata/net-eth-names.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml
rename to tests/qemuxml2argvdata/net-eth-names.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/net-eth.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
rename to tests/qemuxml2argvdata/net-eth.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-fail.xml b/tests/qemuxml2argvdata/net-hostdev-fail.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-fail.xml
rename to tests/qemuxml2argvdata/net-hostdev-fail.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.xml
rename to tests/qemuxml2argvdata/net-hostdev-multidomain.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.xml
rename to tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.xml b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.xml
rename to tests/qemuxml2argvdata/net-hostdev-vfio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml b/tests/qemuxml2argvdata/net-hostdev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml
rename to tests/qemuxml2argvdata/net-hostdev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml b/tests/qemuxml2argvdata/net-mcast.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml
rename to tests/qemuxml2argvdata/net-mcast.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-midonet.xml b/tests/qemuxml2argvdata/net-midonet.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-midonet.xml
rename to tests/qemuxml2argvdata/net-midonet.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml
rename to tests/qemuxml2argvdata/net-mtu.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-openvswitch.xml b/tests/qemuxml2argvdata/net-openvswitch.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-openvswitch.xml
rename to tests/qemuxml2argvdata/net-openvswitch.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml b/tests/qemuxml2argvdata/net-server.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-server.xml
rename to tests/qemuxml2argvdata/net-server.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml b/tests/qemuxml2argvdata/net-udp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml
rename to tests/qemuxml2argvdata/net-udp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml b/tests/qemuxml2argvdata/net-user-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml
rename to tests/qemuxml2argvdata/net-user-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/net-user.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
rename to tests/qemuxml2argvdata/net-user.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-fail.xml b/tests/qemuxml2argvdata/net-vhostuser-fail.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-fail.xml
rename to tests/qemuxml2argvdata/net-vhostuser-fail.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml
rename to tests/qemuxml2argvdata/net-vhostuser-multiq.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml b/tests/qemuxml2argvdata/net-vhostuser.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml
rename to tests/qemuxml2argvdata/net-vhostuser.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.xml b/tests/qemuxml2argvdata/net-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.xml
rename to tests/qemuxml2argvdata/net-virtio-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml b/tests/qemuxml2argvdata/net-virtio-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml
rename to tests/qemuxml2argvdata/net-virtio-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml
rename to tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml b/tests/qemuxml2argvdata/net-virtio-netdev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml
rename to tests/qemuxml2argvdata/net-virtio-netdev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml
rename to tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize-invalid-size.xml b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize-invalid-size.xml
rename to tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml
rename to tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml b/tests/qemuxml2argvdata/net-virtio-s390.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml
rename to tests/qemuxml2argvdata/net-virtio-s390.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/net-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
rename to tests/qemuxml2argvdata/net-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml b/tests/qemuxml2argvdata/no-kvm-pit-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml
rename to tests/qemuxml2argvdata/no-kvm-pit-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml b/tests/qemuxml2argvdata/no-shutdown.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml
rename to tests/qemuxml2argvdata/no-shutdown.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-display.xml b/tests/qemuxml2argvdata/nographics-display.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics-display.xml
rename to tests/qemuxml2argvdata/nographics-display.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/nographics-vga.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
rename to tests/qemuxml2argvdata/nographics-vga.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml b/tests/qemuxml2argvdata/nographics.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics.xml
rename to tests/qemuxml2argvdata/nographics.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml b/tests/qemuxml2argvdata/nosharepages.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
rename to tests/qemuxml2argvdata/nosharepages.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.xml
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.xml
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-no-numatune.xml
rename to tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml
rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.xml
rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.xml
rename to tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-static-vcpu-no-numatune.xml
rename to tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.xml b/tests/qemuxml2argvdata/numad.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad.xml
rename to tests/qemuxml2argvdata/numad.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml
rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml b/tests/qemuxml2argvdata/numatune-auto-prefer.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml
rename to tests/qemuxml2argvdata/numatune-auto-prefer.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.xml b/tests/qemuxml2argvdata/numatune-distances.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.xml
rename to tests/qemuxml2argvdata/numatune-distances.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml b/tests/qemuxml2argvdata/numatune-memnode-no-memory.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml
rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-nocpu.xml b/tests/qemuxml2argvdata/numatune-memnode-nocpu.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-nocpu.xml
rename to tests/qemuxml2argvdata/numatune-memnode-nocpu.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml b/tests/qemuxml2argvdata/numatune-memnode.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
rename to tests/qemuxml2argvdata/numatune-memnode.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml b/tests/qemuxml2argvdata/numatune-memnodes-problematic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml
rename to tests/qemuxml2argvdata/numatune-memnodes-problematic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml
rename to tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml
rename to tests/qemuxml2argvdata/numatune-memory.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml
rename to tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-double.xml b/tests/qemuxml2argvdata/panic-double.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-double.xml
rename to tests/qemuxml2argvdata/panic-double.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml b/tests/qemuxml2argvdata/panic-isa.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml
rename to tests/qemuxml2argvdata/panic-isa.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml b/tests/qemuxml2argvdata/panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml
rename to tests/qemuxml2argvdata/panic-no-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-pseries.xml b/tests/qemuxml2argvdata/panic-pseries.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-pseries.xml
rename to tests/qemuxml2argvdata/panic-pseries.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.xml b/tests/qemuxml2argvdata/panic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic.xml
rename to tests/qemuxml2argvdata/panic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.xml b/tests/qemuxml2argvdata/parallel-parport-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.xml
rename to tests/qemuxml2argvdata/parallel-parport-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/parallel-tcp-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml
rename to tests/qemuxml2argvdata/parallel-tcp-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml b/tests/qemuxml2argvdata/pci-autoadd-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
rename to tests/qemuxml2argvdata/pci-autoadd-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml b/tests/qemuxml2argvdata/pci-autoadd-idx.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
rename to tests/qemuxml2argvdata/pci-autoadd-idx.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.xml b/tests/qemuxml2argvdata/pci-autofill-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.xml
rename to tests/qemuxml2argvdata/pci-autofill-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml
rename to tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.xml b/tests/qemuxml2argvdata/pci-bridge-many-disks.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.xml
rename to tests/qemuxml2argvdata/pci-bridge-many-disks.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-negative-index-invalid.xml b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-negative-index-invalid.xml
rename to tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml b/tests/qemuxml2argvdata/pci-bridge.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
rename to tests/qemuxml2argvdata/pci-bridge.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bus-invalid.xml b/tests/qemuxml2argvdata/pci-bus-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bus-invalid.xml
rename to tests/qemuxml2argvdata/pci-bus-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-domain-invalid.xml b/tests/qemuxml2argvdata/pci-domain-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-domain-invalid.xml
rename to tests/qemuxml2argvdata/pci-domain-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-bus.xml
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-machine.xml
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-node.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-node.xml
rename to tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.xml
rename to tests/qemuxml2argvdata/pci-expander-bus.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-function-invalid.xml b/tests/qemuxml2argvdata/pci-function-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-function-invalid.xml
rename to tests/qemuxml2argvdata/pci-function-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml b/tests/qemuxml2argvdata/pci-many.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml
rename to tests/qemuxml2argvdata/pci-many.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml b/tests/qemuxml2argvdata/pci-rom.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml
rename to tests/qemuxml2argvdata/pci-rom.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml b/tests/qemuxml2argvdata/pci-root-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml
rename to tests/qemuxml2argvdata/pci-root-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml
rename to tests/qemuxml2argvdata/pci-root-nonzero-index.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.xml b/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.xml
rename to tests/qemuxml2argvdata/pci-serial-dev-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-slot-invalid.xml b/tests/qemuxml2argvdata/pci-slot-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-slot-invalid.xml
rename to tests/qemuxml2argvdata/pci-slot-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.xml
rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-machine.xml
rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml
rename to tests/qemuxml2argvdata/pcie-expander-bus.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.xml b/tests/qemuxml2argvdata/pcie-root-port-model-generic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.xml
rename to tests/qemuxml2argvdata/pcie-root-port-model-generic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.xml b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.xml
rename to tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml b/tests/qemuxml2argvdata/pcie-root-port-too-many.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml
rename to tests/qemuxml2argvdata/pcie-root-port-too-many.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml b/tests/qemuxml2argvdata/pcie-root-port.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml
rename to tests/qemuxml2argvdata/pcie-root-port.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.xml b/tests/qemuxml2argvdata/pcie-root.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root.xml
rename to tests/qemuxml2argvdata/pcie-root.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml b/tests/qemuxml2argvdata/pcie-switch-downstream-port.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml
rename to tests/qemuxml2argvdata/pcie-switch-downstream-port.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml b/tests/qemuxml2argvdata/pcie-switch-upstream-port.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml
rename to tests/qemuxml2argvdata/pcie-switch-upstream-port.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-gib.xml b/tests/qemuxml2argvdata/pcihole64-gib.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64-gib.xml
rename to tests/qemuxml2argvdata/pcihole64-gib.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml b/tests/qemuxml2argvdata/pcihole64-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml
rename to tests/qemuxml2argvdata/pcihole64-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml b/tests/qemuxml2argvdata/pcihole64-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
rename to tests/qemuxml2argvdata/pcihole64-q35.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml b/tests/qemuxml2argvdata/pcihole64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml
rename to tests/qemuxml2argvdata/pcihole64.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.xml b/tests/qemuxml2argvdata/pmu-feature-off.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.xml
rename to tests/qemuxml2argvdata/pmu-feature-off.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.xml b/tests/qemuxml2argvdata/pmu-feature.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.xml
rename to tests/qemuxml2argvdata/pmu-feature.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml b/tests/qemuxml2argvdata/ppc-dtb.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml
rename to tests/qemuxml2argvdata/ppc-dtb.xml
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml
new file mode 120000
index 0000000000..a63a8064a4
--- /dev/null
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml
@@ -0,0 +1 @@
+ppc64-usb-controller.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml
new file mode 120000
index 0000000000..a63a8064a4
--- /dev/null
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml
@@ -0,0 +1 @@
+ppc64-usb-controller.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml b/tests/qemuxml2argvdata/ppc64-usb-controller.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.xml
rename to tests/qemuxml2argvdata/ppc64-usb-controller.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml b/tests/qemuxml2argvdata/ppce500-serial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml
rename to tests/qemuxml2argvdata/ppce500-serial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml b/tests/qemuxml2argvdata/pseries-basic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml
rename to tests/qemuxml2argvdata/pseries-basic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml b/tests/qemuxml2argvdata/pseries-console-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml
rename to tests/qemuxml2argvdata/pseries-console-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml b/tests/qemuxml2argvdata/pseries-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml
rename to tests/qemuxml2argvdata/pseries-console-virtio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml
rename to tests/qemuxml2argvdata/pseries-cpu-compat-power9.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml b/tests/qemuxml2argvdata/pseries-cpu-compat.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
rename to tests/qemuxml2argvdata/pseries-cpu-compat.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml b/tests/qemuxml2argvdata/pseries-cpu-exact.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
rename to tests/qemuxml2argvdata/pseries-cpu-exact.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.xml b/tests/qemuxml2argvdata/pseries-cpu-le.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.xml
rename to tests/qemuxml2argvdata/pseries-cpu-le.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-default-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-default-phb-numa-node.xml
rename to tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml b/tests/qemuxml2argvdata/pseries-disk.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
rename to tests/qemuxml2argvdata/pseries-disk.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml b/tests/qemuxml2argvdata/pseries-hostdevs-1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml
rename to tests/qemuxml2argvdata/pseries-hostdevs-1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml b/tests/qemuxml2argvdata/pseries-hostdevs-2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml
rename to tests/qemuxml2argvdata/pseries-hostdevs-2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml b/tests/qemuxml2argvdata/pseries-hostdevs-3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml
rename to tests/qemuxml2argvdata/pseries-hostdevs-3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-invalid-machine.xml b/tests/qemuxml2argvdata/pseries-hpt-resizing-invalid-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-invalid-machine.xml
rename to tests/qemuxml2argvdata/pseries-hpt-resizing-invalid-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing.xml b/tests/qemuxml2argvdata/pseries-hpt-resizing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing.xml
rename to tests/qemuxml2argvdata/pseries-hpt-resizing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml b/tests/qemuxml2argvdata/pseries-many-buses-1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml
rename to tests/qemuxml2argvdata/pseries-many-buses-1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml b/tests/qemuxml2argvdata/pseries-many-buses-2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml
rename to tests/qemuxml2argvdata/pseries-many-buses-2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml b/tests/qemuxml2argvdata/pseries-many-devices.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml
rename to tests/qemuxml2argvdata/pseries-many-devices.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-no-parallel.xml b/tests/qemuxml2argvdata/pseries-no-parallel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-no-parallel.xml
rename to tests/qemuxml2argvdata/pseries-no-parallel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml b/tests/qemuxml2argvdata/pseries-nvram.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
rename to tests/qemuxml2argvdata/pseries-nvram.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-address.xml b/tests/qemuxml2argvdata/pseries-panic-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-address.xml
rename to tests/qemuxml2argvdata/pseries-panic-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.xml b/tests/qemuxml2argvdata/pseries-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.xml
rename to tests/qemuxml2argvdata/pseries-panic-missing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.xml b/tests/qemuxml2argvdata/pseries-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.xml
rename to tests/qemuxml2argvdata/pseries-panic-no-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml b/tests/qemuxml2argvdata/pseries-phb-default-missing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml
rename to tests/qemuxml2argvdata/pseries-phb-default-missing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-1.xml b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-1.xml
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-2.xml b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-2.xml
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-3.xml b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-3.xml
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-numa-node.xml
rename to tests/qemuxml2argvdata/pseries-phb-numa-node.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml b/tests/qemuxml2argvdata/pseries-phb-simple.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml
rename to tests/qemuxml2argvdata/pseries-phb-simple.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml b/tests/qemuxml2argvdata/pseries-serial+console-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml
rename to tests/qemuxml2argvdata/pseries-serial+console-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml b/tests/qemuxml2argvdata/pseries-serial-compat.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml
rename to tests/qemuxml2argvdata/pseries-serial-compat.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml b/tests/qemuxml2argvdata/pseries-serial-invalid-machine.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml
rename to tests/qemuxml2argvdata/pseries-serial-invalid-machine.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml b/tests/qemuxml2argvdata/pseries-serial-native.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml
rename to tests/qemuxml2argvdata/pseries-serial-native.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml b/tests/qemuxml2argvdata/pseries-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml
rename to tests/qemuxml2argvdata/pseries-serial-pci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml b/tests/qemuxml2argvdata/pseries-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml
rename to tests/qemuxml2argvdata/pseries-serial-usb.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml b/tests/qemuxml2argvdata/pseries-usb-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml
rename to tests/qemuxml2argvdata/pseries-usb-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml b/tests/qemuxml2argvdata/pseries-usb-kbd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml
rename to tests/qemuxml2argvdata/pseries-usb-kbd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml b/tests/qemuxml2argvdata/pseries-usb-multi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml
rename to tests/qemuxml2argvdata/pseries-usb-multi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml b/tests/qemuxml2argvdata/pseries-vio-address-clash.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml
rename to tests/qemuxml2argvdata/pseries-vio-address-clash.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml b/tests/qemuxml2argvdata/pseries-vio-user-assigned.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml
rename to tests/qemuxml2argvdata/pseries-vio-user-assigned.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml b/tests/qemuxml2argvdata/pseries-vio.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml
rename to tests/qemuxml2argvdata/pseries-vio.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml b/tests/qemuxml2argvdata/pv-spinlock-disabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml
rename to tests/qemuxml2argvdata/pv-spinlock-disabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml b/tests/qemuxml2argvdata/pv-spinlock-enabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml
rename to tests/qemuxml2argvdata/pv-spinlock-enabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml b/tests/qemuxml2argvdata/q35-acpi-nouefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml
rename to tests/qemuxml2argvdata/q35-acpi-nouefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml b/tests/qemuxml2argvdata/q35-acpi-uefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml
rename to tests/qemuxml2argvdata/q35-acpi-uefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.xml b/tests/qemuxml2argvdata/q35-default-devices-only.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.xml
rename to tests/qemuxml2argvdata/q35-default-devices-only.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml b/tests/qemuxml2argvdata/q35-dmi-bad-address1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml
rename to tests/qemuxml2argvdata/q35-dmi-bad-address1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml b/tests/qemuxml2argvdata/q35-dmi-bad-address2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml
rename to tests/qemuxml2argvdata/q35-dmi-bad-address2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.xml b/tests/qemuxml2argvdata/q35-multifunction.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.xml
rename to tests/qemuxml2argvdata/q35-multifunction.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.xml b/tests/qemuxml2argvdata/q35-noacpi-nouefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.xml
rename to tests/qemuxml2argvdata/q35-noacpi-nouefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml b/tests/qemuxml2argvdata/q35-noacpi-uefi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml
rename to tests/qemuxml2argvdata/q35-noacpi-uefi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml b/tests/qemuxml2argvdata/q35-pci-force-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml
rename to tests/qemuxml2argvdata/q35-pci-force-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.xml b/tests/qemuxml2argvdata/q35-pcie-autoadd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.xml
rename to tests/qemuxml2argvdata/q35-pcie-autoadd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml b/tests/qemuxml2argvdata/q35-pcie.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml
rename to tests/qemuxml2argvdata/q35-pcie.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.xml b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.xml
rename to tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.xml b/tests/qemuxml2argvdata/q35-pm-disable.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.xml
rename to tests/qemuxml2argvdata/q35-pm-disable.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.xml b/tests/qemuxml2argvdata/q35-usb2-multi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.xml
rename to tests/qemuxml2argvdata/q35-usb2-multi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.xml b/tests/qemuxml2argvdata/q35-usb2-reorder.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.xml
rename to tests/qemuxml2argvdata/q35-usb2-reorder.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.xml b/tests/qemuxml2argvdata/q35-usb2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.xml
rename to tests/qemuxml2argvdata/q35-usb2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.xml b/tests/qemuxml2argvdata/q35-virt-manager-basic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.xml
rename to tests/qemuxml2argvdata/q35-virt-manager-basic.xml
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.xml b/tests/qemuxml2argvdata/q35-virtio-pci.xml
new file mode 120000
index 0000000000..42e49a5403
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.xml
@@ -0,0 +1 @@
+q35-pcie.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml b/tests/qemuxml2argvdata/q35-wrong-root.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml
rename to tests/qemuxml2argvdata/q35-wrong-root.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml b/tests/qemuxml2argvdata/q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35.xml
rename to tests/qemuxml2argvdata/q35.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemu-ns-alt.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml
rename to tests/qemuxml2argvdata/qemu-ns-alt.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.xml
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.xml
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-commandline.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.xml
rename to tests/qemuxml2argvdata/qemu-ns-commandline.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.xml
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.xml
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.xml
rename to tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemu-ns-no-env.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
rename to tests/qemuxml2argvdata/qemu-ns-no-env.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml b/tests/qemuxml2argvdata/qemu-ns.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml
rename to tests/qemuxml2argvdata/qemu-ns.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml
deleted file mode 120000
index d859f53f6e..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-none.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml
deleted file mode 120000
index d859f53f6e..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-none.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml
deleted file mode 120000
index 88c660c21c..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-none-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml
deleted file mode 120000
index 831d9d4f1c..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-ppc64-usb-controller.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml
deleted file mode 120000
index 831d9d4f1c..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-ppc64-usb-controller.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml
deleted file mode 120000
index fc8c0aded9..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-q35-pcie.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml
deleted file mode 120000
index c31eb0e43e..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-unavailable-q35.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-usb-controller-default-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml
deleted file mode 120000
index 141d17c311..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-unavailable-q35.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-usb-controller-explicit-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml
deleted file mode 120000
index 989306fa7f..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-usb-controller-qemu-xhci.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
rename to tests/qemuxml2argvdata/reboot-timeout-disabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
rename to tests/qemuxml2argvdata/reboot-timeout-enabled.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml b/tests/qemuxml2argvdata/restore-v2-fd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml
rename to tests/qemuxml2argvdata/restore-v2-fd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/restore-v2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
rename to tests/qemuxml2argvdata/restore-v2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml
rename to tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml
rename to tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-defaultconsole.xml b/tests/qemuxml2argvdata/s390-defaultconsole.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-defaultconsole.xml
rename to tests/qemuxml2argvdata/s390-defaultconsole.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-no-parallel.xml b/tests/qemuxml2argvdata/s390-no-parallel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-no-parallel.xml
rename to tests/qemuxml2argvdata/s390-no-parallel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-address.xml b/tests/qemuxml2argvdata/s390-panic-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic-address.xml
rename to tests/qemuxml2argvdata/s390-panic-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.xml b/tests/qemuxml2argvdata/s390-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.xml
rename to tests/qemuxml2argvdata/s390-panic-missing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.xml b/tests/qemuxml2argvdata/s390-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.xml
rename to tests/qemuxml2argvdata/s390-panic-no-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic.xml b/tests/qemuxml2argvdata/s390-panic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic.xml
rename to tests/qemuxml2argvdata/s390-panic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml b/tests/qemuxml2argvdata/s390-serial-2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml
rename to tests/qemuxml2argvdata/s390-serial-2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml b/tests/qemuxml2argvdata/s390-serial-console.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml
rename to tests/qemuxml2argvdata/s390-serial-console.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml b/tests/qemuxml2argvdata/s390-serial.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml
rename to tests/qemuxml2argvdata/s390-serial.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.xml b/tests/qemuxml2argvdata/seclabel-dac-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.xml
rename to tests/qemuxml2argvdata/seclabel-dac-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml
rename to tests/qemuxml2argvdata/seclabel-device-duplicates.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-multiple.xml b/tests/qemuxml2argvdata/seclabel-device-multiple.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-multiple.xml
rename to tests/qemuxml2argvdata/seclabel-device-multiple.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.xml b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none-relabel.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-override.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml b/tests/qemuxml2argvdata/seclabel-dynamic.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml
rename to tests/qemuxml2argvdata/seclabel-dynamic.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-multiple.xml b/tests/qemuxml2argvdata/seclabel-multiple.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-multiple.xml
rename to tests/qemuxml2argvdata/seclabel-multiple.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml b/tests/qemuxml2argvdata/seclabel-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml
rename to tests/qemuxml2argvdata/seclabel-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.xml b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.xml
rename to tests/qemuxml2argvdata/seclabel-static-labelskip.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml b/tests/qemuxml2argvdata/seclabel-static-relabel.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml
rename to tests/qemuxml2argvdata/seclabel-static-relabel.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml b/tests/qemuxml2argvdata/seclabel-static.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml
rename to tests/qemuxml2argvdata/seclabel-static.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.xml b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.xml
rename to tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/serial-dev-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml
rename to tests/qemuxml2argvdata/serial-dev-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/serial-file-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml
rename to tests/qemuxml2argvdata/serial-file-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml b/tests/qemuxml2argvdata/serial-file-log.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml
rename to tests/qemuxml2argvdata/serial-file-log.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/serial-many-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml
rename to tests/qemuxml2argvdata/serial-many-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/serial-pty-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml
rename to tests/qemuxml2argvdata/serial-pty-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/serial-pty.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
rename to tests/qemuxml2argvdata/serial-pty.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.xml b/tests/qemuxml2argvdata/serial-spiceport-nospice.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.xml
rename to tests/qemuxml2argvdata/serial-spiceport-nospice.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml b/tests/qemuxml2argvdata/serial-spiceport.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
rename to tests/qemuxml2argvdata/serial-spiceport.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml b/tests/qemuxml2argvdata/serial-target-port-auto.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml
rename to tests/qemuxml2argvdata/serial-target-port-auto.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml
rename to tests/qemuxml2argvdata/serial-tcp-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml
rename to tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.xml
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/serial-udp-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml
rename to tests/qemuxml2argvdata/serial-udp-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/serial-unix-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml
rename to tests/qemuxml2argvdata/serial-unix-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml b/tests/qemuxml2argvdata/serial-vc-chardev.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml
rename to tests/qemuxml2argvdata/serial-vc-chardev.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-address.xml b/tests/qemuxml2argvdata/shmem-invalid-address.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-address.xml
rename to tests/qemuxml2argvdata/shmem-invalid-address.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-size.xml b/tests/qemuxml2argvdata/shmem-invalid-size.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-size.xml
rename to tests/qemuxml2argvdata/shmem-invalid-size.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-msi-only.xml b/tests/qemuxml2argvdata/shmem-msi-only.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-msi-only.xml
rename to tests/qemuxml2argvdata/shmem-msi-only.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
rename to tests/qemuxml2argvdata/shmem-plain-doorbell.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-small-size.xml b/tests/qemuxml2argvdata/shmem-small-size.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-small-size.xml
rename to tests/qemuxml2argvdata/shmem-small-size.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.xml b/tests/qemuxml2argvdata/shmem.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem.xml
rename to tests/qemuxml2argvdata/shmem.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml b/tests/qemuxml2argvdata/smartcard-controller.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml
rename to tests/qemuxml2argvdata/smartcard-controller.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml b/tests/qemuxml2argvdata/smartcard-host-certificates.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml
rename to tests/qemuxml2argvdata/smartcard-host-certificates.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml b/tests/qemuxml2argvdata/smartcard-host.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml
rename to tests/qemuxml2argvdata/smartcard-host.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml
rename to tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml
rename to tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml b/tests/qemuxml2argvdata/smbios-date.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml
rename to tests/qemuxml2argvdata/smbios-date.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios-multiple-type2.xml b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smbios-multiple-type2.xml
rename to tests/qemuxml2argvdata/smbios-multiple-type2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios-uuid-match.xml b/tests/qemuxml2argvdata/smbios-uuid-match.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smbios-uuid-match.xml
rename to tests/qemuxml2argvdata/smbios-uuid-match.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml b/tests/qemuxml2argvdata/smbios.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
rename to tests/qemuxml2argvdata/smbios.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/smp.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smp.xml
rename to tests/qemuxml2argvdata/smp.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml
rename to tests/qemuxml2argvdata/sound-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/sound.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-sound.xml
rename to tests/qemuxml2argvdata/sound.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml b/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
rename to tests/qemuxml2argvdata/tap-vhost-incorrect.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml b/tests/qemuxml2argvdata/tap-vhost.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
rename to tests/qemuxml2argvdata/tap-vhost.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-no-backend-invalid.xml b/tests/qemuxml2argvdata/tpm-no-backend-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-tpm-no-backend-invalid.xml
rename to tests/qemuxml2argvdata/tpm-no-backend-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.xml b/tests/qemuxml2argvdata/tpm-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.xml
rename to tests/qemuxml2argvdata/tpm-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml b/tests/qemuxml2argvdata/usb-bus-missing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml
rename to tests/qemuxml2argvdata/usb-bus-missing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml b/tests/qemuxml2argvdata/usb-controller-default-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml
rename to tests/qemuxml2argvdata/usb-controller-default-q35.xml
diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml b/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml
new file mode 120000
index 0000000000..60db694754
--- /dev/null
+++ b/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml
@@ -0,0 +1 @@
+usb-controller-default-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml b/tests/qemuxml2argvdata/usb-controller-explicit-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml
rename to tests/qemuxml2argvdata/usb-controller-explicit-q35.xml
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml b/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml
new file mode 120000
index 0000000000..bc747bb653
--- /dev/null
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml
@@ -0,0 +1 @@
+usb-controller-explicit-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-limit.xml b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-limit.xml
rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.xml
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml
new file mode 120000
index 0000000000..f00efadeb9
--- /dev/null
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml
@@ -0,0 +1 @@
+usb-controller-qemu-xhci.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.xml b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.xml
rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml
rename to tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml b/tests/qemuxml2argvdata/usb-controller-xhci.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml
rename to tests/qemuxml2argvdata/usb-controller-xhci.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml b/tests/qemuxml2argvdata/usb-controller.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml
rename to tests/qemuxml2argvdata/usb-controller.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.xml b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.xml
rename to tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml b/tests/qemuxml2argvdata/usb-hub-autoadd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml
rename to tests/qemuxml2argvdata/usb-hub-autoadd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml b/tests/qemuxml2argvdata/usb-hub-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml
rename to tests/qemuxml2argvdata/usb-hub-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-nonexistent.xml b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-nonexistent.xml
rename to tests/qemuxml2argvdata/usb-hub-nonexistent.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml b/tests/qemuxml2argvdata/usb-hub.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml
rename to tests/qemuxml2argvdata/usb-hub.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.xml
rename to tests/qemuxml2argvdata/usb-ich9-autoassign.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-ich9-companion.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml
rename to tests/qemuxml2argvdata/usb-ich9-companion.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml
rename to tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-no-companion.xml b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-no-companion.xml
rename to tests/qemuxml2argvdata/usb-ich9-no-companion.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.xml b/tests/qemuxml2argvdata/usb-long-port-path.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.xml
rename to tests/qemuxml2argvdata/usb-long-port-path.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml b/tests/qemuxml2argvdata/usb-none-hub.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml
rename to tests/qemuxml2argvdata/usb-none-hub.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml b/tests/qemuxml2argvdata/usb-none-other.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml
rename to tests/qemuxml2argvdata/usb-none-other.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml b/tests/qemuxml2argvdata/usb-none-usbtablet.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml
rename to tests/qemuxml2argvdata/usb-none-usbtablet.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml b/tests/qemuxml2argvdata/usb-none.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml
rename to tests/qemuxml2argvdata/usb-none.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-piix3-controller.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml
rename to tests/qemuxml2argvdata/usb-piix3-controller.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml b/tests/qemuxml2argvdata/usb-port-autoassign.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml
rename to tests/qemuxml2argvdata/usb-port-autoassign.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.xml b/tests/qemuxml2argvdata/usb-port-missing.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.xml
rename to tests/qemuxml2argvdata/usb-port-missing.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml
rename to tests/qemuxml2argvdata/usb-ports-out-of-range.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml b/tests/qemuxml2argvdata/usb-ports.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml
rename to tests/qemuxml2argvdata/usb-ports.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.xml b/tests/qemuxml2argvdata/usb-redir-boot.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.xml
rename to tests/qemuxml2argvdata/usb-redir-boot.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml b/tests/qemuxml2argvdata/usb-redir-filter-version.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml
rename to tests/qemuxml2argvdata/usb-redir-filter-version.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml b/tests/qemuxml2argvdata/usb-redir-filter.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml
rename to tests/qemuxml2argvdata/usb-redir-filter.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml b/tests/qemuxml2argvdata/usb-redir.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml
rename to tests/qemuxml2argvdata/usb-redir.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-too-long-port-path-invalid.xml b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-too-long-port-path-invalid.xml
rename to tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.xml b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.xml
rename to tests/qemuxml2argvdata/usb-xhci-autoassign.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml b/tests/qemuxml2argvdata/usb1-usb2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml
rename to tests/qemuxml2argvdata/usb1-usb2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
rename to tests/qemuxml2argvdata/user-aliases.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.xml b/tests/qemuxml2argvdata/user-aliases2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.xml
rename to tests/qemuxml2argvdata/user-aliases2.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml b/tests/qemuxml2argvdata/vcpu-placement-static.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml
rename to tests/qemuxml2argvdata/vcpu-placement-static.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vhost_queues-invalid.xml b/tests/qemuxml2argvdata/vhost_queues-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vhost_queues-invalid.xml
rename to tests/qemuxml2argvdata/vhost_queues-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml b/tests/qemuxml2argvdata/vhost_queues.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml
rename to tests/qemuxml2argvdata/vhost_queues.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml b/tests/qemuxml2argvdata/video-device-pciaddr-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml
rename to tests/qemuxml2argvdata/video-device-pciaddr-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml b/tests/qemuxml2argvdata/video-invalid.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml
rename to tests/qemuxml2argvdata/video-invalid.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.xml
rename to tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.xml b/tests/qemuxml2argvdata/video-qxl-device-vram64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.xml
rename to tests/qemuxml2argvdata/video-qxl-device-vram64.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.xml b/tests/qemuxml2argvdata/video-qxl-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.xml
rename to tests/qemuxml2argvdata/video-qxl-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml b/tests/qemuxml2argvdata/video-qxl-heads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml
rename to tests/qemuxml2argvdata/video-qxl-heads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.xml b/tests/qemuxml2argvdata/video-qxl-nodevice.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.xml
rename to tests/qemuxml2argvdata/video-qxl-nodevice.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml b/tests/qemuxml2argvdata/video-qxl-noheads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml
rename to tests/qemuxml2argvdata/video-qxl-noheads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.xml
rename to tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.xml
rename to tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.xml b/tests/qemuxml2argvdata/video-qxl-sec-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.xml
rename to tests/qemuxml2argvdata/video-qxl-sec-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.xml b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.xml
rename to tests/qemuxml2argvdata/video-vga-device-vgamem.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.xml b/tests/qemuxml2argvdata/video-vga-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.xml
rename to tests/qemuxml2argvdata/video-vga-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.xml b/tests/qemuxml2argvdata/video-vga-nodevice.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.xml
rename to tests/qemuxml2argvdata/video-vga-nodevice.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml
rename to tests/qemuxml2argvdata/video-vga-qxl-heads.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.xml b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.xml
rename to tests/qemuxml2argvdata/video-virtio-gpu-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.xml b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.xml
rename to tests/qemuxml2argvdata/video-virtio-gpu-secondary.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml
rename to tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.xml
rename to tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.xml b/tests/qemuxml2argvdata/video-virtio-vga.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.xml
rename to tests/qemuxml2argvdata/video-virtio-vga.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.xml b/tests/qemuxml2argvdata/virtio-input-passthrough.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.xml
rename to tests/qemuxml2argvdata/virtio-input-passthrough.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml b/tests/qemuxml2argvdata/virtio-input.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml
rename to tests/qemuxml2argvdata/virtio-input.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml b/tests/qemuxml2argvdata/virtio-lun.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
rename to tests/qemuxml2argvdata/virtio-lun.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests/qemuxml2argvdata/virtio-options.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
rename to tests/qemuxml2argvdata/virtio-options.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.xml b/tests/qemuxml2argvdata/virtio-rng-ccw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.xml
rename to tests/qemuxml2argvdata/virtio-rng-ccw.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml b/tests/qemuxml2argvdata/virtio-rng-default.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml
rename to tests/qemuxml2argvdata/virtio-rng-default.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd-crash.xml b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd-crash.xml
rename to tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.xml b/tests/qemuxml2argvdata/virtio-rng-egd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.xml
rename to tests/qemuxml2argvdata/virtio-rng-egd.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.xml b/tests/qemuxml2argvdata/virtio-rng-multiple.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.xml
rename to tests/qemuxml2argvdata/virtio-rng-multiple.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml b/tests/qemuxml2argvdata/virtio-rng-random.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml
rename to tests/qemuxml2argvdata/virtio-rng-random.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.xml b/tests/qemuxml2argvdata/vmcoreinfo.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.xml
rename to tests/qemuxml2argvdata/vmcoreinfo.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml b/tests/qemuxml2argvdata/watchdog-device.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml
rename to tests/qemuxml2argvdata/watchdog-device.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.xml b/tests/qemuxml2argvdata/watchdog-diag288.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.xml
rename to tests/qemuxml2argvdata/watchdog-diag288.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml b/tests/qemuxml2argvdata/watchdog-dump.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml
rename to tests/qemuxml2argvdata/watchdog-dump.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.xml b/tests/qemuxml2argvdata/watchdog-injectnmi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.xml
rename to tests/qemuxml2argvdata/watchdog-injectnmi.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/watchdog.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
rename to tests/qemuxml2argvdata/watchdog.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml b/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml
rename to tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 385a54615f..1255d18453 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -437,7 +437,7 @@ testCompareXMLToArgv(const void *data)
     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
         goto cleanup;
 
-    if (virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+    if (virAsprintf(&xml, "%s/qemuxml2argvdata/%s.xml",
                     abs_srcdir, info->name) < 0 ||
         virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
                     abs_srcdir, info->name) < 0)
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml
index 80a01c2185..ee470fb1fa 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml
index da3e79b365..03f9d288fa 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-host.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml
index f586fa1954..bf9d58c385 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml
index 80a01c2185..ee470fb1fa 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml
index f586fa1954..bf9d58c385 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml
index 80a01c2185..ee470fb1fa 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml
index 80a01c2185..ee470fb1fa 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml
index f586fa1954..bf9d58c385 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml
\ No newline at end of file
+../qemuxml2argvdata/aarch64-gic-v3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml
index 2ed9a68317..dc1547bb3e 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml
\ No newline at end of file
+../qemuxml2argvdata/blkdeviotune-group-num.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
index 67f3e9a0ea..8f206bf527 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
\ No newline at end of file
+../qemuxml2argvdata/blkdeviotune-max-length.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
index 183e1f1c03..68b6c3f82d 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
\ No newline at end of file
+../qemuxml2argvdata/blkdeviotune-max.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml
index afa3199d4a..54af6627d6 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml
\ No newline at end of file
+../qemuxml2argvdata/disk-drive-detect-zeroes.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml
index 824120a52a..a1a4f841e9 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml
\ No newline at end of file
+../qemuxml2argvdata/encrypted-disk-usage.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml
index adea6e5a85..39ff659682 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.xml
\ No newline at end of file
+../qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml
index 891aaf9e01..b17ea17c8f 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.xml
\ No newline at end of file
+../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml
index 23cef8e67d..0252de82a9 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-memaccess.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml
index 3f7a38333f..a3df8278e8 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-memaccess2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml
index 443e923b29..127e66e64f 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-pages4.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml
index 31d50ae795..cfead1c317 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-pages5.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml
index d81906b887..584b7c92c8 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-pages6.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml
index 9aafa6e958..b4ce4defda 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml
\ No newline at end of file
+../qemuxml2argvdata/hugepages-pages7.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml
index d971a35dcb..2c2b2e77a8 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml
\ No newline at end of file
+../qemuxml2argvdata/intel-iommu-caching-mode.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml
index 3120d9f677..256a673f06 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.xml
\ No newline at end of file
+../qemuxml2argvdata/intel-iommu-device-iotlb.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml
index 9fbec36dc5..e4b2049c77 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.xml
\ No newline at end of file
+../qemuxml2argvdata/intel-iommu-eim.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml
index 898283aaee..18b0da9730 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.xml
\ No newline at end of file
+../qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml
index 0d599a1cfd..ac341a1528 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.xml
\ No newline at end of file
+../qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
index 4cac477a9a..ada4fe94bd 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml
\ No newline at end of file
+../qemuxml2argvdata/memory-hotplug-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml
index fd909ec242..21971d880f 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-net-user-addr.xml
\ No newline at end of file
+../qemuxml2argvdata/net-user-addr.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml
index 26484c984c..9527ed618e 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml
\ No newline at end of file
+../qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml
index 5fe737a69d..b5a27f08cd 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-user-aliases.xml
\ No newline at end of file
+../qemuxml2argvdata/user-aliases.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
index d757b8aac0..26d8a2520a 120000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
@@ -1 +1 @@
-../qemuxml2argvdata/qemuxml2argv-virtio-options.xml
\ No newline at end of file
+../qemuxml2argvdata/virtio-options.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 146a67ee27..a930adf646 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -306,7 +306,7 @@ testInfoSet(struct testInfo *info,
     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
         goto error;
 
-    if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+    if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/%s.xml",
                     abs_srcdir, name) < 0)
         goto error;
 
-- 
GitLab