From aa99cab737dc576ddc9a23559b9829e727aba9ca Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 5 Dec 2017 07:50:12 +0100
Subject: [PATCH] test: Drop useless prefix for qemuargv2xml test data

There's no reason for the files to have qemuargv2xml- prefix
since they all live under qemuargv2xmldata directory.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 .../{qemuargv2xml-boot-cdrom.args => boot-cdrom.args}         | 0
 .../{qemuargv2xml-boot-cdrom.xml => boot-cdrom.xml}           | 0
 .../{qemuargv2xml-boot-floppy.args => boot-floppy.args}       | 0
 .../{qemuargv2xml-boot-floppy.xml => boot-floppy.xml}         | 0
 .../{qemuargv2xml-boot-network.args => boot-network.args}     | 0
 .../{qemuargv2xml-boot-network.xml => boot-network.xml}       | 0
 ...qemuargv2xml-clock-localtime.args => clock-localtime.args} | 0
 .../{qemuargv2xml-clock-localtime.xml => clock-localtime.xml} | 0
 .../{qemuargv2xml-clock-utc.args => clock-utc.args}           | 0
 .../{qemuargv2xml-clock-utc.xml => clock-utc.xml}             | 0
 .../{qemuargv2xml-console-compat.args => console-compat.args} | 0
 .../{qemuargv2xml-console-compat.xml => console-compat.xml}   | 0
 ...muargv2xml-disk-cdrom-empty.args => disk-cdrom-empty.args} | 0
 ...qemuargv2xml-disk-cdrom-empty.xml => disk-cdrom-empty.xml} | 0
 .../{qemuargv2xml-disk-cdrom.args => disk-cdrom.args}         | 0
 .../{qemuargv2xml-disk-cdrom.xml => disk-cdrom.xml}           | 0
 ...-disk-drive-boot-cdrom.args => disk-drive-boot-cdrom.args} | 0
 ...ml-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} | 0
 ...ml-disk-drive-boot-disk.args => disk-drive-boot-disk.args} | 0
 ...2xml-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} | 0
 ...cache-directsync.args => disk-drive-cache-directsync.args} | 0
 ...e-cache-directsync.xml => disk-drive-cache-directsync.xml} | 0
 ...k-drive-cache-unsafe.args => disk-drive-cache-unsafe.args} | 0
 ...isk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} | 0
 ...drive-cache-v2-none.args => disk-drive-cache-v2-none.args} | 0
 ...k-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} | 0
 ...isk-drive-cache-v2-wb.args => disk-drive-cache-v2-wb.args} | 0
 ...-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} | 0
 ...isk-drive-cache-v2-wt.args => disk-drive-cache-v2-wt.args} | 0
 ...-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} | 0
 ...cy-enospace.args => disk-drive-error-policy-enospace.args} | 0
 ...licy-enospace.xml => disk-drive-error-policy-enospace.xml} | 0
 ...ror-policy-stop.args => disk-drive-error-policy-stop.args} | 0
 ...error-policy-stop.xml => disk-drive-error-policy-stop.xml} | 0
 ...nore.args => disk-drive-error-policy-wreport-rignore.args} | 0
 ...ignore.xml => disk-drive-error-policy-wreport-rignore.xml} | 0
 ...2xml-disk-drive-fmt-qcow.args => disk-drive-fmt-qcow.args} | 0
 ...gv2xml-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} | 0
 ...e-network-gluster.args => disk-drive-network-gluster.args} | 0
 ...ive-network-gluster.xml => disk-drive-network-gluster.xml} | 0
 ...ork-iscsi-auth.args => disk-drive-network-iscsi-auth.args} | 0
 ...twork-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} | 0
 ...drive-network-iscsi.args => disk-drive-network-iscsi.args} | 0
 ...k-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} | 0
 ...ork-nbd-export.args => disk-drive-network-nbd-export.args} | 0
 ...twork-nbd-export.xml => disk-drive-network-nbd-export.xml} | 0
 ...v6-export.args => disk-drive-network-nbd-ipv6-export.args} | 0
 ...ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} | 0
 ...network-nbd-ipv6.args => disk-drive-network-nbd-ipv6.args} | 0
 ...e-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} | 0
 ...network-nbd-unix.args => disk-drive-network-nbd-unix.args} | 0
 ...e-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} | 0
 ...isk-drive-network-nbd.args => disk-drive-network-nbd.args} | 0
 ...-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} | 0
 ...network-rbd-auth.args => disk-drive-network-rbd-auth.args} | 0
 ...e-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} | 0
 ...rbd-ceph-env.args => disk-drive-network-rbd-ceph-env.args} | 0
 ...k-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} | 0
 ...network-rbd-ipv6.args => disk-drive-network-rbd-ipv6.args} | 0
 ...e-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} | 0
 ...isk-drive-network-rbd.args => disk-drive-network-rbd.args} | 0
 ...-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} | 0
 ...network-sheepdog.args => disk-drive-network-sheepdog.args} | 0
 ...e-network-sheepdog.xml => disk-drive-network-sheepdog.xml} | 0
 .../{qemuargv2xml-disk-floppy.args => disk-floppy.args}       | 0
 .../{qemuargv2xml-disk-floppy.xml => disk-floppy.xml}         | 0
 .../{qemuargv2xml-disk-many.args => disk-many.args}           | 0
 .../{qemuargv2xml-disk-many.xml => disk-many.xml}             | 0
 .../{qemuargv2xml-disk-usb.args => disk-usb.args}             | 0
 .../{qemuargv2xml-disk-usb.xml => disk-usb.xml}               | 0
 .../{qemuargv2xml-disk-virtio.args => disk-virtio.args}       | 0
 .../{qemuargv2xml-disk-virtio.xml => disk-virtio.xml}         | 0
 ...phics-sdl-fullscreen.args => graphics-sdl-fullscreen.args} | 0
 ...raphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} | 0
 .../{qemuargv2xml-graphics-sdl.args => graphics-sdl.args}     | 0
 .../{qemuargv2xml-graphics-sdl.xml => graphics-sdl.xml}       | 0
 ...2xml-graphics-vnc-policy.args => graphics-vnc-policy.args} | 0
 ...gv2xml-graphics-vnc-policy.xml => graphics-vnc-policy.xml} | 0
 ...argv2xml-graphics-vnc-sasl.args => graphics-vnc-sasl.args} | 0
 ...muargv2xml-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} | 0
 ...2xml-graphics-vnc-socket.args => graphics-vnc-socket.args} | 0
 ...gv2xml-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0
 ...muargv2xml-graphics-vnc-tls.args => graphics-vnc-tls.args} | 0
 ...qemuargv2xml-graphics-vnc-tls.xml => graphics-vnc-tls.xml} | 0
 ...raphics-vnc-websocket.args => graphics-vnc-websocket.args} | 0
 ...-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} | 0
 .../{qemuargv2xml-graphics-vnc.args => graphics-vnc.args}     | 0
 .../{qemuargv2xml-graphics-vnc.xml => graphics-vnc.xml}       | 0
 ...2xml-hostdev-pci-address.args => hostdev-pci-address.args} | 0
 ...gv2xml-hostdev-pci-address.xml => hostdev-pci-address.xml} | 0
 ...2xml-hostdev-usb-address.args => hostdev-usb-address.args} | 0
 ...gv2xml-hostdev-usb-address.xml => hostdev-usb-address.xml} | 0
 .../{qemuargv2xml-hyperv-panic.args => hyperv-panic.args}     | 0
 .../{qemuargv2xml-hyperv-panic.xml => hyperv-panic.xml}       | 0
 .../{qemuargv2xml-hyperv.args => hyperv.args}                 | 0
 .../qemuargv2xmldata/{qemuargv2xml-hyperv.xml => hyperv.xml}  | 0
 .../{qemuargv2xml-input-usbmouse.args => input-usbmouse.args} | 0
 .../{qemuargv2xml-input-usbmouse.xml => input-usbmouse.xml}   | 0
 ...qemuargv2xml-input-usbtablet.args => input-usbtablet.args} | 0
 .../{qemuargv2xml-input-usbtablet.xml => input-usbtablet.xml} | 0
 .../{qemuargv2xml-kvm-features.args => kvm-features.args}     | 0
 .../{qemuargv2xml-kvm-features.xml => kvm-features.xml}       | 0
 .../{qemuargv2xml-kvmclock.args => kvmclock.args}             | 0
 .../{qemuargv2xml-kvmclock.xml => kvmclock.xml}               | 0
 ...keywrap-off-argv.args => machine-aeskeywrap-off-argv.args} | 0
 ...eskeywrap-off-argv.xml => machine-aeskeywrap-off-argv.xml} | 0
 ...eskeywrap-on-argv.args => machine-aeskeywrap-on-argv.args} | 0
 ...-aeskeywrap-on-argv.xml => machine-aeskeywrap-on-argv.xml} | 0
 ...muargv2xml-machine-core-off.args => machine-core-off.args} | 0
 ...qemuargv2xml-machine-core-off.xml => machine-core-off.xml} | 0
 ...qemuargv2xml-machine-core-on.args => machine-core-on.args} | 0
 .../{qemuargv2xml-machine-core-on.xml => machine-core-on.xml} | 0
 ...keywrap-off-argv.args => machine-deakeywrap-off-argv.args} | 0
 ...eakeywrap-off-argv.xml => machine-deakeywrap-off-argv.xml} | 0
 ...eakeywrap-on-argv.args => machine-deakeywrap-on-argv.args} | 0
 ...-deakeywrap-on-argv.xml => machine-deakeywrap-on-argv.xml} | 0
 ...-keywrap-none-argv.args => machine-keywrap-none-argv.args} | 0
 ...ne-keywrap-none-argv.xml => machine-keywrap-none-argv.xml} | 0
 ...2xml-mem-scale-maxmemory.args => mem-scale-maxmemory.args} | 0
 ...gv2xml-mem-scale-maxmemory.xml => mem-scale-maxmemory.xml} | 0
 .../{qemuargv2xml-mem-scale.args => mem-scale.args}           | 0
 .../{qemuargv2xml-mem-scale.xml => mem-scale.xml}             | 0
 .../{qemuargv2xml-migrate.args => migrate.args}               | 0
 .../{qemuargv2xml-migrate.xml => migrate.xml}                 | 0
 .../{qemuargv2xml-misc-acpi.args => misc-acpi.args}           | 0
 .../{qemuargv2xml-misc-acpi.xml => misc-acpi.xml}             | 0
 ...qemuargv2xml-misc-disable-s3.args => misc-disable-s3.args} | 0
 .../{qemuargv2xml-misc-disable-s3.xml => misc-disable-s3.xml} | 0
 ...-misc-disable-suspends.args => misc-disable-suspends.args} | 0
 ...ml-misc-disable-suspends.xml => misc-disable-suspends.xml} | 0
 .../{qemuargv2xml-misc-enable-s4.args => misc-enable-s4.args} | 0
 .../{qemuargv2xml-misc-enable-s4.xml => misc-enable-s4.xml}   | 0
 .../{qemuargv2xml-misc-no-reboot.args => misc-no-reboot.args} | 0
 .../{qemuargv2xml-misc-no-reboot.xml => misc-no-reboot.xml}   | 0
 .../{qemuargv2xml-misc-uuid.args => misc-uuid.args}           | 0
 .../{qemuargv2xml-misc-uuid.xml => misc-uuid.xml}             | 0
 .../{qemuargv2xml-net-eth-ifname.args => net-eth-ifname.args} | 0
 .../{qemuargv2xml-net-eth-ifname.xml => net-eth-ifname.xml}   | 0
 .../{qemuargv2xml-net-eth.args => net-eth.args}               | 0
 .../{qemuargv2xml-net-eth.xml => net-eth.xml}                 | 0
 .../{qemuargv2xml-net-user.args => net-user.args}             | 0
 .../{qemuargv2xml-net-user.xml => net-user.xml}               | 0
 .../{qemuargv2xml-net-virtio.args => net-virtio.args}         | 0
 .../{qemuargv2xml-net-virtio.xml => net-virtio.xml}           | 0
 ...ographics-vga-display.args => nographics-vga-display.args} | 0
 ...-nographics-vga-display.xml => nographics-vga-display.xml} | 0
 .../{qemuargv2xml-nographics-vga.args => nographics-vga.args} | 0
 .../{qemuargv2xml-nographics-vga.xml => nographics-vga.xml}   | 0
 ...argv2xml-nomachine-aarch64.args => nomachine-aarch64.args} | 0
 ...muargv2xml-nomachine-aarch64.xml => nomachine-aarch64.xml} | 0
 ...qemuargv2xml-nomachine-ppc64.args => nomachine-ppc64.args} | 0
 .../{qemuargv2xml-nomachine-ppc64.xml => nomachine-ppc64.xml} | 0
 ...muargv2xml-nomachine-x86_64.args => nomachine-x86_64.args} | 0
 ...qemuargv2xml-nomachine-x86_64.xml => nomachine-x86_64.xml} | 0
 .../{qemuargv2xml-nosharepages.args => nosharepages.args}     | 0
 .../{qemuargv2xml-nosharepages.xml => nosharepages.xml}       | 0
 .../{qemuargv2xml-parallel-tcp.args => parallel-tcp.args}     | 0
 .../{qemuargv2xml-parallel-tcp.xml => parallel-tcp.xml}       | 0
 .../{qemuargv2xml-pseries-disk.args => pseries-disk.args}     | 0
 .../{qemuargv2xml-pseries-disk.xml => pseries-disk.xml}       | 0
 .../{qemuargv2xml-pseries-nvram.args => pseries-nvram.args}   | 0
 .../{qemuargv2xml-pseries-nvram.xml => pseries-nvram.xml}     | 0
 .../{qemuargv2xml-qemu-ns-no-env.args => qemu-ns-no-env.args} | 0
 .../{qemuargv2xml-qemu-ns-no-env.xml => qemu-ns-no-env.xml}   | 0
 ...oot-timeout-disabled.args => reboot-timeout-disabled.args} | 0
 ...eboot-timeout-disabled.xml => reboot-timeout-disabled.xml} | 0
 ...eboot-timeout-enabled.args => reboot-timeout-enabled.args} | 0
 ...-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} | 0
 .../{qemuargv2xml-restore-v2.args => restore-v2.args}         | 0
 .../{qemuargv2xml-restore-v2.xml => restore-v2.xml}           | 0
 .../{qemuargv2xml-serial-dev.args => serial-dev.args}         | 0
 .../{qemuargv2xml-serial-dev.xml => serial-dev.xml}           | 0
 .../{qemuargv2xml-serial-file.args => serial-file.args}       | 0
 .../{qemuargv2xml-serial-file.xml => serial-file.xml}         | 0
 .../{qemuargv2xml-serial-many.args => serial-many.args}       | 0
 .../{qemuargv2xml-serial-many.xml => serial-many.xml}         | 0
 .../{qemuargv2xml-serial-pty.args => serial-pty.args}         | 0
 .../{qemuargv2xml-serial-pty.xml => serial-pty.xml}           | 0
 ...argv2xml-serial-tcp-telnet.args => serial-tcp-telnet.args} | 0
 ...muargv2xml-serial-tcp-telnet.xml => serial-tcp-telnet.xml} | 0
 .../{qemuargv2xml-serial-tcp.args => serial-tcp.args}         | 0
 .../{qemuargv2xml-serial-tcp.xml => serial-tcp.xml}           | 0
 .../{qemuargv2xml-serial-udp.args => serial-udp.args}         | 0
 .../{qemuargv2xml-serial-udp.xml => serial-udp.xml}           | 0
 .../{qemuargv2xml-serial-unix.args => serial-unix.args}       | 0
 .../{qemuargv2xml-serial-unix.xml => serial-unix.xml}         | 0
 .../{qemuargv2xml-serial-vc.args => serial-vc.args}           | 0
 .../{qemuargv2xml-serial-vc.xml => serial-vc.xml}             | 0
 tests/qemuargv2xmldata/{qemuargv2xml-smp.args => smp.args}    | 0
 tests/qemuargv2xmldata/{qemuargv2xml-smp.xml => smp.xml}      | 0
 .../qemuargv2xmldata/{qemuargv2xml-sound.args => sound.args}  | 0
 tests/qemuargv2xmldata/{qemuargv2xml-sound.xml => sound.xml}  | 0
 .../{qemuargv2xml-watchdog.args => watchdog.args}             | 0
 .../{qemuargv2xml-watchdog.xml => watchdog.xml}               | 0
 tests/qemuargv2xmltest.c                                      | 4 ++--
 195 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-cdrom.args => boot-cdrom.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-cdrom.xml => boot-cdrom.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-floppy.args => boot-floppy.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-floppy.xml => boot-floppy.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-network.args => boot-network.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-boot-network.xml => boot-network.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-clock-localtime.args => clock-localtime.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-clock-localtime.xml => clock-localtime.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-clock-utc.args => clock-utc.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-clock-utc.xml => clock-utc.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-console-compat.args => console-compat.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-console-compat.xml => console-compat.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-cdrom-empty.args => disk-cdrom-empty.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-cdrom-empty.xml => disk-cdrom-empty.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-cdrom.args => disk-cdrom.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-cdrom.xml => disk-cdrom.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-boot-cdrom.args => disk-drive-boot-cdrom.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-boot-disk.args => disk-drive-boot-disk.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-directsync.args => disk-drive-cache-directsync.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-directsync.xml => disk-drive-cache-directsync.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-unsafe.args => disk-drive-cache-unsafe.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-none.args => disk-drive-cache-v2-none.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-wb.args => disk-drive-cache-v2-wb.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-wt.args => disk-drive-cache-v2-wt.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-enospace.args => disk-drive-error-policy-enospace.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-enospace.xml => disk-drive-error-policy-enospace.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-stop.args => disk-drive-error-policy-stop.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-wreport-rignore.args => disk-drive-error-policy-wreport-rignore.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-fmt-qcow.args => disk-drive-fmt-qcow.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-gluster.args => disk-drive-network-gluster.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-gluster.xml => disk-drive-network-gluster.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-iscsi-auth.args => disk-drive-network-iscsi-auth.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-iscsi.args => disk-drive-network-iscsi.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-export.args => disk-drive-network-nbd-export.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-export.xml => disk-drive-network-nbd-export.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-ipv6-export.args => disk-drive-network-nbd-ipv6-export.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-ipv6.args => disk-drive-network-nbd-ipv6.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-unix.args => disk-drive-network-nbd-unix.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd.args => disk-drive-network-nbd.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-auth.args => disk-drive-network-rbd-auth.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-ceph-env.args => disk-drive-network-rbd-ceph-env.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-ipv6.args => disk-drive-network-rbd-ipv6.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd.args => disk-drive-network-rbd.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-sheepdog.args => disk-drive-network-sheepdog.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-floppy.args => disk-floppy.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-floppy.xml => disk-floppy.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-many.args => disk-many.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-many.xml => disk-many.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-usb.args => disk-usb.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-usb.xml => disk-usb.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-virtio.args => disk-virtio.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-disk-virtio.xml => disk-virtio.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-sdl.args => graphics-sdl.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-sdl.xml => graphics-sdl.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-policy.args => graphics-vnc-policy.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-policy.xml => graphics-vnc-policy.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-sasl.args => graphics-vnc-sasl.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-socket.args => graphics-vnc-socket.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-socket.xml => graphics-vnc-socket.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-tls.args => graphics-vnc-tls.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-tls.xml => graphics-vnc-tls.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-websocket.args => graphics-vnc-websocket.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc.args => graphics-vnc.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-graphics-vnc.xml => graphics-vnc.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hostdev-pci-address.args => hostdev-pci-address.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hostdev-pci-address.xml => hostdev-pci-address.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hostdev-usb-address.args => hostdev-usb-address.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hostdev-usb-address.xml => hostdev-usb-address.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hyperv-panic.args => hyperv-panic.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hyperv-panic.xml => hyperv-panic.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hyperv.args => hyperv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-hyperv.xml => hyperv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-input-usbmouse.args => input-usbmouse.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-input-usbmouse.xml => input-usbmouse.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-input-usbtablet.args => input-usbtablet.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-input-usbtablet.xml => input-usbtablet.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-kvm-features.args => kvm-features.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-kvm-features.xml => kvm-features.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-kvmclock.args => kvmclock.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-kvmclock.xml => kvmclock.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-aeskeywrap-off-argv.args => machine-aeskeywrap-off-argv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-aeskeywrap-off-argv.xml => machine-aeskeywrap-off-argv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-aeskeywrap-on-argv.args => machine-aeskeywrap-on-argv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-aeskeywrap-on-argv.xml => machine-aeskeywrap-on-argv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-core-off.args => machine-core-off.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-core-off.xml => machine-core-off.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-core-on.args => machine-core-on.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-core-on.xml => machine-core-on.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-deakeywrap-off-argv.args => machine-deakeywrap-off-argv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-deakeywrap-off-argv.xml => machine-deakeywrap-off-argv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-deakeywrap-on-argv.args => machine-deakeywrap-on-argv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-deakeywrap-on-argv.xml => machine-deakeywrap-on-argv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-keywrap-none-argv.args => machine-keywrap-none-argv.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-machine-keywrap-none-argv.xml => machine-keywrap-none-argv.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-mem-scale-maxmemory.args => mem-scale-maxmemory.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-mem-scale-maxmemory.xml => mem-scale-maxmemory.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-mem-scale.args => mem-scale.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-mem-scale.xml => mem-scale.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-migrate.args => migrate.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-migrate.xml => migrate.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-acpi.args => misc-acpi.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-acpi.xml => misc-acpi.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-disable-s3.args => misc-disable-s3.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-disable-s3.xml => misc-disable-s3.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-disable-suspends.args => misc-disable-suspends.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-disable-suspends.xml => misc-disable-suspends.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-enable-s4.args => misc-enable-s4.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-enable-s4.xml => misc-enable-s4.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-no-reboot.args => misc-no-reboot.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-no-reboot.xml => misc-no-reboot.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-uuid.args => misc-uuid.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-misc-uuid.xml => misc-uuid.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-eth-ifname.args => net-eth-ifname.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-eth-ifname.xml => net-eth-ifname.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-eth.args => net-eth.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-eth.xml => net-eth.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-user.args => net-user.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-user.xml => net-user.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-virtio.args => net-virtio.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-net-virtio.xml => net-virtio.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nographics-vga-display.args => nographics-vga-display.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nographics-vga-display.xml => nographics-vga-display.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nographics-vga.args => nographics-vga.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nographics-vga.xml => nographics-vga.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-aarch64.args => nomachine-aarch64.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-aarch64.xml => nomachine-aarch64.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-ppc64.args => nomachine-ppc64.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-ppc64.xml => nomachine-ppc64.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-x86_64.args => nomachine-x86_64.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nomachine-x86_64.xml => nomachine-x86_64.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nosharepages.args => nosharepages.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-nosharepages.xml => nosharepages.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-parallel-tcp.args => parallel-tcp.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-parallel-tcp.xml => parallel-tcp.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-pseries-disk.args => pseries-disk.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-pseries-disk.xml => pseries-disk.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-pseries-nvram.args => pseries-nvram.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-pseries-nvram.xml => pseries-nvram.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-qemu-ns-no-env.args => qemu-ns-no-env.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-qemu-ns-no-env.xml => qemu-ns-no-env.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-reboot-timeout-disabled.args => reboot-timeout-disabled.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-reboot-timeout-enabled.args => reboot-timeout-enabled.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-restore-v2.args => restore-v2.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-restore-v2.xml => restore-v2.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-dev.args => serial-dev.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-dev.xml => serial-dev.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-file.args => serial-file.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-file.xml => serial-file.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-many.args => serial-many.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-many.xml => serial-many.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-pty.args => serial-pty.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-pty.xml => serial-pty.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-tcp-telnet.args => serial-tcp-telnet.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-tcp-telnet.xml => serial-tcp-telnet.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-tcp.args => serial-tcp.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-tcp.xml => serial-tcp.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-udp.args => serial-udp.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-udp.xml => serial-udp.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-unix.args => serial-unix.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-unix.xml => serial-unix.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-vc.args => serial-vc.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-serial-vc.xml => serial-vc.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-smp.args => smp.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-smp.xml => smp.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-sound.args => sound.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-sound.xml => sound.xml} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-watchdog.args => watchdog.args} (100%)
 rename tests/qemuargv2xmldata/{qemuargv2xml-watchdog.xml => watchdog.xml} (100%)

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args b/tests/qemuargv2xmldata/boot-cdrom.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
rename to tests/qemuargv2xmldata/boot-cdrom.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml b/tests/qemuargv2xmldata/boot-cdrom.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
rename to tests/qemuargv2xmldata/boot-cdrom.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args b/tests/qemuargv2xmldata/boot-floppy.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
rename to tests/qemuargv2xmldata/boot-floppy.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml b/tests/qemuargv2xmldata/boot-floppy.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
rename to tests/qemuargv2xmldata/boot-floppy.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args b/tests/qemuargv2xmldata/boot-network.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
rename to tests/qemuargv2xmldata/boot-network.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml b/tests/qemuargv2xmldata/boot-network.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
rename to tests/qemuargv2xmldata/boot-network.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args b/tests/qemuargv2xmldata/clock-localtime.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
rename to tests/qemuargv2xmldata/clock-localtime.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml b/tests/qemuargv2xmldata/clock-localtime.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
rename to tests/qemuargv2xmldata/clock-localtime.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args b/tests/qemuargv2xmldata/clock-utc.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
rename to tests/qemuargv2xmldata/clock-utc.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml b/tests/qemuargv2xmldata/clock-utc.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
rename to tests/qemuargv2xmldata/clock-utc.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args b/tests/qemuargv2xmldata/console-compat.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
rename to tests/qemuargv2xmldata/console-compat.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml b/tests/qemuargv2xmldata/console-compat.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
rename to tests/qemuargv2xmldata/console-compat.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args b/tests/qemuargv2xmldata/disk-cdrom-empty.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
rename to tests/qemuargv2xmldata/disk-cdrom-empty.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml b/tests/qemuargv2xmldata/disk-cdrom-empty.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
rename to tests/qemuargv2xmldata/disk-cdrom-empty.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args b/tests/qemuargv2xmldata/disk-cdrom.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
rename to tests/qemuargv2xmldata/disk-cdrom.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml b/tests/qemuargv2xmldata/disk-cdrom.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
rename to tests/qemuargv2xmldata/disk-cdrom.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args b/tests/qemuargv2xmldata/disk-drive-boot-cdrom.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
rename to tests/qemuargv2xmldata/disk-drive-boot-cdrom.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml b/tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
rename to tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args b/tests/qemuargv2xmldata/disk-drive-boot-disk.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
rename to tests/qemuargv2xmldata/disk-drive-boot-disk.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml b/tests/qemuargv2xmldata/disk-drive-boot-disk.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
rename to tests/qemuargv2xmldata/disk-drive-boot-disk.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args b/tests/qemuargv2xmldata/disk-drive-cache-directsync.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
rename to tests/qemuargv2xmldata/disk-drive-cache-directsync.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml b/tests/qemuargv2xmldata/disk-drive-cache-directsync.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
rename to tests/qemuargv2xmldata/disk-drive-cache-directsync.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args b/tests/qemuargv2xmldata/disk-drive-cache-unsafe.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
rename to tests/qemuargv2xmldata/disk-drive-cache-unsafe.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml b/tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
rename to tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-none.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-none.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
rename to tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args b/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
rename to tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
rename to tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args b/tests/qemuargv2xmldata/disk-drive-error-policy-stop.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
rename to tests/qemuargv2xmldata/disk-drive-error-policy-stop.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
rename to tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args b/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
rename to tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
rename to tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args b/tests/qemuargv2xmldata/disk-drive-fmt-qcow.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
rename to tests/qemuargv2xmldata/disk-drive-fmt-qcow.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml b/tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
rename to tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args b/tests/qemuargv2xmldata/disk-drive-network-gluster.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
rename to tests/qemuargv2xmldata/disk-drive-network-gluster.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml b/tests/qemuargv2xmldata/disk-drive-network-gluster.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
rename to tests/qemuargv2xmldata/disk-drive-network-gluster.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args b/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
rename to tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
rename to tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args b/tests/qemuargv2xmldata/disk-drive-network-iscsi.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
rename to tests/qemuargv2xmldata/disk-drive-network-iscsi.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml b/tests/qemuargv2xmldata/disk-drive-network-iscsi.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
rename to tests/qemuargv2xmldata/disk-drive-network-iscsi.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-export.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-export.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
rename to tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args b/tests/qemuargv2xmldata/disk-drive-network-nbd.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
rename to tests/qemuargv2xmldata/disk-drive-network-nbd.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
rename to tests/qemuargv2xmldata/disk-drive-network-nbd.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
rename to tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args b/tests/qemuargv2xmldata/disk-drive-network-rbd.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
rename to tests/qemuargv2xmldata/disk-drive-network-rbd.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
rename to tests/qemuargv2xmldata/disk-drive-network-rbd.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args b/tests/qemuargv2xmldata/disk-drive-network-sheepdog.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args
rename to tests/qemuargv2xmldata/disk-drive-network-sheepdog.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml b/tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml
rename to tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args b/tests/qemuargv2xmldata/disk-floppy.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args
rename to tests/qemuargv2xmldata/disk-floppy.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml b/tests/qemuargv2xmldata/disk-floppy.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml
rename to tests/qemuargv2xmldata/disk-floppy.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.args b/tests/qemuargv2xmldata/disk-many.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-many.args
rename to tests/qemuargv2xmldata/disk-many.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml b/tests/qemuargv2xmldata/disk-many.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml
rename to tests/qemuargv2xmldata/disk-many.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args b/tests/qemuargv2xmldata/disk-usb.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args
rename to tests/qemuargv2xmldata/disk-usb.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml b/tests/qemuargv2xmldata/disk-usb.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml
rename to tests/qemuargv2xmldata/disk-usb.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args b/tests/qemuargv2xmldata/disk-virtio.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args
rename to tests/qemuargv2xmldata/disk-virtio.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml b/tests/qemuargv2xmldata/disk-virtio.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml
rename to tests/qemuargv2xmldata/disk-virtio.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args b/tests/qemuargv2xmldata/graphics-sdl-fullscreen.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args
rename to tests/qemuargv2xmldata/graphics-sdl-fullscreen.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
rename to tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args b/tests/qemuargv2xmldata/graphics-sdl.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args
rename to tests/qemuargv2xmldata/graphics-sdl.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml b/tests/qemuargv2xmldata/graphics-sdl.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
rename to tests/qemuargv2xmldata/graphics-sdl.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args b/tests/qemuargv2xmldata/graphics-vnc-policy.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args
rename to tests/qemuargv2xmldata/graphics-vnc-policy.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml b/tests/qemuargv2xmldata/graphics-vnc-policy.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
rename to tests/qemuargv2xmldata/graphics-vnc-policy.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args b/tests/qemuargv2xmldata/graphics-vnc-sasl.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
rename to tests/qemuargv2xmldata/graphics-vnc-sasl.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/graphics-vnc-sasl.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
rename to tests/qemuargv2xmldata/graphics-vnc-sasl.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args b/tests/qemuargv2xmldata/graphics-vnc-socket.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args
rename to tests/qemuargv2xmldata/graphics-vnc-socket.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml b/tests/qemuargv2xmldata/graphics-vnc-socket.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
rename to tests/qemuargv2xmldata/graphics-vnc-socket.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args b/tests/qemuargv2xmldata/graphics-vnc-tls.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
rename to tests/qemuargv2xmldata/graphics-vnc-tls.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml b/tests/qemuargv2xmldata/graphics-vnc-tls.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
rename to tests/qemuargv2xmldata/graphics-vnc-tls.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args b/tests/qemuargv2xmldata/graphics-vnc-websocket.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args
rename to tests/qemuargv2xmldata/graphics-vnc-websocket.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/graphics-vnc-websocket.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
rename to tests/qemuargv2xmldata/graphics-vnc-websocket.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args b/tests/qemuargv2xmldata/graphics-vnc.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args
rename to tests/qemuargv2xmldata/graphics-vnc.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml b/tests/qemuargv2xmldata/graphics-vnc.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
rename to tests/qemuargv2xmldata/graphics-vnc.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args b/tests/qemuargv2xmldata/hostdev-pci-address.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args
rename to tests/qemuargv2xmldata/hostdev-pci-address.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml b/tests/qemuargv2xmldata/hostdev-pci-address.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml
rename to tests/qemuargv2xmldata/hostdev-pci-address.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args b/tests/qemuargv2xmldata/hostdev-usb-address.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args
rename to tests/qemuargv2xmldata/hostdev-usb-address.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml b/tests/qemuargv2xmldata/hostdev-usb-address.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml
rename to tests/qemuargv2xmldata/hostdev-usb-address.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args b/tests/qemuargv2xmldata/hyperv-panic.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args
rename to tests/qemuargv2xmldata/hyperv-panic.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml b/tests/qemuargv2xmldata/hyperv-panic.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml
rename to tests/qemuargv2xmldata/hyperv-panic.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.args b/tests/qemuargv2xmldata/hyperv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hyperv.args
rename to tests/qemuargv2xmldata/hyperv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml b/tests/qemuargv2xmldata/hyperv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml
rename to tests/qemuargv2xmldata/hyperv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args b/tests/qemuargv2xmldata/input-usbmouse.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args
rename to tests/qemuargv2xmldata/input-usbmouse.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml b/tests/qemuargv2xmldata/input-usbmouse.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml
rename to tests/qemuargv2xmldata/input-usbmouse.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args b/tests/qemuargv2xmldata/input-usbtablet.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args
rename to tests/qemuargv2xmldata/input-usbtablet.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml b/tests/qemuargv2xmldata/input-usbtablet.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml
rename to tests/qemuargv2xmldata/input-usbtablet.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args b/tests/qemuargv2xmldata/kvm-features.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args
rename to tests/qemuargv2xmldata/kvm-features.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml b/tests/qemuargv2xmldata/kvm-features.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml
rename to tests/qemuargv2xmldata/kvm-features.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args b/tests/qemuargv2xmldata/kvmclock.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args
rename to tests/qemuargv2xmldata/kvmclock.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml b/tests/qemuargv2xmldata/kvmclock.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml
rename to tests/qemuargv2xmldata/kvmclock.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args b/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args
rename to tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml b/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml
rename to tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args b/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args
rename to tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml b/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml
rename to tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args b/tests/qemuargv2xmldata/machine-core-off.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args
rename to tests/qemuargv2xmldata/machine-core-off.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml b/tests/qemuargv2xmldata/machine-core-off.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml
rename to tests/qemuargv2xmldata/machine-core-off.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args b/tests/qemuargv2xmldata/machine-core-on.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args
rename to tests/qemuargv2xmldata/machine-core-on.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml b/tests/qemuargv2xmldata/machine-core-on.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml
rename to tests/qemuargv2xmldata/machine-core-on.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args b/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args
rename to tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml b/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml
rename to tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args b/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args
rename to tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml b/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml
rename to tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args b/tests/qemuargv2xmldata/machine-keywrap-none-argv.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args
rename to tests/qemuargv2xmldata/machine-keywrap-none-argv.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml b/tests/qemuargv2xmldata/machine-keywrap-none-argv.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml
rename to tests/qemuargv2xmldata/machine-keywrap-none-argv.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args b/tests/qemuargv2xmldata/mem-scale-maxmemory.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args
rename to tests/qemuargv2xmldata/mem-scale-maxmemory.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml b/tests/qemuargv2xmldata/mem-scale-maxmemory.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml
rename to tests/qemuargv2xmldata/mem-scale-maxmemory.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args b/tests/qemuargv2xmldata/mem-scale.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args
rename to tests/qemuargv2xmldata/mem-scale.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml b/tests/qemuargv2xmldata/mem-scale.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml
rename to tests/qemuargv2xmldata/mem-scale.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-migrate.args b/tests/qemuargv2xmldata/migrate.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-migrate.args
rename to tests/qemuargv2xmldata/migrate.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-migrate.xml b/tests/qemuargv2xmldata/migrate.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-migrate.xml
rename to tests/qemuargv2xmldata/migrate.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args b/tests/qemuargv2xmldata/misc-acpi.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args
rename to tests/qemuargv2xmldata/misc-acpi.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml b/tests/qemuargv2xmldata/misc-acpi.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml
rename to tests/qemuargv2xmldata/misc-acpi.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args b/tests/qemuargv2xmldata/misc-disable-s3.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args
rename to tests/qemuargv2xmldata/misc-disable-s3.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml b/tests/qemuargv2xmldata/misc-disable-s3.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml
rename to tests/qemuargv2xmldata/misc-disable-s3.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args b/tests/qemuargv2xmldata/misc-disable-suspends.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args
rename to tests/qemuargv2xmldata/misc-disable-suspends.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml b/tests/qemuargv2xmldata/misc-disable-suspends.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml
rename to tests/qemuargv2xmldata/misc-disable-suspends.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args b/tests/qemuargv2xmldata/misc-enable-s4.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args
rename to tests/qemuargv2xmldata/misc-enable-s4.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml b/tests/qemuargv2xmldata/misc-enable-s4.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml
rename to tests/qemuargv2xmldata/misc-enable-s4.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args b/tests/qemuargv2xmldata/misc-no-reboot.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args
rename to tests/qemuargv2xmldata/misc-no-reboot.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml b/tests/qemuargv2xmldata/misc-no-reboot.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml
rename to tests/qemuargv2xmldata/misc-no-reboot.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args b/tests/qemuargv2xmldata/misc-uuid.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args
rename to tests/qemuargv2xmldata/misc-uuid.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml b/tests/qemuargv2xmldata/misc-uuid.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml
rename to tests/qemuargv2xmldata/misc-uuid.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args b/tests/qemuargv2xmldata/net-eth-ifname.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args
rename to tests/qemuargv2xmldata/net-eth-ifname.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/net-eth-ifname.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml
rename to tests/qemuargv2xmldata/net-eth-ifname.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args b/tests/qemuargv2xmldata/net-eth.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-eth.args
rename to tests/qemuargv2xmldata/net-eth.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/net-eth.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml
rename to tests/qemuargv2xmldata/net-eth.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-user.args b/tests/qemuargv2xmldata/net-user.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-user.args
rename to tests/qemuargv2xmldata/net-user.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-user.xml b/tests/qemuargv2xmldata/net-user.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-user.xml
rename to tests/qemuargv2xmldata/net-user.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args b/tests/qemuargv2xmldata/net-virtio.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args
rename to tests/qemuargv2xmldata/net-virtio.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml b/tests/qemuargv2xmldata/net-virtio.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml
rename to tests/qemuargv2xmldata/net-virtio.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args b/tests/qemuargv2xmldata/nographics-vga-display.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args
rename to tests/qemuargv2xmldata/nographics-vga-display.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml b/tests/qemuargv2xmldata/nographics-vga-display.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml
rename to tests/qemuargv2xmldata/nographics-vga-display.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args b/tests/qemuargv2xmldata/nographics-vga.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args
rename to tests/qemuargv2xmldata/nographics-vga.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml b/tests/qemuargv2xmldata/nographics-vga.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml
rename to tests/qemuargv2xmldata/nographics-vga.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args b/tests/qemuargv2xmldata/nomachine-aarch64.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args
rename to tests/qemuargv2xmldata/nomachine-aarch64.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml b/tests/qemuargv2xmldata/nomachine-aarch64.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml
rename to tests/qemuargv2xmldata/nomachine-aarch64.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args b/tests/qemuargv2xmldata/nomachine-ppc64.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args
rename to tests/qemuargv2xmldata/nomachine-ppc64.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml b/tests/qemuargv2xmldata/nomachine-ppc64.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml
rename to tests/qemuargv2xmldata/nomachine-ppc64.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args b/tests/qemuargv2xmldata/nomachine-x86_64.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args
rename to tests/qemuargv2xmldata/nomachine-x86_64.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml b/tests/qemuargv2xmldata/nomachine-x86_64.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml
rename to tests/qemuargv2xmldata/nomachine-x86_64.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args b/tests/qemuargv2xmldata/nosharepages.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args
rename to tests/qemuargv2xmldata/nosharepages.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml b/tests/qemuargv2xmldata/nosharepages.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml
rename to tests/qemuargv2xmldata/nosharepages.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args b/tests/qemuargv2xmldata/parallel-tcp.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args
rename to tests/qemuargv2xmldata/parallel-tcp.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml b/tests/qemuargv2xmldata/parallel-tcp.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml
rename to tests/qemuargv2xmldata/parallel-tcp.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.args b/tests/qemuargv2xmldata/pseries-disk.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.args
rename to tests/qemuargv2xmldata/pseries-disk.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml b/tests/qemuargv2xmldata/pseries-disk.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml
rename to tests/qemuargv2xmldata/pseries-disk.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.args b/tests/qemuargv2xmldata/pseries-nvram.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.args
rename to tests/qemuargv2xmldata/pseries-nvram.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml b/tests/qemuargv2xmldata/pseries-nvram.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml
rename to tests/qemuargv2xmldata/pseries-nvram.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args b/tests/qemuargv2xmldata/qemu-ns-no-env.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args
rename to tests/qemuargv2xmldata/qemu-ns-no-env.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml b/tests/qemuargv2xmldata/qemu-ns-no-env.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml
rename to tests/qemuargv2xmldata/qemu-ns-no-env.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args b/tests/qemuargv2xmldata/reboot-timeout-disabled.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args
rename to tests/qemuargv2xmldata/reboot-timeout-disabled.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml b/tests/qemuargv2xmldata/reboot-timeout-disabled.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml
rename to tests/qemuargv2xmldata/reboot-timeout-disabled.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args b/tests/qemuargv2xmldata/reboot-timeout-enabled.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args
rename to tests/qemuargv2xmldata/reboot-timeout-enabled.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml b/tests/qemuargv2xmldata/reboot-timeout-enabled.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml
rename to tests/qemuargv2xmldata/reboot-timeout-enabled.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args b/tests/qemuargv2xmldata/restore-v2.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args
rename to tests/qemuargv2xmldata/restore-v2.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml b/tests/qemuargv2xmldata/restore-v2.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml
rename to tests/qemuargv2xmldata/restore-v2.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args b/tests/qemuargv2xmldata/serial-dev.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args
rename to tests/qemuargv2xmldata/serial-dev.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml b/tests/qemuargv2xmldata/serial-dev.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
rename to tests/qemuargv2xmldata/serial-dev.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.args b/tests/qemuargv2xmldata/serial-file.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-file.args
rename to tests/qemuargv2xmldata/serial-file.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml b/tests/qemuargv2xmldata/serial-file.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
rename to tests/qemuargv2xmldata/serial-file.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.args b/tests/qemuargv2xmldata/serial-many.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-many.args
rename to tests/qemuargv2xmldata/serial-many.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml b/tests/qemuargv2xmldata/serial-many.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
rename to tests/qemuargv2xmldata/serial-many.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args b/tests/qemuargv2xmldata/serial-pty.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args
rename to tests/qemuargv2xmldata/serial-pty.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml b/tests/qemuargv2xmldata/serial-pty.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
rename to tests/qemuargv2xmldata/serial-pty.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args b/tests/qemuargv2xmldata/serial-tcp-telnet.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args
rename to tests/qemuargv2xmldata/serial-tcp-telnet.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml b/tests/qemuargv2xmldata/serial-tcp-telnet.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
rename to tests/qemuargv2xmldata/serial-tcp-telnet.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args b/tests/qemuargv2xmldata/serial-tcp.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args
rename to tests/qemuargv2xmldata/serial-tcp.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml b/tests/qemuargv2xmldata/serial-tcp.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
rename to tests/qemuargv2xmldata/serial-tcp.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args b/tests/qemuargv2xmldata/serial-udp.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args
rename to tests/qemuargv2xmldata/serial-udp.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml b/tests/qemuargv2xmldata/serial-udp.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
rename to tests/qemuargv2xmldata/serial-udp.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args b/tests/qemuargv2xmldata/serial-unix.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args
rename to tests/qemuargv2xmldata/serial-unix.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml b/tests/qemuargv2xmldata/serial-unix.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
rename to tests/qemuargv2xmldata/serial-unix.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args b/tests/qemuargv2xmldata/serial-vc.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args
rename to tests/qemuargv2xmldata/serial-vc.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml b/tests/qemuargv2xmldata/serial-vc.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
rename to tests/qemuargv2xmldata/serial-vc.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-smp.args b/tests/qemuargv2xmldata/smp.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-smp.args
rename to tests/qemuargv2xmldata/smp.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-smp.xml b/tests/qemuargv2xmldata/smp.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-smp.xml
rename to tests/qemuargv2xmldata/smp.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-sound.args b/tests/qemuargv2xmldata/sound.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-sound.args
rename to tests/qemuargv2xmldata/sound.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-sound.xml b/tests/qemuargv2xmldata/sound.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-sound.xml
rename to tests/qemuargv2xmldata/sound.xml
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.args b/tests/qemuargv2xmldata/watchdog.args
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-watchdog.args
rename to tests/qemuargv2xmldata/watchdog.args
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml b/tests/qemuargv2xmldata/watchdog.xml
similarity index 100%
rename from tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml
rename to tests/qemuargv2xmldata/watchdog.xml
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 481c65a901..cb010268c4 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -130,9 +130,9 @@ testCompareXMLToArgvHelper(const void *data)
     char *xml = NULL;
     char *args = NULL;
 
-    if (virAsprintf(&xml, "%s/qemuargv2xmldata/qemuargv2xml-%s.xml",
+    if (virAsprintf(&xml, "%s/qemuargv2xmldata/%s.xml",
                     abs_srcdir, info->name) < 0 ||
-        virAsprintf(&args, "%s/qemuargv2xmldata/qemuargv2xml-%s.args",
+        virAsprintf(&args, "%s/qemuargv2xmldata/%s.args",
                     abs_srcdir, info->name) < 0)
         goto cleanup;