From 5cba53db57ce2725cf742b89e2c17eb8b4d99586 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 15 Feb 2022 16:10:36 +0100
Subject: [PATCH] tests: Drop domcaps test data for qemu < 2.11

The minimal supported version of QEMU is 2.11. And after capabilities
for older QEMUs were dropped in v7.3.0-17-g184de10c1d we have some
domaincapsdata/ files that are never read. This is because
domaincapstest uses testQemuCapsIterate() which iterates over
qemucapabilitiesdata/caps_*.xml files.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml  | 151 --------------
 .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml  | 147 --------------
 tests/domaincapsdata/qemu_2.4.0.x86_64.xml    | 151 --------------
 .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml  | 151 --------------
 .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml  | 147 --------------
 tests/domaincapsdata/qemu_2.5.0.x86_64.xml    | 151 --------------
 .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml  | 151 --------------
 .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml  | 147 --------------
 .../qemu_2.6.0-virt.aarch64.xml               | 149 --------------
 tests/domaincapsdata/qemu_2.6.0.aarch64.xml   | 143 -------------
 tests/domaincapsdata/qemu_2.6.0.ppc64.xml     | 116 -----------
 tests/domaincapsdata/qemu_2.6.0.x86_64.xml    | 151 --------------
 .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml  | 152 --------------
 .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml  | 148 --------------
 tests/domaincapsdata/qemu_2.7.0.s390x.xml     | 108 ----------
 tests/domaincapsdata/qemu_2.7.0.x86_64.xml    | 152 --------------
 .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml  | 152 --------------
 .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml  | 148 --------------
 tests/domaincapsdata/qemu_2.8.0.s390x.xml     | 189 -----------------
 tests/domaincapsdata/qemu_2.8.0.x86_64.xml    | 152 --------------
 .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml  | 166 ---------------
 .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml  | 185 -----------------
 tests/domaincapsdata/qemu_2.9.0.ppc64.xml     | 116 -----------
 tests/domaincapsdata/qemu_2.9.0.s390x.xml     | 190 ------------------
 tests/domaincapsdata/qemu_2.9.0.x86_64.xml    | 166 ---------------
 25 files changed, 3779 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.4.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.5.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.6.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.7.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.7.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.8.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.8.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.9.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.9.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.9.0.x86_64.xml

