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