From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Apr 2025 07:34:50 +0000 (+0200)
Subject: domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0)
X-Git-Tag: v11.4.0-rc1~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5650f1f1e71e7c8648928c36058335fdd99eea9c;p=thirdparty%2Flibvirt.git

domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0)

The files were forgotten after the previous bump to use qemu-5.2 as
minimum. The data for qemu-5.2, qemu-6.0, and qemu-6.1 was already
removed when bumping to qemu-6.2.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
deleted file mode 100644
index e5ffe3934d..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-4.2</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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-IBRS</model>
-      <vendor>Intel</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='vmx-ins-outs'/>
-      <feature policy='require' name='vmx-true-ctls'/>
-      <feature policy='require' name='vmx-store-lma'/>
-      <feature policy='require' name='vmx-activity-hlt'/>
-      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
-      <feature policy='require' name='vmx-apicv-xapic'/>
-      <feature policy='require' name='vmx-ept'/>
-      <feature policy='require' name='vmx-desc-exit'/>
-      <feature policy='require' name='vmx-rdtscp-exit'/>
-      <feature policy='require' name='vmx-apicv-x2apic'/>
-      <feature policy='require' name='vmx-vpid'/>
-      <feature policy='require' name='vmx-wbinvd-exit'/>
-      <feature policy='require' name='vmx-unrestricted-guest'/>
-      <feature policy='require' name='vmx-rdrand-exit'/>
-      <feature policy='require' name='vmx-invpcid-exit'/>
-      <feature policy='require' name='vmx-vmfunc'/>
-      <feature policy='require' name='vmx-shadow-vmcs'/>
-      <feature policy='require' name='vmx-rdseed-exit'/>
-      <feature policy='require' name='vmx-pml'/>
-      <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-ept-execonly'/>
-      <feature policy='require' name='vmx-page-walk-4'/>
-      <feature policy='require' name='vmx-ept-2mb'/>
-      <feature policy='require' name='vmx-ept-1gb'/>
-      <feature policy='require' name='vmx-invept'/>
-      <feature policy='require' name='vmx-eptad'/>
-      <feature policy='require' name='vmx-invept-single-context'/>
-      <feature policy='require' name='vmx-invept-all-context'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
-      <feature policy='require' name='vmx-intr-exit'/>
-      <feature policy='require' name='vmx-nmi-exit'/>
-      <feature policy='require' name='vmx-vnmi'/>
-      <feature policy='require' name='vmx-preemption-timer'/>
-      <feature policy='require' name='vmx-vintr-pending'/>
-      <feature policy='require' name='vmx-tsc-offset'/>
-      <feature policy='require' name='vmx-hlt-exit'/>
-      <feature policy='require' name='vmx-invlpg-exit'/>
-      <feature policy='require' name='vmx-mwait-exit'/>
-      <feature policy='require' name='vmx-rdpmc-exit'/>
-      <feature policy='require' name='vmx-rdtsc-exit'/>
-      <feature policy='require' name='vmx-cr3-load-noexit'/>
-      <feature policy='require' name='vmx-cr3-store-noexit'/>
-      <feature policy='require' name='vmx-cr8-load-exit'/>
-      <feature policy='require' name='vmx-cr8-store-exit'/>
-      <feature policy='require' name='vmx-flexpriority'/>
-      <feature policy='require' name='vmx-vnmi-pending'/>
-      <feature policy='require' name='vmx-movdr-exit'/>
-      <feature policy='require' name='vmx-io-exit'/>
-      <feature policy='require' name='vmx-io-bitmap'/>
-      <feature policy='require' name='vmx-mtf'/>
-      <feature policy='require' name='vmx-msr-bitmap'/>
-      <feature policy='require' name='vmx-monitor-exit'/>
-      <feature policy='require' name='vmx-pause-exit'/>
-      <feature policy='require' name='vmx-secondary-ctls'/>
-      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
-      <feature policy='require' name='vmx-exit-ack-intr'/>
-      <feature policy='require' name='vmx-exit-save-pat'/>
-      <feature policy='require' name='vmx-exit-load-pat'/>
-      <feature policy='require' name='vmx-exit-save-efer'/>
-      <feature policy='require' name='vmx-exit-load-efer'/>
-      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
-      <feature policy='require' name='vmx-entry-noload-debugctl'/>
-      <feature policy='require' name='vmx-entry-ia32e-mode'/>
-      <feature policy='require' name='vmx-entry-load-pat'/>
-      <feature policy='require' name='vmx-entry-load-efer'/>
-      <feature policy='require' name='vmx-eptp-switching'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client</model>
-      <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
deleted file mode 100644
index a849e8f156..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-4.2</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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_G3</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <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='la57'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
-      <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='disable' name='misalignsse'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='no' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='no' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
deleted file mode 100644
index a7c2e0baee..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-4.2</machine>
-  <arch>aarch64</arch>
-  <vcpu max='512'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>pxa262</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
deleted file mode 100644
index a7c2e0baee..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-4.2</machine>
-  <arch>aarch64</arch>
-  <vcpu max='512'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>pxa262</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
deleted file mode 100644
index 2c41777e73..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-4.2</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='allow'>POWER8</model>
-      <maxphysaddr mode='passthrough' limit='64'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
-      <model usable='unknown' vendor='IBM'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>spapr-tpm-proxy</value>
-      </enum>
-      <enum name='backendModel'/>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
deleted file mode 100644
index 809ce9c903..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-4.2</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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'>gen15a-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='vxpdeh'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <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='deflate'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='mepochptff'/>
-      <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='apqi'/>
-      <feature policy='require' name='apft'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='IBM'>z800-base</model>
-      <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2</model>
-      <model usable='yes' vendor='IBM'>z13.2</model>
-      <model usable='yes' vendor='IBM'>z9BC-base</model>
-      <model usable='yes' vendor='IBM'>z990.5-base</model>
-      <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='yes' vendor='IBM'>z890</model>
-      <model usable='yes' vendor='IBM'>z9BC</model>
-      <model usable='yes' vendor='IBM'>z13</model>
-      <model usable='yes' vendor='IBM'>z196</model>
-      <model usable='yes' vendor='IBM'>z13s</model>
-      <model usable='yes' vendor='IBM'>z990.3</model>
-      <model usable='yes' vendor='IBM'>z13s-base</model>
-      <model usable='yes' vendor='IBM'>z9EC</model>
-      <model usable='yes' vendor='IBM'>gen15a</model>
-      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
-      <model usable='yes' vendor='IBM'>z14.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.3-base</model>
-      <model usable='yes' vendor='IBM'>z13.2-base</model>
-      <model usable='yes' vendor='IBM'>z196.2-base</model>
-      <model usable='yes' vendor='IBM'>zBC12-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3</model>
-      <model usable='yes' vendor='IBM'>zEC12</model>
-      <model usable='yes' vendor='IBM'>z900</model>
-      <model usable='yes' vendor='IBM'>z114-base</model>
-      <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.2</model>
-      <model usable='yes' vendor='IBM'>z10EC-base</model>
-      <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='yes' vendor='IBM'>z14ZR1</model>
-      <model usable='yes' vendor='IBM'>z10BC</model>
-      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z990.2</model>
-      <model usable='yes' vendor='IBM'>z9BC.2</model>
-      <model usable='yes' vendor='IBM'>z990</model>
-      <model usable='yes' vendor='IBM'>z14</model>
-      <model usable='yes' vendor='IBM'>gen15b-base</model>
-      <model usable='yes' vendor='IBM'>z990.4</model>
-      <model usable='yes' vendor='unknown'>max</model>
-      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-      <model usable='yes' vendor='IBM'>gen15a-base</model>
-      <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='yes' vendor='IBM'>zEC12.2</model>
-      <model usable='yes' vendor='IBM'>z10EC</model>
-      <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='yes' vendor='IBM'>z10BC.2</model>
-      <model usable='yes' vendor='IBM'>z9EC-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z114</model>
-      <model usable='yes' vendor='IBM'>z890.3</model>
-      <model usable='yes' vendor='IBM'>z196-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z196.2</model>
-      <model usable='yes' vendor='IBM'>z14.2</model>
-      <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
-      <model usable='yes' vendor='IBM'>z890-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3</model>
-      <model usable='yes' vendor='IBM'>z14-base</model>
-      <model usable='yes' vendor='IBM'>z990.4-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z10BC-base</model>
-      <model usable='yes' vendor='IBM'>z13-base</model>
-      <model usable='yes' vendor='IBM'>z990.3-base</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
-      <model usable='yes' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>z890.3-base</model>
-      <model usable='yes' vendor='IBM'>z990.5</model>
-      <model usable='yes' vendor='IBM'>gen15b</model>
-      <model usable='no' vendor='unknown'>qemu</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
deleted file mode 100644
index 32ba46ebbc..0000000000
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-4.2</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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-IBRS</model>
-      <vendor>Intel</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='vmx-ins-outs'/>
-      <feature policy='require' name='vmx-true-ctls'/>
-      <feature policy='require' name='vmx-store-lma'/>
-      <feature policy='require' name='vmx-activity-hlt'/>
-      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
-      <feature policy='require' name='vmx-apicv-xapic'/>
-      <feature policy='require' name='vmx-ept'/>
-      <feature policy='require' name='vmx-desc-exit'/>
-      <feature policy='require' name='vmx-rdtscp-exit'/>
-      <feature policy='require' name='vmx-apicv-x2apic'/>
-      <feature policy='require' name='vmx-vpid'/>
-      <feature policy='require' name='vmx-wbinvd-exit'/>
-      <feature policy='require' name='vmx-unrestricted-guest'/>
-      <feature policy='require' name='vmx-rdrand-exit'/>
-      <feature policy='require' name='vmx-invpcid-exit'/>
-      <feature policy='require' name='vmx-vmfunc'/>
-      <feature policy='require' name='vmx-shadow-vmcs'/>
-      <feature policy='require' name='vmx-rdseed-exit'/>
-      <feature policy='require' name='vmx-pml'/>
-      <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-ept-execonly'/>
-      <feature policy='require' name='vmx-page-walk-4'/>
-      <feature policy='require' name='vmx-ept-2mb'/>
-      <feature policy='require' name='vmx-ept-1gb'/>
-      <feature policy='require' name='vmx-invept'/>
-      <feature policy='require' name='vmx-eptad'/>
-      <feature policy='require' name='vmx-invept-single-context'/>
-      <feature policy='require' name='vmx-invept-all-context'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
-      <feature policy='require' name='vmx-intr-exit'/>
-      <feature policy='require' name='vmx-nmi-exit'/>
-      <feature policy='require' name='vmx-vnmi'/>
-      <feature policy='require' name='vmx-preemption-timer'/>
-      <feature policy='require' name='vmx-vintr-pending'/>
-      <feature policy='require' name='vmx-tsc-offset'/>
-      <feature policy='require' name='vmx-hlt-exit'/>
-      <feature policy='require' name='vmx-invlpg-exit'/>
-      <feature policy='require' name='vmx-mwait-exit'/>
-      <feature policy='require' name='vmx-rdpmc-exit'/>
-      <feature policy='require' name='vmx-rdtsc-exit'/>
-      <feature policy='require' name='vmx-cr3-load-noexit'/>
-      <feature policy='require' name='vmx-cr3-store-noexit'/>
-      <feature policy='require' name='vmx-cr8-load-exit'/>
-      <feature policy='require' name='vmx-cr8-store-exit'/>
-      <feature policy='require' name='vmx-flexpriority'/>
-      <feature policy='require' name='vmx-vnmi-pending'/>
-      <feature policy='require' name='vmx-movdr-exit'/>
-      <feature policy='require' name='vmx-io-exit'/>
-      <feature policy='require' name='vmx-io-bitmap'/>
-      <feature policy='require' name='vmx-mtf'/>
-      <feature policy='require' name='vmx-msr-bitmap'/>
-      <feature policy='require' name='vmx-monitor-exit'/>
-      <feature policy='require' name='vmx-pause-exit'/>
-      <feature policy='require' name='vmx-secondary-ctls'/>
-      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
-      <feature policy='require' name='vmx-exit-ack-intr'/>
-      <feature policy='require' name='vmx-exit-save-pat'/>
-      <feature policy='require' name='vmx-exit-load-pat'/>
-      <feature policy='require' name='vmx-exit-save-efer'/>
-      <feature policy='require' name='vmx-exit-load-efer'/>
-      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
-      <feature policy='require' name='vmx-entry-noload-debugctl'/>
-      <feature policy='require' name='vmx-entry-ia32e-mode'/>
-      <feature policy='require' name='vmx-entry-load-pat'/>
-      <feature policy='require' name='vmx-entry-load-efer'/>
-      <feature policy='require' name='vmx-eptp-switching'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client</model>
-      <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
deleted file mode 100644
index 70bd7bc46e..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-5.0</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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-IBRS</model>
-      <vendor>Intel</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='vmx-ins-outs'/>
-      <feature policy='require' name='vmx-true-ctls'/>
-      <feature policy='require' name='vmx-store-lma'/>
-      <feature policy='require' name='vmx-activity-hlt'/>
-      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
-      <feature policy='require' name='vmx-apicv-xapic'/>
-      <feature policy='require' name='vmx-ept'/>
-      <feature policy='require' name='vmx-desc-exit'/>
-      <feature policy='require' name='vmx-rdtscp-exit'/>
-      <feature policy='require' name='vmx-apicv-x2apic'/>
-      <feature policy='require' name='vmx-vpid'/>
-      <feature policy='require' name='vmx-wbinvd-exit'/>
-      <feature policy='require' name='vmx-unrestricted-guest'/>
-      <feature policy='require' name='vmx-rdrand-exit'/>
-      <feature policy='require' name='vmx-invpcid-exit'/>
-      <feature policy='require' name='vmx-vmfunc'/>
-      <feature policy='require' name='vmx-shadow-vmcs'/>
-      <feature policy='require' name='vmx-rdseed-exit'/>
-      <feature policy='require' name='vmx-pml'/>
-      <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-ept-execonly'/>
-      <feature policy='require' name='vmx-page-walk-4'/>
-      <feature policy='require' name='vmx-ept-2mb'/>
-      <feature policy='require' name='vmx-ept-1gb'/>
-      <feature policy='require' name='vmx-invept'/>
-      <feature policy='require' name='vmx-eptad'/>
-      <feature policy='require' name='vmx-invept-single-context'/>
-      <feature policy='require' name='vmx-invept-all-context'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
-      <feature policy='require' name='vmx-intr-exit'/>
-      <feature policy='require' name='vmx-nmi-exit'/>
-      <feature policy='require' name='vmx-vnmi'/>
-      <feature policy='require' name='vmx-preemption-timer'/>
-      <feature policy='require' name='vmx-vintr-pending'/>
-      <feature policy='require' name='vmx-tsc-offset'/>
-      <feature policy='require' name='vmx-hlt-exit'/>
-      <feature policy='require' name='vmx-invlpg-exit'/>
-      <feature policy='require' name='vmx-mwait-exit'/>
-      <feature policy='require' name='vmx-rdpmc-exit'/>
-      <feature policy='require' name='vmx-rdtsc-exit'/>
-      <feature policy='require' name='vmx-cr3-load-noexit'/>
-      <feature policy='require' name='vmx-cr3-store-noexit'/>
-      <feature policy='require' name='vmx-cr8-load-exit'/>
-      <feature policy='require' name='vmx-cr8-store-exit'/>
-      <feature policy='require' name='vmx-flexpriority'/>
-      <feature policy='require' name='vmx-vnmi-pending'/>
-      <feature policy='require' name='vmx-movdr-exit'/>
-      <feature policy='require' name='vmx-io-exit'/>
-      <feature policy='require' name='vmx-io-bitmap'/>
-      <feature policy='require' name='vmx-mtf'/>
-      <feature policy='require' name='vmx-msr-bitmap'/>
-      <feature policy='require' name='vmx-monitor-exit'/>
-      <feature policy='require' name='vmx-pause-exit'/>
-      <feature policy='require' name='vmx-secondary-ctls'/>
-      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
-      <feature policy='require' name='vmx-exit-ack-intr'/>
-      <feature policy='require' name='vmx-exit-save-pat'/>
-      <feature policy='require' name='vmx-exit-load-pat'/>
-      <feature policy='require' name='vmx-exit-save-efer'/>
-      <feature policy='require' name='vmx-exit-load-efer'/>
-      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
-      <feature policy='require' name='vmx-entry-noload-debugctl'/>
-      <feature policy='require' name='vmx-entry-ia32e-mode'/>
-      <feature policy='require' name='vmx-entry-load-pat'/>
-      <feature policy='require' name='vmx-entry-load-efer'/>
-      <feature policy='require' name='vmx-eptp-switching'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client</model>
-      <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml
deleted file mode 100644
index c487d467ef..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-riscv64</path>
-  <domain>qemu</domain>
-  <machine>virt</machine>
-  <arch>riscv64</arch>
-  <vcpu max='8'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='no'/>
-    <mode name='custom' supported='no'/>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
deleted file mode 100644
index d69ea76a78..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-5.0</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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_G3</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <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='la57'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
-      <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='disable' name='misalignsse'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
deleted file mode 100644
index 2466dda755..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-5.0</machine>
-  <arch>aarch64</arch>
-  <vcpu max='512'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
-      <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>pxa262</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml
deleted file mode 100644
index b0e4aafcd5..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-riscv64</path>
-  <domain>kvm</domain>
-  <machine>virt</machine>
-  <arch>riscv64</arch>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
deleted file mode 100644
index 2466dda755..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-5.0</machine>
-  <arch>aarch64</arch>
-  <vcpu max='512'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'>
-      <value>efi</value>
-    </enum>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='no'/>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
-      <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>pxa262</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
deleted file mode 100644
index c66d0645fc..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-5.0</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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='allow'>POWER8</model>
-      <maxphysaddr mode='passthrough' limit='64'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='IBM'>POWER10</model>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
-      <model usable='unknown' vendor='IBM'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>cirrus</value>
-        <value>vmvga</value>
-        <value>virtio</value>
-        <value>none</value>
-        <value>bochs</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-spapr</value>
-        <value>spapr-tpm-proxy</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='no'/>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
deleted file mode 100644
index c57d4f3283..0000000000
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-5.0</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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-IBRS</model>
-      <vendor>Intel</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='vmx-ins-outs'/>
-      <feature policy='require' name='vmx-true-ctls'/>
-      <feature policy='require' name='vmx-store-lma'/>
-      <feature policy='require' name='vmx-activity-hlt'/>
-      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
-      <feature policy='require' name='vmx-apicv-xapic'/>
-      <feature policy='require' name='vmx-ept'/>
-      <feature policy='require' name='vmx-desc-exit'/>
-      <feature policy='require' name='vmx-rdtscp-exit'/>
-      <feature policy='require' name='vmx-apicv-x2apic'/>
-      <feature policy='require' name='vmx-vpid'/>
-      <feature policy='require' name='vmx-wbinvd-exit'/>
-      <feature policy='require' name='vmx-unrestricted-guest'/>
-      <feature policy='require' name='vmx-rdrand-exit'/>
-      <feature policy='require' name='vmx-invpcid-exit'/>
-      <feature policy='require' name='vmx-vmfunc'/>
-      <feature policy='require' name='vmx-shadow-vmcs'/>
-      <feature policy='require' name='vmx-rdseed-exit'/>
-      <feature policy='require' name='vmx-pml'/>
-      <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-ept-execonly'/>
-      <feature policy='require' name='vmx-page-walk-4'/>
-      <feature policy='require' name='vmx-ept-2mb'/>
-      <feature policy='require' name='vmx-ept-1gb'/>
-      <feature policy='require' name='vmx-invept'/>
-      <feature policy='require' name='vmx-eptad'/>
-      <feature policy='require' name='vmx-invept-single-context'/>
-      <feature policy='require' name='vmx-invept-all-context'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
-      <feature policy='require' name='vmx-intr-exit'/>
-      <feature policy='require' name='vmx-nmi-exit'/>
-      <feature policy='require' name='vmx-vnmi'/>
-      <feature policy='require' name='vmx-preemption-timer'/>
-      <feature policy='require' name='vmx-vintr-pending'/>
-      <feature policy='require' name='vmx-tsc-offset'/>
-      <feature policy='require' name='vmx-hlt-exit'/>
-      <feature policy='require' name='vmx-invlpg-exit'/>
-      <feature policy='require' name='vmx-mwait-exit'/>
-      <feature policy='require' name='vmx-rdpmc-exit'/>
-      <feature policy='require' name='vmx-rdtsc-exit'/>
-      <feature policy='require' name='vmx-cr3-load-noexit'/>
-      <feature policy='require' name='vmx-cr3-store-noexit'/>
-      <feature policy='require' name='vmx-cr8-load-exit'/>
-      <feature policy='require' name='vmx-cr8-store-exit'/>
-      <feature policy='require' name='vmx-flexpriority'/>
-      <feature policy='require' name='vmx-vnmi-pending'/>
-      <feature policy='require' name='vmx-movdr-exit'/>
-      <feature policy='require' name='vmx-io-exit'/>
-      <feature policy='require' name='vmx-io-bitmap'/>
-      <feature policy='require' name='vmx-mtf'/>
-      <feature policy='require' name='vmx-msr-bitmap'/>
-      <feature policy='require' name='vmx-monitor-exit'/>
-      <feature policy='require' name='vmx-pause-exit'/>
-      <feature policy='require' name='vmx-secondary-ctls'/>
-      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
-      <feature policy='require' name='vmx-exit-ack-intr'/>
-      <feature policy='require' name='vmx-exit-save-pat'/>
-      <feature policy='require' name='vmx-exit-load-pat'/>
-      <feature policy='require' name='vmx-exit-save-efer'/>
-      <feature policy='require' name='vmx-exit-load-efer'/>
-      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
-      <feature policy='require' name='vmx-entry-noload-debugctl'/>
-      <feature policy='require' name='vmx-entry-ia32e-mode'/>
-      <feature policy='require' name='vmx-entry-load-pat'/>
-      <feature policy='require' name='vmx-entry-load-efer'/>
-      <feature policy='require' name='vmx-eptp-switching'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='Intel'>Skylake-Client</model>
-      <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
deleted file mode 100644
index f276f0b735..0000000000
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-5.1</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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'>EPYC-Rome</model>
-      <vendor>AMD</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
deleted file mode 100644
index eea710a054..0000000000
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-5.1</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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_G3</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <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='la57'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
-      <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='disable' name='misalignsse'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
deleted file mode 100644
index a471a937d7..0000000000
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-sparc</path>
-  <domain>kvm</domain>
-  <machine>SS-5</machine>
-  <arch>sparc</arch>
-  <iothreads supported='yes'/>
-  <os supported='yes'>
-    <enum name='firmware'/>
-    <loader supported='yes'>
-      <value>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <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'/>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'/>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
deleted file mode 100644
index 56e30cc302..0000000000
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-5.1</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>/obviously/fake/firmware1.fd</value>
-      <value>/obviously/fake/firmware2.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>on</value>
-        <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'>EPYC-Rome</model>
-      <vendor>AMD</vendor>
-      <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
-      <model usable='yes' vendor='unknown'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <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>
-        <value>egl-headless</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>
-        <value>bochs</value>
-        <value>ramfb</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>
-        <value>builtin</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-        <value>virtiofs</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-        <value>external</value>
-      </enum>
-      <enum name='backendVersion'>
-        <value>1.2</value>
-      </enum>
-    </tpm>
-    <redirdev supported='yes'>
-      <enum name='bus'>
-        <value>usb</value>
-      </enum>
-    </redirdev>
-    <channel supported='yes'>
-      <enum name='type'>
-        <value>pty</value>
-        <value>unix</value>
-        <value>spicevmc</value>
-      </enum>
-    </channel>
-    <crypto supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-      </enum>
-      <enum name='type'>
-        <value>qemu</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>builtin</value>
-      </enum>
-    </crypto>
-    <interface supported='yes'>
-      <enum name='backendType'>
-        <value>default</value>
-      </enum>
-    </interface>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
-    <async-teardown supported='no'/>
-    <sev supported='no'/>
-    <sgx supported='no'/>
-    <launchSecurity supported='no'/>
-  </features>
-</domainCapabilities>