diff --git a/tests/qemuxml2argvdata b/tests/qemuxml2argvdata
deleted file mode 120000
index 4f6042e85b..0000000000
--- a/tests/qemuxml2argvdata
+++ /dev/null
@@ -1 +0,0 @@
-qemuxmlconfdata/
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/blkdeviotune-group-num.x86_64-latest.xml b/tests/qemuxml2xmloutdata/blkdeviotune-group-num.x86_64-latest.xml
deleted file mode 120000
index dc1547bb3e..0000000000
--- a/tests/qemuxml2xmloutdata/blkdeviotune-group-num.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/blkdeviotune-group-num.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/blkdeviotune-max-length.x86_64-latest.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max-length.x86_64-latest.xml
deleted file mode 120000
index 8f206bf527..0000000000
--- a/tests/qemuxml2xmloutdata/blkdeviotune-max-length.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/blkdeviotune-max-length.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/blkdeviotune-max.x86_64-latest.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max.x86_64-latest.xml
deleted file mode 120000
index 68b6c3f82d..0000000000
--- a/tests/qemuxml2xmloutdata/blkdeviotune-max.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/blkdeviotune-max.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml
deleted file mode 120000
index 2543835ffb..0000000000
--- a/tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/boot-floppy-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml b/tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
deleted file mode 120000
index dfa513e43a..0000000000
--- a/tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/clock-realtime.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml b/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
deleted file mode 120000
index 4bfddd6573..0000000000
--- a/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/clock-timer-armvtimer.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/crypto-builtin.x86_64-latest.xml b/tests/qemuxml2xmloutdata/crypto-builtin.x86_64-latest.xml
deleted file mode 120000
index fc0a6331f2..0000000000
--- a/tests/qemuxml2xmloutdata/crypto-builtin.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/crypto-builtin.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-detect-zeroes.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-detect-zeroes.x86_64-latest.xml
deleted file mode 120000
index 17a520c4d4..0000000000
--- a/tests/qemuxml2xmloutdata/disk-detect-zeroes.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/disk-detect-zeroes.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
deleted file mode 120000
index ea9eb267ac..0000000000
--- a/tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/disk-nvme.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml
deleted file mode 120000
index d6773202b7..0000000000
--- a/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/disk-virtio-queues.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml
deleted file mode 120000
index dde52fd1db..0000000000
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/disk-virtio-scsi-reservations.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml b/tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
deleted file mode 120000
index 5edee5a7c4..0000000000
--- a/tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/downscript.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml b/tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
deleted file mode 120000
index a1a4f841e9..0000000000
--- a/tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/encrypted-disk-usage.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml
deleted file mode 120000
index 4a35465bd2..0000000000
--- a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/fd-memory-no-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml
deleted file mode 120000
index 6ccadd7e24..0000000000
--- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/fd-memory-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml
deleted file mode 120000
index 9c5ab497de..0000000000
--- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/fd-memory-numa-topology2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml
deleted file mode 120000
index 40ae69bcb0..0000000000
--- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/fd-memory-numa-topology3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml
deleted file mode 120000
index 68c72e72ed..0000000000
--- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/fd-memory-numa-topology4.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml
deleted file mode 120000
index c2ff4590c1..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/graphics-dbus-address.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml
deleted file mode 120000
index fe0f4a81d9..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/graphics-dbus-audio.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml
deleted file mode 120000
index 85dabfad76..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/graphics-dbus-chardev.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml
deleted file mode 120000
index 8f705412b3..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/graphics-dbus-p2p.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml
deleted file mode 120000
index e52af445d9..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/graphics-dbus.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.x86_64-latest.xml
deleted file mode 120000
index 8786948fdd..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-default-2M.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-default-2M.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-system-size.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-default-system-size.x86_64-latest.xml
deleted file mode 120000
index e64e3fb282..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-default-system-size.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-default-system-size.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml
deleted file mode 120000
index a55514468e..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess.x86_64-latest.xml
deleted file mode 120000
index 0252de82a9..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-memaccess.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-memaccess.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess2.x86_64-latest.xml
deleted file mode 120000
index a3df8278e8..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-memaccess2.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-memaccess2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml
deleted file mode 120000
index 0b2a12b5de..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-memaccess3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml
deleted file mode 120000
index b55838b780..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml
deleted file mode 120000
index bab31c4b99..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-numa-default-2M.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.x86_64-latest.xml
deleted file mode 120000
index 8fa2b323aa..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-numa-default-dimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml
deleted file mode 120000
index c98dfbcd12..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-numa-nodeset-part.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml
deleted file mode 120000
index 5603409c08..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-numa-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-nvdimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-nvdimm.x86_64-latest.xml
deleted file mode 120000
index 8288d3c58f..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-nvdimm.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml
deleted file mode 120000
index 3b7f1d12b1..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-shared.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/input-linux.x86_64-latest.xml b/tests/qemuxml2xmloutdata/input-linux.x86_64-latest.xml
deleted file mode 120000
index 84e1e79b51..0000000000
--- a/tests/qemuxml2xmloutdata/input-linux.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/input-linux.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml b/tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml
deleted file mode 120000
index dbd1dfd97a..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/intel-iommu-aw-bits.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml b/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml
deleted file mode 120000
index 2c2b2e77a8..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/intel-iommu-caching-mode.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml
deleted file mode 120000
index 256a673f06..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/intel-iommu-device-iotlb.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml b/tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml
deleted file mode 120000
index e4b2049c77..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/intel-iommu-eim.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml
deleted file mode 120000
index 97f38b1296..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/intel-iommu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/iothreads-ids-pool-sizes.x86_64-latest.xml b/tests/qemuxml2xmloutdata/iothreads-ids-pool-sizes.x86_64-latest.xml
deleted file mode 120000
index 6ed642fe5f..0000000000
--- a/tests/qemuxml2xmloutdata/iothreads-ids-pool-sizes.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/iothreads-ids-pool-sizes.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml b/tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
deleted file mode 120000
index 047170b59a..0000000000
--- a/tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/kvm-features-off.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml b/tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
deleted file mode 120000
index bda3acffac..0000000000
--- a/tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/kvm-features.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/luks-disks.x86_64-latest.xml b/tests/qemuxml2xmloutdata/luks-disks.x86_64-latest.xml
deleted file mode 120000
index d65e470c32..0000000000
--- a/tests/qemuxml2xmloutdata/luks-disks.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/luks-disks.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-latest.xml
deleted file mode 120000
index 27d38522c2..0000000000
--- a/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memfd-memory-default-hugepage.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memfd-memory-numa.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memfd-memory-numa.x86_64-latest.xml
deleted file mode 120000
index a610bf7a49..0000000000
--- a/tests/qemuxml2xmloutdata/memfd-memory-numa.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memfd-memory-numa.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
deleted file mode 120000
index 18b0da9730..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
deleted file mode 120000
index 9fc600126c..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
deleted file mode 120000
index ac341a1528..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
deleted file mode 120000
index 3e57c1ec97..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
deleted file mode 120000
index 10be8447a8..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml
deleted file mode 120000
index ada4fe94bd..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml
deleted file mode 120000
index a9d298129c..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-virtio-mem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml
deleted file mode 120000
index 904425abe4..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
deleted file mode 120000
index a4a2e06bc6..0000000000
--- a/tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/net-mtu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
deleted file mode 120000
index 21971d880f..0000000000
--- a/tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/net-user-addr.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rss.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-virtio-rss.x86_64-latest.xml
deleted file mode 120000
index 90c32c96bb..0000000000
--- a/tests/qemuxml2xmloutdata/net-virtio-rss.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/net-virtio-rss.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml
deleted file mode 120000
index f7a3c3ada0..0000000000
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/net-virtio-teaming-hostdev.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml
deleted file mode 120000
index 6903a80ab1..0000000000
--- a/tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/numatune-hmat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml
deleted file mode 120000
index df405a8a84..0000000000
--- a/tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/numatune-memnode-restrictive-mode.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
deleted file mode 120000
index f213032685..0000000000
--- a/tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/numatune-no-vcpu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pages-dimm-discard.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pages-dimm-discard.x86_64-latest.xml
deleted file mode 120000
index 05bbef8d65..0000000000
--- a/tests/qemuxml2xmloutdata/pages-dimm-discard.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pages-dimm-discard.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pages-discard-hugepages.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pages-discard-hugepages.x86_64-latest.xml
deleted file mode 120000
index 3d2f0682dc..0000000000
--- a/tests/qemuxml2xmloutdata/pages-discard-hugepages.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pages-discard-hugepages.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
deleted file mode 120000
index 4d22fef81f..0000000000
--- a/tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pages-discard.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
deleted file mode 120000
index 0570e40273..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
deleted file mode 120000
index 2b0e42925f..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
deleted file mode 120000
index 9527ed618e..0000000000
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/sgx-epc.x86_64-7.0.0.xml b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-7.0.0.xml
deleted file mode 120000
index cc2263ac99..0000000000
--- a/tests/qemuxml2xmloutdata/sgx-epc.x86_64-7.0.0.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/sgx-epc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml b/tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
deleted file mode 120000
index 09a2682910..0000000000
--- a/tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/smbios-type-fwcfg.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
deleted file mode 120000
index d69355b81e..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-emulator-spapr.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
deleted file mode 120000
index 030f4f373d..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
deleted file mode 120000
index eb65b59aac..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
deleted file mode 120000
index b8f1123553..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-emulator-tpm2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
deleted file mode 120000
index 3ddc89fc94..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-emulator.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml
deleted file mode 120000
index 3ce73f0a84..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-external.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
deleted file mode 120000
index 2f5f021ee6..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-passthrough-crb.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
deleted file mode 120000
index 2fbd46cad0..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/tpm-passthrough.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml b/tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
deleted file mode 120000
index b5a27f08cd..0000000000
--- a/tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/user-aliases.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.x86_64-latest.xml
deleted file mode 120000
index 9966cf47a7..0000000000
--- a/tests/qemuxml2xmloutdata/vcpu-placement-static.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vcpu-placement-static.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml
deleted file mode 120000
index fbc552ef94..0000000000
--- a/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vhost-user-fs-fd-memory.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml
deleted file mode 120000
index 0c0f05b254..0000000000
--- a/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vhost-user-fs-hugepages.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml
deleted file mode 120000
index ea0382990a..0000000000
--- a/tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vhost-user-fs-sock.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
deleted file mode 120000
index 78971a8ef9..0000000000
--- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock.x86_64-latest.xml
deleted file mode 120000
index bb24241fb2..0000000000
--- a/tests/qemuxml2xmloutdata/vhost-vsock.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/vhost-vsock.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
deleted file mode 120000
index f2d0595dda..0000000000
--- a/tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/video-qxl-resolution.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml b/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
deleted file mode 120000
index 769796d9eb..0000000000
--- a/tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/video-virtio-vga-gpu-gl.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml
deleted file mode 120000
index 26d8a2520a..0000000000
--- a/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/virtio-options.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml
deleted file mode 120000
index 8226a54027..0000000000
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-features-wrong.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-features-wrong.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.2.0.xml b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.2.0.xml
rename to tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0.xml b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-pci-serial.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-pci-serial.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-tpm.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-tpm.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-traditional-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-traditional-pci.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-usb-controller.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-usb-controller.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-video-default.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-video-default.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml
rename to tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml
rename to tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
rename to tests/qemuxmlconfdata/acpi-table.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-latest.xml b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-latest.xml
rename to tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-latest.xml b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-latest.xml
rename to tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-latest.xml
rename to tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml
rename to tests/qemuxmlconfdata/async-teardown.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-file-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-file-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-none-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-none-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pipewire-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pipewire-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pipewire-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pipewire-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pipewire-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pipewire-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml b/tests/qemuxmlconfdata/autoindex.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml
rename to tests/qemuxmlconfdata/autoindex.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-latest.xml b/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-latest.xml
rename to tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86_64-latest.xml b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-latest.xml b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-latest.xml
rename to tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
rename to tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-device.x86_64-latest.xml b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/balloon-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
rename to tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml
diff --git a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.xml b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.xml
new file mode 120000
index 0000000000..8bf951e989
--- /dev/null
+++ b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.xml
@@ -0,0 +1 @@
+blkdeviotune-group-num.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.xml b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.xml
new file mode 120000
index 0000000000..8fb7640e6b
--- /dev/null
+++ b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.xml
@@ -0,0 +1 @@
+blkdeviotune-max-length.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.xml b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.xml
new file mode 120000
index 0000000000..9adfb9ce1c
--- /dev/null
+++ b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.xml
@@ -0,0 +1 @@
+blkdeviotune-max.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/blkiotune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-complex.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.xml
new file mode 120000
index 0000000000..51dfd73f1a
--- /dev/null
+++ b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.xml
@@ -0,0 +1 @@
+boot-floppy-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-floppy.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-multi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-network.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-network.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml b/tests/qemuxmlconfdata/boot-order.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
rename to tests/qemuxmlconfdata/boot-order.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-qemu-vdagent.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-qemu-vdagent.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-state.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/channel-virtio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml
rename to tests/qemuxmlconfdata/chardev-label.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml
rename to tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-absolute.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-absolute.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-absolute.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-catchup.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-france.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-france.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-france.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-france.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-localtime-basis-localtime.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-localtime-basis-localtime.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-localtime.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.xml
new file mode 120000
index 0000000000..06e7fee4ce
--- /dev/null
+++ b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.xml
@@ -0,0 +1 @@
+clock-realtime.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.xml b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.xml
new file mode 120000
index 0000000000..4f870121b5
--- /dev/null
+++ b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.xml
@@ -0,0 +1 @@
+clock-timer-armvtimer.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-utc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/clock-variable.x86_64-latest.xml b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-variable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/clock-variable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml b/tests/qemuxmlconfdata/console-compat.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-compat.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-compat2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-sclp.s390x-latest.xml b/tests/qemuxmlconfdata/console-sclp.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-sclp.s390x-latest.xml
rename to tests/qemuxmlconfdata/console-sclp.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-latest.xml b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/console-virtio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/controller-order.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-order.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/controller-order.x86_64-latest.xml
rename to tests/qemuxmlconfdata/controller-order.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/controller-usb-order.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/controller-usb-order.x86_64-latest.xml
rename to tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-full.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-full.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-check-partial.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-check-partial.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-empty.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-fallback.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-fallback.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.0.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.0.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/cpu-nofallback.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml
rename to tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-limit.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-phys-bits-limit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-qemu-host-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-qemu-host-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest.xml b/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest.xml
rename to tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml b/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml
rename to tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-topology5.aarch64-latest.xml b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-topology5.aarch64-latest.xml
rename to tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cputune-numatune.x86_64-latest.xml b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cputune-numatune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.x86_64-latest.xml b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cputune-zero-shares.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml b/tests/qemuxmlconfdata/cputune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/cputune.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.xml b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.xml
new file mode 120000
index 0000000000..ea5d9eca5e
--- /dev/null
+++ b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.xml
@@ -0,0 +1 @@
+crypto-builtin.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
rename to tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
rename to tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml
rename to tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml
rename to tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml
rename to tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/default-video-type-x86_64.x86_64-latest.xml b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/default-video-type-x86_64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/devices-acpi-index.x86_64-latest.xml b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/devices-acpi-index.x86_64-latest.xml
rename to tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-active-commit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-aio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml b/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
rename to tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-blockio.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-blockio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-blockio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cache.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-network.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-network.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.xml
new file mode 120000
index 0000000000..809574fec9
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.xml
@@ -0,0 +1 @@
+disk-detect-zeroes.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-device-removable.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-device-removable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-device-removable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-device-removable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-discard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-discard_no_unref.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-discard_no_unref.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-latest.xml b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-latest.xml
rename to tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-latest.xml b/tests/qemuxmlconfdata/disk-floppy-pseries.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-latest.xml
rename to tests/qemuxmlconfdata/disk-floppy-pseries.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-floppy.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-geometry.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-mirror-old.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-mirror.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-mirror.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-mirror.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-http.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-encryption-layering.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-source-curl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml b/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml
rename to tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.xml
new file mode 120000
index 0000000000..d268ffa778
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.xml
@@ -0,0 +1 @@
+disk-nvme.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-order.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-order.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-order.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-order.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-rotation.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-scsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-serial.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-shared.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-slices.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-source-fd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-source-fd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-transient.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-transient.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-latest.xml b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-latest.xml
rename to tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.xml
diff --git a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.xml
new file mode 120000
index 0000000000..761ed0cec8
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.xml
@@ -0,0 +1 @@
+disk-virtio-queues.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml
rename to tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.xml
new file mode 120000
index 0000000000..d9b0793b72
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.xml
@@ -0,0 +1 @@
+disk-virtio-scsi-reservations.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-virtio.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.xml b/tests/qemuxmlconfdata/downscript.x86_64-latest.xml
new file mode 120000
index 0000000000..49c580cf11
--- /dev/null
+++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.xml
@@ -0,0 +1 @@
+downscript.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.xml b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.xml
new file mode 120000
index 0000000000..e2bfb1926a
--- /dev/null
+++ b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.xml
@@ -0,0 +1 @@
+encrypted-disk-usage.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
rename to tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml b/tests/qemuxmlconfdata/event_idx.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
rename to tests/qemuxmlconfdata/event_idx.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.xml b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.xml
new file mode 120000
index 0000000000..6a90b5d3ac
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.xml
@@ -0,0 +1 @@
+fd-memory-no-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.xml
new file mode 120000
index 0000000000..77b50535c9
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.xml
@@ -0,0 +1 @@
+fd-memory-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.xml
new file mode 120000
index 0000000000..a0601192d8
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.xml
@@ -0,0 +1 @@
+fd-memory-numa-topology2.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.xml
new file mode 120000
index 0000000000..25208de1cd
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.xml
@@ -0,0 +1 @@
+fd-memory-numa-topology3.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.xml
new file mode 120000
index 0000000000..ea7265a768
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.xml
@@ -0,0 +1 @@
+fd-memory-numa-topology4.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml b/tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml
rename to tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/fips-enabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-abi-update.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-loader-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-file.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-file.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-template.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-rw.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-rw.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-smm-off.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-smm-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-stateless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-features.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-features.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-template.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-template.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-rw.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-rw.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-secboot.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-secboot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi-stateless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
rename to tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/fs9p-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fs9p-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/fs9p.x86_64-latest.xml b/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fs9p.x86_64-latest.xml
rename to tests/qemuxmlconfdata/fs9p.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/genid-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/genid-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/genid-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/genid.x86_64-latest.xml b/tests/qemuxmlconfdata/genid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/genid.x86_64-latest.xml
rename to tests/qemuxmlconfdata/genid.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.xml
new file mode 120000
index 0000000000..765ee1dd01
--- /dev/null
+++ b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.xml
@@ -0,0 +1 @@
+graphics-dbus-address.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.xml
new file mode 120000
index 0000000000..7719645513
--- /dev/null
+++ b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.xml
@@ -0,0 +1 @@
+graphics-dbus-audio.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.xml
new file mode 120000
index 0000000000..155d0583ac
--- /dev/null
+++ b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.xml
@@ -0,0 +1 @@
+graphics-dbus-chardev.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.xml
new file mode 120000
index 0000000000..b9516c40d1
--- /dev/null
+++ b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.xml
@@ -0,0 +1 @@
+graphics-dbus-p2p.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.xml
new file mode 120000
index 0000000000..c1cae03339
--- /dev/null
+++ b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.xml
@@ -0,0 +1 @@
+graphics-dbus.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendernode.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendernode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-spice.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdline.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdline.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-opengl.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-opengl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address-device-boot.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-usb-address-device-boot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hotplug-base.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.xml
new file mode 120000
index 0000000000..a60915aea7
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-default-2M.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-default-5M.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hugepages-default-5M.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.xml
new file mode 120000
index 0000000000..036ecbecff
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-default-system-size.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.xml
new file mode 120000
index 0000000000..c38125bf68
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-default.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.xml
new file mode 120000
index 0000000000..d75a028d7d
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-memaccess.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.xml
new file mode 120000
index 0000000000..b9ababb3ac
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-memaccess2.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.xml
new file mode 120000
index 0000000000..817ad2ea4b
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-memaccess3.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.xml
new file mode 120000
index 0000000000..0bc24ea846
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.xml
new file mode 120000
index 0000000000..4b6cdf8e4e
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-numa-default-2M.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.xml
new file mode 120000
index 0000000000..e432a5974b
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-numa-default-dimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.xml
new file mode 120000
index 0000000000..b66ab9500f
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-numa-nodeset-part.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.xml
new file mode 120000
index 0000000000..d18bf8f542
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-numa-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.xml
new file mode 120000
index 0000000000..9c7353cf58
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.xml b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.xml
new file mode 120000
index 0000000000..cd67db5c5f
--- /dev/null
+++ b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.xml
@@ -0,0 +1 @@
+hugepages-shared.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.aarch64-latest.xml
rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hyperv-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.0.xml b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-6.1.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.0.xml
rename to tests/qemuxmlconfdata/hyperv-passthrough.x86_64-6.1.0.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/input-linux.x86_64-latest.xml b/tests/qemuxmlconfdata/input-linux.x86_64-latest.xml
new file mode 120000
index 0000000000..f063705531
--- /dev/null
+++ b/tests/qemuxmlconfdata/input-linux.x86_64-latest.xml
@@ -0,0 +1 @@
+input-linux.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
rename to tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
rename to tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.xml
diff --git a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.xml b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.xml
new file mode 120000
index 0000000000..d5e6909d34
--- /dev/null
+++ b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.xml
@@ -0,0 +1 @@
+intel-iommu-aw-bits.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.xml b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.xml
new file mode 120000
index 0000000000..63d9f28caf
--- /dev/null
+++ b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.xml
@@ -0,0 +1 @@
+intel-iommu-caching-mode.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.xml b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.xml
new file mode 120000
index 0000000000..9a46b4be17
--- /dev/null
+++ b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.xml
@@ -0,0 +1 @@
+intel-iommu-device-iotlb.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.xml b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.xml
new file mode 120000
index 0000000000..a1a3103b97
--- /dev/null
+++ b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.xml
@@ -0,0 +1 @@
+intel-iommu-eim.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.xml
new file mode 120000
index 0000000000..5e25ff775c
--- /dev/null
+++ b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.xml
@@ -0,0 +1 @@
+intel-iommu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml
rename to tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml b/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
rename to tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.x86_64-latest.xml b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-disk.x86_64-latest.xml
rename to tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-ids-partial.x86_64-latest.xml b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-ids-partial.x86_64-latest.xml
rename to tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.xml b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.xml
new file mode 120000
index 0000000000..0c106bc075
--- /dev/null
+++ b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.xml
@@ -0,0 +1 @@
+iothreads-ids-pool-sizes.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/iothreads-ids.x86_64-latest.xml b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-ids.x86_64-latest.xml
rename to tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.xml b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.xml
new file mode 120000
index 0000000000..4715b657b5
--- /dev/null
+++ b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.xml
@@ -0,0 +1 @@
+kvm-features-off.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.xml b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.xml
new file mode 120000
index 0000000000..261ee7841a
--- /dev/null
+++ b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.xml
@@ -0,0 +1 @@
+kvm-features.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml
rename to tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.xml b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.xml
rename to tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
rename to tests/qemuxmlconfdata/kvmclock.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-latest.xml b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-latest.xml
rename to tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev-direct.x86_64-latest.xml b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/launch-security-sev-direct.x86_64-latest.xml
rename to tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0.0.xml b/tests/qemuxmlconfdata/launch-security-sev.x86_64-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0.0.xml
rename to tests/qemuxmlconfdata/launch-security-sev.x86_64-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/lease.x86_64-latest.xml b/tests/qemuxmlconfdata/lease.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
rename to tests/qemuxmlconfdata/lease.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.x86_64-latest.xml b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/luks-disks-source.x86_64-latest.xml
rename to tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.xml b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.xml
new file mode 120000
index 0000000000..10d386057f
--- /dev/null
+++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.xml
@@ -0,0 +1 @@
+luks-disks.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-serial+console-native.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml
rename to tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s390x-latest.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s390x-latest.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390x-latest.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s390x-latest.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-core-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-core-on.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s390x-latest.xml b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s390x-latest.xml b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390x-latest.xml b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s390x-latest.xml b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390x-latest.xml b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-latest.xml b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-loadparm-hostdev.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390x-latest.xml b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-latest.xml b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-latest.xml
rename to tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-latest.xml b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-latest.xml
rename to tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.xml b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.xml
new file mode 120000
index 0000000000..7e94b3194d
--- /dev/null
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.xml
@@ -0,0 +1 @@
+memfd-memory-default-hugepage.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.xml b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.xml
new file mode 120000
index 0000000000..236618a5ff
--- /dev/null
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.xml
@@ -0,0 +1 @@
+memfd-memory-numa.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-align-fail.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-align-fail.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-align-fail.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memory-align-fail.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
new file mode 120000
index 0000000000..a00b70a955
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm-access.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
new file mode 120000
index 0000000000..e87cb632b0
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm-align.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
new file mode 120000
index 0000000000..f49509192c
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm-label.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
new file mode 120000
index 0000000000..5ad6fec6be
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm-pmem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
new file mode 120000
index 0000000000..65827de914
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm-readonly.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.xml
new file mode 120000
index 0000000000..8af62e4461
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-nvdimm.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.xml
new file mode 120000
index 0000000000..4d58821714
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-virtio-mem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.xml
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.xml
new file mode 120000
index 0000000000..6ba09297b1
--- /dev/null
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.xml
@@ -0,0 +1 @@
+memory-hotplug-virtio-pmem.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml b/tests/qemuxmlconfdata/memtune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/memtune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
rename to tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml b/tests/qemuxmlconfdata/metadata.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
rename to tests/qemuxmlconfdata/metadata.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-latest.xml b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-latest.xml
rename to tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml b/tests/qemuxmlconfdata/migrate.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
rename to tests/qemuxmlconfdata/migrate.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml b/tests/qemuxmlconfdata/minimal.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
rename to tests/qemuxmlconfdata/minimal.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/misc-no-reboot.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
rename to tests/qemuxmlconfdata/misc-uuid.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mlock-off.x86_64-latest.xml b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mlock-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/mlock-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/mlock-on.x86_64-latest.xml b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/mlock-on.x86_64-latest.xml
rename to tests/qemuxmlconfdata/mlock-on.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/multifunction-pci-device.x86_64-latest.xml b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/multifunction-pci-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/name-escape.x86_64-latest.xml b/tests/qemuxmlconfdata/name-escape.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/name-escape.x86_64-latest.xml
rename to tests/qemuxmlconfdata/name-escape.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-client.x86_64-latest.xml b/tests/qemuxmlconfdata/net-client.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-client.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-client.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-coalesce.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-eth-names.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml b/tests/qemuxmlconfdata/net-eth.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-eth.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev-fail.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev-fail.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-hostdev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-linkstate.x86_64-latest.xml b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-linkstate.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-linkstate.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-many-models.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-mcast.x86_64-latest.xml b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-mcast.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-mcast.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-midonet.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.xml b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.xml
new file mode 120000
index 0000000000..8ec2bc0403
--- /dev/null
+++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.xml
@@ -0,0 +1 @@
+net-mtu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml b/tests/qemuxmlconfdata/net-server.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-server.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml b/tests/qemuxmlconfdata/net-udp.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-udp.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.xml
new file mode 120000
index 0000000000..3d86f7843c
--- /dev/null
+++ b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.xml
@@ -0,0 +1 @@
+net-user-addr.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml
rename to tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/net-user-passt.x86_64-latest.xml b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-user-passt.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-user-passt.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml b/tests/qemuxmlconfdata/net-user.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-user.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-vdpa.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.xml
new file mode 120000
index 0000000000..6379b09576
--- /dev/null
+++ b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.xml
@@ -0,0 +1 @@
+net-virtio-rss.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.xml
new file mode 120000
index 0000000000..890571435a
--- /dev/null
+++ b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.xml
@@ -0,0 +1 @@
+net-virtio-teaming-hostdev.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-vhost.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-vhost.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
rename to tests/qemuxmlconfdata/net-virtio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
rename to tests/qemuxmlconfdata/nosharepages.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatune.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numad.x86_64-latest.xml b/tests/qemuxmlconfdata/numad.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numad.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numad.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-nodeset-invalid.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-auto-nodeset-invalid.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-distances.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-hmat-none.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-hmat-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.xml
new file mode 120000
index 0000000000..7bc5ec0dc6
--- /dev/null
+++ b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.xml
@@ -0,0 +1 @@
+numatune-hmat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.xml
new file mode 120000
index 0000000000..e16803d208
--- /dev/null
+++ b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.xml
@@ -0,0 +1 @@
+numatune-memnode-restrictive-mode.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-restrictive.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-memnode-unavailable-restrictive.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-strict.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-memnode-unavailable-strict.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/numatune-memnode.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/numatune-memnode.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.xml
new file mode 120000
index 0000000000..591e0b919f
--- /dev/null
+++ b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.xml
@@ -0,0 +1 @@
+numatune-no-vcpu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-latest.xml b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml
rename to tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.xml b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.xml
new file mode 120000
index 0000000000..2f5af44603
--- /dev/null
+++ b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.xml
@@ -0,0 +1 @@
+pages-dimm-discard.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.xml b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.xml
new file mode 120000
index 0000000000..1265c4ef25
--- /dev/null
+++ b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.xml
@@ -0,0 +1 @@
+pages-discard-hugepages.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.xml b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.xml
new file mode 120000
index 0000000000..5950326b37
--- /dev/null
+++ b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.xml
@@ -0,0 +1 @@
+pages-discard.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml b/tests/qemuxmlconfdata/panic-double.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml
rename to tests/qemuxmlconfdata/panic-double.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/panic-no-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml b/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml
rename to tests/qemuxmlconfdata/panic-pseries.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/panic.x86_64-latest.xml b/tests/qemuxmlconfdata/panic.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/panic.x86_64-latest.xml
rename to tests/qemuxmlconfdata/panic.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
new file mode 120000
index 0000000000..fd1795f887
--- /dev/null
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
@@ -0,0 +1 @@
+pc-i440fx-acpi-root-hotplug-disable.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
new file mode 120000
index 0000000000..23ea9117a9
--- /dev/null
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
@@ -0,0 +1 @@
+pc-i440fx-acpi-root-hotplug-enable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-bridge.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-many.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-many.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-rom-disabled-invalid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-rom-disabled-invalid.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-rom.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-root.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pcihole64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pmu-feature.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml b/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml
rename to tests/qemuxmlconfdata/ppc-dtb.ppc-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppc64-usb-controller.ppc64-latest.xml
rename to tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml b/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml
rename to tests/qemuxmlconfdata/ppce500-serial.ppc-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-basic.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-console-native.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-console-native.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power10.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-cpu-compat-power10.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.xml b/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.xml
rename to tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-features.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-features.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-serial+console-native.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-serial+console-native.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-serial-compat.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-serial-compat.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml
rename to tests/qemuxmlconfdata/pseries-vio.ppc64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pvpanic-pci-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pvpanic-pci-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pvpanic-pci-x86_64.x86_64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pvpanic-pci-x86_64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-pcie.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-usb2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml b/tests/qemuxmlconfdata/q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
rename to tests/qemuxmlconfdata/qemu-ns.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
rename to tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/restore-v2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
rename to tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml
rename to tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
rename to tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controller.s390x-latest.xml b/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controller.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390x-latest.xml b/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-6.0.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml
rename to tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-6.0.0.xml
diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml b/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml b/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml b/tests/qemuxmlconfdata/s390-panic.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-panic.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml b/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-serial-2.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml b/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-serial-console.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml b/tests/qemuxmlconfdata/s390-serial.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-serial.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-override.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
rename to tests/qemuxmlconfdata/seclabel-static.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-file-log.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
new file mode 120000
index 0000000000..a673a1c735
--- /dev/null
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
@@ -0,0 +1 @@
+serial-tcp-tlsx509-chardev-notls.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-latest.xml b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-latest.xml
rename to tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.xml
new file mode 120000
index 0000000000..713f421f9a
--- /dev/null
+++ b/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.xml
@@ -0,0 +1 @@
+sgx-epc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-latest.xml b/tests/qemuxmlconfdata/shmem-invalid-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-latest.xml
rename to tests/qemuxmlconfdata/shmem-invalid-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.x86_64-latest.xml b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/shmem-plain-doorbell.x86_64-latest.xml
rename to tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-host.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86_64-latest.xml b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.xml b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.xml
new file mode 120000
index 0000000000..d852ffc069
--- /dev/null
+++ b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.xml
@@ -0,0 +1 @@
+smbios-type-fwcfg.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml b/tests/qemuxmlconfdata/smbios.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
rename to tests/qemuxmlconfdata/smbios.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml
rename to tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml b/tests/qemuxmlconfdata/sound-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/sound-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml b/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml
rename to tests/qemuxmlconfdata/sparc-minimal.sparc-latest.xml
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
rename to tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
rename to tests/qemuxmlconfdata/tap-vhost.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml
new file mode 120000
index 0000000000..e3c4cd8051
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml
@@ -0,0 +1 @@
+tpm-emulator-spapr.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
new file mode 120000
index 0000000000..4cb393a03c
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-emulator-tpm2-enc.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
new file mode 120000
index 0000000000..dda7f54831
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-emulator-tpm2-pstate.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.xml
new file mode 120000
index 0000000000..2866a447d8
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-emulator-tpm2.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.xml
new file mode 120000
index 0000000000..4c7d344b53
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-emulator.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.xml
new file mode 120000
index 0000000000..10c6df1fa8
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-external.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.xml
new file mode 120000
index 0000000000..bda6f06d3d
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-passthrough-crb.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.xml
new file mode 120000
index 0000000000..3801655a6c
--- /dev/null
+++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.xml
@@ -0,0 +1 @@
+tpm-passthrough.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml
rename to tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-bus-missing.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-bus-missing.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-default-i440fx.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-ich9-companion.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-ich9-companion.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoassign.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoassign.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-hub.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-hub.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-hub.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-none.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-none.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-ports.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-ports.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-ports.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb-redir.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/usb1-usb2.x86_64-latest.xml b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/usb1-usb2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest.xml b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest.xml
rename to tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.xml b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.xml
new file mode 120000
index 0000000000..9351b7c969
--- /dev/null
+++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.xml
@@ -0,0 +1 @@
+user-aliases.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/user-aliases2.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.xml b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.xml
new file mode 120000
index 0000000000..f7f49936fd
--- /dev/null
+++ b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.xml
@@ -0,0 +1 @@
+vcpu-placement-static.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.xml
new file mode 120000
index 0000000000..82ca2357df
--- /dev/null
+++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.xml
@@ -0,0 +1 @@
+vhost-user-fs-fd-memory.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.xml
new file mode 120000
index 0000000000..c48a0a74b5
--- /dev/null
+++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.xml
@@ -0,0 +1 @@
+vhost-user-fs-hugepages.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.xml
new file mode 120000
index 0000000000..cf8627b13a
--- /dev/null
+++ b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.xml
@@ -0,0 +1 @@
+vhost-user-fs-sock.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_64-latest.xml
rename to tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.xml
rename to tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vhost-vsock-auto.x86_64-latest.xml
rename to tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml
rename to tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.xml
diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.xml
new file mode 120000
index 0000000000..72f634ce28
--- /dev/null
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.xml
@@ -0,0 +1 @@
+vhost-vsock-ccw-iommu.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.xml
diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.xml
new file mode 120000
index 0000000000..443be118e5
--- /dev/null
+++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.xml
@@ -0,0 +1 @@
+vhost-vsock.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-bochs-display-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-bochs-display-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-none-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.xml
new file mode 120000
index 0000000000..f615594111
--- /dev/null
+++ b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.xml
@@ -0,0 +1 @@
+video-qxl-resolution.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-ramfb-display-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-ramfb-display-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64-latest.xml b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-vga-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-latest.xml b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-blob-off.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-blob-off.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-blob-on.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-blob-on.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
new file mode 120000
index 0000000000..34e32ab8ba
--- /dev/null
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.xml
@@ -0,0 +1 @@
+video-virtio-vga-gpu-gl.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest.xml b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest.xml
rename to tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml
rename to tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-lun.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-lun.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-controller-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-controller-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-controller-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-input-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-memballoon-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-memballoon-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-packed.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-options-video-packed.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.xml
new file mode 120000
index 0000000000..caee6fcf5d
--- /dev/null
+++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.xml
@@ -0,0 +1 @@
+virtio-options.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2.0.xml b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-5.2.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2.0.xml
rename to tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-5.2.0.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
rename to tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml
rename to tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.xml b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.xml
rename to tests/qemuxmlconfdata/watchdog-device.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.xml b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.xml
rename to tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml
rename to tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-latest.xml b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-latest.xml
rename to tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml
rename to tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml b/tests/qemuxmlconfdata/watchdog.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
rename to tests/qemuxmlconfdata/watchdog.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml b/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml
new file mode 120000
index 0000000000..7d70f3e5cb
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml
@@ -0,0 +1 @@
+x86_64-default-cpu-tcg-features.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.xml
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 743ddc995c..b6fb5e5052 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1009,7 +1009,7 @@ testRun(const char *name,
     }
 
     if (!(info->flags & FLAG_EXPECT_PARSE_ERROR))