diff --git a/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
deleted file mode 100644
index 3ae03de391..0000000000
--- a/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.4</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
deleted file mode 100644
index 461cc4c102..0000000000
--- a/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.4</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.4.0.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0.x86_64.xml
deleted file mode 100644
index e1af5b6622..0000000000
--- a/tests/domaincapsdata/qemu_2.4.0.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.4</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
deleted file mode 100644
index f46991ca27..0000000000
--- a/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.5</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
deleted file mode 100644
index 82edcbfac6..0000000000
--- a/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.5</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.5.0.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0.x86_64.xml
deleted file mode 100644
index 57f9f9b41b..0000000000
--- a/tests/domaincapsdata/qemu_2.5.0.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.5</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
deleted file mode 100644
index 8bcd8f92ab..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.6</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
deleted file mode 100644
index 2a7b46f775..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.6</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
deleted file mode 100644
index 14cab3f557..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-2.6</machine>
-  <arch>aarch64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>2</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
deleted file mode 100644
index f84e648a15..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0.aarch64.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>integratorcp</machine>
-  <arch>aarch64</arch>
-  <vcpu max='1'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0.ppc64.xml b/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
deleted file mode 100644
index 7f9372a359..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0.ppc64.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-2.6</machine>
-  <arch>ppc64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-      <model usable='unknown'>POWER8</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.6.0.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
deleted file mode 100644
index 4eeec1a22b..0000000000
--- a/tests/domaincapsdata/qemu_2.6.0.x86_64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.6</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
deleted file mode 100644
index 537941561b..0000000000
--- a/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.7</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Skylake-Client</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
deleted file mode 100644
index 79f5fba212..0000000000
--- a/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.7</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Skylake-Client</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.7.0.s390x.xml b/tests/domaincapsdata/qemu_2.7.0.s390x.xml
deleted file mode 100644
index f76564a9bc..0000000000
--- a/tests/domaincapsdata/qemu_2.7.0.s390x.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.7</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='no'/>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.7.0.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0.x86_64.xml
deleted file mode 100644
index 1dd19dfc37..0000000000
--- a/tests/domaincapsdata/qemu_2.7.0.x86_64.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.7</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>Opteron_G5</model>
-      <model usable='unknown'>Opteron_G4</model>
-      <model usable='unknown'>Opteron_G3</model>
-      <model usable='unknown'>Opteron_G2</model>
-      <model usable='unknown'>Opteron_G1</model>
-      <model usable='unknown'>Skylake-Client</model>
-      <model usable='unknown'>Broadwell</model>
-      <model usable='unknown'>Broadwell-noTSX</model>
-      <model usable='unknown'>Haswell</model>
-      <model usable='unknown'>Haswell-noTSX</model>
-      <model usable='unknown'>IvyBridge</model>
-      <model usable='unknown'>SandyBridge</model>
-      <model usable='unknown'>Westmere</model>
-      <model usable='unknown'>Nehalem</model>
-      <model usable='unknown'>Penryn</model>
-      <model usable='unknown'>Conroe</model>
-      <model usable='unknown'>n270</model>
-      <model usable='unknown'>athlon</model>
-      <model usable='unknown'>pentium3</model>
-      <model usable='unknown'>pentium2</model>
-      <model usable='unknown'>pentium</model>
-      <model usable='unknown'>486</model>
-      <model usable='unknown'>coreduo</model>
-      <model usable='unknown'>kvm32</model>
-      <model usable='unknown'>qemu32</model>
-      <model usable='unknown'>kvm64</model>
-      <model usable='unknown'>core2duo</model>
-      <model usable='unknown'>phenom</model>
-      <model usable='unknown'>qemu64</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
deleted file mode 100644
index e0bb1b1eee..0000000000
--- a/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.8</machine>
-  <arch>x86_64</arch>
-  <vcpu max='288'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
deleted file mode 100644
index 1829fbda60..0000000000
--- a/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.8</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.8.0.s390x.xml b/tests/domaincapsdata/qemu_2.8.0.s390x.xml
deleted file mode 100644
index 2c075d7cdb..0000000000
--- a/tests/domaincapsdata/qemu_2.8.0.s390x.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.8</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>zEC12.2-base</model>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>z10EC-base</model>
-      <model usable='unknown'>z9EC-base</model>
-      <model usable='unknown'>z196.2-base</model>
-      <model usable='unknown'>z900-base</model>
-      <model usable='unknown'>z990</model>
-      <model usable='unknown'>z900.2-base</model>
-      <model usable='unknown'>z900.3</model>
-      <model usable='unknown'>z114</model>
-      <model usable='unknown'>z890-base</model>
-      <model usable='unknown'>z13.2-base</model>
-      <model usable='unknown'>zEC12.2</model>
-      <model usable='unknown'>z900.2</model>
-      <model usable='unknown'>z10BC</model>
-      <model usable='unknown'>z10BC.2</model>
-      <model usable='unknown'>z196</model>
-      <model usable='unknown'>z9EC</model>
-      <model usable='unknown'>z990-base</model>
-      <model usable='unknown'>z10EC.3</model>
-      <model usable='unknown'>z900</model>
-      <model usable='unknown'>z9EC.3-base</model>
-      <model usable='unknown'>z990.5-base</model>
-      <model usable='unknown'>z10EC.2</model>
-      <model usable='unknown'>z9BC.2</model>
-      <model usable='unknown'>z10EC</model>
-      <model usable='unknown'>z990.3-base</model>
-      <model usable='unknown'>z13s</model>
-      <model usable='unknown'>z10EC.3-base</model>
-      <model usable='unknown'>zEC12.2-base</model>
-      <model usable='unknown'>z890.3-base</model>
-      <model usable='unknown'>z9EC.3</model>
-      <model usable='unknown'>z990.5</model>
-      <model usable='unknown'>z13</model>
-      <model usable='unknown'>z13s-base</model>
-      <model usable='unknown'>z9EC.2</model>
-      <model usable='unknown'>z990.4</model>
-      <model usable='unknown'>zEC12-base</model>
-      <model usable='unknown'>z9EC.2-base</model>
-      <model usable='unknown'>zBC12</model>
-      <model usable='unknown'>z196.2</model>
-      <model usable='unknown'>z990.3</model>
-      <model usable='unknown'>z990.2-base</model>
-      <model usable='unknown'>z900.3-base</model>
-      <model usable='unknown'>z890.3</model>
-      <model usable='unknown'>z10EC.2-base</model>
-      <model usable='unknown'>z990.2</model>
-      <model usable='unknown'>z890.2</model>
-      <model usable='unknown'>zBC12-base</model>
-      <model usable='unknown'>z800-base</model>
-      <model usable='unknown'>zEC12</model>
-      <model usable='unknown'>z9BC.2-base</model>
-      <model usable='unknown'>z9BC</model>
-      <model usable='unknown'>z10BC.2-base</model>
-      <model usable='unknown'>z990.4-base</model>
-      <model usable='unknown'>qemu</model>
-      <model usable='unknown'>z10BC-base</model>
-      <model usable='unknown'>z9BC-base</model>
-      <model usable='unknown'>z800</model>
-      <model usable='unknown'>z890.2-base</model>
-      <model usable='unknown'>z13.2</model>
-      <model usable='unknown'>z114-base</model>
-      <model usable='unknown'>z196-base</model>
-      <model usable='unknown'>z13-base</model>
-      <model usable='unknown'>z890</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.8.0.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
deleted file mode 100644
index 5f55b0730d..0000000000
--- a/tests/domaincapsdata/qemu_2.8.0.x86_64.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.8</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>Broadwell</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
deleted file mode 100644
index 797b970040..0000000000
--- a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.9</machine>
-  <arch>x86_64</arch>
-  <vcpu max='288'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
deleted file mode 100644
index b47c426f1b..0000000000
--- a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.9</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='no'/>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Opteron_G4</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='fsgsbase'/>
-      <feature policy='require' name='bmi1'/>
-      <feature policy='require' name='smep'/>
-      <feature policy='require' name='bmi2'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='adx'/>
-      <feature policy='require' name='smap'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='ospke'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
-      <feature policy='disable' name='avx'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='xop'/>
-      <feature policy='disable' name='fma4'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.9.0.ppc64.xml b/tests/domaincapsdata/qemu_2.9.0.ppc64.xml
deleted file mode 100644
index 2523d6ec6b..0000000000
--- a/tests/domaincapsdata/qemu_2.9.0.ppc64.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-2.9</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.9.0.s390x.xml b/tests/domaincapsdata/qemu_2.9.0.s390x.xml
deleted file mode 100644
index d5b58a786d..0000000000
--- a/tests/domaincapsdata/qemu_2.9.0.s390x.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.9</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z13.2-base</model>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>z10EC-base</model>
-      <model usable='unknown'>z9EC-base</model>
-      <model usable='unknown'>z196.2-base</model>
-      <model usable='unknown'>z900-base</model>
-      <model usable='unknown'>z990</model>
-      <model usable='unknown'>z900.2-base</model>
-      <model usable='unknown'>z900.3</model>
-      <model usable='unknown'>z114</model>
-      <model usable='unknown'>z890-base</model>
-      <model usable='unknown'>z13.2-base</model>
-      <model usable='unknown'>zEC12.2</model>
-      <model usable='unknown'>z900.2</model>
-      <model usable='unknown'>z10BC</model>
-      <model usable='unknown'>z10BC.2</model>
-      <model usable='unknown'>z196</model>
-      <model usable='unknown'>z9EC</model>
-      <model usable='unknown'>z990-base</model>
-      <model usable='unknown'>z10EC.3</model>
-      <model usable='unknown'>z900</model>
-      <model usable='unknown'>z9EC.3-base</model>
-      <model usable='unknown'>z990.5-base</model>
-      <model usable='unknown'>z10EC.2</model>
-      <model usable='unknown'>z9BC.2</model>
-      <model usable='unknown'>z10EC</model>
-      <model usable='unknown'>z990.3-base</model>
-      <model usable='unknown'>z13s</model>
-      <model usable='unknown'>z10EC.3-base</model>
-      <model usable='unknown'>zEC12.2-base</model>
-      <model usable='unknown'>z890.3-base</model>
-      <model usable='unknown'>z9EC.3</model>
-      <model usable='unknown'>z990.5</model>
-      <model usable='unknown'>z13</model>
-      <model usable='unknown'>z13s-base</model>
-      <model usable='unknown'>z9EC.2</model>
-      <model usable='unknown'>z990.4</model>
-      <model usable='unknown'>zEC12-base</model>
-      <model usable='unknown'>z9EC.2-base</model>
-      <model usable='unknown'>zBC12</model>
-      <model usable='unknown'>z196.2</model>
-      <model usable='unknown'>z990.3</model>
-      <model usable='unknown'>z990.2-base</model>
-      <model usable='unknown'>z900.3-base</model>
-      <model usable='unknown'>z890.3</model>
-      <model usable='unknown'>z10EC.2-base</model>
-      <model usable='unknown'>z990.2</model>
-      <model usable='unknown'>z890.2</model>
-      <model usable='unknown'>z800-base</model>
-      <model usable='unknown'>zBC12-base</model>
-      <model usable='unknown'>zEC12</model>
-      <model usable='unknown'>z9BC.2-base</model>
-      <model usable='unknown'>z9BC</model>
-      <model usable='unknown'>z10BC.2-base</model>
-      <model usable='unknown'>z990.4-base</model>
-      <model usable='unknown'>qemu</model>
-      <model usable='unknown'>z10BC-base</model>
-      <model usable='unknown'>z9BC-base</model>
-      <model usable='unknown'>z800</model>
-      <model usable='unknown'>z890.2-base</model>
-      <model usable='unknown'>z13.2</model>
-      <model usable='unknown'>z114-base</model>
-      <model usable='unknown'>z196-base</model>
-      <model usable='unknown'>z13-base</model>
-      <model usable='unknown'>z890</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
deleted file mode 100644
index 7716e9d381..0000000000
--- a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.9</machine>
-  <arch>x86_64</arch>
-  <vcpu max='255'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>bios</value>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-      <enum name='type'>
-        <value>rom</value>
-        <value>pflash</value>
-      </enum>
-      <enum name='readonly'>
-        <value>yes</value>
-        <value>no</value>
-      </enum>
-      <enum name='secure'>
-        <value>no</value>
-      </enum>
-    </loader>
-  </os>
-  <cpu>
-    <mode name='host-passthrough' supported='yes'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>qxl</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>