From ad24406440e8572446f528c428dfae13f347a82c Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 1 Dec 2017 16:09:43 +0100
Subject: [PATCH] tests: Drop qemuxml2argv- prefix for qemuxml2argv test cases

Similarly to the previous commit, rename .args files.

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

  for i in qemuxml2argv-*.args; 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>
---
 ...64-aavmf-virtio-mmio.args => aarch64-aavmf-virtio-mmio.args} | 0
 ...l2argv-aarch64-acpi-nouefi.args => aarch64-acpi-nouefi.args} | 0
 ...muxml2argv-aarch64-acpi-uefi.args => aarch64-acpi-uefi.args} | 0
 ...arch64-cpu-passthrough.args => aarch64-cpu-passthrough.args} | 0
 tests/qemuxml2argvdata/aarch64-gic-default.args                 | 1 +
 ...qemuxml2argv-aarch64-gic-host.args => aarch64-gic-host.args} | 0
 tests/qemuxml2argvdata/aarch64-gic-none-both.args               | 1 +
 ...argv-aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.args} | 0
 tests/qemuxml2argvdata/aarch64-gic-none-v2.args                 | 1 +
 tests/qemuxml2argvdata/aarch64-gic-none-v3.args                 | 1 +
 tests/qemuxml2argvdata/aarch64-gic-none.args                    | 1 +
 .../{qemuxml2argv-aarch64-gic-v2.args => aarch64-gic-v2.args}   | 0
 .../{qemuxml2argv-aarch64-gic-v3.args => aarch64-gic-v3.args}   | 0
 ...argv-aarch64-kvm-32-on-64.args => aarch64-kvm-32-on-64.args} | 0
 ...gv-aarch64-noacpi-nouefi.args => aarch64-noacpi-nouefi.args} | 0
 ...l2argv-aarch64-noacpi-uefi.args => aarch64-noacpi-uefi.args} | 0
 ...xml2argv-aarch64-pci-serial.args => aarch64-pci-serial.args} | 0
 ...oller-nec-xhci.args => aarch64-usb-controller-nec-xhci.args} | 0
 ...ler-qemu-xhci.args => aarch64-usb-controller-qemu-xhci.args} | 0
 ...gv-aarch64-video-default.args => aarch64-video-default.args} | 0
 ...eo-virtio-gpu-pci.args => aarch64-video-virtio-gpu-pci.args} | 0
 ...ci-default.args => aarch64-virt-2.6-virtio-pci-default.args} | 0
 ...ch64-virt-default-nic.args => aarch64-virt-default-nic.args} | 0
 ...l2argv-aarch64-virt-virtio.args => aarch64-virt-virtio.args} | 0
 ...-virtio-pci-default.args => aarch64-virtio-pci-default.args} | 0
 ...-addresses.args => aarch64-virtio-pci-manual-addresses.args} | 0
 .../{qemuxml2argv-acpi-table.args => acpi-table.args}           | 0
 ...argv-arm-vexpressa9-basic.args => arm-vexpressa9-basic.args} | 0
 ...gv-arm-vexpressa9-nodevs.args => arm-vexpressa9-nodevs.args} | 0
 ...gv-arm-vexpressa9-virtio.args => arm-vexpressa9-virtio.args} | 0
 .../{qemuxml2argv-arm-virt-virtio.args => arm-virt-virtio.args} | 0
 .../{qemuxml2argv-autoindex.args => autoindex.args}             | 0
 ...l2argv-balloon-ccw-deflate.args => balloon-ccw-deflate.args} | 0
 ...l2argv-balloon-device-auto.args => balloon-device-auto.args} | 0
 ...-device-deflate-off.args => balloon-device-deflate-off.args} | 0
 ...-balloon-device-deflate.args => balloon-device-deflate.args} | 0
 ...gv-balloon-device-period.args => balloon-device-period.args} | 0
 .../{qemuxml2argv-balloon-device.args => balloon-device.args}   | 0
 ...argv-balloon-mmio-deflate.args => balloon-mmio-deflate.args} | 0
 ...muxml2argv-bios-nvram-secure.args => bios-nvram-secure.args} | 0
 .../{qemuxml2argv-bios-nvram.args => bios-nvram.args}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-bios.args => bios.args}    | 0
 ...-blkdeviotune-group-num.args => blkdeviotune-group-num.args} | 0
 ...lkdeviotune-max-length.args => blkdeviotune-max-length.args} | 0
 ...qemuxml2argv-blkdeviotune-max.args => blkdeviotune-max.args} | 0
 .../{qemuxml2argv-blkdeviotune.args => blkdeviotune.args}       | 0
 ...qemuxml2argv-blkiotune-device.args => blkiotune-device.args} | 0
 .../{qemuxml2argv-blkiotune.args => blkiotune.args}             | 0
 .../{qemuxml2argv-boot-cdrom.args => boot-cdrom.args}           | 0
 ...-boot-complex-bootindex.args => boot-complex-bootindex.args} | 0
 .../{qemuxml2argv-boot-complex.args => boot-complex.args}       | 0
 .../{qemuxml2argv-boot-floppy-q35.args => boot-floppy-q35.args} | 0
 .../{qemuxml2argv-boot-floppy.args => boot-floppy.args}         | 0
 ...ve-bootindex.args => boot-menu-disable-drive-bootindex.args} | 0
 ...oot-menu-disable-drive.args => boot-menu-disable-drive.args} | 0
 ...muxml2argv-boot-menu-disable.args => boot-menu-disable.args} | 0
 ...nu-enable-bootindex.args => boot-menu-enable-bootindex.args} | 0
 ...ble-with-timeout.args => boot-menu-enable-with-timeout.args} | 0
 ...qemuxml2argv-boot-menu-enable.args => boot-menu-enable.args} | 0
 .../{qemuxml2argv-boot-multi.args => boot-multi.args}           | 0
 .../{qemuxml2argv-boot-network.args => boot-network.args}       | 0
 .../{qemuxml2argv-boot-order.args => boot-order.args}           | 0
 .../{qemuxml2argv-boot-strict.args => boot-strict.args}         | 0
 ...argv-bootindex-floppy-q35.args => bootindex-floppy-q35.args} | 0
 ...qemuxml2argv-channel-guestfwd.args => channel-guestfwd.args} | 0
 ...argv-channel-spicevmc-old.args => channel-spicevmc-old.args} | 0
 ...qemuxml2argv-channel-spicevmc.args => channel-spicevmc.args} | 0
 ...l2argv-channel-virtio-auto.args => channel-virtio-auto.args} | 0
 ...-channel-virtio-autoadd.args => channel-virtio-autoadd.args} | 0
 ...el-virtio-autoassign.args => channel-virtio-autoassign.args} | 0
 ...-channel-virtio-default.args => channel-virtio-default.args} | 0
 ...argv-channel-virtio-state.args => channel-virtio-state.args} | 0
 ...l2argv-channel-virtio-unix.args => channel-virtio-unix.args} | 0
 .../{qemuxml2argv-channel-virtio.args => channel-virtio.args}   | 0
 ...muxml2argv-chardev-reconnect.args => chardev-reconnect.args} | 0
 .../{qemuxml2argv-clock-catchup.args => clock-catchup.args}     | 0
 .../{qemuxml2argv-clock-france.args => clock-france.args}       | 0
 .../{qemuxml2argv-clock-hpet-off.args => clock-hpet-off.args}   | 0
 ...asis-localtime.args => clock-localtime-basis-localtime.args} | 0
 .../{qemuxml2argv-clock-localtime.args => clock-localtime.args} | 0
 ...-clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.args} | 0
 .../{qemuxml2argv-clock-utc.args => clock-utc.args}             | 0
 .../{qemuxml2argv-clock-variable.args => clock-variable.args}   | 0
 ...l2argv-console-compat-auto.args => console-compat-auto.args} | 0
 ...-console-compat-chardev.args => console-compat-chardev.args} | 0
 .../{qemuxml2argv-console-compat.args => console-compat.args}   | 0
 .../{qemuxml2argv-console-sclp.args => console-sclp.args}       | 0
 ...xml2argv-console-virtio-ccw.args => console-virtio-ccw.args} | 0
 ...l2argv-console-virtio-many.args => console-virtio-many.args} | 0
 ...l2argv-console-virtio-s390.args => console-virtio-s390.args} | 0
 .../{qemuxml2argv-console-virtio.args => console-virtio.args}   | 0
 ...qemuxml2argv-controller-order.args => controller-order.args} | 0
 ...muxml2argv-cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.args} | 0
 .../{qemuxml2argv-cpu-Haswell.args => cpu-Haswell.args}         | 0
 .../{qemuxml2argv-cpu-Haswell2.args => cpu-Haswell2.args}       | 0
 .../{qemuxml2argv-cpu-Haswell3.args => cpu-Haswell3.args}       | 0
 ...muxml2argv-cpu-cache-disable.args => cpu-cache-disable.args} | 0
 ...xml2argv-cpu-cache-disable2.args => cpu-cache-disable2.args} | 0
 ...xml2argv-cpu-cache-disable3.args => cpu-cache-disable3.args} | 0
 ...argv-cpu-cache-emulate-l3.args => cpu-cache-emulate-l3.args} | 0
 ...gv-cpu-cache-passthrough.args => cpu-cache-passthrough.args} | 0
 ...-cpu-cache-passthrough2.args => cpu-cache-passthrough2.args} | 0
 ...-cpu-check-default-none.args => cpu-check-default-none.args} | 0
 ...pu-check-default-none2.args => cpu-check-default-none2.args} | 0
 ...heck-default-partial.args => cpu-check-default-partial.args} | 0
 ...ck-default-partial2.args => cpu-check-default-partial2.args} | 0
 tests/qemuxml2argvdata/cpu-check-full.args                      | 1 +
 .../{qemuxml2argv-cpu-check-none.args => cpu-check-none.args}   | 0
 tests/qemuxml2argvdata/cpu-check-partial.args                   | 1 +
 ...qemuxml2argv-cpu-eoi-disabled.args => cpu-eoi-disabled.args} | 0
 .../{qemuxml2argv-cpu-eoi-enabled.args => cpu-eoi-enabled.args} | 0
 .../{qemuxml2argv-cpu-exact1.args => cpu-exact1.args}           | 0
 ...gv-cpu-exact2-nofallback.args => cpu-exact2-nofallback.args} | 0
 .../{qemuxml2argv-cpu-exact2.args => cpu-exact2.args}           | 0
 .../{qemuxml2argv-cpu-fallback.args => cpu-fallback.args}       | 0
 ...muxml2argv-cpu-host-kvmclock.args => cpu-host-kvmclock.args} | 0
 ...xml2argv-cpu-host-model-cmt.args => cpu-host-model-cmt.args} | 0
 ...pu-host-model-fallback.args => cpu-host-model-fallback.args} | 0
 ...gv-cpu-host-model-vendor.args => cpu-host-model-vendor.args} | 0
 .../{qemuxml2argv-cpu-host-model.args => cpu-host-model.args}   | 0
 ...through-features.args => cpu-host-passthrough-features.args} | 0
 ...argv-cpu-host-passthrough.args => cpu-host-passthrough.args} | 0
 ...l2argv-cpu-hotplug-startup.args => cpu-hotplug-startup.args} | 0
 .../{qemuxml2argv-cpu-kvmclock.args => cpu-kvmclock.args}       | 0
 .../{qemuxml2argv-cpu-minimum1.args => cpu-minimum1.args}       | 0
 .../{qemuxml2argv-cpu-minimum2.args => cpu-minimum2.args}       | 0
 ...muxml2argv-cpu-numa-disjoint.args => cpu-numa-disjoint.args} | 0
 ...xml2argv-cpu-numa-memshared.args => cpu-numa-memshared.args} | 0
 ...a-no-memory-element.args => cpu-numa-no-memory-element.args} | 0
 .../{qemuxml2argv-cpu-numa1.args => cpu-numa1.args}             | 0
 .../{qemuxml2argv-cpu-numa2.args => cpu-numa2.args}             | 0
 ...muxml2argv-cpu-s390-features.args => cpu-s390-features.args} | 0
 .../{qemuxml2argv-cpu-s390-zEC12.args => cpu-s390-zEC12.args}   | 0
 .../{qemuxml2argv-cpu-strict1.args => cpu-strict1.args}         | 0
 .../{qemuxml2argv-cpu-topology1.args => cpu-topology1.args}     | 0
 .../{qemuxml2argv-cpu-topology2.args => cpu-topology2.args}     | 0
 .../{qemuxml2argv-cpu-topology3.args => cpu-topology3.args}     | 0
 ...muxml2argv-cpu-tsc-frequency.args => cpu-tsc-frequency.args} | 0
 ...qemuxml2argv-cputune-numatune.args => cputune-numatune.args} | 0
 ...l2argv-cputune-zero-shares.args => cputune-zero-shares.args} | 0
 .../{qemuxml2argv-cputune.args => cputune.args}                 | 0
 .../{qemuxml2argv-debug-threads.args => debug-threads.args}     | 0
 ...gv-default-kvm-host-arch.args => default-kvm-host-arch.args} | 0
 ...-default-qemu-host-arch.args => default-qemu-host-arch.args} | 0
 .../{qemuxml2argv-disk-aio.args => disk-aio.args}               | 0
 .../{qemuxml2argv-disk-blockio.args => disk-blockio.args}       | 0
 ...qemuxml2argv-disk-cdrom-empty.args => disk-cdrom-empty.args} | 0
 ...-disk-cdrom-network-ftp.args => disk-cdrom-network-ftp.args} | 0
 ...isk-cdrom-network-ftps.args => disk-cdrom-network-ftps.args} | 0
 ...isk-cdrom-network-http.args => disk-cdrom-network-http.args} | 0
 ...k-cdrom-network-https.args => disk-cdrom-network-https.args} | 0
 ...isk-cdrom-network-tftp.args => disk-cdrom-network-tftp.args} | 0
 ...ay-no-device-cap.args => disk-cdrom-tray-no-device-cap.args} | 0
 .../{qemuxml2argv-disk-cdrom-tray.args => disk-cdrom-tray.args} | 0
 .../{qemuxml2argv-disk-cdrom.args => disk-cdrom.args}           | 0
 ...muxml2argv-disk-copy_on_read.args => disk-copy_on_read.args} | 0
 ...gv-disk-drive-boot-cdrom.args => disk-drive-boot-cdrom.args} | 0
 ...argv-disk-drive-boot-disk.args => disk-drive-boot-disk.args} | 0
 ...e-cache-directsync.args => disk-drive-cache-directsync.args} | 0
 ...isk-drive-cache-unsafe.args => disk-drive-cache-unsafe.args} | 0
 ...k-drive-cache-v2-none.args => disk-drive-cache-v2-none.args} | 0
 ...-disk-drive-cache-v2-wb.args => disk-drive-cache-v2-wb.args} | 0
 ...-disk-drive-cache-v2-wt.args => disk-drive-cache-v2-wt.args} | 0
 ...isk-drive-copy-on-read.args => disk-drive-copy-on-read.args} | 0
 ...k-drive-detect-zeroes.args => disk-drive-detect-zeroes.args} | 0
 ...xml2argv-disk-drive-discard.args => disk-drive-discard.args} | 0
 ...licy-enospace.args => disk-drive-error-policy-enospace.args} | 0
 ...error-policy-stop.args => disk-drive-error-policy-stop.args} | 0
 ...ignore.args => disk-drive-error-policy-wreport-rignore.args} | 0
 ...l2argv-disk-drive-fmt-qcow.args => disk-drive-fmt-qcow.args} | 0
 ...ive-network-gluster.args => disk-drive-network-gluster.args} | 0
 ...twork-iscsi-auth.args => disk-drive-network-iscsi-auth.args} | 0
 ...network-iscsi-lun.args => disk-drive-network-iscsi-lun.args} | 0
 ...k-drive-network-iscsi.args => disk-drive-network-iscsi.args} | 0
 ...twork-nbd-export.args => disk-drive-network-nbd-export.args} | 0
 ...ipv6-export.args => disk-drive-network-nbd-ipv6-export.args} | 0
 ...e-network-nbd-ipv6.args => disk-drive-network-nbd-ipv6.args} | 0
 ...e-network-nbd-unix.args => disk-drive-network-nbd-unix.args} | 0
 ...-disk-drive-network-nbd.args => disk-drive-network-nbd.args} | 0
 ...k-rbd-auth-AES.args => disk-drive-network-rbd-auth-AES.args} | 0
 ...e-network-rbd-auth.args => disk-drive-network-rbd-auth.args} | 0
 ...k-rbd-ceph-env.args => disk-drive-network-rbd-ceph-env.args} | 0
 ...e-network-rbd-ipv6.args => disk-drive-network-rbd-ipv6.args} | 0
 ...-disk-drive-network-rbd.args => disk-drive-network-rbd.args} | 0
 ...e-network-sheepdog.args => disk-drive-network-sheepdog.args} | 0
 ...ork-source-auth.args => disk-drive-network-source-auth.args} | 0
 ...k-tlsx509-vxhs.args => disk-drive-network-tlsx509-vxhs.args} | 0
 ...isk-drive-network-vxhs.args => disk-drive-network-vxhs.args} | 0
 ...xml2argv-disk-drive-no-boot.args => disk-drive-no-boot.args} | 0
 ...k-drive-readonly-disk.args => disk-drive-readonly-disk.args} | 0
 ...adonly-no-device.args => disk-drive-readonly-no-device.args} | 0
 ...drive-shared-locking.args => disk-drive-shared-locking.args} | 0
 ...muxml2argv-disk-drive-shared.args => disk-drive-shared.args} | 0
 ...l2argv-disk-floppy-pseries.args => disk-floppy-pseries.args} | 0
 ...y-no-device-cap.args => disk-floppy-tray-no-device-cap.args} | 0
 ...qemuxml2argv-disk-floppy-tray.args => disk-floppy-tray.args} | 0
 .../{qemuxml2argv-disk-floppy.args => disk-floppy.args}         | 0
 .../{qemuxml2argv-disk-geometry.args => disk-geometry.args}     | 0
 ...th-AES.args => disk-hostdev-scsi-virtio-iscsi-auth-AES.args} | 0
 ...argv-disk-ide-drive-split.args => disk-ide-drive-split.args} | 0
 .../{qemuxml2argv-disk-ide-wwn.args => disk-ide-wwn.args}       | 0
 .../{qemuxml2argv-disk-ioeventfd.args => disk-ioeventfd.args}   | 0
 .../{qemuxml2argv-disk-iscsi.args => disk-iscsi.args}           | 0
 .../{qemuxml2argv-disk-many.args => disk-many.args}             | 0
 .../{qemuxml2argv-disk-order.args => disk-order.args}           | 0
 ...qemuxml2argv-disk-sata-device.args => disk-sata-device.args} | 0
 ...gv-disk-scsi-device-auto.args => disk-scsi-device-auto.args} | 0
 ...qemuxml2argv-disk-scsi-device.args => disk-scsi-device.args} | 0
 ...argv-disk-scsi-disk-split.args => disk-scsi-disk-split.args} | 0
 ...xml2argv-disk-scsi-disk-vpd.args => disk-scsi-disk-vpd.args} | 0
 ...xml2argv-disk-scsi-disk-wwn.args => disk-scsi-disk-wwn.args} | 0
 ...scsi-lun-passthrough.args => disk-scsi-lun-passthrough.args} | 0
 ...muxml2argv-disk-scsi-megasas.args => disk-scsi-megasas.args} | 0
 ...argv-disk-scsi-mptsas1068.args => disk-scsi-mptsas1068.args} | 0
 ...gv-disk-scsi-virtio-scsi.args => disk-scsi-virtio-scsi.args} | 0
 .../{qemuxml2argv-disk-scsi-vscsi.args => disk-scsi-vscsi.args} | 0
 .../{qemuxml2argv-disk-serial.args => disk-serial.args}         | 0
 .../{qemuxml2argv-disk-snapshot.args => disk-snapshot.args}     | 0
 ...gv-disk-source-pool-mode.args => disk-source-pool-mode.args} | 0
 ...qemuxml2argv-disk-source-pool.args => disk-source-pool.args} | 0
 ...usb-device-removable.args => disk-usb-device-removable.args} | 0
 .../{qemuxml2argv-disk-usb-device.args => disk-usb-device.args} | 0
 ...argv-disk-virtio-ccw-many.args => disk-virtio-ccw-many.args} | 0
 .../{qemuxml2argv-disk-virtio-ccw.args => disk-virtio-ccw.args} | 0
 ...k-virtio-drive-queues.args => disk-virtio-drive-queues.args} | 0
 ...qemuxml2argv-disk-virtio-s390.args => disk-virtio-s390.args} | 0
 ...argv-disk-virtio-scsi-ccw.args => disk-virtio-scsi-ccw.args} | 0
 ...-scsi-cmd_per_lun.args => disk-virtio-scsi-cmd_per_lun.args} | 0
 ...rtio-scsi-ioeventfd.args => disk-virtio-scsi-ioeventfd.args} | 0
 ...-scsi-max_sectors.args => disk-virtio-scsi-max_sectors.args} | 0
 ...io-scsi-num_queues.args => disk-virtio-scsi-num_queues.args} | 0
 .../{qemuxml2argv-disk-virtio.args => disk-virtio.args}         | 0
 ...argv-encrypted-disk-usage.args => encrypted-disk-usage.args} | 0
 .../{qemuxml2argv-encrypted-disk.args => encrypted-disk.args}   | 0
 .../{qemuxml2argv-eoi-disabled.args => eoi-disabled.args}       | 0
 .../{qemuxml2argv-eoi-enabled.args => eoi-enabled.args}         | 0
 .../{qemuxml2argv-event_idx.args => event_idx.args}             | 0
 ...ry-no-numa-topology.args => fd-memory-no-numa-topology.args} | 0
 ...d-memory-numa-topology.args => fd-memory-numa-topology.args} | 0
 ...memory-numa-topology2.args => fd-memory-numa-topology2.args} | 0
 ...memory-numa-topology3.args => fd-memory-numa-topology3.args} | 0
 .../{qemuxml2argv-fips-enabled.args => fips-enabled.args}       | 0
 ...qemuxml2argv-floppy-drive-fat.args => floppy-drive-fat.args} | 0
 .../{qemuxml2argv-fs9p-ccw.args => fs9p-ccw.args}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-fs9p.args => fs9p.args}    | 0
 ...raphics-sdl-fullscreen.args => graphics-sdl-fullscreen.args} | 0
 .../{qemuxml2argv-graphics-sdl.args => graphics-sdl.args}       | 0
 ...agent-file-xfer.args => graphics-spice-agent-file-xfer.args} | 0
 ...ics-spice-agentmouse.args => graphics-spice-agentmouse.args} | 0
 ...auto-socket-cfg.args => graphics-spice-auto-socket-cfg.args} | 0
 ...s-spice-auto-socket.args => graphics-spice-auto-socket.args} | 0
 ...s-spice-compression.args => graphics-spice-compression.args} | 0
 ...-graphics-spice-no-args.args => graphics-spice-no-args.args} | 0
 ...-graphics-spice-qxl-vga.args => graphics-spice-qxl-vga.args} | 0
 ...l2argv-graphics-spice-sasl.args => graphics-spice-sasl.args} | 0
 ...gv-graphics-spice-socket.args => graphics-spice-socket.args} | 0
 ...-graphics-spice-timeout.args => graphics-spice-timeout.args} | 0
 ...phics-spice-usb-redir.args => graphics-spice-usb-redir.args} | 0
 .../{qemuxml2argv-graphics-spice.args => graphics-spice.args}   | 0
 ...c-auto-socket-cfg.args => graphics-vnc-auto-socket-cfg.args} | 0
 ...phics-vnc-auto-socket.args => graphics-vnc-auto-socket.args} | 0
 ...vnc-no-listen-attr.args => graphics-vnc-no-listen-attr.args} | 0
 ...muxml2argv-graphics-vnc-none.args => graphics-vnc-none.args} | 0
 ...l2argv-graphics-vnc-policy.args => graphics-vnc-policy.args} | 0
 ...ed-socket.args => graphics-vnc-remove-generated-socket.args} | 0
 ...muxml2argv-graphics-vnc-sasl.args => graphics-vnc-sasl.args} | 0
 ...et-new-cmdline.args => graphics-vnc-socket-new-cmdline.args} | 0
 ...l2argv-graphics-vnc-socket.args => graphics-vnc-socket.args} | 0
 ...qemuxml2argv-graphics-vnc-tls.args => graphics-vnc-tls.args} | 0
 ...-graphics-vnc-websocket.args => graphics-vnc-websocket.args} | 0
 .../{qemuxml2argv-graphics-vnc.args => graphics-vnc.args}       | 0
 ...ostdev-mdev-precreated.args => hostdev-mdev-precreated.args} | 0
 ...-pci-address-device.args => hostdev-pci-address-device.args} | 0
 ...l2argv-hostdev-pci-address.args => hostdev-pci-address.args} | 0
 ...muxml2argv-hostdev-scsi-boot.args => hostdev-scsi-boot.args} | 0
 ...csi-lsi-iscsi-auth.args => hostdev-scsi-lsi-iscsi-auth.args} | 0
 ...-hostdev-scsi-lsi-iscsi.args => hostdev-scsi-lsi-iscsi.args} | 0
 ...qemuxml2argv-hostdev-scsi-lsi.args => hostdev-scsi-lsi.args} | 0
 ...gv-hostdev-scsi-readonly.args => hostdev-scsi-readonly.args} | 0
 ...csi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.args} | 0
 ...csi-vhost-scsi-pci.args => hostdev-scsi-vhost-scsi-pci.args} | 0
 ...rtio-iscsi-auth.args => hostdev-scsi-virtio-iscsi-auth.args} | 0
 ...ev-scsi-virtio-iscsi.args => hostdev-scsi-virtio-iscsi.args} | 0
 ...tdev-scsi-virtio-scsi.args => hostdev-scsi-virtio-scsi.args} | 0
 ...ss-device-boot.args => hostdev-usb-address-device-boot.args} | 0
 ...-usb-address-device.args => hostdev-usb-address-device.args} | 0
 ...l2argv-hostdev-usb-address.args => hostdev-usb-address.args} | 0
 ...tdev-vfio-multidomain.args => hostdev-vfio-multidomain.args} | 0
 .../{qemuxml2argv-hostdev-vfio.args => hostdev-vfio.args}       | 0
 .../{qemuxml2argv-hotplug-base.args => hotplug-base.args}       | 0
 ...l2argv-hugepages-memaccess.args => hugepages-memaccess.args} | 0
 ...argv-hugepages-memaccess2.args => hugepages-memaccess2.args} | 0
 .../{qemuxml2argv-hugepages-numa.args => hugepages-numa.args}   | 0
 .../{qemuxml2argv-hugepages-pages.args => hugepages-pages.args} | 0
 ...qemuxml2argv-hugepages-pages2.args => hugepages-pages2.args} | 0
 ...qemuxml2argv-hugepages-pages3.args => hugepages-pages3.args} | 0
 ...qemuxml2argv-hugepages-pages5.args => hugepages-pages5.args} | 0
 ...qemuxml2argv-hugepages-pages6.args => hugepages-pages6.args} | 0
 ...qemuxml2argv-hugepages-pages7.args => hugepages-pages7.args} | 0
 ...qemuxml2argv-hugepages-shared.args => hugepages-shared.args} | 0
 .../{qemuxml2argv-hugepages.args => hugepages.args}             | 0
 .../{qemuxml2argv-hyperv-off.args => hyperv-off.args}           | 0
 .../{qemuxml2argv-hyperv-panic.args => hyperv-panic.args}       | 0
 .../qemuxml2argvdata/{qemuxml2argv-hyperv.args => hyperv.args}  | 0
 ...l2argv-input-usbmouse-addr.args => input-usbmouse-addr.args} | 0
 .../{qemuxml2argv-input-usbmouse.args => input-usbmouse.args}   | 0
 .../{qemuxml2argv-input-usbtablet.args => input-usbtablet.args} | 0
 ...el-iommu-caching-mode.args => intel-iommu-caching-mode.args} | 0
 ...el-iommu-device-iotlb.args => intel-iommu-device-iotlb.args} | 0
 .../{qemuxml2argv-intel-iommu-eim.args => intel-iommu-eim.args} | 0
 ...l2argv-intel-iommu-machine.args => intel-iommu-machine.args} | 0
 .../{qemuxml2argv-intel-iommu.args => intel-iommu.args}         | 0
 ...eads-disk-virtio-ccw.args => iothreads-disk-virtio-ccw.args} | 0
 .../{qemuxml2argv-iothreads-disk.args => iothreads-disk.args}   | 0
 ...gv-iothreads-ids-partial.args => iothreads-ids-partial.args} | 0
 .../{qemuxml2argv-iothreads-ids.args => iothreads-ids.args}     | 0
 ...eads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.args} | 0
 ...eads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.args} | 0
 .../{qemuxml2argv-iothreads.args => iothreads.args}             | 0
 ...qemuxml2argv-kvm-features-off.args => kvm-features-off.args} | 0
 .../{qemuxml2argv-kvm-features.args => kvm-features.args}       | 0
 .../{qemuxml2argv-kvm-pit-delay.args => kvm-pit-delay.args}     | 0
 .../{qemuxml2argv-kvm-pit-discard.args => kvm-pit-discard.args} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-kvm.args => kvm.args}      | 0
 ...gv-kvmclock+eoi-disabled.args => kvmclock+eoi-disabled.args} | 0
 .../{qemuxml2argv-kvmclock.args => kvmclock.args}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-lease.args => lease.args}  | 0
 ...muxml2argv-luks-disks-source.args => luks-disks-source.args} | 0
 .../{qemuxml2argv-luks-disks.args => luks-disks.args}           | 0
 tests/qemuxml2argvdata/mach-virt-console-native.args            | 1 +
 ...h-virt-console-virtio.args => mach-virt-console-virtio.args} | 0
 tests/qemuxml2argvdata/mach-virt-serial+console-native.args     | 1 +
 tests/qemuxml2argvdata/mach-virt-serial-compat.args             | 1 +
 ...ach-virt-serial-native.args => mach-virt-serial-native.args} | 0
 ...argv-mach-virt-serial-pci.args => mach-virt-serial-pci.args} | 0
 ...argv-mach-virt-serial-usb.args => mach-virt-serial-usb.args} | 0
 ...eskeywrap-off-argv.args => machine-aeskeywrap-off-argv.args} | 0
 ...-aeskeywrap-off-cap.args => machine-aeskeywrap-off-cap.args} | 0
 ...eskeywrap-off-caps.args => machine-aeskeywrap-off-caps.args} | 0
 ...-aeskeywrap-on-argv.args => machine-aeskeywrap-on-argv.args} | 0
 ...ne-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.args} | 0
 ...-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.args} | 0
 ...qemuxml2argv-machine-aliases1.args => machine-aliases1.args} | 0
 ...qemuxml2argv-machine-aliases2.args => machine-aliases2.args} | 0
 ...argv-machine-core-cfg-off.args => machine-core-cfg-off.args} | 0
 ...qemuxml2argv-machine-core-off.args => machine-core-off.args} | 0
 .../{qemuxml2argv-machine-core-on.args => machine-core-on.args} | 0
 ...eakeywrap-off-argv.args => machine-deakeywrap-off-argv.args} | 0
 ...-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.args} | 0
 ...eakeywrap-off-caps.args => machine-deakeywrap-off-caps.args} | 0
 ...-deakeywrap-on-argv.args => machine-deakeywrap-on-argv.args} | 0
 ...ne-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.args} | 0
 ...-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.args} | 0
 ...ne-keywrap-none-argv.args => machine-keywrap-none-argv.args} | 0
 ...ne-keywrap-none-caps.args => machine-keywrap-none-caps.args} | 0
 ...argv-machine-keywrap-none.args => machine-keywrap-none.args} | 0
 ...s390.args => machine-loadparm-multiple-disks-nets-s390.args} | 0
 ...ne-loadparm-net-s390.args => machine-loadparm-net-s390.args} | 0
 ...gv-machine-loadparm-s390.args => machine-loadparm-s390.args} | 0
 .../{qemuxml2argv-machine-smm-opt.args => machine-smm-opt.args} | 0
 .../{qemuxml2argv-machine-usb-opt.args => machine-usb-opt.args} | 0
 ...xml2argv-machine-vmport-opt.args => machine-vmport-opt.args} | 0
 .../{qemuxml2argv-master-key.args => master-key.args}           | 0
 ...ory-hotplug-dimm-addr.args => memory-hotplug-dimm-addr.args} | 0
 ...l2argv-memory-hotplug-dimm.args => memory-hotplug-dimm.args} | 0
 ...lug-nvdimm-access.args => memory-hotplug-nvdimm-access.args} | 0
 ...tplug-nvdimm-label.args => memory-hotplug-nvdimm-label.args} | 0
 ...gv-memory-hotplug-nvdimm.args => memory-hotplug-nvdimm.args} | 0
 ...tplug-ppc64-nonuma.args => memory-hotplug-ppc64-nonuma.args} | 0
 .../{qemuxml2argv-memory-hotplug.args => memory-hotplug.args}   | 0
 ...muxml2argv-memtune-unlimited.args => memtune-unlimited.args} | 0
 .../{qemuxml2argv-memtune.args => memtune.args}                 | 0
 .../{qemuxml2argv-metadata.args => metadata.args}               | 0
 ...-migrate-numa-unaligned.args => migrate-numa-unaligned.args} | 0
 .../{qemuxml2argv-migrate.args => migrate.args}                 | 0
 ...gv-minimal-msg-timestamp.args => minimal-msg-timestamp.args} | 0
 .../{qemuxml2argv-minimal.args => minimal.args}                 | 0
 .../{qemuxml2argv-misc-acpi.args => misc-acpi.args}             | 0
 .../{qemuxml2argv-misc-disable-s3.args => misc-disable-s3.args} | 0
 ...gv-misc-disable-suspends.args => misc-disable-suspends.args} | 0
 .../{qemuxml2argv-misc-enable-s4.args => misc-enable-s4.args}   | 0
 .../{qemuxml2argv-misc-no-reboot.args => misc-no-reboot.args}   | 0
 .../{qemuxml2argv-misc-uuid.args => misc-uuid.args}             | 0
 .../{qemuxml2argv-mlock-off.args => mlock-off.args}             | 0
 .../{qemuxml2argv-mlock-on.args => mlock-on.args}               | 0
 ...muxml2argv-mlock-unsupported.args => mlock-unsupported.args} | 0
 .../{qemuxml2argv-monitor-json.args => monitor-json.args}       | 0
 ...tifunction-pci-device.args => multifunction-pci-device.args} | 0
 .../{qemuxml2argv-name-escape.args => name-escape.args}         | 0
 .../{qemuxml2argv-net-client.args => net-client.args}           | 0
 .../{qemuxml2argv-net-eth-hostip.args => net-eth-hostip.args}   | 0
 .../{qemuxml2argv-net-eth-ifname.args => net-eth-ifname.args}   | 0
 .../{qemuxml2argv-net-eth-names.args => net-eth-names.args}     | 0
 .../{qemuxml2argv-net-eth.args => net-eth.args}                 | 0
 ...et-hostdev-multidomain.args => net-hostdev-multidomain.args} | 0
 ...-vfio-multidomain.args => net-hostdev-vfio-multidomain.args} | 0
 ...qemuxml2argv-net-hostdev-vfio.args => net-hostdev-vfio.args} | 0
 .../{qemuxml2argv-net-hostdev.args => net-hostdev.args}         | 0
 .../{qemuxml2argv-net-mcast.args => net-mcast.args}             | 0
 .../{qemuxml2argv-net-server.args => net-server.args}           | 0
 .../{qemuxml2argv-net-udp.args => net-udp.args}                 | 0
 .../{qemuxml2argv-net-user-addr.args => net-user-addr.args}     | 0
 .../{qemuxml2argv-net-user.args => net-user.args}               | 0
 ...argv-net-vhostuser-multiq.args => net-vhostuser-multiq.args} | 0
 .../{qemuxml2argv-net-vhostuser.args => net-vhostuser.args}     | 0
 .../{qemuxml2argv-net-virtio-ccw.args => net-virtio-ccw.args}   | 0
 ...muxml2argv-net-virtio-device.args => net-virtio-device.args} | 0
 ...o-disable-offloads.args => net-virtio-disable-offloads.args} | 0
 ...muxml2argv-net-virtio-netdev.args => net-virtio-netdev.args} | 0
 ...-virtio-rxtxqueuesize.args => net-virtio-rxtxqueuesize.args} | 0
 .../{qemuxml2argv-net-virtio-s390.args => net-virtio-s390.args} | 0
 .../{qemuxml2argv-net-virtio.args => net-virtio.args}           | 0
 ...muxml2argv-no-kvm-pit-device.args => no-kvm-pit-device.args} | 0
 .../{qemuxml2argv-no-shutdown.args => no-shutdown.args}         | 0
 ...xml2argv-nographics-display.args => nographics-display.args} | 0
 .../{qemuxml2argv-nographics-vga.args => nographics-vga.args}   | 0
 .../{qemuxml2argv-nographics.args => nographics.args}           | 0
 .../{qemuxml2argv-nosharepages.args => nosharepages.args}       | 0
 ...mory-vcpu-cpuset.args => numad-auto-memory-vcpu-cpuset.args} | 0
 ...args => numad-auto-memory-vcpu-no-cpuset-and-placement.args} | 0
 ...tatic-numatune.args => numad-auto-vcpu-static-numatune.args} | 0
 ...memory-auto-vcpu.args => numad-static-memory-auto-vcpu.args} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-numad.args => numad.args}  | 0
 ...-nodeset-invalid.args => numatune-auto-nodeset-invalid.args} | 0
 ...argv-numatune-auto-prefer.args => numatune-auto-prefer.args} | 0
 ...xml2argv-numatune-distances.args => numatune-distances.args} | 0
 ...e-memnode-no-memory.args => numatune-memnode-no-memory.args} | 0
 ...qemuxml2argv-numatune-memnode.args => numatune-memnode.args} | 0
 .../{qemuxml2argv-numatune-memory.args => numatune-memory.args} | 0
 .../{qemuxml2argv-panic-double.args => panic-double.args}       | 0
 ...qemuxml2argv-panic-no-address.args => panic-no-address.args} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-panic.args => panic.args}  | 0
 ...allel-parport-chardev.args => parallel-parport-chardev.args} | 0
 ...argv-parallel-tcp-chardev.args => parallel-tcp-chardev.args} | 0
 ...qemuxml2argv-pci-autoadd-addr.args => pci-autoadd-addr.args} | 0
 .../{qemuxml2argv-pci-autoadd-idx.args => pci-autoadd-idx.args} | 0
 ...muxml2argv-pci-autofill-addr.args => pci-autofill-addr.args} | 0
 ...gv-pci-bridge-many-disks.args => pci-bridge-many-disks.args} | 0
 .../{qemuxml2argv-pci-bridge.args => pci-bridge.args}           | 0
 ...qemuxml2argv-pci-expander-bus.args => pci-expander-bus.args} | 0
 .../{qemuxml2argv-pci-many.args => pci-many.args}               | 0
 .../{qemuxml2argv-pci-rom.args => pci-rom.args}                 | 0
 ...-pci-serial-dev-chardev.args => pci-serial-dev-chardev.args} | 0
 ...muxml2argv-pcie-expander-bus.args => pcie-expander-bus.args} | 0
 ...ort-model-generic.args => pcie-root-port-model-generic.args} | 0
 ...ort-model-ioh3420.args => pcie-root-port-model-ioh3420.args} | 0
 .../{qemuxml2argv-pcie-root-port.args => pcie-root-port.args}   | 0
 .../{qemuxml2argv-pcie-root.args => pcie-root.args}             | 0
 ...ch-downstream-port.args => pcie-switch-downstream-port.args} | 0
 ...switch-upstream-port.args => pcie-switch-upstream-port.args} | 0
 .../{qemuxml2argv-pcihole64-none.args => pcihole64-none.args}   | 0
 .../{qemuxml2argv-pcihole64-q35.args => pcihole64-q35.args}     | 0
 .../{qemuxml2argv-pcihole64.args => pcihole64.args}             | 0
 .../{qemuxml2argv-pmu-feature-off.args => pmu-feature-off.args} | 0
 .../{qemuxml2argv-pmu-feature.args => pmu-feature.args}         | 0
 .../{qemuxml2argv-ppc-dtb.args => ppc-dtb.args}                 | 0
 ...-controller-legacy.args => ppc64-usb-controller-legacy.args} | 0
 ...oller-qemu-xhci.args => ppc64-usb-controller-qemu-xhci.args} | 0
 ...argv-ppc64-usb-controller.args => ppc64-usb-controller.args} | 0
 .../{qemuxml2argv-ppce500-serial.args => ppce500-serial.args}   | 0
 .../{qemuxml2argv-pseries-basic.args => pseries-basic.args}     | 0
 tests/qemuxml2argvdata/pseries-console-native.args              | 1 +
 ...-pseries-console-virtio.args => pseries-console-virtio.args} | 0
 ...es-cpu-compat-power9.args => pseries-cpu-compat-power9.args} | 0
 ...xml2argv-pseries-cpu-compat.args => pseries-cpu-compat.args} | 0
 ...muxml2argv-pseries-cpu-exact.args => pseries-cpu-exact.args} | 0
 .../{qemuxml2argv-pseries-cpu-le.args => pseries-cpu-le.args}   | 0
 .../{qemuxml2argv-pseries-disk.args => pseries-disk.args}       | 0
 ...xml2argv-pseries-hostdevs-1.args => pseries-hostdevs-1.args} | 0
 ...xml2argv-pseries-hostdevs-2.args => pseries-hostdevs-2.args} | 0
 ...xml2argv-pseries-hostdevs-3.args => pseries-hostdevs-3.args} | 0
 ...argv-pseries-hpt-resizing.args => pseries-hpt-resizing.args} | 0
 ...argv-pseries-many-buses-1.args => pseries-many-buses-1.args} | 0
 ...argv-pseries-many-buses-2.args => pseries-many-buses-2.args} | 0
 ...argv-pseries-many-devices.args => pseries-many-devices.args} | 0
 .../{qemuxml2argv-pseries-nvram.args => pseries-nvram.args}     | 0
 ...gv-pseries-panic-missing.args => pseries-panic-missing.args} | 0
 ...ries-panic-no-address.args => pseries-panic-no-address.args} | 0
 ...hb-default-missing.args => pseries-phb-default-missing.args} | 0
 ...gv-pseries-phb-numa-node.args => pseries-phb-numa-node.args} | 0
 ...xml2argv-pseries-phb-simple.args => pseries-phb-simple.args} | 0
 tests/qemuxml2argvdata/pseries-serial+console-native.args       | 1 +
 tests/qemuxml2argvdata/pseries-serial-compat.args               | 1 +
 ...gv-pseries-serial-native.args => pseries-serial-native.args} | 0
 ...xml2argv-pseries-serial-pci.args => pseries-serial-pci.args} | 0
 ...xml2argv-pseries-serial-usb.args => pseries-serial-usb.args} | 0
 ...l2argv-pseries-usb-default.args => pseries-usb-default.args} | 0
 .../{qemuxml2argv-pseries-usb-kbd.args => pseries-usb-kbd.args} | 0
 ...muxml2argv-pseries-usb-multi.args => pseries-usb-multi.args} | 0
 ...es-vio-user-assigned.args => pseries-vio-user-assigned.args} | 0
 .../{qemuxml2argv-pseries-vio.args => pseries-vio.args}         | 0
 ...argv-pv-spinlock-disabled.args => pv-spinlock-disabled.args} | 0
 ...l2argv-pv-spinlock-enabled.args => pv-spinlock-enabled.args} | 0
 .../{qemuxml2argv-q35-acpi-nouefi.args => q35-acpi-nouefi.args} | 0
 .../{qemuxml2argv-q35-acpi-uefi.args => q35-acpi-uefi.args}     | 0
 ...-default-devices-only.args => q35-default-devices-only.args} | 0
 ...muxml2argv-q35-multifunction.args => q35-multifunction.args} | 0
 ...muxml2argv-q35-noacpi-nouefi.args => q35-noacpi-nouefi.args} | 0
 ...gv-q35-pci-force-address.args => q35-pci-force-address.args} | 0
 ...qemuxml2argv-q35-pcie-autoadd.args => q35-pcie-autoadd.args} | 0
 .../{qemuxml2argv-q35-pcie.args => q35-pcie.args}               | 0
 ...35-pm-disable-fallback.args => q35-pm-disable-fallback.args} | 0
 .../{qemuxml2argv-q35-pm-disable.args => q35-pm-disable.args}   | 0
 .../{qemuxml2argv-q35-usb2-multi.args => q35-usb2-multi.args}   | 0
 ...qemuxml2argv-q35-usb2-reorder.args => q35-usb2-reorder.args} | 0
 .../{qemuxml2argv-q35-usb2.args => q35-usb2.args}               | 0
 ...-q35-virt-manager-basic.args => q35-virt-manager-basic.args} | 0
 .../{qemuxml2argv-q35-virtio-pci.args => q35-virtio-pci.args}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-q35.args => q35.args}      | 0
 .../{qemuxml2argv-qemu-ns-alt.args => qemu-ns-alt.args}         | 0
 ...emu-ns-commandline-ns0.args => qemu-ns-commandline-ns0.args} | 0
 ...emu-ns-commandline-ns1.args => qemu-ns-commandline-ns1.args} | 0
 ...l2argv-qemu-ns-commandline.args => qemu-ns-commandline.args} | 0
 ...commandline-ns0.args => qemu-ns-domain-commandline-ns0.args} | 0
 ...-domain-commandline.args => qemu-ns-domain-commandline.args} | 0
 ...xml2argv-qemu-ns-domain-ns0.args => qemu-ns-domain-ns0.args} | 0
 .../{qemuxml2argv-qemu-ns-no-env.args => qemu-ns-no-env.args}   | 0
 .../{qemuxml2argv-qemu-ns.args => qemu-ns.args}                 | 0
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args    | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args    | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args    | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args       | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args         | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args      | 1 -
 .../qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args | 1 -
 .../qemuxml2argv-mach-virt-serial+console-native.args           | 1 -
 .../qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args | 1 -
 .../qemuxml2argv-pseries-serial+console-native.args             | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.args          | 1 -
 ...eboot-timeout-disabled.args => reboot-timeout-disabled.args} | 0
 ...-reboot-timeout-enabled.args => reboot-timeout-enabled.args} | 0
 .../{qemuxml2argv-restore-v2-fd.args => restore-v2-fd.args}     | 0
 .../{qemuxml2argv-restore-v2.args => restore-v2.args}           | 0
 ...usb-controller.args => s390-allow-bogus-usb-controller.args} | 0
 ...allow-bogus-usb-none.args => s390-allow-bogus-usb-none.args} | 0
 ...xml2argv-s390-panic-missing.args => s390-panic-missing.args} | 0
 ...gv-s390-panic-no-address.args => s390-panic-no-address.args} | 0
 .../{qemuxml2argv-s390-serial-2.args => s390-serial-2.args}     | 0
 ...l2argv-s390-serial-console.args => s390-serial-console.args} | 0
 .../{qemuxml2argv-s390-serial.args => s390-serial.args}         | 0
 ...muxml2argv-seclabel-dac-none.args => seclabel-dac-none.args} | 0
 ...l-dynamic-baselabel.args => seclabel-dynamic-baselabel.args} | 0
 ...l-dynamic-labelskip.args => seclabel-dynamic-labelskip.args} | 0
 ...bel-dynamic-override.args => seclabel-dynamic-override.args} | 0
 ...label-dynamic-relabel.args => seclabel-dynamic-relabel.args} | 0
 ...qemuxml2argv-seclabel-dynamic.args => seclabel-dynamic.args} | 0
 .../{qemuxml2argv-seclabel-none.args => seclabel-none.args}     | 0
 ...bel-static-labelskip.args => seclabel-static-labelskip.args} | 0
 ...eclabel-static-relabel.args => seclabel-static-relabel.args} | 0
 .../{qemuxml2argv-seclabel-static.args => seclabel-static.args} | 0
 ...l-dev-chardev-iobase.args => serial-dev-chardev-iobase.args} | 0
 ...xml2argv-serial-dev-chardev.args => serial-dev-chardev.args} | 0
 ...l2argv-serial-file-chardev.args => serial-file-chardev.args} | 0
 .../{qemuxml2argv-serial-file-log.args => serial-file-log.args} | 0
 ...l2argv-serial-many-chardev.args => serial-many-chardev.args} | 0
 ...xml2argv-serial-pty-chardev.args => serial-pty-chardev.args} | 0
 .../{qemuxml2argv-serial-pty.args => serial-pty.args}           | 0
 ...ial-spiceport-nospice.args => serial-spiceport-nospice.args} | 0
 ...qemuxml2argv-serial-spiceport.args => serial-spiceport.args} | 0
 ...xml2argv-serial-tcp-chardev.args => serial-tcp-chardev.args} | 0
 ...l-tcp-telnet-chardev.args => serial-tcp-telnet-chardev.args} | 0
 ...chardev-notls.args => serial-tcp-tlsx509-chardev-notls.args} | 0
 ...ardev-verify.args => serial-tcp-tlsx509-chardev-verify.args} | 0
 ...tcp-tlsx509-chardev.args => serial-tcp-tlsx509-chardev.args} | 0
 ...cret-chardev.args => serial-tcp-tlsx509-secret-chardev.args} | 0
 ...xml2argv-serial-udp-chardev.args => serial-udp-chardev.args} | 0
 ...l2argv-serial-unix-chardev.args => serial-unix-chardev.args} | 0
 ...muxml2argv-serial-vc-chardev.args => serial-vc-chardev.args} | 0
 ...argv-shmem-plain-doorbell.args => shmem-plain-doorbell.args} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-shmem.args => shmem.args}  | 0
 ...argv-smartcard-controller.args => smartcard-controller.args} | 0
 ...-host-certificates.args => smartcard-host-certificates.args} | 0
 .../{qemuxml2argv-smartcard-host.args => smartcard-host.args}   | 0
 ...hrough-spicevmc.args => smartcard-passthrough-spicevmc.args} | 0
 ...card-passthrough-tcp.args => smartcard-passthrough-tcp.args} | 0
 .../qemuxml2argvdata/{qemuxml2argv-smbios.args => smbios.args}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-smp.args => smp.args}      | 0
 .../{qemuxml2argv-sound-device.args => sound-device.args}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-sound.args => sound.args}  | 0
 .../{qemuxml2argv-tpm-passthrough.args => tpm-passthrough.args} | 0
 ...troller-default-q35.args => usb-controller-default-q35.args} | 0
 ...oller-explicit-q35.args => usb-controller-explicit-q35.args} | 0
 ...-controller-qemu-xhci.args => usb-controller-qemu-xhci.args} | 0
 ...l2argv-usb-controller-xhci.args => usb-controller-xhci.args} | 0
 .../{qemuxml2argv-usb-controller.args => usb-controller.args}   | 0
 ...-usb-hub-autoadd-deluxe.args => usb-hub-autoadd-deluxe.args} | 0
 .../{qemuxml2argv-usb-hub-autoadd.args => usb-hub-autoadd.args} | 0
 .../{qemuxml2argv-usb-hub.args => usb-hub.args}                 | 0
 ...l2argv-usb-ich9-autoassign.args => usb-ich9-autoassign.args} | 0
 ...xml2argv-usb-ich9-companion.args => usb-ich9-companion.args} | 0
 ...xml2argv-usb-ich9-ehci-addr.args => usb-ich9-ehci-addr.args} | 0
 ...xml2argv-usb-long-port-path.args => usb-long-port-path.args} | 0
 .../{qemuxml2argv-usb-none.args => usb-none.args}               | 0
 ...argv-usb-piix3-controller.args => usb-piix3-controller.args} | 0
 ...l2argv-usb-port-autoassign.args => usb-port-autoassign.args} | 0
 ...qemuxml2argv-usb-port-missing.args => usb-port-missing.args} | 0
 .../{qemuxml2argv-usb-ports.args => usb-ports.args}             | 0
 .../{qemuxml2argv-usb-redir-boot.args => usb-redir-boot.args}   | 0
 ...-redir-filter-version.args => usb-redir-filter-version.args} | 0
 ...qemuxml2argv-usb-redir-filter.args => usb-redir-filter.args} | 0
 .../{qemuxml2argv-usb-redir.args => usb-redir.args}             | 0
 ...l2argv-usb-xhci-autoassign.args => usb-xhci-autoassign.args} | 0
 .../{qemuxml2argv-usb1-usb2.args => usb1-usb2.args}             | 0
 .../{qemuxml2argv-user-aliases.args => user-aliases.args}       | 0
 tests/qemuxml2argvdata/user-aliases2.args                       | 1 +
 ...gv-vcpu-placement-static.args => vcpu-placement-static.args} | 0
 ...e-pciaddr-default.args => video-device-pciaddr-default.args} | 0
 ...ideo-qxl-device-vgamem.args => video-qxl-device-vgamem.args} | 0
 ...ideo-qxl-device-vram64.args => video-qxl-device-vram64.args} | 0
 ...qemuxml2argv-video-qxl-device.args => video-qxl-device.args} | 0
 .../{qemuxml2argv-video-qxl-heads.args => video-qxl-heads.args} | 0
 ...xml2argv-video-qxl-nodevice.args => video-qxl-nodevice.args} | 0
 ...muxml2argv-video-qxl-noheads.args => video-qxl-noheads.args} | 0
 ...-sec-device-vgamem.args => video-qxl-sec-device-vgamem.args} | 0
 ...-sec-device-vram64.args => video-qxl-sec-device-vram64.args} | 0
 ...argv-video-qxl-sec-device.args => video-qxl-sec-device.args} | 0
 ...ideo-vga-device-vgamem.args => video-vga-device-vgamem.args} | 0
 ...qemuxml2argv-video-vga-device.args => video-vga-device.args} | 0
 ...xml2argv-video-vga-nodevice.args => video-vga-nodevice.args} | 0
 ...l2argv-video-vga-qxl-heads.args => video-vga-qxl-heads.args} | 0
 ...ideo-virtio-gpu-device.args => video-virtio-gpu-device.args} | 0
 ...irtio-gpu-secondary.args => video-virtio-gpu-secondary.args} | 0
 ...-virtio-gpu-spice-gl.args => video-virtio-gpu-spice-gl.args} | 0
 ...-video-virtio-gpu-virgl.args => video-virtio-gpu-virgl.args} | 0
 ...qemuxml2argv-video-virtio-vga.args => video-virtio-vga.args} | 0
 ...tio-input-passthrough.args => virtio-input-passthrough.args} | 0
 .../{qemuxml2argv-virtio-input.args => virtio-input.args}       | 0
 .../{qemuxml2argv-virtio-lun.args => virtio-lun.args}           | 0
 .../{qemuxml2argv-virtio-options.args => virtio-options.args}   | 0
 .../{qemuxml2argv-virtio-rng-ccw.args => virtio-rng-ccw.args}   | 0
 ...xml2argv-virtio-rng-default.args => virtio-rng-default.args} | 0
 .../{qemuxml2argv-virtio-rng-egd.args => virtio-rng-egd.args}   | 0
 ...l2argv-virtio-rng-multiple.args => virtio-rng-multiple.args} | 0
 ...muxml2argv-virtio-rng-random.args => virtio-rng-random.args} | 0
 .../{qemuxml2argv-vmcoreinfo.args => vmcoreinfo.args}           | 0
 .../{qemuxml2argv-watchdog-device.args => watchdog-device.args} | 0
 ...qemuxml2argv-watchdog-diag288.args => watchdog-diag288.args} | 0
 .../{qemuxml2argv-watchdog-dump.args => watchdog-dump.args}     | 0
 ...xml2argv-watchdog-injectnmi.args => watchdog-injectnmi.args} | 0
 .../{qemuxml2argv-watchdog.args => watchdog.args}               | 0
 ...qemuxml2argv-x86-kvm-32-on-64.args => x86-kvm-32-on-64.args} | 0
 tests/qemuxml2argvtest.c                                        | 2 +-
 645 files changed, 15 insertions(+), 15 deletions(-)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-aavmf-virtio-mmio.args => aarch64-aavmf-virtio-mmio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-acpi-nouefi.args => aarch64-acpi-nouefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-acpi-uefi.args => aarch64-acpi-uefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-cpu-passthrough.args => aarch64-cpu-passthrough.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-host.args => aarch64-gic-host.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-both.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-v2.args
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none-v3.args
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-none.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-v2.args => aarch64-gic-v2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic-v3.args => aarch64-gic-v3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-kvm-32-on-64.args => aarch64-kvm-32-on-64.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-noacpi-nouefi.args => aarch64-noacpi-nouefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-noacpi-uefi.args => aarch64-noacpi-uefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-pci-serial.args => aarch64-pci-serial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-usb-controller-nec-xhci.args => aarch64-usb-controller-nec-xhci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-usb-controller-qemu-xhci.args => aarch64-usb-controller-qemu-xhci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-video-default.args => aarch64-video-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-video-virtio-gpu-pci.args => aarch64-video-virtio-gpu-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args => aarch64-virt-2.6-virtio-pci-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-default-nic.args => aarch64-virt-default-nic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virt-virtio.args => aarch64-virt-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci-default.args => aarch64-virtio-pci-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci-manual-addresses.args => aarch64-virtio-pci-manual-addresses.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-acpi-table.args => acpi-table.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-basic.args => arm-vexpressa9-basic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-nodevs.args => arm-vexpressa9-nodevs.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-vexpressa9-virtio.args => arm-vexpressa9-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-arm-virt-virtio.args => arm-virt-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-autoindex.args => autoindex.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-ccw-deflate.args => balloon-ccw-deflate.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-auto.args => balloon-device-auto.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-deflate-off.args => balloon-device-deflate-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-deflate.args => balloon-device-deflate.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device-period.args => balloon-device-period.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-device.args => balloon-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-balloon-mmio-deflate.args => balloon-mmio-deflate.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram-secure.args => bios-nvram-secure.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram.args => bios-nvram.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bios.args => bios.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-group-num.args => blkdeviotune-group-num.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-max-length.args => blkdeviotune-max-length.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune-max.args => blkdeviotune-max.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkdeviotune.args => blkdeviotune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkiotune-device.args => blkiotune-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-blkiotune.args => blkiotune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-cdrom.args => boot-cdrom.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-complex-bootindex.args => boot-complex-bootindex.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-complex.args => boot-complex.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-floppy-q35.args => boot-floppy-q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-floppy.args => boot-floppy.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable-drive-bootindex.args => boot-menu-disable-drive-bootindex.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable-drive.args => boot-menu-disable-drive.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-disable.args => boot-menu-disable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable-bootindex.args => boot-menu-enable-bootindex.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable-with-timeout.args => boot-menu-enable-with-timeout.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-menu-enable.args => boot-menu-enable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-multi.args => boot-multi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-network.args => boot-network.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-order.args => boot-order.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-boot-strict.args => boot-strict.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-bootindex-floppy-q35.args => bootindex-floppy-q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-guestfwd.args => channel-guestfwd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-spicevmc-old.args => channel-spicevmc-old.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-spicevmc.args => channel-spicevmc.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-auto.args => channel-virtio-auto.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-autoadd.args => channel-virtio-autoadd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-autoassign.args => channel-virtio-autoassign.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-default.args => channel-virtio-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-state.args => channel-virtio-state.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio-unix.args => channel-virtio-unix.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-channel-virtio.args => channel-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-chardev-reconnect.args => chardev-reconnect.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-catchup.args => clock-catchup.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-france.args => clock-france.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-hpet-off.args => clock-hpet-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-localtime.args => clock-localtime.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-utc.args => clock-utc.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-clock-variable.args => clock-variable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat-auto.args => console-compat-auto.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat-chardev.args => console-compat-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-compat.args => console-compat.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-sclp.args => console-sclp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-ccw.args => console-virtio-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-many.args => console-virtio-many.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio-s390.args => console-virtio-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-console-virtio.args => console-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-controller-order.args => controller-order.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell.args => cpu-Haswell.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell2.args => cpu-Haswell2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-Haswell3.args => cpu-Haswell3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable.args => cpu-cache-disable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable2.args => cpu-cache-disable2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-disable3.args => cpu-cache-disable3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-emulate-l3.args => cpu-cache-emulate-l3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough.args => cpu-cache-passthrough.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-cache-passthrough2.args => cpu-cache-passthrough2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-none.args => cpu-check-default-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-none2.args => cpu-check-default-none2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-partial.args => cpu-check-default-partial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-default-partial2.args => cpu-check-default-partial2.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/cpu-check-full.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-check-none.args => cpu-check-none.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-eoi-disabled.args => cpu-eoi-disabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-eoi-enabled.args => cpu-eoi-enabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact1.args => cpu-exact1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact2-nofallback.args => cpu-exact2-nofallback.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact2.args => cpu-exact2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-fallback.args => cpu-fallback.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-kvmclock.args => cpu-host-kvmclock.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-cmt.args => cpu-host-model-cmt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-fallback.args => cpu-host-model-fallback.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model-vendor.args => cpu-host-model-vendor.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-model.args => cpu-host-model.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-passthrough-features.args => cpu-host-passthrough-features.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-host-passthrough.args => cpu-host-passthrough.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-hotplug-startup.args => cpu-hotplug-startup.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-kvmclock.args => cpu-kvmclock.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-minimum1.args => cpu-minimum1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-minimum2.args => cpu-minimum2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-disjoint.args => cpu-numa-disjoint.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-memshared.args => cpu-numa-memshared.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa-no-memory-element.args => cpu-numa-no-memory-element.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa1.args => cpu-numa1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa2.args => cpu-numa2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-s390-features.args => cpu-s390-features.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-s390-zEC12.args => cpu-s390-zEC12.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-strict1.args => cpu-strict1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology1.args => cpu-topology1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology2.args => cpu-topology2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-topology3.args => cpu-topology3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cpu-tsc-frequency.args => cpu-tsc-frequency.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-numatune.args => cputune-numatune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune-zero-shares.args => cputune-zero-shares.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-cputune.args => cputune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-debug-threads.args => debug-threads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-default-kvm-host-arch.args => default-kvm-host-arch.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-default-qemu-host-arch.args => default-qemu-host-arch.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-aio.args => disk-aio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-blockio.args => disk-blockio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-empty.args => disk-cdrom-empty.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-ftp.args => disk-cdrom-network-ftp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-ftps.args => disk-cdrom-network-ftps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-http.args => disk-cdrom-network-http.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-https.args => disk-cdrom-network-https.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-network-tftp.args => disk-cdrom-network-tftp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-tray-no-device-cap.args => disk-cdrom-tray-no-device-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom-tray.args => disk-cdrom-tray.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom.args => disk-cdrom.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-copy_on_read.args => disk-copy_on_read.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-boot-cdrom.args => disk-drive-boot-cdrom.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-boot-disk.args => disk-drive-boot-disk.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-directsync.args => disk-drive-cache-directsync.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-unsafe.args => disk-drive-cache-unsafe.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-none.args => disk-drive-cache-v2-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-wb.args => disk-drive-cache-v2-wb.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-cache-v2-wt.args => disk-drive-cache-v2-wt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-copy-on-read.args => disk-drive-copy-on-read.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-detect-zeroes.args => disk-drive-detect-zeroes.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-discard.args => disk-drive-discard.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-enospace.args => disk-drive-error-policy-enospace.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-stop.args => disk-drive-error-policy-stop.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-error-policy-wreport-rignore.args => disk-drive-error-policy-wreport-rignore.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-fmt-qcow.args => disk-drive-fmt-qcow.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-gluster.args => disk-drive-network-gluster.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-auth.args => disk-drive-network-iscsi-auth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi-lun.args => disk-drive-network-iscsi-lun.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-iscsi.args => disk-drive-network-iscsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-export.args => disk-drive-network-nbd-export.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-ipv6-export.args => disk-drive-network-nbd-ipv6-export.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-ipv6.args => disk-drive-network-nbd-ipv6.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd-unix.args => disk-drive-network-nbd-unix.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-nbd.args => disk-drive-network-nbd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-auth-AES.args => disk-drive-network-rbd-auth-AES.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-auth.args => disk-drive-network-rbd-auth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-ceph-env.args => disk-drive-network-rbd-ceph-env.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd-ipv6.args => disk-drive-network-rbd-ipv6.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-rbd.args => disk-drive-network-rbd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-sheepdog.args => disk-drive-network-sheepdog.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-source-auth.args => disk-drive-network-source-auth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509-vxhs.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-network-vxhs.args => disk-drive-network-vxhs.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-no-boot.args => disk-drive-no-boot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-readonly-disk.args => disk-drive-readonly-disk.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-readonly-no-device.args => disk-drive-readonly-no-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-shared-locking.args => disk-drive-shared-locking.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-drive-shared.args => disk-drive-shared.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-pseries.args => disk-floppy-pseries.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-tray-no-device-cap.args => disk-floppy-tray-no-device-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy-tray.args => disk-floppy-tray.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-floppy.args => disk-floppy.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-geometry.args => disk-geometry.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.args => disk-hostdev-scsi-virtio-iscsi-auth-AES.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ide-drive-split.args => disk-ide-drive-split.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ide-wwn.args => disk-ide-wwn.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-ioeventfd.args => disk-ioeventfd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-iscsi.args => disk-iscsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-many.args => disk-many.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-order.args => disk-order.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-sata-device.args => disk-sata-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-device-auto.args => disk-scsi-device-auto.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-device.args => disk-scsi-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-split.args => disk-scsi-disk-split.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-vpd.args => disk-scsi-disk-vpd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-disk-wwn.args => disk-scsi-disk-wwn.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-lun-passthrough.args => disk-scsi-lun-passthrough.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-megasas.args => disk-scsi-megasas.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-mptsas1068.args => disk-scsi-mptsas1068.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-virtio-scsi.args => disk-scsi-virtio-scsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-scsi-vscsi.args => disk-scsi-vscsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-serial.args => disk-serial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-snapshot.args => disk-snapshot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-source-pool-mode.args => disk-source-pool-mode.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-source-pool.args => disk-source-pool.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-device-removable.args => disk-usb-device-removable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-usb-device.args => disk-usb-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-ccw-many.args => disk-virtio-ccw-many.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-ccw.args => disk-virtio-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-drive-queues.args => disk-virtio-drive-queues.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-s390.args => disk-virtio-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-ccw.args => disk-virtio-scsi-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args => disk-virtio-scsi-cmd_per_lun.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-ioeventfd.args => disk-virtio-scsi-ioeventfd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-max_sectors.args => disk-virtio-scsi-max_sectors.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio-scsi-num_queues.args => disk-virtio-scsi-num_queues.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-disk-virtio.args => disk-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-encrypted-disk-usage.args => encrypted-disk-usage.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-encrypted-disk.args => encrypted-disk.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-eoi-disabled.args => eoi-disabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-eoi-enabled.args => eoi-enabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-event_idx.args => event_idx.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-no-numa-topology.args => fd-memory-no-numa-topology.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology.args => fd-memory-numa-topology.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology2.args => fd-memory-numa-topology2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fd-memory-numa-topology3.args => fd-memory-numa-topology3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fips-enabled.args => fips-enabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-floppy-drive-fat.args => floppy-drive-fat.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fs9p-ccw.args => fs9p-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-fs9p.args => fs9p.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-sdl.args => graphics-sdl.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-agent-file-xfer.args => graphics-spice-agent-file-xfer.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-agentmouse.args => graphics-spice-agentmouse.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-auto-socket-cfg.args => graphics-spice-auto-socket-cfg.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-auto-socket.args => graphics-spice-auto-socket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-compression.args => graphics-spice-compression.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-no-args.args => graphics-spice-no-args.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-qxl-vga.args => graphics-spice-qxl-vga.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-sasl.args => graphics-spice-sasl.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-socket.args => graphics-spice-socket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-timeout.args => graphics-spice-timeout.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice-usb-redir.args => graphics-spice-usb-redir.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-spice.args => graphics-spice.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-auto-socket-cfg.args => graphics-vnc-auto-socket-cfg.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-auto-socket.args => graphics-vnc-auto-socket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-no-listen-attr.args => graphics-vnc-no-listen-attr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-none.args => graphics-vnc-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-policy.args => graphics-vnc-policy.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-remove-generated-socket.args => graphics-vnc-remove-generated-socket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-sasl.args => graphics-vnc-sasl.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-socket-new-cmdline.args => graphics-vnc-socket-new-cmdline.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-socket.args => graphics-vnc-socket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-tls.args => graphics-vnc-tls.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc-websocket.args => graphics-vnc-websocket.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-graphics-vnc.args => graphics-vnc.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-mdev-precreated.args => hostdev-mdev-precreated.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-pci-address-device.args => hostdev-pci-address-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-pci-address.args => hostdev-pci-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-boot.args => hostdev-scsi-boot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args => hostdev-scsi-lsi-iscsi-auth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi-iscsi.args => hostdev-scsi-lsi-iscsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-lsi.args => hostdev-scsi-lsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-readonly.args => hostdev-scsi-readonly.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args => hostdev-scsi-vhost-scsi-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args => hostdev-scsi-virtio-iscsi-auth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-iscsi.args => hostdev-scsi-virtio-iscsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-scsi-virtio-scsi.args => hostdev-scsi-virtio-scsi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address-device-boot.args => hostdev-usb-address-device-boot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address-device.args => hostdev-usb-address-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-usb-address.args => hostdev-usb-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-vfio-multidomain.args => hostdev-vfio-multidomain.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hostdev-vfio.args => hostdev-vfio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hotplug-base.args => hotplug-base.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-memaccess.args => hugepages-memaccess.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-memaccess2.args => hugepages-memaccess2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-numa.args => hugepages-numa.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages.args => hugepages-pages.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages2.args => hugepages-pages2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages3.args => hugepages-pages3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages5.args => hugepages-pages5.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages6.args => hugepages-pages6.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-pages7.args => hugepages-pages7.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages-shared.args => hugepages-shared.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hugepages.args => hugepages.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv-off.args => hyperv-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv-panic.args => hyperv-panic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-hyperv.args => hyperv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbmouse-addr.args => input-usbmouse-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbmouse.args => input-usbmouse.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-input-usbtablet.args => input-usbtablet.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-caching-mode.args => intel-iommu-caching-mode.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-device-iotlb.args => intel-iommu-device-iotlb.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-eim.args => intel-iommu-eim.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu-machine.args => intel-iommu-machine.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-intel-iommu.args => intel-iommu.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-disk-virtio-ccw.args => iothreads-disk-virtio-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-disk.args => iothreads-disk.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-ids-partial.args => iothreads-ids-partial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-ids.args => iothreads-ids.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-iothreads.args => iothreads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-features-off.args => kvm-features-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-features.args => kvm-features.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-pit-delay.args => kvm-pit-delay.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm-pit-discard.args => kvm-pit-discard.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvm.args => kvm.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvmclock+eoi-disabled.args => kvmclock+eoi-disabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-kvmclock.args => kvmclock.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-lease.args => lease.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disks-source.args => luks-disks-source.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-luks-disks.args => luks-disks.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/mach-virt-console-native.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-console-virtio.args => mach-virt-console-virtio.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/mach-virt-serial+console-native.args
 create mode 120000 tests/qemuxml2argvdata/mach-virt-serial-compat.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-native.args => mach-virt-serial-native.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-pci.args => mach-virt-serial-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mach-virt-serial-usb.args => mach-virt-serial-usb.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-argv.args => machine-aeskeywrap-off-argv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-cap.args => machine-aeskeywrap-off-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-off-caps.args => machine-aeskeywrap-off-caps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-argv.args => machine-aeskeywrap-on-argv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aliases1.args => machine-aliases1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-aliases2.args => machine-aliases2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-cfg-off.args => machine-core-cfg-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-off.args => machine-core-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-core-on.args => machine-core-on.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-argv.args => machine-deakeywrap-off-argv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-off-caps.args => machine-deakeywrap-off-caps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-argv.args => machine-deakeywrap-on-argv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none-argv.args => machine-keywrap-none-argv.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none-caps.args => machine-keywrap-none-caps.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-keywrap-none.args => machine-keywrap-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args => machine-loadparm-multiple-disks-nets-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-net-s390.args => machine-loadparm-net-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-loadparm-s390.args => machine-loadparm-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-smm-opt.args => machine-smm-opt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-usb-opt.args => machine-usb-opt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-machine-vmport-opt.args => machine-vmport-opt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-master-key.args => master-key.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-dimm-addr.args => memory-hotplug-dimm-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-dimm.args => memory-hotplug-dimm.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm-access.args => memory-hotplug-nvdimm-access.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm-label.args => memory-hotplug-nvdimm-label.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-nvdimm.args => memory-hotplug-nvdimm.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug-ppc64-nonuma.args => memory-hotplug-ppc64-nonuma.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memory-hotplug.args => memory-hotplug.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memtune-unlimited.args => memtune-unlimited.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-memtune.args => memtune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-metadata.args => metadata.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-migrate-numa-unaligned.args => migrate-numa-unaligned.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-migrate.args => migrate.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-minimal-msg-timestamp.args => minimal-msg-timestamp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-minimal.args => minimal.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-acpi.args => misc-acpi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-disable-s3.args => misc-disable-s3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-disable-suspends.args => misc-disable-suspends.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-enable-s4.args => misc-enable-s4.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-no-reboot.args => misc-no-reboot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-misc-uuid.args => misc-uuid.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-off.args => mlock-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-on.args => mlock-on.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-mlock-unsupported.args => mlock-unsupported.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-monitor-json.args => monitor-json.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-multifunction-pci-device.args => multifunction-pci-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-name-escape.args => name-escape.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-client.args => net-client.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-hostip.args => net-eth-hostip.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-ifname.args => net-eth-ifname.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth-names.args => net-eth-names.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-eth.args => net-eth.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-multidomain.args => net-hostdev-multidomain.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-vfio-multidomain.args => net-hostdev-vfio-multidomain.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev-vfio.args => net-hostdev-vfio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-hostdev.args => net-hostdev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-mcast.args => net-mcast.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-server.args => net-server.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-udp.args => net-udp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-user-addr.args => net-user-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-user.args => net-user.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-vhostuser-multiq.args => net-vhostuser-multiq.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-vhostuser.args => net-vhostuser.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-ccw.args => net-virtio-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-device.args => net-virtio-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-disable-offloads.args => net-virtio-disable-offloads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-netdev.args => net-virtio-netdev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxtxqueuesize.args => net-virtio-rxtxqueuesize.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-s390.args => net-virtio-s390.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio.args => net-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-no-kvm-pit-device.args => no-kvm-pit-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-no-shutdown.args => no-shutdown.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics-display.args => nographics-display.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics-vga.args => nographics-vga.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nographics.args => nographics.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-nosharepages.args => nosharepages.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-memory-vcpu-cpuset.args => numad-auto-memory-vcpu-cpuset.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args => numad-auto-memory-vcpu-no-cpuset-and-placement.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-auto-vcpu-static-numatune.args => numad-auto-vcpu-static-numatune.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad-static-memory-auto-vcpu.args => numad-static-memory-auto-vcpu.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numad.args => numad.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-auto-nodeset-invalid.args => numatune-auto-nodeset-invalid.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-auto-prefer.args => numatune-auto-prefer.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-distances.args => numatune-distances.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnode-no-memory.args => numatune-memnode-no-memory.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memnode.args => numatune-memnode.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-numatune-memory.args => numatune-memory.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-double.args => panic-double.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic-no-address.args => panic-no-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-panic.args => panic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-parallel-parport-chardev.args => parallel-parport-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-parallel-tcp-chardev.args => parallel-tcp-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autoadd-addr.args => pci-autoadd-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autoadd-idx.args => pci-autoadd-idx.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-autofill-addr.args => pci-autofill-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge-many-disks.args => pci-bridge-many-disks.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge.args => pci-bridge.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-expander-bus.args => pci-expander-bus.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-many.args => pci-many.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-rom.args => pci-rom.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pci-serial-dev-chardev.args => pci-serial-dev-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-expander-bus.args => pcie-expander-bus.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port-model-generic.args => pcie-root-port-model-generic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port-model-ioh3420.args => pcie-root-port-model-ioh3420.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root-port.args => pcie-root-port.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-root.args => pcie-root.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-switch-downstream-port.args => pcie-switch-downstream-port.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcie-switch-upstream-port.args => pcie-switch-upstream-port.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64-none.args => pcihole64-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64-q35.args => pcihole64-q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pcihole64.args => pcihole64.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pmu-feature-off.args => pmu-feature-off.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pmu-feature.args => pmu-feature.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc-dtb.args => ppc-dtb.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc64-usb-controller-legacy.args => ppc64-usb-controller-legacy.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc64-usb-controller-qemu-xhci.args => ppc64-usb-controller-qemu-xhci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppc64-usb-controller.args => ppc64-usb-controller.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-ppce500-serial.args => ppce500-serial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => pseries-basic.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/pseries-console-native.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-console-virtio.args => pseries-console-virtio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.args => pseries-cpu-compat-power9.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat.args => pseries-cpu-compat.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-exact.args => pseries-cpu-exact.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-le.args => pseries-cpu-le.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-disk.args => pseries-disk.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-1.args => pseries-hostdevs-1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-2.args => pseries-hostdevs-2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hostdevs-3.args => pseries-hostdevs-3.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-hpt-resizing.args => pseries-hpt-resizing.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-buses-1.args => pseries-many-buses-1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-buses-2.args => pseries-many-buses-2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-many-devices.args => pseries-many-devices.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-nvram.args => pseries-nvram.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-panic-missing.args => pseries-panic-missing.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-panic-no-address.args => pseries-panic-no-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-default-missing.args => pseries-phb-default-missing.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-numa-node.args => pseries-phb-numa-node.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-simple.args => pseries-phb-simple.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/pseries-serial+console-native.args
 create mode 120000 tests/qemuxml2argvdata/pseries-serial-compat.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-native.args => pseries-serial-native.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-pci.args => pseries-serial-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-serial-usb.args => pseries-serial-usb.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-default.args => pseries-usb-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-kbd.args => pseries-usb-kbd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-usb-multi.args => pseries-usb-multi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-vio-user-assigned.args => pseries-vio-user-assigned.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-vio.args => pseries-vio.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pv-spinlock-disabled.args => pv-spinlock-disabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-pv-spinlock-enabled.args => pv-spinlock-enabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-acpi-nouefi.args => q35-acpi-nouefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-acpi-uefi.args => q35-acpi-uefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-default-devices-only.args => q35-default-devices-only.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-multifunction.args => q35-multifunction.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-noacpi-nouefi.args => q35-noacpi-nouefi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pci-force-address.args => q35-pci-force-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pcie-autoadd.args => q35-pcie-autoadd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pcie.args => q35-pcie.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pm-disable-fallback.args => q35-pm-disable-fallback.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-pm-disable.args => q35-pm-disable.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2-multi.args => q35-usb2-multi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2-reorder.args => q35-usb2-reorder.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2.args => q35-usb2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-virt-manager-basic.args => q35-virt-manager-basic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35-virtio-pci.args => q35-virtio-pci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-q35.args => q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-alt.args => qemu-ns-alt.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline-ns0.args => qemu-ns-commandline-ns0.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline-ns1.args => qemu-ns-commandline-ns1.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-commandline.args => qemu-ns-commandline.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-commandline-ns0.args => qemu-ns-domain-commandline-ns0.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-commandline.args => qemu-ns-domain-commandline.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-domain-ns0.args => qemu-ns-domain-ns0.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns-no-env.args => qemu-ns-no-env.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns.args => qemu-ns.args} (100%)
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args
 delete mode 120000 tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-reboot-timeout-disabled.args => reboot-timeout-disabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-reboot-timeout-enabled.args => reboot-timeout-enabled.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-restore-v2-fd.args => restore-v2-fd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-restore-v2.args => restore-v2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-allow-bogus-usb-controller.args => s390-allow-bogus-usb-controller.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-allow-bogus-usb-none.args => s390-allow-bogus-usb-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic-missing.args => s390-panic-missing.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-panic-no-address.args => s390-panic-no-address.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial-2.args => s390-serial-2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial-console.args => s390-serial-console.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-s390-serial.args => s390-serial.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dac-none.args => seclabel-dac-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-baselabel.args => seclabel-dynamic-baselabel.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-labelskip.args => seclabel-dynamic-labelskip.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-override.args => seclabel-dynamic-override.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-relabel.args => seclabel-dynamic-relabel.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic.args => seclabel-dynamic.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-none.args => seclabel-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static-labelskip.args => seclabel-static-labelskip.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static-relabel.args => seclabel-static-relabel.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-seclabel-static.args => seclabel-static.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-dev-chardev-iobase.args => serial-dev-chardev-iobase.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-dev-chardev.args => serial-dev-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-file-chardev.args => serial-file-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-file-log.args => serial-file-log.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-many-chardev.args => serial-many-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-pty-chardev.args => serial-pty-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-pty.args => serial-pty.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-spiceport-nospice.args => serial-spiceport-nospice.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-spiceport.args => serial-spiceport.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-chardev.args => serial-tcp-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-telnet-chardev.args => serial-tcp-telnet-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev-notls.args => serial-tcp-tlsx509-chardev-notls.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev-verify.args => serial-tcp-tlsx509-chardev-verify.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-chardev.args => serial-tcp-tlsx509-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args => serial-tcp-tlsx509-secret-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-udp-chardev.args => serial-udp-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-unix-chardev.args => serial-unix-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-serial-vc-chardev.args => serial-vc-chardev.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem-plain-doorbell.args => shmem-plain-doorbell.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-shmem.args => shmem.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-controller.args => smartcard-controller.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-host-certificates.args => smartcard-host-certificates.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-host.args => smartcard-host.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smbios.args => smbios.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-smp.args => smp.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-sound-device.args => sound-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-sound.args => sound.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-tpm-passthrough.args => tpm-passthrough.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-default-q35.args => usb-controller-default-q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-explicit-q35.args => usb-controller-explicit-q35.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-qemu-xhci.args => usb-controller-qemu-xhci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller-xhci.args => usb-controller-xhci.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-controller.args => usb-controller.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-autoadd-deluxe.args => usb-hub-autoadd-deluxe.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub-autoadd.args => usb-hub-autoadd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-hub.args => usb-hub.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-autoassign.args => usb-ich9-autoassign.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-companion.args => usb-ich9-companion.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ich9-ehci-addr.args => usb-ich9-ehci-addr.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-long-port-path.args => usb-long-port-path.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-none.args => usb-none.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-piix3-controller.args => usb-piix3-controller.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-port-autoassign.args => usb-port-autoassign.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-port-missing.args => usb-port-missing.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-ports.args => usb-ports.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-boot.args => usb-redir-boot.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-filter-version.args => usb-redir-filter-version.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir-filter.args => usb-redir-filter.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-redir.args => usb-redir.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb-xhci-autoassign.args => usb-xhci-autoassign.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-usb1-usb2.args => usb1-usb2.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-user-aliases.args => user-aliases.args} (100%)
 create mode 120000 tests/qemuxml2argvdata/user-aliases2.args
 rename tests/qemuxml2argvdata/{qemuxml2argv-vcpu-placement-static.args => vcpu-placement-static.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-device-pciaddr-default.args => video-device-pciaddr-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device-vgamem.args => video-qxl-device-vgamem.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device-vram64.args => video-qxl-device-vram64.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-device.args => video-qxl-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-heads.args => video-qxl-heads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-nodevice.args => video-qxl-nodevice.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-noheads.args => video-qxl-noheads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device-vgamem.args => video-qxl-sec-device-vgamem.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device-vram64.args => video-qxl-sec-device-vram64.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-device.args => video-qxl-sec-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-device-vgamem.args => video-vga-device-vgamem.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-device.args => video-vga-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-nodevice.args => video-vga-nodevice.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-vga-qxl-heads.args => video-vga-qxl-heads.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-device.args => video-virtio-gpu-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-secondary.args => video-virtio-gpu-secondary.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-spice-gl.args => video-virtio-gpu-spice-gl.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-gpu-virgl.args => video-virtio-gpu-virgl.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-video-virtio-vga.args => video-virtio-vga.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-input-passthrough.args => virtio-input-passthrough.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-input.args => virtio-input.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-lun.args => virtio-lun.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-options.args => virtio-options.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-ccw.args => virtio-rng-ccw.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-default.args => virtio-rng-default.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-egd.args => virtio-rng-egd.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-multiple.args => virtio-rng-multiple.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-virtio-rng-random.args => virtio-rng-random.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-vmcoreinfo.args => vmcoreinfo.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-device.args => watchdog-device.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-diag288.args => watchdog-diag288.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-dump.args => watchdog-dump.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog-injectnmi.args => watchdog-injectnmi.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-watchdog.args => watchdog.args} (100%)
 rename tests/qemuxml2argvdata/{qemuxml2argv-x86-kvm-32-on-64.args => x86-kvm-32-on-64.args} (100%)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
rename to tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.args
rename to tests/qemuxml2argvdata/aarch64-acpi-nouefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args
rename to tests/qemuxml2argvdata/aarch64-acpi-uefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
rename to tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxml2argvdata/aarch64-gic-default.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
rename to tests/qemuxml2argvdata/aarch64-gic-host.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
new file mode 120000
index 0000000000..6209eff4b0
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
@@ -0,0 +1 @@
+aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
new file mode 120000
index 0000000000..6209eff4b0
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
@@ -0,0 +1 @@
+aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2argvdata/aarch64-gic-none.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
rename to tests/qemuxml2argvdata/aarch64-gic-v2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
rename to tests/qemuxml2argvdata/aarch64-gic-v3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
rename to tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args
rename to tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args
rename to tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args
rename to tests/qemuxml2argvdata/aarch64-pci-serial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args
rename to tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args
rename to tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.args
rename to tests/qemuxml2argvdata/aarch64-video-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args
rename to tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
rename to tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
rename to tests/qemuxml2argvdata/aarch64-virt-default-nic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
rename to tests/qemuxml2argvdata/aarch64-virt-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args
rename to tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args
rename to tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
rename to tests/qemuxml2argvdata/acpi-table.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-basic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
rename to tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
rename to tests/qemuxml2argvdata/arm-virt-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args b/tests/qemuxml2argvdata/autoindex.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-autoindex.args
rename to tests/qemuxml2argvdata/autoindex.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args
rename to tests/qemuxml2argvdata/balloon-ccw-deflate.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
rename to tests/qemuxml2argvdata/balloon-device-auto.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args
rename to tests/qemuxml2argvdata/balloon-device-deflate-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args
rename to tests/qemuxml2argvdata/balloon-device-deflate.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
rename to tests/qemuxml2argvdata/balloon-device-period.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
rename to tests/qemuxml2argvdata/balloon-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args
rename to tests/qemuxml2argvdata/balloon-mmio-deflate.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
rename to tests/qemuxml2argvdata/bios-nvram-secure.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
rename to tests/qemuxml2argvdata/bios-nvram.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/bios.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bios.args
rename to tests/qemuxml2argvdata/bios.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args
rename to tests/qemuxml2argvdata/blkdeviotune-group-num.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args
rename to tests/qemuxml2argvdata/blkdeviotune-max-length.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
rename to tests/qemuxml2argvdata/blkdeviotune-max.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/blkdeviotune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
rename to tests/qemuxml2argvdata/blkdeviotune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
rename to tests/qemuxml2argvdata/blkiotune-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
rename to tests/qemuxml2argvdata/blkiotune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
rename to tests/qemuxml2argvdata/boot-cdrom.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/boot-complex-bootindex.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
rename to tests/qemuxml2argvdata/boot-complex-bootindex.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
rename to tests/qemuxml2argvdata/boot-complex.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
rename to tests/qemuxml2argvdata/boot-floppy-q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
rename to tests/qemuxml2argvdata/boot-floppy.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/boot-menu-disable-drive-bootindex.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
rename to tests/qemuxml2argvdata/boot-menu-disable-drive-bootindex.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
rename to tests/qemuxml2argvdata/boot-menu-disable-drive.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
rename to tests/qemuxml2argvdata/boot-menu-disable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args b/tests/qemuxml2argvdata/boot-menu-enable-bootindex.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args
rename to tests/qemuxml2argvdata/boot-menu-enable-bootindex.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
rename to tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
rename to tests/qemuxml2argvdata/boot-menu-enable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
rename to tests/qemuxml2argvdata/boot-multi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/boot-network.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
rename to tests/qemuxml2argvdata/boot-network.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/boot-order.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
rename to tests/qemuxml2argvdata/boot-order.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
rename to tests/qemuxml2argvdata/boot-strict.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/bootindex-floppy-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
rename to tests/qemuxml2argvdata/bootindex-floppy-q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
rename to tests/qemuxml2argvdata/channel-guestfwd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/channel-spicevmc-old.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
rename to tests/qemuxml2argvdata/channel-spicevmc-old.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
rename to tests/qemuxml2argvdata/channel-spicevmc.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
rename to tests/qemuxml2argvdata/channel-virtio-auto.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
rename to tests/qemuxml2argvdata/channel-virtio-autoadd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
rename to tests/qemuxml2argvdata/channel-virtio-autoassign.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
rename to tests/qemuxml2argvdata/channel-virtio-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
rename to tests/qemuxml2argvdata/channel-virtio-state.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
rename to tests/qemuxml2argvdata/channel-virtio-unix.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
rename to tests/qemuxml2argvdata/channel-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args
rename to tests/qemuxml2argvdata/chardev-reconnect.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
rename to tests/qemuxml2argvdata/clock-catchup.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/clock-france.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
rename to tests/qemuxml2argvdata/clock-france.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
rename to tests/qemuxml2argvdata/clock-hpet-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
rename to tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
rename to tests/qemuxml2argvdata/clock-localtime.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
rename to tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
rename to tests/qemuxml2argvdata/clock-utc.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
rename to tests/qemuxml2argvdata/clock-variable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
rename to tests/qemuxml2argvdata/console-compat-auto.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
rename to tests/qemuxml2argvdata/console-compat-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/console-compat.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
rename to tests/qemuxml2argvdata/console-compat.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/console-sclp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
rename to tests/qemuxml2argvdata/console-sclp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
rename to tests/qemuxml2argvdata/console-virtio-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
rename to tests/qemuxml2argvdata/console-virtio-many.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/console-virtio-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
rename to tests/qemuxml2argvdata/console-virtio-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
rename to tests/qemuxml2argvdata/console-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/controller-order.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
rename to tests/qemuxml2argvdata/controller-order.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
rename to tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
rename to tests/qemuxml2argvdata/cpu-Haswell.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
rename to tests/qemuxml2argvdata/cpu-Haswell2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
rename to tests/qemuxml2argvdata/cpu-Haswell3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args
rename to tests/qemuxml2argvdata/cpu-cache-disable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args
rename to tests/qemuxml2argvdata/cpu-cache-disable2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args
rename to tests/qemuxml2argvdata/cpu-cache-disable3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args
rename to tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args
rename to tests/qemuxml2argvdata/cpu-cache-passthrough.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args
rename to tests/qemuxml2argvdata/cpu-cache-passthrough2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args
rename to tests/qemuxml2argvdata/cpu-check-default-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args
rename to tests/qemuxml2argvdata/cpu-check-default-none2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args
rename to tests/qemuxml2argvdata/cpu-check-default-partial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args
rename to tests/qemuxml2argvdata/cpu-check-default-partial2.args
diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args
new file mode 120000
index 0000000000..e280ccb23d
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-full.args
@@ -0,0 +1 @@
+cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args
rename to tests/qemuxml2argvdata/cpu-check-none.args
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args
new file mode 120000
index 0000000000..e280ccb23d
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-partial.args
@@ -0,0 +1 @@
+cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-disabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-enabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
rename to tests/qemuxml2argvdata/cpu-exact1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
rename to tests/qemuxml2argvdata/cpu-exact2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
rename to tests/qemuxml2argvdata/cpu-fallback.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
rename to tests/qemuxml2argvdata/cpu-host-kvmclock.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args
rename to tests/qemuxml2argvdata/cpu-host-model-cmt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
rename to tests/qemuxml2argvdata/cpu-host-model-fallback.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
rename to tests/qemuxml2argvdata/cpu-host-model-vendor.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
rename to tests/qemuxml2argvdata/cpu-host-model.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
rename to tests/qemuxml2argvdata/cpu-host-passthrough-features.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
rename to tests/qemuxml2argvdata/cpu-host-passthrough.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args
rename to tests/qemuxml2argvdata/cpu-hotplug-startup.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
rename to tests/qemuxml2argvdata/cpu-kvmclock.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
rename to tests/qemuxml2argvdata/cpu-minimum1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
rename to tests/qemuxml2argvdata/cpu-minimum2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
rename to tests/qemuxml2argvdata/cpu-numa-disjoint.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args
rename to tests/qemuxml2argvdata/cpu-numa-memshared.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
rename to tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
rename to tests/qemuxml2argvdata/cpu-numa1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
rename to tests/qemuxml2argvdata/cpu-numa2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args
rename to tests/qemuxml2argvdata/cpu-s390-features.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args
rename to tests/qemuxml2argvdata/cpu-s390-zEC12.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
rename to tests/qemuxml2argvdata/cpu-strict1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
rename to tests/qemuxml2argvdata/cpu-topology1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
rename to tests/qemuxml2argvdata/cpu-topology2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
rename to tests/qemuxml2argvdata/cpu-topology3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args
rename to tests/qemuxml2argvdata/cpu-tsc-frequency.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
rename to tests/qemuxml2argvdata/cputune-numatune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
rename to tests/qemuxml2argvdata/cputune-zero-shares.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/cputune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-cputune.args
rename to tests/qemuxml2argvdata/cputune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args
rename to tests/qemuxml2argvdata/debug-threads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
rename to tests/qemuxml2argvdata/default-kvm-host-arch.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
rename to tests/qemuxml2argvdata/default-qemu-host-arch.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
rename to tests/qemuxml2argvdata/disk-aio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
rename to tests/qemuxml2argvdata/disk-blockio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/disk-cdrom-empty.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
rename to tests/qemuxml2argvdata/disk-cdrom-empty.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
rename to tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
rename to tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/disk-cdrom-network-http.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
rename to tests/qemuxml2argvdata/disk-cdrom-network-http.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/disk-cdrom-network-https.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
rename to tests/qemuxml2argvdata/disk-cdrom-network-https.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
rename to tests/qemuxml2argvdata/disk-cdrom-network-tftp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
rename to tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
rename to tests/qemuxml2argvdata/disk-cdrom-tray.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
rename to tests/qemuxml2argvdata/disk-cdrom.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
rename to tests/qemuxml2argvdata/disk-copy_on_read.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/disk-drive-boot-cdrom.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
rename to tests/qemuxml2argvdata/disk-drive-boot-cdrom.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/disk-drive-boot-disk.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
rename to tests/qemuxml2argvdata/disk-drive-boot-disk.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/disk-drive-cache-directsync.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args
rename to tests/qemuxml2argvdata/disk-drive-cache-directsync.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/disk-drive-cache-unsafe.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args
rename to tests/qemuxml2argvdata/disk-drive-cache-unsafe.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/disk-drive-cache-v2-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args
rename to tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/disk-drive-copy-on-read.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args
rename to tests/qemuxml2argvdata/disk-drive-copy-on-read.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args
rename to tests/qemuxml2argvdata/disk-drive-detect-zeroes.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/disk-drive-discard.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
rename to tests/qemuxml2argvdata/disk-drive-discard.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/disk-drive-error-policy-enospace.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
rename to tests/qemuxml2argvdata/disk-drive-error-policy-enospace.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/disk-drive-error-policy-stop.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
rename to tests/qemuxml2argvdata/disk-drive-error-policy-stop.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/disk-drive-error-policy-wreport-rignore.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
rename to tests/qemuxml2argvdata/disk-drive-error-policy-wreport-rignore.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/disk-drive-fmt-qcow.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args
rename to tests/qemuxml2argvdata/disk-drive-fmt-qcow.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/disk-drive-network-gluster.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args
rename to tests/qemuxml2argvdata/disk-drive-network-gluster.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/disk-drive-network-iscsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args
rename to tests/qemuxml2argvdata/disk-drive-network-iscsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/disk-drive-network-nbd-export.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-export.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
rename to tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/disk-drive-network-nbd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args
rename to tests/qemuxml2argvdata/disk-drive-network-nbd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args b/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args
rename to tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/disk-drive-network-rbd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
rename to tests/qemuxml2argvdata/disk-drive-network-rbd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/disk-drive-network-sheepdog.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args
rename to tests/qemuxml2argvdata/disk-drive-network-sheepdog.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.args b/tests/qemuxml2argvdata/disk-drive-network-source-auth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.args
rename to tests/qemuxml2argvdata/disk-drive-network-source-auth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args
rename to tests/qemuxml2argvdata/disk-drive-network-vxhs.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/disk-drive-no-boot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
rename to tests/qemuxml2argvdata/disk-drive-no-boot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/disk-drive-readonly-disk.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
rename to tests/qemuxml2argvdata/disk-drive-readonly-disk.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/disk-drive-readonly-no-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
rename to tests/qemuxml2argvdata/disk-drive-readonly-no-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.args b/tests/qemuxml2argvdata/disk-drive-shared-locking.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.args
rename to tests/qemuxml2argvdata/disk-drive-shared-locking.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/disk-drive-shared.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args
rename to tests/qemuxml2argvdata/disk-drive-shared.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/disk-floppy-pseries.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
rename to tests/qemuxml2argvdata/disk-floppy-pseries.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
rename to tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
rename to tests/qemuxml2argvdata/disk-floppy-tray.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
rename to tests/qemuxml2argvdata/disk-floppy.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
rename to tests/qemuxml2argvdata/disk-geometry.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-virtio-iscsi-auth-AES.args
rename to tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/disk-ide-drive-split.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
rename to tests/qemuxml2argvdata/disk-ide-drive-split.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
rename to tests/qemuxml2argvdata/disk-ide-wwn.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
rename to tests/qemuxml2argvdata/disk-ioeventfd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
rename to tests/qemuxml2argvdata/disk-iscsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/disk-many.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
rename to tests/qemuxml2argvdata/disk-many.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/disk-order.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
rename to tests/qemuxml2argvdata/disk-order.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
rename to tests/qemuxml2argvdata/disk-sata-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
rename to tests/qemuxml2argvdata/disk-scsi-device-auto.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/disk-scsi-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
rename to tests/qemuxml2argvdata/disk-scsi-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
rename to tests/qemuxml2argvdata/disk-scsi-disk-split.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
rename to tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
rename to tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
rename to tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/disk-scsi-megasas.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
rename to tests/qemuxml2argvdata/disk-scsi-megasas.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/disk-scsi-mptsas1068.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args
rename to tests/qemuxml2argvdata/disk-scsi-mptsas1068.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
rename to tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/disk-scsi-vscsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
rename to tests/qemuxml2argvdata/disk-scsi-vscsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
rename to tests/qemuxml2argvdata/disk-serial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args
rename to tests/qemuxml2argvdata/disk-snapshot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
rename to tests/qemuxml2argvdata/disk-source-pool-mode.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
rename to tests/qemuxml2argvdata/disk-source-pool.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
rename to tests/qemuxml2argvdata/disk-usb-device-removable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
rename to tests/qemuxml2argvdata/disk-usb-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
rename to tests/qemuxml2argvdata/disk-virtio-ccw-many.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/disk-virtio-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
rename to tests/qemuxml2argvdata/disk-virtio-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.args b/tests/qemuxml2argvdata/disk-virtio-drive-queues.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.args
rename to tests/qemuxml2argvdata/disk-virtio-drive-queues.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/disk-virtio-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
rename to tests/qemuxml2argvdata/disk-virtio-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
rename to tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
rename to tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
rename to tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
rename to tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
rename to tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
rename to tests/qemuxml2argvdata/disk-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args
rename to tests/qemuxml2argvdata/encrypted-disk-usage.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
rename to tests/qemuxml2argvdata/encrypted-disk.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/eoi-disabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
rename to tests/qemuxml2argvdata/eoi-disabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/eoi-enabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
rename to tests/qemuxml2argvdata/eoi-enabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/event_idx.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
rename to tests/qemuxml2argvdata/event_idx.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args
rename to tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args
rename to tests/qemuxml2argvdata/fd-memory-numa-topology.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args
rename to tests/qemuxml2argvdata/fd-memory-numa-topology2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args
rename to tests/qemuxml2argvdata/fd-memory-numa-topology3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/fips-enabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
rename to tests/qemuxml2argvdata/fips-enabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args
rename to tests/qemuxml2argvdata/floppy-drive-fat.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
rename to tests/qemuxml2argvdata/fs9p-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/fs9p.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
rename to tests/qemuxml2argvdata/fs9p.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
rename to tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
rename to tests/qemuxml2argvdata/graphics-sdl.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
rename to tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
rename to tests/qemuxml2argvdata/graphics-spice-agentmouse.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args
rename to tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args
rename to tests/qemuxml2argvdata/graphics-spice-auto-socket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
rename to tests/qemuxml2argvdata/graphics-spice-compression.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args
rename to tests/qemuxml2argvdata/graphics-spice-no-args.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
rename to tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
rename to tests/qemuxml2argvdata/graphics-spice-sasl.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args
rename to tests/qemuxml2argvdata/graphics-spice-socket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
rename to tests/qemuxml2argvdata/graphics-spice-timeout.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
rename to tests/qemuxml2argvdata/graphics-spice-usb-redir.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
rename to tests/qemuxml2argvdata/graphics-spice.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args
rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args
rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args
rename to tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args
rename to tests/qemuxml2argvdata/graphics-vnc-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
rename to tests/qemuxml2argvdata/graphics-vnc-policy.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args
rename to tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
rename to tests/qemuxml2argvdata/graphics-vnc-sasl.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args
rename to tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
rename to tests/qemuxml2argvdata/graphics-vnc-socket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
rename to tests/qemuxml2argvdata/graphics-vnc-tls.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args
rename to tests/qemuxml2argvdata/graphics-vnc-websocket.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
rename to tests/qemuxml2argvdata/graphics-vnc.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.args
rename to tests/qemuxml2argvdata/hostdev-mdev-precreated.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
rename to tests/qemuxml2argvdata/hostdev-pci-address-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
rename to tests/qemuxml2argvdata/hostdev-pci-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/hostdev-scsi-boot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
rename to tests/qemuxml2argvdata/hostdev-scsi-boot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
rename to tests/qemuxml2argvdata/hostdev-scsi-lsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
rename to tests/qemuxml2argvdata/hostdev-scsi-readonly.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
rename to tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
rename to tests/qemuxml2argvdata/hostdev-usb-address-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
rename to tests/qemuxml2argvdata/hostdev-usb-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
rename to tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
rename to tests/qemuxml2argvdata/hostdev-vfio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args
rename to tests/qemuxml2argvdata/hotplug-base.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args
rename to tests/qemuxml2argvdata/hugepages-memaccess.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.args
rename to tests/qemuxml2argvdata/hugepages-memaccess2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/hugepages-numa.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
rename to tests/qemuxml2argvdata/hugepages-numa.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/hugepages-pages.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
rename to tests/qemuxml2argvdata/hugepages-pages.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/hugepages-pages2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
rename to tests/qemuxml2argvdata/hugepages-pages2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/hugepages-pages3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
rename to tests/qemuxml2argvdata/hugepages-pages3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/hugepages-pages5.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
rename to tests/qemuxml2argvdata/hugepages-pages5.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/hugepages-pages6.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
rename to tests/qemuxml2argvdata/hugepages-pages6.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args b/tests/qemuxml2argvdata/hugepages-pages7.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args
rename to tests/qemuxml2argvdata/hugepages-pages7.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
rename to tests/qemuxml2argvdata/hugepages-shared.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/hugepages.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
rename to tests/qemuxml2argvdata/hugepages.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/hyperv-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args
rename to tests/qemuxml2argvdata/hyperv-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args b/tests/qemuxml2argvdata/hyperv-panic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args
rename to tests/qemuxml2argvdata/hyperv-panic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/hyperv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-hyperv.args
rename to tests/qemuxml2argvdata/hyperv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
rename to tests/qemuxml2argvdata/input-usbmouse-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
rename to tests/qemuxml2argvdata/input-usbmouse.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
rename to tests/qemuxml2argvdata/input-usbtablet.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.args
rename to tests/qemuxml2argvdata/intel-iommu-caching-mode.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.args
rename to tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.args b/tests/qemuxml2argvdata/intel-iommu-eim.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.args
rename to tests/qemuxml2argvdata/intel-iommu-eim.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args b/tests/qemuxml2argvdata/intel-iommu-machine.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args
rename to tests/qemuxml2argvdata/intel-iommu-machine.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args b/tests/qemuxml2argvdata/intel-iommu.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args
rename to tests/qemuxml2argvdata/intel-iommu.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
rename to tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
rename to tests/qemuxml2argvdata/iothreads-disk.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
rename to tests/qemuxml2argvdata/iothreads-ids-partial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
rename to tests/qemuxml2argvdata/iothreads-ids.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args
rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args
rename to tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/iothreads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
rename to tests/qemuxml2argvdata/iothreads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args
rename to tests/qemuxml2argvdata/kvm-features-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args
rename to tests/qemuxml2argvdata/kvm-features.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
rename to tests/qemuxml2argvdata/kvm-pit-delay.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.args
rename to tests/qemuxml2argvdata/kvm-pit-discard.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/kvm.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvm.args
rename to tests/qemuxml2argvdata/kvm.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args
rename to tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args
rename to tests/qemuxml2argvdata/kvmclock.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/lease.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-lease.args
rename to tests/qemuxml2argvdata/lease.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args
rename to tests/qemuxml2argvdata/luks-disks-source.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args
rename to tests/qemuxml2argvdata/luks-disks.args
diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args
new file mode 120000
index 0000000000..c7abf01bd6
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-console-native.args
@@ -0,0 +1 @@
+mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.args
rename to tests/qemuxml2argvdata/mach-virt-console-virtio.args
diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
new file mode 120000
index 0000000000..c7abf01bd6
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
@@ -0,0 +1 @@
+mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
new file mode 120000
index 0000000000..c7abf01bd6
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
@@ -0,0 +1 @@
+mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.args
rename to tests/qemuxml2argvdata/mach-virt-serial-native.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args
rename to tests/qemuxml2argvdata/mach-virt-serial-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args
rename to tests/qemuxml2argvdata/mach-virt-serial-usb.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
rename to tests/qemuxml2argvdata/machine-aliases1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
rename to tests/qemuxml2argvdata/machine-aliases2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.args b/tests/qemuxml2argvdata/machine-core-cfg-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.args
rename to tests/qemuxml2argvdata/machine-core-cfg-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
rename to tests/qemuxml2argvdata/machine-core-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
rename to tests/qemuxml2argvdata/machine-core-on.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
rename to tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/machine-keywrap-none-argv.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
rename to tests/qemuxml2argvdata/machine-keywrap-none-argv.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
rename to tests/qemuxml2argvdata/machine-keywrap-none-caps.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
rename to tests/qemuxml2argvdata/machine-keywrap-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args
rename to tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args
rename to tests/qemuxml2argvdata/machine-loadparm-net-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args
rename to tests/qemuxml2argvdata/machine-loadparm-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.args
rename to tests/qemuxml2argvdata/machine-smm-opt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/machine-usb-opt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
rename to tests/qemuxml2argvdata/machine-usb-opt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
rename to tests/qemuxml2argvdata/machine-vmport-opt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-master-key.args b/tests/qemuxml2argvdata/master-key.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-master-key.args
rename to tests/qemuxml2argvdata/master-key.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
rename to tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
rename to tests/qemuxml2argvdata/memory-hotplug-dimm.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.args
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args
rename to tests/qemuxml2argvdata/memory-hotplug-nvdimm.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
rename to tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
rename to tests/qemuxml2argvdata/memory-hotplug.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
rename to tests/qemuxml2argvdata/memtune-unlimited.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/memtune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-memtune.args
rename to tests/qemuxml2argvdata/memtune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/metadata.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-metadata.args
rename to tests/qemuxml2argvdata/metadata.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args
rename to tests/qemuxml2argvdata/migrate-numa-unaligned.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/migrate.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-migrate.args
rename to tests/qemuxml2argvdata/migrate.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
rename to tests/qemuxml2argvdata/minimal-msg-timestamp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/minimal.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-minimal.args
rename to tests/qemuxml2argvdata/minimal.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
rename to tests/qemuxml2argvdata/misc-acpi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
rename to tests/qemuxml2argvdata/misc-disable-s3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
rename to tests/qemuxml2argvdata/misc-disable-suspends.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
rename to tests/qemuxml2argvdata/misc-enable-s4.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
rename to tests/qemuxml2argvdata/misc-no-reboot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
rename to tests/qemuxml2argvdata/misc-uuid.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/mlock-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args
rename to tests/qemuxml2argvdata/mlock-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/mlock-on.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args
rename to tests/qemuxml2argvdata/mlock-on.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/mlock-unsupported.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args
rename to tests/qemuxml2argvdata/mlock-unsupported.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
rename to tests/qemuxml2argvdata/monitor-json.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
rename to tests/qemuxml2argvdata/multifunction-pci-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-name-escape.args b/tests/qemuxml2argvdata/name-escape.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
rename to tests/qemuxml2argvdata/name-escape.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/net-client.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-client.args
rename to tests/qemuxml2argvdata/net-client.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args
rename to tests/qemuxml2argvdata/net-eth-hostip.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
rename to tests/qemuxml2argvdata/net-eth-ifname.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
rename to tests/qemuxml2argvdata/net-eth-names.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/net-eth.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
rename to tests/qemuxml2argvdata/net-eth.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
rename to tests/qemuxml2argvdata/net-hostdev-multidomain.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
rename to tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
rename to tests/qemuxml2argvdata/net-hostdev-vfio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
rename to tests/qemuxml2argvdata/net-hostdev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
rename to tests/qemuxml2argvdata/net-mcast.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/net-server.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-server.args
rename to tests/qemuxml2argvdata/net-server.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/net-udp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
rename to tests/qemuxml2argvdata/net-udp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.args
rename to tests/qemuxml2argvdata/net-user-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/net-user.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-user.args
rename to tests/qemuxml2argvdata/net-user.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
rename to tests/qemuxml2argvdata/net-vhostuser-multiq.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
rename to tests/qemuxml2argvdata/net-vhostuser.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args
rename to tests/qemuxml2argvdata/net-virtio-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
rename to tests/qemuxml2argvdata/net-virtio-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
rename to tests/qemuxml2argvdata/net-virtio-disable-offloads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
rename to tests/qemuxml2argvdata/net-virtio-netdev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args
rename to tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/net-virtio-s390.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
rename to tests/qemuxml2argvdata/net-virtio-s390.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
rename to tests/qemuxml2argvdata/net-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args b/tests/qemuxml2argvdata/no-kvm-pit-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args
rename to tests/qemuxml2argvdata/no-kvm-pit-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/no-shutdown.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
rename to tests/qemuxml2argvdata/no-shutdown.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args b/tests/qemuxml2argvdata/nographics-display.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args
rename to tests/qemuxml2argvdata/nographics-display.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/nographics-vga.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
rename to tests/qemuxml2argvdata/nographics-vga.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/nographics.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nographics.args
rename to tests/qemuxml2argvdata/nographics.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
rename to tests/qemuxml2argvdata/nosharepages.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
rename to tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/numad.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numad.args
rename to tests/qemuxml2argvdata/numad.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args
rename to tests/qemuxml2argvdata/numatune-auto-prefer.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.args
rename to tests/qemuxml2argvdata/numatune-distances.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args
rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args
rename to tests/qemuxml2argvdata/numatune-memnode.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
rename to tests/qemuxml2argvdata/numatune-memory.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args b/tests/qemuxml2argvdata/panic-double.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-double.args
rename to tests/qemuxml2argvdata/panic-double.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
rename to tests/qemuxml2argvdata/panic-no-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/panic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-panic.args
rename to tests/qemuxml2argvdata/panic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
rename to tests/qemuxml2argvdata/parallel-parport-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
rename to tests/qemuxml2argvdata/parallel-tcp-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
rename to tests/qemuxml2argvdata/pci-autoadd-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
rename to tests/qemuxml2argvdata/pci-autoadd-idx.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args
rename to tests/qemuxml2argvdata/pci-autofill-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
rename to tests/qemuxml2argvdata/pci-bridge-many-disks.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args
rename to tests/qemuxml2argvdata/pci-bridge.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args
rename to tests/qemuxml2argvdata/pci-expander-bus.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/pci-many.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
rename to tests/qemuxml2argvdata/pci-many.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
rename to tests/qemuxml2argvdata/pci-rom.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
rename to tests/qemuxml2argvdata/pci-serial-dev-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args
rename to tests/qemuxml2argvdata/pcie-expander-bus.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.args
rename to tests/qemuxml2argvdata/pcie-root-port-model-generic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.args
rename to tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
rename to tests/qemuxml2argvdata/pcie-root-port.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args
rename to tests/qemuxml2argvdata/pcie-root.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
rename to tests/qemuxml2argvdata/pcie-switch-downstream-port.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
rename to tests/qemuxml2argvdata/pcie-switch-upstream-port.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args b/tests/qemuxml2argvdata/pcihole64-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args
rename to tests/qemuxml2argvdata/pcihole64-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
rename to tests/qemuxml2argvdata/pcihole64-q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args
rename to tests/qemuxml2argvdata/pcihole64.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args
rename to tests/qemuxml2argvdata/pmu-feature-off.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args
rename to tests/qemuxml2argvdata/pmu-feature.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
rename to tests/qemuxml2argvdata/ppc-dtb.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args
rename to tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args
rename to tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args
rename to tests/qemuxml2argvdata/ppc64-usb-controller.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
rename to tests/qemuxml2argvdata/ppce500-serial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
rename to tests/qemuxml2argvdata/pseries-basic.args
diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qemuxml2argvdata/pseries-console-native.args
new file mode 120000
index 0000000000..1c09cf2102
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-console-native.args
@@ -0,0 +1 @@
+pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.args
rename to tests/qemuxml2argvdata/pseries-console-virtio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args
rename to tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
rename to tests/qemuxml2argvdata/pseries-cpu-compat.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
rename to tests/qemuxml2argvdata/pseries-cpu-exact.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args
rename to tests/qemuxml2argvdata/pseries-cpu-le.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args b/tests/qemuxml2argvdata/pseries-disk.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args
rename to tests/qemuxml2argvdata/pseries-disk.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args
rename to tests/qemuxml2argvdata/pseries-hostdevs-1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args
rename to tests/qemuxml2argvdata/pseries-hostdevs-2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args
rename to tests/qemuxml2argvdata/pseries-hostdevs-3.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing.args b/tests/qemuxml2argvdata/pseries-hpt-resizing.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing.args
rename to tests/qemuxml2argvdata/pseries-hpt-resizing.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args
rename to tests/qemuxml2argvdata/pseries-many-buses-1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args
rename to tests/qemuxml2argvdata/pseries-many-buses-2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args
rename to tests/qemuxml2argvdata/pseries-many-devices.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args
rename to tests/qemuxml2argvdata/pseries-nvram.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args
rename to tests/qemuxml2argvdata/pseries-panic-missing.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args
rename to tests/qemuxml2argvdata/pseries-panic-no-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args
rename to tests/qemuxml2argvdata/pseries-phb-default-missing.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-numa-node.args
rename to tests/qemuxml2argvdata/pseries-phb-numa-node.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args
rename to tests/qemuxml2argvdata/pseries-phb-simple.args
diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/tests/qemuxml2argvdata/pseries-serial+console-native.args
new file mode 120000
index 0000000000..1c09cf2102
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-serial+console-native.args
@@ -0,0 +1 @@
+pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemuxml2argvdata/pseries-serial-compat.args
new file mode 120000
index 0000000000..1c09cf2102
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-serial-compat.args
@@ -0,0 +1 @@
+pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.args
rename to tests/qemuxml2argvdata/pseries-serial-native.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.args
rename to tests/qemuxml2argvdata/pseries-serial-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.args
rename to tests/qemuxml2argvdata/pseries-serial-usb.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
rename to tests/qemuxml2argvdata/pseries-usb-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
rename to tests/qemuxml2argvdata/pseries-usb-kbd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
rename to tests/qemuxml2argvdata/pseries-usb-multi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
rename to tests/qemuxml2argvdata/pseries-vio-user-assigned.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
rename to tests/qemuxml2argvdata/pseries-vio.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args
rename to tests/qemuxml2argvdata/pv-spinlock-disabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args
rename to tests/qemuxml2argvdata/pv-spinlock-enabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args
rename to tests/qemuxml2argvdata/q35-acpi-nouefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args
rename to tests/qemuxml2argvdata/q35-acpi-uefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args
rename to tests/qemuxml2argvdata/q35-default-devices-only.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args
rename to tests/qemuxml2argvdata/q35-multifunction.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args
rename to tests/qemuxml2argvdata/q35-noacpi-nouefi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args
rename to tests/qemuxml2argvdata/q35-pci-force-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args
rename to tests/qemuxml2argvdata/q35-pcie-autoadd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args
rename to tests/qemuxml2argvdata/q35-pcie.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args
rename to tests/qemuxml2argvdata/q35-pm-disable-fallback.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args
rename to tests/qemuxml2argvdata/q35-pm-disable.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args
rename to tests/qemuxml2argvdata/q35-usb2-multi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args
rename to tests/qemuxml2argvdata/q35-usb2-reorder.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args
rename to tests/qemuxml2argvdata/q35-usb2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args
rename to tests/qemuxml2argvdata/q35-virt-manager-basic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args
rename to tests/qemuxml2argvdata/q35-virtio-pci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-q35.args
rename to tests/qemuxml2argvdata/q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args
rename to tests/qemuxml2argvdata/qemu-ns-alt.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args
rename to tests/qemuxml2argvdata/qemu-ns-commandline.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args
rename to tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
rename to tests/qemuxml2argvdata/qemu-ns-no-env.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemu-ns.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
rename to tests/qemuxml2argvdata/qemu-ns.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args
deleted file mode 120000
index 323403903d..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args
deleted file mode 120000
index 5b20f61585..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args
deleted file mode 120000
index 323403903d..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args
deleted file mode 120000
index 5b20f61585..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args
deleted file mode 120000
index 323403903d..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args
deleted file mode 120000
index dd946106e5..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args
deleted file mode 120000
index dd946106e5..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
deleted file mode 120000
index 1a90484d3b..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
deleted file mode 120000
index 1a90484d3b..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
deleted file mode 120000
index 1a90484d3b..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args
deleted file mode 120000
index d6c830ecdf..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args
deleted file mode 120000
index d6c830ecdf..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args
deleted file mode 120000
index d6c830ecdf..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.args
deleted file mode 120000
index e029bc0ec8..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases2.args
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2argv-boot-floppy-q35.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
rename to tests/qemuxml2argvdata/reboot-timeout-disabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
rename to tests/qemuxml2argvdata/reboot-timeout-enabled.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
rename to tests/qemuxml2argvdata/restore-v2-fd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
rename to tests/qemuxml2argvdata/restore-v2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
rename to tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
rename to tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args
rename to tests/qemuxml2argvdata/s390-panic-missing.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args
rename to tests/qemuxml2argvdata/s390-panic-no-address.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args
rename to tests/qemuxml2argvdata/s390-serial-2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
rename to tests/qemuxml2argvdata/s390-serial-console.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args
rename to tests/qemuxml2argvdata/s390-serial.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
rename to tests/qemuxml2argvdata/seclabel-dac-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-override.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
rename to tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
rename to tests/qemuxml2argvdata/seclabel-dynamic.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
rename to tests/qemuxml2argvdata/seclabel-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
rename to tests/qemuxml2argvdata/seclabel-static-labelskip.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
rename to tests/qemuxml2argvdata/seclabel-static-relabel.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
rename to tests/qemuxml2argvdata/seclabel-static.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
rename to tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
rename to tests/qemuxml2argvdata/serial-dev-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
rename to tests/qemuxml2argvdata/serial-file-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args
rename to tests/qemuxml2argvdata/serial-file-log.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
rename to tests/qemuxml2argvdata/serial-many-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
rename to tests/qemuxml2argvdata/serial-pty-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/serial-pty.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
rename to tests/qemuxml2argvdata/serial-pty.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
rename to tests/qemuxml2argvdata/serial-spiceport-nospice.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
rename to tests/qemuxml2argvdata/serial-spiceport.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
rename to tests/qemuxml2argvdata/serial-tcp-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
rename to tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.args
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.args
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
rename to tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
rename to tests/qemuxml2argvdata/serial-udp-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
rename to tests/qemuxml2argvdata/serial-unix-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
rename to tests/qemuxml2argvdata/serial-vc-chardev.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
rename to tests/qemuxml2argvdata/shmem-plain-doorbell.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/shmem.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-shmem.args
rename to tests/qemuxml2argvdata/shmem.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
rename to tests/qemuxml2argvdata/smartcard-controller.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
rename to tests/qemuxml2argvdata/smartcard-host-certificates.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
rename to tests/qemuxml2argvdata/smartcard-host.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
rename to tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
rename to tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/smbios.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smbios.args
rename to tests/qemuxml2argvdata/smbios.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/smp.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-smp.args
rename to tests/qemuxml2argvdata/smp.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/sound-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
rename to tests/qemuxml2argvdata/sound-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/sound.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-sound.args
rename to tests/qemuxml2argvdata/sound.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/tpm-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args
rename to tests/qemuxml2argvdata/tpm-passthrough.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args
rename to tests/qemuxml2argvdata/usb-controller-default-q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args
rename to tests/qemuxml2argvdata/usb-controller-explicit-q35.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args
rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args
rename to tests/qemuxml2argvdata/usb-controller-xhci.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args
rename to tests/qemuxml2argvdata/usb-controller.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.args
rename to tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args
rename to tests/qemuxml2argvdata/usb-hub-autoadd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args
rename to tests/qemuxml2argvdata/usb-hub.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.args
rename to tests/qemuxml2argvdata/usb-ich9-autoassign.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args
rename to tests/qemuxml2argvdata/usb-ich9-companion.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args
rename to tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.args
rename to tests/qemuxml2argvdata/usb-long-port-path.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/usb-none.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
rename to tests/qemuxml2argvdata/usb-none.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args
rename to tests/qemuxml2argvdata/usb-piix3-controller.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args
rename to tests/qemuxml2argvdata/usb-port-autoassign.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args
rename to tests/qemuxml2argvdata/usb-port-missing.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args
rename to tests/qemuxml2argvdata/usb-ports.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args
rename to tests/qemuxml2argvdata/usb-redir-boot.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args
rename to tests/qemuxml2argvdata/usb-redir-filter-version.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args
rename to tests/qemuxml2argvdata/usb-redir-filter.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args
rename to tests/qemuxml2argvdata/usb-redir.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.args
rename to tests/qemuxml2argvdata/usb-xhci-autoassign.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args
rename to tests/qemuxml2argvdata/usb1-usb2.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args
rename to tests/qemuxml2argvdata/user-aliases.args
diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argvdata/user-aliases2.args
new file mode 120000
index 0000000000..d63573a9a5
--- /dev/null
+++ b/tests/qemuxml2argvdata/user-aliases2.args
@@ -0,0 +1 @@
+boot-floppy-q35.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args
rename to tests/qemuxml2argvdata/vcpu-placement-static.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
rename to tests/qemuxml2argvdata/video-device-pciaddr-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
rename to tests/qemuxml2argvdata/video-qxl-device-vgamem.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.args
rename to tests/qemuxml2argvdata/video-qxl-device-vram64.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
rename to tests/qemuxml2argvdata/video-qxl-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args
rename to tests/qemuxml2argvdata/video-qxl-heads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
rename to tests/qemuxml2argvdata/video-qxl-nodevice.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args
rename to tests/qemuxml2argvdata/video-qxl-noheads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
rename to tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.args
rename to tests/qemuxml2argvdata/video-qxl-sec-device-vram64.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
rename to tests/qemuxml2argvdata/video-qxl-sec-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
rename to tests/qemuxml2argvdata/video-vga-device-vgamem.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
rename to tests/qemuxml2argvdata/video-vga-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
rename to tests/qemuxml2argvdata/video-vga-nodevice.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
rename to tests/qemuxml2argvdata/video-vga-qxl-heads.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args
rename to tests/qemuxml2argvdata/video-virtio-vga.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args
rename to tests/qemuxml2argvdata/virtio-input-passthrough.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args
rename to tests/qemuxml2argvdata/virtio-input.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
rename to tests/qemuxml2argvdata/virtio-lun.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.args b/tests/qemuxml2argvdata/virtio-options.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-options.args
rename to tests/qemuxml2argvdata/virtio-options.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
rename to tests/qemuxml2argvdata/virtio-rng-ccw.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args
rename to tests/qemuxml2argvdata/virtio-rng-default.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args
rename to tests/qemuxml2argvdata/virtio-rng-egd.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args
rename to tests/qemuxml2argvdata/virtio-rng-multiple.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args
rename to tests/qemuxml2argvdata/virtio-rng-random.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.args
rename to tests/qemuxml2argvdata/vmcoreinfo.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
rename to tests/qemuxml2argvdata/watchdog-device.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
rename to tests/qemuxml2argvdata/watchdog-diag288.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
rename to tests/qemuxml2argvdata/watchdog-dump.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
rename to tests/qemuxml2argvdata/watchdog-injectnmi.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/watchdog.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
rename to tests/qemuxml2argvdata/watchdog.args
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args
rename to tests/qemuxml2argvdata/x86-kvm-32-on-64.args
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1255d18453..ca24e0bbb1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -439,7 +439,7 @@ testCompareXMLToArgv(const void *data)
 
     if (virAsprintf(&xml, "%s/qemuxml2argvdata/%s.xml",
                     abs_srcdir, info->name) < 0 ||
-        virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
+        virAsprintf(&args, "%s/qemuxml2argvdata/%s.args",
                     abs_srcdir, info->name) < 0)
         goto cleanup;