-        info->out_xml_inactive = g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml", abs_srcdir, info->name, suffix);
+        info->out_xml_inactive = g_strdup_printf("%s/qemuxmlconfdata/%s%s.xml", abs_srcdir, info->name, suffix);
 
     virTestRunLog(ret, name_parse, testXMLParse, info);
     virTestRunLog(ret, name_xml, testCompareDef2XML, info);
diff --git a/tests/virschematest.c b/tests/virschematest.c
index e13e0b890c..9b6649a6cf 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -231,7 +231,7 @@ static const struct testSchemaEntry schemaCapability[] = {
 
 
 /* give exceptions for output files of invalid input XMLs */
-static const char *exceptions_qemuxml2xmloutdata[] = {
+static const char *exceptions_qemuxmlconfdata[] = {
     "disk-cdrom-empty-network-invalid.x86_64-latest.xml",
     "numatune-auto-nodeset-invalid.x86_64-latest.xml",
     NULL
@@ -239,11 +239,10 @@ static const char *exceptions_qemuxml2xmloutdata[] = {
 
 static const struct testSchemaEntry schemaDomain[] = {
     { .dir = "tests/domainschemadata" },
-    { .dir = "tests/qemuxmlconfdata" },
-    { .dir = "tests/xmconfigdata" },
-    { .dir = "tests/qemuxml2xmloutdata",
-      .exceptions = exceptions_qemuxml2xmloutdata,
+    { .dir = "tests/qemuxmlconfdata",
+      .exceptions = exceptions_qemuxmlconfdata,
     },
+    { .dir = "tests/xmconfigdata" },
     { .dir = "tests/lxcxml2xmldata" },
     { .dir = "tests/lxcxml2xmloutdata" },
     { .dir = "tests/bhyvexml2argvdata" },