From 4d82c8fd610437d5397b21bb4bbbee7b192e6dfe Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 5 Dec 2017 08:00:41 +0100
Subject: [PATCH] test: Drop useless prefix for qemuxml2xmldata test data

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

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 ...avmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} | 0
 ...ut-aarch64-gic-default.xml => aarch64-gic-default.xml} | 0
 ...l2xmlout-aarch64-gic-host.xml => aarch64-gic-host.xml} | 0
 ...arch64-gic-none-both.xml => aarch64-gic-none-both.xml} | 0
 ...-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} | 0
 ...ut-aarch64-gic-none-v2.xml => aarch64-gic-none-v2.xml} | 0
 ...ut-aarch64-gic-none-v3.xml => aarch64-gic-none-v3.xml} | 0
 ...l2xmlout-aarch64-gic-none.xml => aarch64-gic-none.xml} | 0
 ...muxml2xmlout-aarch64-gic-v2.xml => aarch64-gic-v2.xml} | 0
 ...muxml2xmlout-aarch64-gic-v3.xml => aarch64-gic-v3.xml} | 0
 ...lout-aarch64-pci-serial.xml => aarch64-pci-serial.xml} | 0
 ...arch64-video-default.xml => aarch64-video-default.xml} | 0
 ...irtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} | 0
 ...tio-pci-default.xml => aarch64-virtio-pci-default.xml} | 0
 ...resses.xml => aarch64-virtio-pci-manual-addresses.xml} | 0
 .../{qemuxml2xmlout-acpi-table.xml => acpi-table.xml}     | 0
 .../{qemuxml2xmlout-autoindex.xml => autoindex.xml}       | 0
 ...ut-balloon-device-auto.xml => balloon-device-auto.xml} | 0
 ...alloon-device-period.xml => balloon-device-period.xml} | 0
 ...ram-os-interleave.xml => bios-nvram-os-interleave.xml} | 0
 .../{qemuxml2xmlout-bios-nvram.xml => bios-nvram.xml}     | 0
 ...deviotune-group-num.xml => blkdeviotune-group-num.xml} | 0
 ...viotune-max-length.xml => blkdeviotune-max-length.xml} | 0
 ...l2xmlout-blkdeviotune-max.xml => blkdeviotune-max.xml} | 0
 .../{qemuxml2xmlout-blkdeviotune.xml => blkdeviotune.xml} | 0
 ...l2xmlout-blkiotune-device.xml => blkiotune-device.xml} | 0
 .../{qemuxml2xmlout-blkiotune.xml => blkiotune.xml}       | 0
 .../{qemuxml2xmlout-boot-cdrom.xml => boot-cdrom.xml}     | 0
 ...xml2xmlout-boot-floppy-q35.xml => boot-floppy-q35.xml} | 0
 .../{qemuxml2xmlout-boot-floppy.xml => boot-floppy.xml}   | 0
 ...ith-timeout.xml => boot-menu-disable-with-timeout.xml} | 0
 ...xmlout-boot-menu-disable.xml => boot-menu-disable.xml} | 0
 ...with-timeout.xml => boot-menu-enable-with-timeout.xml} | 0
 .../{qemuxml2xmlout-boot-multi.xml => boot-multi.xml}     | 0
 .../{qemuxml2xmlout-boot-network.xml => boot-network.xml} | 0
 .../{qemuxml2xmlout-boot-order.xml => boot-order.xml}     | 0
 ...-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} | 0
 ...l2xmlout-channel-guestfwd.xml => channel-guestfwd.xml} | 0
 ...-unix-source-path.xml => channel-unix-source-path.xml} | 0
 ...ut-channel-virtio-auto.xml => channel-virtio-auto.xml} | 0
 ...o-state-active.xml => channel-virtio-state-active.xml} | 0
 ...ate-inactive.xml => channel-virtio-state-inactive.xml} | 0
 ...muxml2xmlout-channel-virtio.xml => channel-virtio.xml} | 0
 ...qemuxml2xmlout-chardev-label.xml => chardev-label.xml} | 0
 ...qemuxml2xmlout-clock-catchup.xml => clock-catchup.xml} | 0
 ...xml2xmlout-clock-localtime.xml => clock-localtime.xml} | 0
 ...ck-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} | 0
 .../{qemuxml2xmlout-clock-utc.xml => clock-utc.xml}       | 0
 ...ut-console-compat-auto.xml => console-compat-auto.xml} | 0
 ...muxml2xmlout-console-compat.xml => console-compat.xml} | 0
 ...xml2xmlout-console-compat2.xml => console-compat2.xml} | 0
 ...ut-console-virtio-many.xml => console-virtio-many.xml} | 0
 ...muxml2xmlout-console-virtio.xml => console-virtio.xml} | 0
 ...-controller-usb-order.xml => controller-usb-order.xml} | 0
 ...-check-default-none.xml => cpu-check-default-none.xml} | 0
 ...heck-default-none2.xml => cpu-check-default-none2.xml} | 0
 ...-default-partial.xml => cpu-check-default-partial.xml} | 0
 ...efault-partial2.xml => cpu-check-default-partial2.xml} | 0
 ...muxml2xmlout-cpu-check-full.xml => cpu-check-full.xml} | 0
 ...muxml2xmlout-cpu-check-none.xml => cpu-check-none.xml} | 0
 ...xmlout-cpu-check-partial.xml => cpu-check-partial.xml} | 0
 .../{qemuxml2xmlout-cpu-empty.xml => cpu-empty.xml}       | 0
 ...l2xmlout-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} | 0
 ...xml2xmlout-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml} | 0
 ...xmlout-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} | 0
 ...ost-model-features.xml => cpu-host-model-features.xml} | 0
 ...ugh-features.xml => cpu-host-passthrough-features.xml} | 0
 .../{qemuxml2xmlout-cpu-kvmclock.xml => cpu-kvmclock.xml} | 0
 ...xmlout-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} | 0
 ...ut-cpu-numa-disordered.xml => cpu-numa-disordered.xml} | 0
 ...lout-cpu-numa-memshared.xml => cpu-numa-memshared.xml} | 0
 ...-memory-element.xml => cpu-numa-no-memory-element.xml} | 0
 .../{qemuxml2xmlout-cpu-numa1.xml => cpu-numa1.xml}       | 0
 .../{qemuxml2xmlout-cpu-numa2.xml => cpu-numa2.xml}       | 0
 ...xmlout-cputune-iothreads.xml => cputune-iothreads.xml} | 0
 ...riority.xml => cputune-iothreadsched-zeropriority.xml} | 0
 ...putune-iothreadsched.xml => cputune-iothreadsched.xml} | 0
 ...l2xmlout-cputune-numatune.xml => cputune-numatune.xml} | 0
 ...ut-cputune-zero-shares.xml => cputune-zero-shares.xml} | 0
 .../{qemuxml2xmlout-cputune.xml => cputune.xml}           | 0
 ...efault-kvm-host-arch.xml => default-kvm-host-arch.xml} | 0
 ...ault-qemu-host-arch.xml => default-qemu-host-arch.xml} | 0
 ...lout-disk-active-commit.xml => disk-active-commit.xml} | 0
 .../{qemuxml2xmlout-disk-aio.xml => disk-aio.xml}         | 0
 ...g-chains-active.xml => disk-backing-chains-active.xml} | 0
 ...ains-inactive.xml => disk-backing-chains-inactive.xml} | 0
 ...l2xmlout-disk-cdrom-empty.xml => disk-cdrom-empty.xml} | 0
 .../{qemuxml2xmlout-disk-cdrom.xml => disk-cdrom.xml}     | 0
 ...xmlout-disk-copy_on_read.xml => disk-copy_on_read.xml} | 0
 ...isk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} | 0
 ...-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} | 0
 ...che-directsync.xml => disk-drive-cache-directsync.xml} | 0
 ...drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} | 0
 ...ive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} | 0
 ...k-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} | 0
 ...k-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} | 0
 ...drive-copy-on-read.xml => disk-drive-copy-on-read.xml} | 0
 ...ive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} | 0
 ...lout-disk-drive-discard.xml => disk-drive-discard.xml} | 0
 ...-enospace.xml => disk-drive-error-policy-enospace.xml} | 0
 ...r-policy-stop.xml => disk-drive-error-policy-stop.xml} | 0
 ...re.xml => disk-drive-error-policy-wreport-rignore.xml} | 0
 ...muxml2xmlout-disk-drive-fat.xml => disk-drive-fat.xml} | 0
 ...ut-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} | 0
 ...network-gluster.xml => disk-drive-network-gluster.xml} | 0
 ...k-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} | 0
 ...ive-network-iscsi.xml => disk-drive-network-iscsi.xml} | 0
 ...k-nbd-export.xml => disk-drive-network-nbd-export.xml} | 0
 ...-export.xml => disk-drive-network-nbd-ipv6-export.xml} | 0
 ...twork-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} | 0
 ...twork-nbd-unix.xml => disk-drive-network-nbd-unix.xml} | 0
 ...k-drive-network-nbd.xml => disk-drive-network-nbd.xml} | 0
 ...twork-rbd-auth.xml => disk-drive-network-rbd-auth.xml} | 0
 ...d-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} | 0
 ...twork-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} | 0
 ...k-drive-network-rbd.xml => disk-drive-network-rbd.xml} | 0
 ...twork-sheepdog.xml => disk-drive-network-sheepdog.xml} | 0
 ...source-auth.xml => disk-drive-network-source-auth.xml} | 0
 ...sx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} | 0
 ...drive-network-vxhs.xml => disk-drive-network-vxhs.xml} | 0
 .../{qemuxml2xmlout-disk-floppy.xml => disk-floppy.xml}   | 0
 .../{qemuxml2xmlout-disk-many.xml => disk-many.xml}       | 0
 ...lout-disk-mirror-active.xml => disk-mirror-active.xml} | 0
 ...-disk-mirror-inactive.xml => disk-mirror-inactive.xml} | 0
 ...rror-old-inactive.xml => disk-mirror-old-inactive.xml} | 0
 ...xml2xmlout-disk-mirror-old.xml => disk-mirror-old.xml} | 0
 ...isk-scsi-device-auto.xml => disk-scsi-device-auto.xml} | 0
 ...l2xmlout-disk-scsi-device.xml => disk-scsi-device.xml} | 0
 ...lout-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} | 0
 ...hrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} | 0
 ...xmlout-disk-scsi-megasas.xml => disk-scsi-megasas.xml} | 0
 ...-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} | 0
 ...isk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} | 0
 ...xml2xmlout-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml} | 0
 .../{qemuxml2xmlout-disk-serial.xml => disk-serial.xml}   | 0
 ...isk-source-pool-mode.xml => disk-source-pool-mode.xml} | 0
 ...l2xmlout-disk-source-pool.xml => disk-source-pool.xml} | 0
 ...xml2xmlout-disk-usb-device.xml => disk-usb-device.xml} | 0
 ...rtio-drive-queues.xml => disk-virtio-drive-queues.xml} | 0
 ...i-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} | 0
 ...-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} | 0
 ...i-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} | 0
 ...csi-num_queues.xml => disk-virtio-scsi-num_queues.xml} | 0
 .../{qemuxml2xmlout-disk-virtio.xml => disk-virtio.xml}   | 0
 ...-encrypted-disk-usage.xml => encrypted-disk-usage.xml} | 0
 ...muxml2xmlout-encrypted-disk.xml => encrypted-disk.xml} | 0
 .../{qemuxml2xmlout-eoi-disabled.xml => eoi-disabled.xml} | 0
 .../{qemuxml2xmlout-eoi-enabled.xml => eoi-enabled.xml}   | 0
 .../{qemuxml2xmlout-event_idx.xml => event_idx.xml}       | 0
 ...l2xmlout-floppy-drive-fat.xml => floppy-drive-fat.xml} | 0
 ...ics-listen-network.xml => graphics-listen-network.xml} | 0
 ...s-listen-network2.xml => graphics-listen-network2.xml} | 0
 ...ics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} | 0
 .../{qemuxml2xmlout-graphics-sdl.xml => graphics-sdl.xml} | 0
 ...-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} | 0
 ...ice-auto-socket.xml => graphics-spice-auto-socket.xml} | 0
 ...ice-compression.xml => graphics-spice-compression.xml} | 0
 ...phics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} | 0
 ...raphics-spice-socket.xml => graphics-spice-socket.xml} | 0
 ...phics-spice-timeout.xml => graphics-spice-timeout.xml} | 0
 ...muxml2xmlout-graphics-spice.xml => graphics-spice.xml} | 0
 ...to-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} | 0
 ...s-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} | 0
 ...no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} | 0
 ...ml => graphics-vnc-remove-generated-socket-active.xml} | 0
 ... => graphics-vnc-remove-generated-socket-inactive.xml} | 0
 ...xmlout-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} | 0
 ...ut-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0
 ...l2xmlout-graphics-vnc-tls.xml => graphics-vnc-tls.xml} | 0
 ...phics-vnc-websocket.xml => graphics-vnc-websocket.xml} | 0
 .../{qemuxml2xmlout-graphics-vnc.xml => graphics-vnc.xml} | 0
 ...ev-mdev-precreated.xml => hostdev-mdev-precreated.xml} | 0
 ...ut-hostdev-pci-address.xml => hostdev-pci-address.xml} | 0
 ...togen-address.xml => hostdev-scsi-autogen-address.xml} | 0
 ...ev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} | 0
 ...lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} | 0
 ...tdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} | 0
 ...l2xmlout-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} | 0
 ...lout-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} | 0
 ...ostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} | 0
 ...xmlout-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} | 0
 ...tdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} | 0
 ...vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} | 0
 ...vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} | 0
 ...-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} | 0
 ...csi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} | 0
 ...-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} | 0
 ...ut-hostdev-usb-address.xml => hostdev-usb-address.xml} | 0
 .../{qemuxml2xmlout-hostdev-vfio.xml => hostdev-vfio.xml} | 0
 ...ut-hugepages-memaccess.xml => hugepages-memaccess.xml} | 0
 ...-hugepages-memaccess2.xml => hugepages-memaccess2.xml} | 0
 ...xml2xmlout-hugepages-pages.xml => hugepages-pages.xml} | 0
 ...l2xmlout-hugepages-pages2.xml => hugepages-pages2.xml} | 0
 ...l2xmlout-hugepages-pages3.xml => hugepages-pages3.xml} | 0
 ...l2xmlout-hugepages-pages4.xml => hugepages-pages4.xml} | 0
 ...l2xmlout-hugepages-pages5.xml => hugepages-pages5.xml} | 0
 ...l2xmlout-hugepages-pages6.xml => hugepages-pages6.xml} | 0
 ...l2xmlout-hugepages-pages7.xml => hugepages-pages7.xml} | 0
 ...l2xmlout-hugepages-shared.xml => hugepages-shared.xml} | 0
 .../{qemuxml2xmlout-hugepages.xml => hugepages.xml}       | 0
 .../{qemuxml2xmlout-hyperv-off.xml => hyperv-off.xml}     | 0
 .../{qemuxml2xmlout-hyperv-panic.xml => hyperv-panic.xml} | 0
 .../{qemuxml2xmlout-hyperv.xml => hyperv.xml}             | 0
 ...muxml2xmlout-input-usbmouse.xml => input-usbmouse.xml} | 0
 ...xml2xmlout-input-usbtablet.xml => input-usbtablet.xml} | 0
 ...ommu-caching-mode.xml => intel-iommu-caching-mode.xml} | 0
 ...ommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} | 0
 ...xml2xmlout-intel-iommu-eim.xml => intel-iommu-eim.xml} | 0
 ...ut-intel-iommu-machine.xml => intel-iommu-machine.xml} | 0
 .../{qemuxml2xmlout-intel-iommu.xml => intel-iommu.xml}   | 0
 ...l2xmlout-interface-driver.xml => interface-driver.xml} | 0
 ...l2xmlout-interface-server.xml => interface-server.xml} | 0
 ...-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} | 0
 ...muxml2xmlout-iothreads-disk.xml => iothreads-disk.xml} | 0
 ...othreads-ids-partial.xml => iothreads-ids-partial.xml} | 0
 ...qemuxml2xmlout-iothreads-ids.xml => iothreads-ids.xml} | 0
 ...-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} | 0
 ...-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} | 0
 .../{qemuxml2xmlout-iothreads.xml => iothreads.xml}       | 0
 ...l2xmlout-kvm-features-off.xml => kvm-features-off.xml} | 0
 .../{qemuxml2xmlout-kvm-features.xml => kvm-features.xml} | 0
 .../{qemuxml2xmlout-kvmclock.xml => kvmclock.xml}         | 0
 .../{qemuxml2xmlout-lease.xml => lease.xml}               | 0
 ...xmlout-luks-disks-source.xml => luks-disks-source.xml} | 0
 .../{qemuxml2xmlout-luks-disks.xml => luks-disks.xml}     | 0
 tests/qemuxml2xmloutdata/mach-virt-console-native.xml     | 1 +
 ...rt-console-virtio.xml => mach-virt-console-virtio.xml} | 0
 .../mach-virt-serial+console-native.xml                   | 1 +
 ...virt-serial-compat.xml => mach-virt-serial-compat.xml} | 0
 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml      | 1 +
 ...-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} | 0
 ...-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} | 0
 ...l2xmlout-machine-core-off.xml => machine-core-off.xml} | 0
 ...xml2xmlout-machine-core-on.xml => machine-core-on.xml} | 0
 ....xml => machine-loadparm-multiple-disks-nets-s390.xml} | 0
 ...ut-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} | 0
 ...emory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} | 0
 ...nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} | 0
 ...g-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} | 0
 ...emory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} | 0
 ...muxml2xmlout-memory-hotplug.xml => memory-hotplug.xml} | 0
 ...xmlout-memorybacking-set.xml => memorybacking-set.xml} | 0
 ...ut-memorybacking-unset.xml => memorybacking-unset.xml} | 0
 ...xmlout-memtune-unlimited.xml => memtune-unlimited.xml} | 0
 .../{qemuxml2xmlout-memtune.xml => memtune.xml}           | 0
 ...lout-metadata-duplicate.xml => metadata-duplicate.xml} | 0
 .../{qemuxml2xmlout-metadata.xml => metadata.xml}         | 0
 .../{qemuxml2xmlout-migrate.xml => migrate.xml}           | 0
 .../{qemuxml2xmlout-minimal.xml => minimal.xml}           | 0
 .../{qemuxml2xmlout-misc-acpi.xml => misc-acpi.xml}       | 0
 ...xml2xmlout-misc-disable-s3.xml => misc-disable-s3.xml} | 0
 ...isc-disable-suspends.xml => misc-disable-suspends.xml} | 0
 ...muxml2xmlout-misc-enable-s4.xml => misc-enable-s4.xml} | 0
 ...muxml2xmlout-misc-no-reboot.xml => misc-no-reboot.xml} | 0
 .../{qemuxml2xmlout-misc-uuid.xml => misc-uuid.xml}       | 0
 ...qemuxml2xmlout-net-bandwidth.xml => net-bandwidth.xml} | 0
 ...muxml2xmlout-net-bandwidth2.xml => net-bandwidth2.xml} | 0
 .../{qemuxml2xmlout-net-coalesce.xml => net-coalesce.xml} | 0
 ...muxml2xmlout-net-eth-hostip.xml => net-eth-hostip.xml} | 0
 ...muxml2xmlout-net-eth-ifname.xml => net-eth-ifname.xml} | 0
 .../{qemuxml2xmlout-net-eth.xml => net-eth.xml}           | 0
 ...l2xmlout-net-hostdev-vfio.xml => net-hostdev-vfio.xml} | 0
 .../{qemuxml2xmlout-net-hostdev.xml => net-hostdev.xml}   | 0
 .../{qemuxml2xmlout-net-midonet.xml => net-midonet.xml}   | 0
 .../{qemuxml2xmlout-net-mtu.xml => net-mtu.xml}           | 0
 ...xml2xmlout-net-openvswitch.xml => net-openvswitch.xml} | 0
 .../{qemuxml2xmlout-net-udp.xml => net-udp.xml}           | 0
 ...qemuxml2xmlout-net-user-addr.xml => net-user-addr.xml} | 0
 .../{qemuxml2xmlout-net-user.xml => net-user.xml}         | 0
 ...qemuxml2xmlout-net-vhostuser.xml => net-vhostuser.xml} | 0
 ...xmlout-net-virtio-device.xml => net-virtio-device.xml} | 0
 ...sable-offloads.xml => net-virtio-disable-offloads.xml} | 0
 ...ork-portgroup.xml => net-virtio-network-portgroup.xml} | 0
 ...tio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} | 0
 .../{qemuxml2xmlout-net-virtio.xml => net-virtio.xml}     | 0
 ...muxml2xmlout-nographics-vga.xml => nographics-vga.xml} | 0
 .../{qemuxml2xmlout-nosharepages.xml => nosharepages.xml} | 0
 ...-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} | 0
 ...=> numad-auto-memory-vcpu-no-cpuset-and-placement.xml} | 0
 ...pu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} | 0
 ...-no-numatune.xml => numad-static-vcpu-no-numatune.xml} | 0
 ...-numatune-auto-prefer.xml => numatune-auto-prefer.xml} | 0
 ...mnode-no-memory.xml => numatune-memnode-no-memory.xml} | 0
 ...l2xmlout-numatune-memnode.xml => numatune-memnode.xml} | 0
 .../{qemuxml2xmlout-panic-double.xml => panic-double.xml} | 0
 .../{qemuxml2xmlout-panic-isa.xml => panic-isa.xml}       | 0
 ...l2xmlout-panic-no-address.xml => panic-no-address.xml} | 0
 ...qemuxml2xmlout-panic-pseries.xml => panic-pseries.xml} | 0
 .../{qemuxml2xmlout-panic.xml => panic.xml}               | 0
 .../{qemuxml2xmlout-parallel-tcp.xml => parallel-tcp.xml} | 0
 ...l2xmlout-pci-autoadd-addr.xml => pci-autoadd-addr.xml} | 0
 ...xml2xmlout-pci-autoadd-idx.xml => pci-autoadd-idx.xml} | 0
 ...xmlout-pci-autofill-addr.xml => pci-autofill-addr.xml} | 0
 ...ci-bridge-many-disks.xml => pci-bridge-many-disks.xml} | 0
 .../{qemuxml2xmlout-pci-bridge.xml => pci-bridge.xml}     | 0
 ...l2xmlout-pci-expander-bus.xml => pci-expander-bus.xml} | 0
 .../{qemuxml2xmlout-pci-many.xml => pci-many.xml}         | 0
 .../{qemuxml2xmlout-pci-rom.xml => pci-rom.xml}           | 0
 ...-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} | 0
 ...xmlout-pcie-expander-bus.xml => pcie-expander-bus.xml} | 0
 ...model-generic.xml => pcie-root-port-model-generic.xml} | 0
 ...model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} | 0
 ...muxml2xmlout-pcie-root-port.xml => pcie-root-port.xml} | 0
 .../{qemuxml2xmlout-pcie-root.xml => pcie-root.xml}       | 0
 ...ownstream-port.xml => pcie-switch-downstream-port.xml} | 0
 ...ch-upstream-port.xml => pcie-switch-upstream-port.xml} | 0
 ...qemuxml2xmlout-pcihole64-gib.xml => pcihole64-gib.xml} | 0
 ...muxml2xmlout-pcihole64-none.xml => pcihole64-none.xml} | 0
 ...qemuxml2xmlout-pcihole64-q35.xml => pcihole64-q35.xml} | 0
 .../{qemuxml2xmlout-pcihole64.xml => pcihole64.xml}       | 0
 ...xml2xmlout-pmu-feature-off.xml => pmu-feature-off.xml} | 0
 .../{qemuxml2xmlout-pmu-feature.xml => pmu-feature.xml}   | 0
 ...troller-legacy.xml => ppc64-usb-controller-legacy.xml} | 0
 ...-ppc64-usb-controller.xml => ppc64-usb-controller.xml} | 0
 tests/qemuxml2xmloutdata/pseries-console-native.xml       | 1 +
 ...ries-console-virtio.xml => pseries-console-virtio.xml} | 0
 ...pu-compat-power9.xml => pseries-cpu-compat-power9.xml} | 0
 ...lout-pseries-cpu-compat.xml => pseries-cpu-compat.xml} | 0
 ...xmlout-pseries-cpu-exact.xml => pseries-cpu-exact.xml} | 0
 ...lout-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} | 0
 ...lout-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} | 0
 ...lout-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} | 0
 ...-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} | 0
 ...-pseries-many-buses-1.xml => pseries-many-buses-1.xml} | 0
 ...-pseries-many-buses-2.xml => pseries-many-buses-2.xml} | 0
 ...-pseries-many-devices.xml => pseries-many-devices.xml} | 0
 ...qemuxml2xmlout-pseries-nvram.xml => pseries-nvram.xml} | 0
 ...series-panic-missing.xml => pseries-panic-missing.xml} | 0
 ...-panic-no-address.xml => pseries-panic-no-address.xml} | 0
 ...efault-missing.xml => pseries-phb-default-missing.xml} | 0
 ...series-phb-numa-node.xml => pseries-phb-numa-node.xml} | 0
 ...lout-pseries-phb-simple.xml => pseries-phb-simple.xml} | 0
 .../qemuxml2xmloutdata/pseries-serial+console-native.xml  | 1 +
 tests/qemuxml2xmloutdata/pseries-serial-compat.xml        | 1 +
 ...series-serial-native.xml => pseries-serial-native.xml} | 0
 ...lout-pseries-serial-pci.xml => pseries-serial-pci.xml} | 0
 ...lout-pseries-serial-usb.xml => pseries-serial-usb.xml} | 0
 ...-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} | 0
 ...ut-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} | 0
 ...ault-devices-only.xml => q35-default-devices-only.xml} | 0
 ...xmlout-q35-multifunction.xml => q35-multifunction.xml} | 0
 ...35-pci-force-address.xml => q35-pci-force-address.xml} | 0
 ...l2xmlout-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} | 0
 .../{qemuxml2xmlout-q35-pcie.xml => q35-pcie.xml}         | 0
 ...muxml2xmlout-q35-usb2-multi.xml => q35-usb2-multi.xml} | 0
 ...l2xmlout-q35-usb2-reorder.xml => q35-usb2-reorder.xml} | 0
 .../{qemuxml2xmlout-q35-usb2.xml => q35-usb2.xml}         | 0
 ...-virt-manager-basic.xml => q35-virt-manager-basic.xml} | 0
 ...muxml2xmlout-q35-virtio-pci.xml => q35-virtio-pci.xml} | 0
 .../{qemuxml2xmlout-q35.xml => q35.xml}                   | 0
 ...muxml2xmlout-qemu-ns-no-env.xml => qemu-ns-no-env.xml} | 0
 .../qemuxml2xmlout-mach-virt-console-native.xml           | 1 -
 .../qemuxml2xmlout-mach-virt-serial+console-native.xml    | 1 -
 .../qemuxml2xmlout-mach-virt-serial-native.xml            | 1 -
 .../qemuxml2xmlout-pseries-console-native.xml             | 1 -
 .../qemuxml2xmlout-pseries-serial+console-native.xml      | 1 -
 .../qemuxml2xmlout-pseries-serial-compat.xml              | 1 -
 ...t-timeout-disabled.xml => reboot-timeout-disabled.xml} | 0
 ...oot-timeout-enabled.xml => reboot-timeout-enabled.xml} | 0
 .../{qemuxml2xmlout-restore-v2.xml => restore-v2.xml}     | 0
 ...ut-s390-defaultconsole.xml => s390-defaultconsole.xml} | 0
 ...lout-s390-panic-missing.xml => s390-panic-missing.xml} | 0
 ...390-panic-no-address.xml => s390-panic-no-address.xml} | 0
 .../{qemuxml2xmlout-s390-panic.xml => s390-panic.xml}     | 0
 ...qemuxml2xmlout-s390-serial-2.xml => s390-serial-2.xml} | 0
 ...ut-s390-serial-console.xml => s390-serial-console.xml} | 0
 .../{qemuxml2xmlout-s390-serial.xml => s390-serial.xml}   | 0
 ...xmlout-seclabel-dac-none.xml => seclabel-dac-none.xml} | 0
 ...l-device-multiple.xml => seclabel-device-multiple.xml} | 0
 ...namic-baselabel.xml => seclabel-dynamic-baselabel.xml} | 0
 ...namic-labelskip.xml => seclabel-dynamic-labelskip.xml} | 0
 ...none-relabel.xml => seclabel-dynamic-none-relabel.xml} | 0
 ...eclabel-dynamic-none.xml => seclabel-dynamic-none.xml} | 0
 ...dynamic-override.xml => seclabel-dynamic-override.xml} | 0
 ...l-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} | 0
 ...qemuxml2xmlout-seclabel-none.xml => seclabel-none.xml} | 0
 ...static-labelskip.xml => seclabel-static-labelskip.xml} | 0
 ...xml2xmlout-seclabel-static.xml => seclabel-static.xml} | 0
 .../{qemuxml2xmlout-serial-dev.xml => serial-dev.xml}     | 0
 .../{qemuxml2xmlout-serial-file.xml => serial-file.xml}   | 0
 .../{qemuxml2xmlout-serial-many.xml => serial-many.xml}   | 0
 .../{qemuxml2xmlout-serial-pty.xml => serial-pty.xml}     | 0
 ...spiceport-nospice.xml => serial-spiceport-nospice.xml} | 0
 ...l2xmlout-serial-spiceport.xml => serial-spiceport.xml} | 0
 ...l-target-port-auto.xml => serial-target-port-auto.xml} | 0
 ...xmlout-serial-tcp-telnet.xml => serial-tcp-telnet.xml} | 0
 ...dev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} | 0
 ...tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} | 0
 .../{qemuxml2xmlout-serial-tcp.xml => serial-tcp.xml}     | 0
 .../{qemuxml2xmlout-serial-udp.xml => serial-udp.xml}     | 0
 .../{qemuxml2xmlout-serial-unix.xml => serial-unix.xml}   | 0
 .../{qemuxml2xmlout-serial-vc.xml => serial-vc.xml}       | 0
 ...-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} | 0
 .../{qemuxml2xmlout-shmem.xml => shmem.xml}               | 0
 ...-smartcard-controller.xml => smartcard-controller.xml} | 0
 ...t-certificates.xml => smartcard-host-certificates.xml} | 0
 ...muxml2xmlout-smartcard-host.xml => smartcard-host.xml} | 0
 ...gh-spicevmc.xml => smartcard-passthrough-spicevmc.xml} | 0
 ...-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} | 0
 ...mbios-multiple-type2.xml => smbios-multiple-type2.xml} | 0
 .../{qemuxml2xmlout-smbios.xml => smbios.xml}             | 0
 .../{qemuxml2xmlout-smp.xml => smp.xml}                   | 0
 .../{qemuxml2xmlout-sound-device.xml => sound-device.xml} | 0
 .../{qemuxml2xmlout-sound.xml => sound.xml}               | 0
 ...ut-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} | 0
 .../{qemuxml2xmlout-tap-vhost.xml => tap-vhost.xml}       | 0
 ...xml2xmlout-tpm-passthrough.xml => tpm-passthrough.xml} | 0
 ...ler-default-q35.xml => usb-controller-default-q35.xml} | 0
 ...r-explicit-q35.xml => usb-controller-explicit-q35.xml} | 0
 ...muxml2xmlout-usb-controller.xml => usb-controller.xml} | 0
 ...lout-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} | 0
 .../{qemuxml2xmlout-usb-none.xml => usb-none.xml}         | 0
 ...-usb-piix3-controller.xml => usb-piix3-controller.xml} | 0
 ...l2xmlout-usb-port-missing.xml => usb-port-missing.xml} | 0
 ...ir-filter-version.xml => usb-redir-filter-version.xml} | 0
 ...l2xmlout-usb-redir-filter.xml => usb-redir-filter.xml} | 0
 .../{qemuxml2xmlout-usb-redir.xml => usb-redir.xml}       | 0
 .../{qemuxml2xmlout-user-aliases.xml => user-aliases.xml} | 0
 ...cpu-placement-static.xml => vcpu-placement-static.xml} | 0
 .../{qemuxml2xmlout-vhost_queues.xml => vhost_queues.xml} | 0
 ...iaddr-default.xml => video-device-pciaddr-default.xml} | 0
 ...xml2xmlout-video-qxl-heads.xml => video-qxl-heads.xml} | 0
 ...xmlout-video-qxl-noheads.xml => video-qxl-noheads.xml} | 0
 ...-virtio-gpu-device.xml => video-virtio-gpu-device.xml} | 0
 ...o-gpu-secondary.xml => video-virtio-gpu-secondary.xml} | 0
 ...tio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} | 0
 ...eo-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} | 0
 ...input-passthrough.xml => virtio-input-passthrough.xml} | 0
 .../{qemuxml2xmlout-virtio-input.xml => virtio-input.xml} | 0
 .../{qemuxml2xmlout-virtio-lun.xml => virtio-lun.xml}     | 0
 ...muxml2xmlout-virtio-options.xml => virtio-options.xml} | 0
 ...muxml2xmlout-virtio-rng-egd.xml => virtio-rng-egd.xml} | 0
 ...xmlout-virtio-rng-random.xml => virtio-rng-random.xml} | 0
 .../{qemuxml2xmlout-vmcoreinfo.xml => vmcoreinfo.xml}     | 0
 .../{qemuxml2xmlout-watchdog.xml => watchdog.xml}         | 0
 tests/qemuxml2xmltest.c                                   | 8 ++++----
 436 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-default.xml => aarch64-gic-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-host.xml => aarch64-gic-host.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-both.xml => aarch64-gic-none-both.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-v2.xml => aarch64-gic-none-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-v3.xml => aarch64-gic-none-v3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none.xml => aarch64-gic-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-v2.xml => aarch64-gic-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-v3.xml => aarch64-gic-v3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-pci-serial.xml => aarch64-pci-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-video-default.xml => aarch64-video-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-acpi-table.xml => acpi-table.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-autoindex.xml => autoindex.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-balloon-device-auto.xml => balloon-device-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-balloon-device-period.xml => balloon-device-period.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bios-nvram.xml => bios-nvram.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-max.xml => blkdeviotune-max.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune.xml => blkdeviotune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkiotune-device.xml => blkiotune-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkiotune.xml => blkiotune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-cdrom.xml => boot-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-floppy-q35.xml => boot-floppy-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-floppy.xml => boot-floppy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-disable-with-timeout.xml => boot-menu-disable-with-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-disable.xml => boot-menu-disable.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-enable-with-timeout.xml => boot-menu-enable-with-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-multi.xml => boot-multi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-network.xml => boot-network.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-order.xml => boot-order.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-guestfwd.xml => channel-guestfwd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-unix-source-path.xml => channel-unix-source-path.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-auto.xml => channel-virtio-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-state-active.xml => channel-virtio-state-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-state-inactive.xml => channel-virtio-state-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio.xml => channel-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-chardev-label.xml => chardev-label.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-catchup.xml => clock-catchup.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-localtime.xml => clock-localtime.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-utc.xml => clock-utc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat-auto.xml => console-compat-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat.xml => console-compat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat2.xml => console-compat2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-virtio-many.xml => console-virtio-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-virtio.xml => console-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-controller-usb-order.xml => controller-usb-order.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-none.xml => cpu-check-default-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-none2.xml => cpu-check-default-none2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-partial.xml => cpu-check-default-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-partial2.xml => cpu-check-default-partial2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-full.xml => cpu-check-full.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-none.xml => cpu-check-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-partial.xml => cpu-check-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-empty.xml => cpu-empty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-model-features.xml => cpu-host-model-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-passthrough-features.xml => cpu-host-passthrough-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-kvmclock.xml => cpu-kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-disordered.xml => cpu-numa-disordered.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-memshared.xml => cpu-numa-memshared.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-no-memory-element.xml => cpu-numa-no-memory-element.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa1.xml => cpu-numa1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa2.xml => cpu-numa2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreads.xml => cputune-iothreads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreadsched.xml => cputune-iothreadsched.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-numatune.xml => cputune-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-zero-shares.xml => cputune-zero-shares.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune.xml => cputune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-default-kvm-host-arch.xml => default-kvm-host-arch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-default-qemu-host-arch.xml => default-qemu-host-arch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-active-commit.xml => disk-active-commit.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-aio.xml => disk-aio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-backing-chains-active.xml => disk-backing-chains-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-backing-chains-inactive.xml => disk-backing-chains-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-cdrom-empty.xml => disk-cdrom-empty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-cdrom.xml => disk-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-copy_on_read.xml => disk-copy_on_read.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-directsync.xml => disk-drive-cache-directsync.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-discard.xml => disk-drive-discard.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-enospace.xml => disk-drive-error-policy-enospace.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-fat.xml => disk-drive-fat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-gluster.xml => disk-drive-network-gluster.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-export.xml => disk-drive-network-nbd-export.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-source-auth.xml => disk-drive-network-source-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-floppy.xml => disk-floppy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-many.xml => disk-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-active.xml => disk-mirror-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-inactive.xml => disk-mirror-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-old-inactive.xml => disk-mirror-old-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-old.xml => disk-mirror-old.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-device.xml => disk-scsi-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-megasas.xml => disk-scsi-megasas.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-serial.xml => disk-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-source-pool-mode.xml => disk-source-pool-mode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-source-pool.xml => disk-source-pool.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-usb-device.xml => disk-usb-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio.xml => disk-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-encrypted-disk-usage.xml => encrypted-disk-usage.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-encrypted-disk.xml => encrypted-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-eoi-disabled.xml => eoi-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-eoi-enabled.xml => eoi-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-event_idx.xml => event_idx.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-floppy-drive-fat.xml => floppy-drive-fat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-listen-network.xml => graphics-listen-network.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-listen-network2.xml => graphics-listen-network2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-sdl.xml => graphics-sdl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-compression.xml => graphics-spice-compression.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-socket.xml => graphics-spice-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-timeout.xml => graphics-spice-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice.xml => graphics-spice.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml => graphics-vnc-remove-generated-socket-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml => graphics-vnc-remove-generated-socket-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-socket.xml => graphics-vnc-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-tls.xml => graphics-vnc-tls.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc.xml => graphics-vnc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-pci-address.xml => hostdev-pci-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-autogen-address.xml => hostdev-scsi-autogen-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-usb-address.xml => hostdev-usb-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-vfio.xml => hostdev-vfio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-memaccess.xml => hugepages-memaccess.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-memaccess2.xml => hugepages-memaccess2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages.xml => hugepages-pages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages2.xml => hugepages-pages2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages3.xml => hugepages-pages3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages4.xml => hugepages-pages4.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages5.xml => hugepages-pages5.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages6.xml => hugepages-pages6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages7.xml => hugepages-pages7.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-shared.xml => hugepages-shared.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages.xml => hugepages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv-off.xml => hyperv-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv-panic.xml => hyperv-panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv.xml => hyperv.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-input-usbmouse.xml => input-usbmouse.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-input-usbtablet.xml => input-usbtablet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-eim.xml => intel-iommu-eim.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-machine.xml => intel-iommu-machine.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu.xml => intel-iommu.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-interface-driver.xml => interface-driver.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-interface-server.xml => interface-server.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-disk.xml => iothreads-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-ids-partial.xml => iothreads-ids-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-ids.xml => iothreads-ids.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads.xml => iothreads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvm-features-off.xml => kvm-features-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvm-features.xml => kvm-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvmclock.xml => kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-lease.xml => lease.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-luks-disks-source.xml => luks-disks-source.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-luks-disks.xml => luks-disks.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-console-virtio.xml => mach-virt-console-virtio.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-core-off.xml => machine-core-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-core-on.xml => machine-core-on.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug.xml => memory-hotplug.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memorybacking-set.xml => memorybacking-set.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memorybacking-unset.xml => memorybacking-unset.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memtune-unlimited.xml => memtune-unlimited.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memtune.xml => memtune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-metadata-duplicate.xml => metadata-duplicate.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-metadata.xml => metadata.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-migrate.xml => migrate.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-minimal.xml => minimal.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-acpi.xml => misc-acpi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-disable-s3.xml => misc-disable-s3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-disable-suspends.xml => misc-disable-suspends.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-enable-s4.xml => misc-enable-s4.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-no-reboot.xml => misc-no-reboot.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-uuid.xml => misc-uuid.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-bandwidth.xml => net-bandwidth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-bandwidth2.xml => net-bandwidth2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-coalesce.xml => net-coalesce.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth-hostip.xml => net-eth-hostip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth-ifname.xml => net-eth-ifname.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth.xml => net-eth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-hostdev-vfio.xml => net-hostdev-vfio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-hostdev.xml => net-hostdev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-midonet.xml => net-midonet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-mtu.xml => net-mtu.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-openvswitch.xml => net-openvswitch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-udp.xml => net-udp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-user-addr.xml => net-user-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-user.xml => net-user.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-vhostuser.xml => net-vhostuser.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-device.xml => net-virtio-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-disable-offloads.xml => net-virtio-disable-offloads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-network-portgroup.xml => net-virtio-network-portgroup.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio.xml => net-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-nographics-vga.xml => nographics-vga.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-nosharepages.xml => nosharepages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-static-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-auto-prefer.xml => numatune-auto-prefer.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-memnode-no-memory.xml => numatune-memnode-no-memory.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-memnode.xml => numatune-memnode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-double.xml => panic-double.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-isa.xml => panic-isa.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-no-address.xml => panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => panic-pseries.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic.xml => panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-parallel-tcp.xml => parallel-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autoadd-addr.xml => pci-autoadd-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autoadd-idx.xml => pci-autoadd-idx.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autofill-addr.xml => pci-autofill-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-bridge.xml => pci-bridge.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-expander-bus.xml => pci-expander-bus.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-many.xml => pci-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-rom.xml => pci-rom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-expander-bus.xml => pcie-expander-bus.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port-model-generic.xml => pcie-root-port-model-generic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port.xml => pcie-root-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root.xml => pcie-root.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-switch-downstream-port.xml => pcie-switch-downstream-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-switch-upstream-port.xml => pcie-switch-upstream-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-gib.xml => pcihole64-gib.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-none.xml => pcihole64-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-q35.xml => pcihole64-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64.xml => pcihole64.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pmu-feature-off.xml => pmu-feature-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pmu-feature.xml => pmu-feature.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-ppc64-usb-controller-legacy.xml => ppc64-usb-controller-legacy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-ppc64-usb-controller.xml => ppc64-usb-controller.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-console-virtio.xml => pseries-console-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-compat.xml => pseries-cpu-compat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-exact.xml => pseries-cpu-exact.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-buses-1.xml => pseries-many-buses-1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-buses-2.xml => pseries-many-buses-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-devices.xml => pseries-many-devices.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => pseries-nvram.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => pseries-panic-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-no-address.xml => pseries-panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-default-missing.xml => pseries-phb-default-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-simple.xml => pseries-phb-simple.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
 create mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-native.xml => pseries-serial-native.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-pci.xml => pseries-serial-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-usb.xml => pseries-serial-usb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-default-devices-only.xml => q35-default-devices-only.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-multifunction.xml => q35-multifunction.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pci-force-address.xml => q35-pci-force-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pcie.xml => q35-pcie.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2-multi.xml => q35-usb2-multi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2-reorder.xml => q35-usb2-reorder.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2.xml => q35-usb2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-virtio-pci.xml => q35-virtio-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35.xml => q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-qemu-ns-no-env.xml => qemu-ns-no-env.xml} (100%)
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-restore-v2.xml => restore-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => s390-defaultconsole.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic-missing.xml => s390-panic-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic-no-address.xml => s390-panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic.xml => s390-panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial-2.xml => s390-serial-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial-console.xml => s390-serial-console.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial.xml => s390-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dac-none.xml => seclabel-dac-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-device-multiple.xml => seclabel-device-multiple.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-override.xml => seclabel-dynamic-override.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-none.xml => seclabel-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-static-labelskip.xml => seclabel-static-labelskip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-static.xml => seclabel-static.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-dev.xml => serial-dev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-file.xml => serial-file.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-many.xml => serial-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-pty.xml => serial-pty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-spiceport-nospice.xml => serial-spiceport-nospice.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-spiceport.xml => serial-spiceport.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-target-port-auto.xml => serial-target-port-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-telnet.xml => serial-tcp-telnet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp.xml => serial-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-udp.xml => serial-udp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-unix.xml => serial-unix.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-vc.xml => serial-vc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem.xml => shmem.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-controller.xml => smartcard-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-host-certificates.xml => smartcard-host-certificates.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-host.xml => smartcard-host.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-passthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smbios-multiple-type2.xml => smbios-multiple-type2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smbios.xml => smbios.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smp.xml => smp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-sound-device.xml => sound-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-sound.xml => sound.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tap-vhost.xml => tap-vhost.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tpm-passthrough.xml => tpm-passthrough.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller-default-q35.xml => usb-controller-default-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller-explicit-q35.xml => usb-controller-explicit-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller.xml => usb-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-none.xml => usb-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-piix3-controller.xml => usb-piix3-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-port-missing.xml => usb-port-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir-filter-version.xml => usb-redir-filter-version.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir-filter.xml => usb-redir-filter.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir.xml => usb-redir.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-user-aliases.xml => user-aliases.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vcpu-placement-static.xml => vcpu-placement-static.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vhost_queues.xml => vhost_queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-device-pciaddr-default.xml => video-device-pciaddr-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-qxl-heads.xml => video-qxl-heads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-qxl-noheads.xml => video-qxl-noheads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-input-passthrough.xml => virtio-input-passthrough.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-input.xml => virtio-input.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-lun.xml => virtio-lun.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-options.xml => virtio-options.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-rng-egd.xml => virtio-rng-egd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-rng-random.xml => virtio-rng-random.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vmcoreinfo.xml => vmcoreinfo.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-watchdog.xml => watchdog.xml} (100%)

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml
rename to tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/aarch64-gic-host.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-host.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-v3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-pci-serial.xml b/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-pci-serial.xml
rename to tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-default.xml b/tests/qemuxml2xmloutdata/aarch64-video-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-video-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml
rename to tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml
rename to tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml b/tests/qemuxml2xmloutdata/acpi-table.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml
rename to tests/qemuxml2xmloutdata/acpi-table.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml b/tests/qemuxml2xmloutdata/autoindex.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml
rename to tests/qemuxml2xmloutdata/autoindex.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml
rename to tests/qemuxml2xmloutdata/balloon-device-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml
rename to tests/qemuxml2xmloutdata/balloon-device-period.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml
rename to tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml b/tests/qemuxml2xmloutdata/bios-nvram.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml
rename to tests/qemuxml2xmloutdata/bios-nvram.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml b/tests/qemuxml2xmloutdata/blkdeviotune-group-num.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-group-num.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max-length.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-max-length.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-max.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml b/tests/qemuxml2xmloutdata/blkdeviotune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml
rename to tests/qemuxml2xmloutdata/blkiotune-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml
rename to tests/qemuxml2xmloutdata/blkiotune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/boot-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml
rename to tests/qemuxml2xmloutdata/boot-floppy-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml
rename to tests/qemuxml2xmloutdata/boot-floppy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml
rename to tests/qemuxml2xmloutdata/boot-multi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml
rename to tests/qemuxml2xmloutdata/boot-network.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml
rename to tests/qemuxml2xmloutdata/boot-order.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml
rename to tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml
rename to tests/qemuxml2xmloutdata/channel-guestfwd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml
rename to tests/qemuxml2xmloutdata/channel-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml b/tests/qemuxml2xmloutdata/chardev-label.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml
rename to tests/qemuxml2xmloutdata/chardev-label.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml
rename to tests/qemuxml2xmloutdata/clock-catchup.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml
rename to tests/qemuxml2xmloutdata/clock-localtime.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml
rename to tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml
rename to tests/qemuxml2xmloutdata/clock-utc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
rename to tests/qemuxml2xmloutdata/console-compat-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml
rename to tests/qemuxml2xmloutdata/console-compat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml
rename to tests/qemuxml2xmloutdata/console-compat2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml
rename to tests/qemuxml2xmloutdata/console-virtio-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml
rename to tests/qemuxml2xmloutdata/console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml b/tests/qemuxml2xmloutdata/controller-usb-order.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml
rename to tests/qemuxml2xmloutdata/controller-usb-order.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml b/tests/qemuxml2xmloutdata/cpu-check-full.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml
rename to tests/qemuxml2xmloutdata/cpu-check-full.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml b/tests/qemuxml2xmloutdata/cpu-check-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml b/tests/qemuxml2xmloutdata/cpu-empty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml
rename to tests/qemuxml2xmloutdata/cpu-empty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml
rename to tests/qemuxml2xmloutdata/cpu-numa1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml
rename to tests/qemuxml2xmloutdata/cpu-numa2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/cputune-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml
rename to tests/qemuxml2xmloutdata/cputune-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml
rename to tests/qemuxml2xmloutdata/cputune-zero-shares.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml
rename to tests/qemuxml2xmloutdata/cputune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml b/tests/qemuxml2xmloutdata/disk-active-commit.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml
rename to tests/qemuxml2xmloutdata/disk-aio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/disk-cdrom-empty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom-empty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml
rename to tests/qemuxml2xmloutdata/disk-copy_on_read.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml
rename to tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml
rename to tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml b/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml
rename to tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml b/tests/qemuxml2xmloutdata/disk-drive-discard.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml
rename to tests/qemuxml2xmloutdata/disk-drive-discard.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-enospace.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-enospace.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-stop.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-stop.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-wreport-rignore.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-wreport-rignore.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml b/tests/qemuxml2xmloutdata/disk-drive-fat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml
rename to tests/qemuxml2xmloutdata/disk-drive-fat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml
rename to tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml
rename to tests/qemuxml2xmloutdata/disk-floppy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml b/tests/qemuxml2xmloutdata/disk-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml
rename to tests/qemuxml2xmloutdata/disk-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml b/tests/qemuxml2xmloutdata/disk-mirror-old.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml b/tests/qemuxml2xmloutdata/disk-scsi-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml
rename to tests/qemuxml2xmloutdata/disk-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml
rename to tests/qemuxml2xmloutdata/disk-usb-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml
rename to tests/qemuxml2xmloutdata/disk-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml b/tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/eoi-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/eoi-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml b/tests/qemuxml2xmloutdata/event_idx.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml
rename to tests/qemuxml2xmloutdata/event_idx.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml
rename to tests/qemuxml2xmloutdata/floppy-drive-fat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml b/tests/qemuxml2xmloutdata/graphics-sdl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-compression.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml
rename to tests/qemuxml2xmloutdata/graphics-spice.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml b/tests/qemuxml2xmloutdata/graphics-vnc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-precreated.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-usb-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/hostdev-vfio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-pages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml b/tests/qemuxml2xmloutdata/hugepages-pages2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml b/tests/qemuxml2xmloutdata/hugepages-pages4.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages4.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages5.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml b/tests/qemuxml2xmloutdata/hugepages-pages6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml b/tests/qemuxml2xmloutdata/hugepages-pages7.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages7.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml
rename to tests/qemuxml2xmloutdata/hugepages-shared.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml b/tests/qemuxml2xmloutdata/hugepages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml
rename to tests/qemuxml2xmloutdata/hugepages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml
rename to tests/qemuxml2xmloutdata/hyperv-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml
rename to tests/qemuxml2xmloutdata/hyperv-panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml
rename to tests/qemuxml2xmloutdata/hyperv.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml
rename to tests/qemuxml2xmloutdata/input-usbmouse.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml
rename to tests/qemuxml2xmloutdata/input-usbtablet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml b/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml b/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml b/tests/qemuxml2xmloutdata/intel-iommu-eim.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-eim.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-machine.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml
rename to tests/qemuxml2xmloutdata/intel-iommu.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml b/tests/qemuxml2xmloutdata/interface-driver.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml
rename to tests/qemuxml2xmloutdata/interface-driver.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml b/tests/qemuxml2xmloutdata/interface-server.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
rename to tests/qemuxml2xmloutdata/interface-server.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml b/tests/qemuxml2xmloutdata/iothreads-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml
rename to tests/qemuxml2xmloutdata/iothreads-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml
rename to tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml b/tests/qemuxml2xmloutdata/iothreads-ids.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml
rename to tests/qemuxml2xmloutdata/iothreads-ids.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml b/tests/qemuxml2xmloutdata/iothreads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml
rename to tests/qemuxml2xmloutdata/iothreads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml
rename to tests/qemuxml2xmloutdata/kvm-features-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml
rename to tests/qemuxml2xmloutdata/kvm-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml
rename to tests/qemuxml2xmloutdata/kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml b/tests/qemuxml2xmloutdata/lease.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml
rename to tests/qemuxml2xmloutdata/lease.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml b/tests/qemuxml2xmloutdata/luks-disks-source.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml
rename to tests/qemuxml2xmloutdata/luks-disks-source.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml
rename to tests/qemuxml2xmloutdata/luks-disks.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
new file mode 120000
index 0000000000..8b64e06c7f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml
rename to tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
new file mode 120000
index 0000000000..8b64e06c7f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
new file mode 120000
index 0000000000..8b64e06c7f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml
rename to tests/qemuxml2xmloutdata/machine-core-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml
rename to tests/qemuxml2xmloutdata/machine-core-on.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml
rename to tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml
rename to tests/qemuxml2xmloutdata/memorybacking-set.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml
rename to tests/qemuxml2xmloutdata/memorybacking-unset.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml
rename to tests/qemuxml2xmloutdata/memtune-unlimited.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml
rename to tests/qemuxml2xmloutdata/memtune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml
rename to tests/qemuxml2xmloutdata/metadata-duplicate.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml
rename to tests/qemuxml2xmloutdata/metadata.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml
rename to tests/qemuxml2xmloutdata/migrate.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml
rename to tests/qemuxml2xmloutdata/minimal.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-acpi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml
rename to tests/qemuxml2xmloutdata/misc-acpi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml
rename to tests/qemuxml2xmloutdata/misc-disable-s3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml
rename to tests/qemuxml2xmloutdata/misc-disable-suspends.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml
rename to tests/qemuxml2xmloutdata/misc-enable-s4.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml
rename to tests/qemuxml2xmloutdata/misc-no-reboot.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-uuid.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-uuid.xml
rename to tests/qemuxml2xmloutdata/misc-uuid.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml b/tests/qemuxml2xmloutdata/net-bandwidth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
rename to tests/qemuxml2xmloutdata/net-coalesce.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml
rename to tests/qemuxml2xmloutdata/net-eth-hostip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml
rename to tests/qemuxml2xmloutdata/net-eth-ifname.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml
rename to tests/qemuxml2xmloutdata/net-eth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml
rename to tests/qemuxml2xmloutdata/net-hostdev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml
rename to tests/qemuxml2xmloutdata/net-midonet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml
rename to tests/qemuxml2xmloutdata/net-mtu.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml
rename to tests/qemuxml2xmloutdata/net-openvswitch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml
rename to tests/qemuxml2xmloutdata/net-udp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml b/tests/qemuxml2xmloutdata/net-user-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml
rename to tests/qemuxml2xmloutdata/net-user-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml b/tests/qemuxml2xmloutdata/net-user.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml
rename to tests/qemuxml2xmloutdata/net-user.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml
rename to tests/qemuxml2xmloutdata/net-vhostuser.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml
rename to tests/qemuxml2xmloutdata/net-virtio-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml
rename to tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml
rename to tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml
rename to tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml
rename to tests/qemuxml2xmloutdata/net-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-nographics-vga.xml b/tests/qemuxml2xmloutdata/nographics-vga.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-nographics-vga.xml
rename to tests/qemuxml2xmloutdata/nographics-vga.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml
rename to tests/qemuxml2xmloutdata/nosharepages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml
rename to tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml b/tests/qemuxml2xmloutdata/numatune-memnode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml b/tests/qemuxml2xmloutdata/panic-double.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml
rename to tests/qemuxml2xmloutdata/panic-double.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml
rename to tests/qemuxml2xmloutdata/panic-isa.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml b/tests/qemuxml2xmloutdata/panic-pseries.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml
rename to tests/qemuxml2xmloutdata/panic-pseries.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml b/tests/qemuxml2xmloutdata/panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml
rename to tests/qemuxml2xmloutdata/panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml b/tests/qemuxml2xmloutdata/parallel-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml
rename to tests/qemuxml2xmloutdata/parallel-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autofill-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge-many-disks.xml b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge-many-disks.xml
rename to tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml b/tests/qemuxml2xmloutdata/pci-bridge.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml
rename to tests/qemuxml2xmloutdata/pci-bridge.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pci-expander-bus.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml b/tests/qemuxml2xmloutdata/pci-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml
rename to tests/qemuxml2xmloutdata/pci-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml
rename to tests/qemuxml2xmloutdata/pci-rom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml
rename to tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pcie-expander-bus.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-generic.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-generic.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-ioh3420.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-ioh3420.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml b/tests/qemuxml2xmloutdata/pcie-root-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml b/tests/qemuxml2xmloutdata/pcie-root.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml
rename to tests/qemuxml2xmloutdata/pcie-root.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml
rename to tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml
rename to tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml
rename to tests/qemuxml2xmloutdata/pcihole64-gib.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml b/tests/qemuxml2xmloutdata/pcihole64-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml
rename to tests/qemuxml2xmloutdata/pcihole64-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml
rename to tests/qemuxml2xmloutdata/pcihole64-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml
rename to tests/qemuxml2xmloutdata/pcihole64.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml
rename to tests/qemuxml2xmloutdata/pmu-feature-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml
rename to tests/qemuxml2xmloutdata/pmu-feature.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller-legacy.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller-legacy.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.xml b/tests/qemuxml2xmloutdata/pseries-console-native.xml
new file mode 120000
index 0000000000..0d45a892c8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-console-native.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-virtio.xml b/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-virtio.xml
rename to tests/qemuxml2xmloutdata/pseries-console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing.xml b/tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing.xml
rename to tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml b/tests/qemuxml2xmloutdata/pseries-many-devices.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml
rename to tests/qemuxml2xmloutdata/pseries-many-devices.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml
rename to tests/qemuxml2xmloutdata/pseries-nvram.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.xml b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-numa-node.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-simple.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-simple.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-simple.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
new file mode 120000
index 0000000000..0d45a892c8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
new file mode 120000
index 0000000000..0d45a892c8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-native.xml b/tests/qemuxml2xmloutdata/pseries-serial-native.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-native.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-native.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-pci.xml b/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-pci.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-usb.xml b/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-usb.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-usb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml
rename to tests/qemuxml2xmloutdata/q35-default-devices-only.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml b/tests/qemuxml2xmloutdata/q35-multifunction.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml
rename to tests/qemuxml2xmloutdata/q35-multifunction.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml
rename to tests/qemuxml2xmloutdata/q35-pci-force-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml
rename to tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml b/tests/qemuxml2xmloutdata/q35-pcie.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml
rename to tests/qemuxml2xmloutdata/q35-pcie.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-multi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml b/tests/qemuxml2xmloutdata/q35-usb2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml
rename to tests/qemuxml2xmloutdata/q35-usb2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml
rename to tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml
rename to tests/qemuxml2xmloutdata/q35-virtio-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml b/tests/qemuxml2xmloutdata/q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
rename to tests/qemuxml2xmloutdata/q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-qemu-ns-no-env.xml
rename to tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
deleted file mode 120000
index a4768fcf86..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
deleted file mode 120000
index a4768fcf86..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
deleted file mode 120000
index a4768fcf86..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
deleted file mode 120000
index b0e645fc03..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
deleted file mode 120000
index b0e645fc03..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
deleted file mode 120000
index b0e645fc03..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-restore-v2.xml
rename to tests/qemuxml2xmloutdata/restore-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
rename to tests/qemuxml2xmloutdata/s390-defaultconsole.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-missing.xml b/tests/qemuxml2xmloutdata/s390-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-missing.xml
rename to tests/qemuxml2xmloutdata/s390-panic-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-no-address.xml b/tests/qemuxml2xmloutdata/s390-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/s390-panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic.xml b/tests/qemuxml2xmloutdata/s390-panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic.xml
rename to tests/qemuxml2xmloutdata/s390-panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml b/tests/qemuxml2xmloutdata/s390-serial-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml
rename to tests/qemuxml2xmloutdata/s390-serial-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml b/tests/qemuxml2xmloutdata/s390-serial-console.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
rename to tests/qemuxml2xmloutdata/s390-serial-console.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml b/tests/qemuxml2xmloutdata/s390-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml
rename to tests/qemuxml2xmloutdata/s390-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dac-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml
rename to tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-labelskip.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml
rename to tests/qemuxml2xmloutdata/seclabel-static.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml b/tests/qemuxml2xmloutdata/serial-dev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml
rename to tests/qemuxml2xmloutdata/serial-dev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml b/tests/qemuxml2xmloutdata/serial-file.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml
rename to tests/qemuxml2xmloutdata/serial-file.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml b/tests/qemuxml2xmloutdata/serial-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml
rename to tests/qemuxml2xmloutdata/serial-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml b/tests/qemuxml2xmloutdata/serial-pty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml
rename to tests/qemuxml2xmloutdata/serial-pty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml
rename to tests/qemuxml2xmloutdata/serial-target-port-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml b/tests/qemuxml2xmloutdata/serial-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml
rename to tests/qemuxml2xmloutdata/serial-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml b/tests/qemuxml2xmloutdata/serial-udp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml
rename to tests/qemuxml2xmloutdata/serial-udp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml b/tests/qemuxml2xmloutdata/serial-unix.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml
rename to tests/qemuxml2xmloutdata/serial-unix.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml b/tests/qemuxml2xmloutdata/serial-vc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml
rename to tests/qemuxml2xmloutdata/serial-vc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml
rename to tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
rename to tests/qemuxml2xmloutdata/shmem.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-controller.xml b/tests/qemuxml2xmloutdata/smartcard-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-controller.xml
rename to tests/qemuxml2xmloutdata/smartcard-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host-certificates.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host-certificates.xml
rename to tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host.xml b/tests/qemuxml2xmloutdata/smartcard-host.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host.xml
rename to tests/qemuxml2xmloutdata/smartcard-host.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-spicevmc.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-spicevmc.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-tcp.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-tcp.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml
rename to tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml
rename to tests/qemuxml2xmloutdata/smbios.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml b/tests/qemuxml2xmloutdata/smp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml
rename to tests/qemuxml2xmloutdata/smp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml
rename to tests/qemuxml2xmloutdata/sound-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml b/tests/qemuxml2xmloutdata/sound.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml
rename to tests/qemuxml2xmloutdata/sound.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
rename to tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml b/tests/qemuxml2xmloutdata/tap-vhost.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
rename to tests/qemuxml2xmloutdata/tap-vhost.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml
rename to tests/qemuxml2xmloutdata/tpm-passthrough.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller.xml
rename to tests/qemuxml2xmloutdata/usb-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-ich9-ehci-addr.xml
rename to tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-none.xml
rename to tests/qemuxml2xmloutdata/usb-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-piix3-controller.xml b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-piix3-controller.xml
rename to tests/qemuxml2xmloutdata/usb-piix3-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-port-missing.xml b/tests/qemuxml2xmloutdata/usb-port-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-port-missing.xml
rename to tests/qemuxml2xmloutdata/usb-port-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter.xml b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml b/tests/qemuxml2xmloutdata/usb-redir.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml
rename to tests/qemuxml2xmloutdata/usb-redir.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml b/tests/qemuxml2xmloutdata/user-aliases.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml
rename to tests/qemuxml2xmloutdata/user-aliases.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml
rename to tests/qemuxml2xmloutdata/vcpu-placement-static.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml b/tests/qemuxml2xmloutdata/vhost_queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml
rename to tests/qemuxml2xmloutdata/vhost_queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pciaddr-default.xml b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pciaddr-default.xml
rename to tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-heads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-noheads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-secondary.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-secondary.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml
rename to tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml b/tests/qemuxml2xmloutdata/virtio-input.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml
rename to tests/qemuxml2xmloutdata/virtio-input.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml b/tests/qemuxml2xmloutdata/virtio-lun.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml
rename to tests/qemuxml2xmloutdata/virtio-lun.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml b/tests/qemuxml2xmloutdata/virtio-options.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
rename to tests/qemuxml2xmloutdata/virtio-options.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-egd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-random.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vmcoreinfo.xml
rename to tests/qemuxml2xmloutdata/vmcoreinfo.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml
rename to tests/qemuxml2xmloutdata/watchdog.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a930adf646..2be8eb2c15 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -312,7 +312,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_INACTIVE) {
         if (virAsprintf(&info->outInactiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-inactive.xml",
+                        "%s/qemuxml2xmloutdata/%s-inactive.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -320,7 +320,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outInactiveName);
 
             if (virAsprintf(&info->outInactiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }
@@ -328,7 +328,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_ACTIVE) {
         if (virAsprintf(&info->outActiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-active.xml",
+                        "%s/qemuxml2xmloutdata/%s-active.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -336,7 +336,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outActiveName);
 
             if (virAsprintf(&info->outActiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }