[qemu] Add test dependency to reuse test resources from master-sync-shared

4 files changed, 11 insertions, 1149 deletions

diff --git a/core/modules/qemu/runvirt-plugin-qemu/pom.xml b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
index f02be96d..d8bb9743 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/pom.xml
+++ b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
@@ -102,6 +102,14 @@
       <version>1.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.openslx.bwlp</groupId>
+      <artifactId>master-sync-shared</artifactId>
+      <version>1.1-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
index 45aa1109..a308693f 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 import org.openslx.libvirt.domain.Domain;
 import org.openslx.libvirt.xml.LibvirtXmlDocumentException;
 import org.openslx.libvirt.xml.LibvirtXmlSerializationException;
+import org.openslx.libvirt.xml.LibvirtXmlTestResources;
 import org.openslx.libvirt.xml.LibvirtXmlValidationException;
 import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs;
 import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs.CmdLnOption;
@@ -101,7 +102,8 @@ public class FilterTestUtils
 		Domain domain = null;
 
 		try {
-			domain = new Domain( FilterTestResources.getLibvirtXmlFile( "qemu-kvm_default-ubuntu-20-04-vm_filtered.xml" ) );
+			domain = new Domain( LibvirtXmlTestResources
+					.getLibvirtXmlStream( "qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml" ) );
 		} catch ( LibvirtXmlDocumentException | LibvirtXmlSerializationException | LibvirtXmlValidationException e ) {
 			fail( "Cannot prepare requested Libvirt domain XML file from the resources folder: "
 					+ e.getLocalizedMessage() );
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml b/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml
deleted file mode 100644
index 4f2a94f2..00000000
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml
+++ /dev/null
@@ -1,986 +0,0 @@
-<capabilities>
-
-  <host>
-    <uuid>9b2f12af-1fba-444c-b72b-9cbc43fb3ca5</uuid>
-    <cpu>
-      <arch>x86_64</arch>
-      <model>Skylake-Client-IBRS</model>
-      <vendor>Intel</vendor>
-      <microcode version='226'/>
-      <counter name='tsc' frequency='3191999000' scaling='no'/>
-      <topology sockets='1' dies='1' cores='4' threads='1'/>
-      <feature name='ds'/>
-      <feature name='acpi'/>
-      <feature name='ss'/>
-      <feature name='ht'/>
-      <feature name='tm'/>
-      <feature name='pbe'/>
-      <feature name='dtes64'/>
-      <feature name='monitor'/>
-      <feature name='ds_cpl'/>
-      <feature name='vmx'/>
-      <feature name='smx'/>
-      <feature name='est'/>
-      <feature name='tm2'/>
-      <feature name='xtpr'/>
-      <feature name='pdcm'/>
-      <feature name='osxsave'/>
-      <feature name='tsc_adjust'/>
-      <feature name='clflushopt'/>
-      <feature name='intel-pt'/>
-      <feature name='md-clear'/>
-      <feature name='stibp'/>
-      <feature name='ssbd'/>
-      <feature name='xsaves'/>
-      <feature name='pdpe1gb'/>
-      <feature name='invtsc'/>
-      <pages unit='KiB' size='4'/>
-      <pages unit='KiB' size='2048'/>
-      <pages unit='KiB' size='1048576'/>
-    </cpu>
-    <power_management>
-      <suspend_mem/>
-    </power_management>
-    <iommu support='yes'/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>tcp</uri_transport>
-        <uri_transport>rdma</uri_transport>
-      </uri_transports>
-    </migration_features>
-    <topology>
-      <cells num='1'>
-        <cell id='0'>
-          <memory unit='KiB'>16161320</memory>
-          <pages unit='KiB' size='4'>4040330</pages>
-          <pages unit='KiB' size='2048'>0</pages>
-          <pages unit='KiB' size='1048576'>0</pages>
-          <distances>
-            <sibling id='0' value='10'/>
-          </distances>
-          <cpus num='4'>
-            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
-          </cpus>
-        </cell>
-      </cells>
-    </topology>
-    <cache>
-      <bank id='0' level='3' type='both' size='6' unit='MiB' cpus='0-3'/>
-    </cache>
-    <secmodel>
-      <model>none</model>
-      <doi>0</doi>
-    </secmodel>
-  </host>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='alpha'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-alpha</emulator>
-      <machine maxCpus='4'>clipper</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='armv6l'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-arm</emulator>
-      <machine maxCpus='1'>integratorcp</machine>
-      <machine maxCpus='2'>ast2600-evb</machine>
-      <machine maxCpus='1'>borzoi</machine>
-      <machine maxCpus='1'>spitz</machine>
-      <machine maxCpus='255'>virt-2.7</machine>
-      <machine maxCpus='2'>nuri</machine>
-      <machine maxCpus='2'>mcimx7d-sabre</machine>
-      <machine maxCpus='1'>romulus-bmc</machine>
-      <machine maxCpus='512'>virt-3.0</machine>
-      <machine maxCpus='512'>virt-5.0</machine>
-      <machine maxCpus='2'>npcm750-evb</machine>
-      <machine maxCpus='255'>virt-2.10</machine>
-      <machine maxCpus='2'>musca-b1</machine>
-      <machine maxCpus='255'>virt-2.8</machine>
-      <machine maxCpus='4'>realview-pbx-a9</machine>
-      <machine maxCpus='1'>versatileab</machine>
-      <machine maxCpus='1'>kzm</machine>
-      <machine maxCpus='2'>musca-a</machine>
-      <machine maxCpus='512'>virt-3.1</machine>
-      <machine maxCpus='1'>mcimx6ul-evk</machine>
-      <machine maxCpus='512'>virt-5.1</machine>
-      <machine maxCpus='2'>smdkc210</machine>
-      <machine maxCpus='1'>sx1</machine>
-      <machine maxCpus='255'>virt-2.11</machine>
-      <machine maxCpus='1'>imx25-pdk</machine>
-      <machine maxCpus='255'>virt-2.9</machine>
-      <machine maxCpus='4'>orangepi-pc</machine>
-      <machine maxCpus='1'>z2</machine>
-      <machine maxCpus='512'>virt-5.2</machine>
-      <machine canonical='virt-5.2' maxCpus='512'>virt</machine>
-      <machine maxCpus='1'>xilinx-zynq-a9</machine>
-      <machine maxCpus='1'>tosa</machine>
-      <machine maxCpus='1'>mps2-an500</machine>
-      <machine maxCpus='255'>virt-2.12</machine>
-      <machine maxCpus='2'>mps2-an521</machine>
-      <machine maxCpus='4'>sabrelite</machine>
-      <machine maxCpus='1'>mps2-an511</machine>
-      <machine maxCpus='1'>canon-a1100</machine>
-      <machine maxCpus='1'>realview-eb</machine>
-      <machine maxCpus='1'>emcraft-sf2</machine>
-      <machine maxCpus='1'>realview-pb-a8</machine>
-      <machine maxCpus='512'>virt-4.0</machine>
-      <machine maxCpus='1'>raspi1ap</machine>
-      <machine maxCpus='1'>palmetto-bmc</machine>
-      <machine maxCpus='1'>sx1-v1</machine>
-      <machine maxCpus='1'>n810</machine>
-      <machine maxCpus='2'>tacoma-bmc</machine>
-      <machine maxCpus='1'>n800</machine>
-      <machine maxCpus='512'>virt-4.1</machine>
-      <machine maxCpus='2'>quanta-gsj</machine>
-      <machine maxCpus='1'>versatilepb</machine>
-      <machine maxCpus='1'>terrier</machine>
-      <machine maxCpus='1'>mainstone</machine>
-      <machine maxCpus='4'>realview-eb-mpcore</machine>
-      <machine maxCpus='1'>supermicrox11-bmc</machine>
-      <machine maxCpus='512'>virt-4.2</machine>
-      <machine maxCpus='1'>witherspoon-bmc</machine>
-      <machine maxCpus='1'>swift-bmc</machine>
-      <machine maxCpus='4'>vexpress-a9</machine>
-      <machine maxCpus='4'>midway</machine>
-      <machine maxCpus='1'>musicpal</machine>
-      <machine maxCpus='1'>lm3s811evb</machine>
-      <machine maxCpus='1'>lm3s6965evb</machine>
-      <machine maxCpus='1'>microbit</machine>
-      <machine maxCpus='1'>mps2-an505</machine>
-      <machine maxCpus='1'>mps2-an385</machine>
-      <machine maxCpus='1'>cubieboard</machine>
-      <machine maxCpus='1'>verdex</machine>
-      <machine maxCpus='1'>netduino2</machine>
-      <machine maxCpus='1'>mps2-an386</machine>
-      <machine maxCpus='4'>raspi2b</machine>
-      <machine canonical='raspi2b' maxCpus='4'>raspi2</machine>
-      <machine maxCpus='4'>vexpress-a15</machine>
-      <machine maxCpus='1'>sonorapass-bmc</machine>
-      <machine maxCpus='1'>cheetah</machine>
-      <machine maxCpus='255'>virt-2.6</machine>
-      <machine maxCpus='1'>ast2500-evb</machine>
-      <machine maxCpus='4'>highbank</machine>
-      <machine maxCpus='1'>akita</machine>
-      <machine maxCpus='1'>connex</machine>
-      <machine maxCpus='1'>netduinoplus2</machine>
-      <machine maxCpus='1'>collie</machine>
-      <machine maxCpus='1'>raspi0</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='armv7l'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-arm</emulator>
-      <machine maxCpus='1'>integratorcp</machine>
-      <machine maxCpus='2'>ast2600-evb</machine>
-      <machine maxCpus='1'>borzoi</machine>
-      <machine maxCpus='1'>spitz</machine>
-      <machine maxCpus='255'>virt-2.7</machine>
-      <machine maxCpus='2'>nuri</machine>
-      <machine maxCpus='2'>mcimx7d-sabre</machine>
-      <machine maxCpus='1'>romulus-bmc</machine>
-      <machine maxCpus='512'>virt-3.0</machine>
-      <machine maxCpus='512'>virt-5.0</machine>
-      <machine maxCpus='2'>npcm750-evb</machine>
-      <machine maxCpus='255'>virt-2.10</machine>
-      <machine maxCpus='2'>musca-b1</machine>
-      <machine maxCpus='255'>virt-2.8</machine>
-      <machine maxCpus='4'>realview-pbx-a9</machine>
-      <machine maxCpus='1'>versatileab</machine>
-      <machine maxCpus='1'>kzm</machine>
-      <machine maxCpus='2'>musca-a</machine>
-      <machine maxCpus='512'>virt-3.1</machine>
-      <machine maxCpus='1'>mcimx6ul-evk</machine>
-      <machine maxCpus='512'>virt-5.1</machine>
-      <machine maxCpus='2'>smdkc210</machine>
-      <machine maxCpus='1'>sx1</machine>
-      <machine maxCpus='255'>virt-2.11</machine>
-      <machine maxCpus='1'>imx25-pdk</machine>
-      <machine maxCpus='255'>virt-2.9</machine>
-      <machine maxCpus='4'>orangepi-pc</machine>
-      <machine maxCpus='1'>z2</machine>
-      <machine maxCpus='512'>virt-5.2</machine>
-      <machine canonical='virt-5.2' maxCpus='512'>virt</machine>
-      <machine maxCpus='1'>xilinx-zynq-a9</machine>
-      <machine maxCpus='1'>tosa</machine>
-      <machine maxCpus='1'>mps2-an500</machine>
-      <machine maxCpus='255'>virt-2.12</machine>
-      <machine maxCpus='2'>mps2-an521</machine>
-      <machine maxCpus='4'>sabrelite</machine>
-      <machine maxCpus='1'>mps2-an511</machine>
-      <machine maxCpus='1'>canon-a1100</machine>
-      <machine maxCpus='1'>realview-eb</machine>
-      <machine maxCpus='1'>emcraft-sf2</machine>
-      <machine maxCpus='1'>realview-pb-a8</machine>
-      <machine maxCpus='512'>virt-4.0</machine>
-      <machine maxCpus='1'>raspi1ap</machine>
-      <machine maxCpus='1'>palmetto-bmc</machine>
-      <machine maxCpus='1'>sx1-v1</machine>
-      <machine maxCpus='1'>n810</machine>
-      <machine maxCpus='2'>tacoma-bmc</machine>
-      <machine maxCpus='1'>n800</machine>
-      <machine maxCpus='512'>virt-4.1</machine>
-      <machine maxCpus='2'>quanta-gsj</machine>
-      <machine maxCpus='1'>versatilepb</machine>
-      <machine maxCpus='1'>terrier</machine>
-      <machine maxCpus='1'>mainstone</machine>
-      <machine maxCpus='4'>realview-eb-mpcore</machine>
-      <machine maxCpus='1'>supermicrox11-bmc</machine>
-      <machine maxCpus='512'>virt-4.2</machine>
-      <machine maxCpus='1'>witherspoon-bmc</machine>
-      <machine maxCpus='1'>swift-bmc</machine>
-      <machine maxCpus='4'>vexpress-a9</machine>
-      <machine maxCpus='4'>midway</machine>
-      <machine maxCpus='1'>musicpal</machine>
-      <machine maxCpus='1'>lm3s811evb</machine>
-      <machine maxCpus='1'>lm3s6965evb</machine>
-      <machine maxCpus='1'>microbit</machine>
-      <machine maxCpus='1'>mps2-an505</machine>
-      <machine maxCpus='1'>mps2-an385</machine>
-      <machine maxCpus='1'>cubieboard</machine>
-      <machine maxCpus='1'>verdex</machine>
-      <machine maxCpus='1'>netduino2</machine>
-      <machine maxCpus='1'>mps2-an386</machine>
-      <machine maxCpus='4'>raspi2b</machine>
-      <machine canonical='raspi2b' maxCpus='4'>raspi2</machine>
-      <machine maxCpus='4'>vexpress-a15</machine>
-      <machine maxCpus='1'>sonorapass-bmc</machine>
-      <machine maxCpus='1'>cheetah</machine>
-      <machine maxCpus='255'>virt-2.6</machine>
-      <machine maxCpus='1'>ast2500-evb</machine>
-      <machine maxCpus='4'>highbank</machine>
-      <machine maxCpus='1'>akita</machine>
-      <machine maxCpus='1'>connex</machine>
-      <machine maxCpus='1'>netduinoplus2</machine>
-      <machine maxCpus='1'>collie</machine>
-      <machine maxCpus='1'>raspi0</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='aarch64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-aarch64</emulator>
-      <machine maxCpus='1'>integratorcp</machine>
-      <machine maxCpus='2'>ast2600-evb</machine>
-      <machine maxCpus='1'>borzoi</machine>
-      <machine maxCpus='1'>spitz</machine>
-      <machine maxCpus='255'>virt-2.7</machine>
-      <machine maxCpus='2'>nuri</machine>
-      <machine maxCpus='2'>mcimx7d-sabre</machine>
-      <machine maxCpus='1'>romulus-bmc</machine>
-      <machine maxCpus='512'>virt-3.0</machine>
-      <machine maxCpus='512'>virt-5.0</machine>
-      <machine maxCpus='2'>npcm750-evb</machine>
-      <machine maxCpus='255'>virt-2.10</machine>
-      <machine maxCpus='2'>musca-b1</machine>
-      <machine maxCpus='255'>virt-2.8</machine>
-      <machine maxCpus='4'>realview-pbx-a9</machine>
-      <machine maxCpus='1'>versatileab</machine>
-      <machine maxCpus='1'>kzm</machine>
-      <machine maxCpus='2'>musca-a</machine>
-      <machine maxCpus='512'>virt-3.1</machine>
-      <machine maxCpus='1'>mcimx6ul-evk</machine>
-      <machine maxCpus='512'>virt-5.1</machine>
-      <machine maxCpus='2'>smdkc210</machine>
-      <machine maxCpus='1'>sx1</machine>
-      <machine maxCpus='255'>virt-2.11</machine>
-      <machine maxCpus='1'>imx25-pdk</machine>
-      <machine maxCpus='255'>virt-2.9</machine>
-      <machine maxCpus='4'>orangepi-pc</machine>
-      <machine maxCpus='1'>z2</machine>
-      <machine maxCpus='512'>virt-5.2</machine>
-      <machine canonical='virt-5.2' maxCpus='512'>virt</machine>
-      <machine maxCpus='1'>xilinx-zynq-a9</machine>
-      <machine maxCpus='6'>xlnx-zcu102</machine>
-      <machine maxCpus='1'>tosa</machine>
-      <machine maxCpus='1'>mps2-an500</machine>
-      <machine maxCpus='255'>virt-2.12</machine>
-      <machine maxCpus='2'>mps2-an521</machine>
-      <machine maxCpus='4'>sabrelite</machine>
-      <machine maxCpus='1'>mps2-an511</machine>
-      <machine maxCpus='1'>canon-a1100</machine>
-      <machine maxCpus='1'>realview-eb</machine>
-      <machine maxCpus='1'>emcraft-sf2</machine>
-      <machine maxCpus='1'>realview-pb-a8</machine>
-      <machine maxCpus='512'>sbsa-ref</machine>
-      <machine maxCpus='512'>virt-4.0</machine>
-      <machine maxCpus='1'>raspi1ap</machine>
-      <machine maxCpus='1'>palmetto-bmc</machine>
-      <machine maxCpus='1'>sx1-v1</machine>
-      <machine maxCpus='1'>n810</machine>
-      <machine maxCpus='2'>tacoma-bmc</machine>
-      <machine maxCpus='1'>n800</machine>
-      <machine maxCpus='512'>virt-4.1</machine>
-      <machine maxCpus='2'>quanta-gsj</machine>
-      <machine maxCpus='1'>versatilepb</machine>
-      <machine maxCpus='1'>terrier</machine>
-      <machine maxCpus='1'>mainstone</machine>
-      <machine maxCpus='4'>realview-eb-mpcore</machine>
-      <machine maxCpus='1'>supermicrox11-bmc</machine>
-      <machine maxCpus='512'>virt-4.2</machine>
-      <machine maxCpus='1'>witherspoon-bmc</machine>
-      <machine maxCpus='1'>swift-bmc</machine>
-      <machine maxCpus='4'>vexpress-a9</machine>
-      <machine maxCpus='4'>midway</machine>
-      <machine maxCpus='1'>musicpal</machine>
-      <machine maxCpus='1'>lm3s811evb</machine>
-      <machine maxCpus='1'>lm3s6965evb</machine>
-      <machine maxCpus='1'>microbit</machine>
-      <machine maxCpus='1'>mps2-an505</machine>
-      <machine maxCpus='1'>mps2-an385</machine>
-      <machine maxCpus='4'>raspi3ap</machine>
-      <machine maxCpus='1'>cubieboard</machine>
-      <machine maxCpus='1'>verdex</machine>
-      <machine maxCpus='1'>netduino2</machine>
-      <machine maxCpus='2'>xlnx-versal-virt</machine>
-      <machine maxCpus='1'>mps2-an386</machine>
-      <machine maxCpus='4'>raspi3b</machine>
-      <machine canonical='raspi3b' maxCpus='4'>raspi3</machine>
-      <machine maxCpus='4'>raspi2b</machine>
-      <machine canonical='raspi2b' maxCpus='4'>raspi2</machine>
-      <machine maxCpus='4'>vexpress-a15</machine>
-      <machine maxCpus='1'>sonorapass-bmc</machine>
-      <machine maxCpus='1'>cheetah</machine>
-      <machine maxCpus='255'>virt-2.6</machine>
-      <machine maxCpus='1'>ast2500-evb</machine>
-      <machine maxCpus='4'>highbank</machine>
-      <machine maxCpus='1'>akita</machine>
-      <machine maxCpus='1'>connex</machine>
-      <machine maxCpus='1'>netduinoplus2</machine>
-      <machine maxCpus='1'>collie</machine>
-      <machine maxCpus='1'>raspi0</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <acpi default='on' toggle='yes'/>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='cris'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-cris</emulator>
-      <machine maxCpus='1'>axis-dev88</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-i386</emulator>
-      <machine maxCpus='255'>pc-i440fx-5.2</machine>
-      <machine canonical='pc-i440fx-5.2' maxCpus='255'>pc</machine>
-      <machine maxCpus='288'>pc-q35-5.2</machine>
-      <machine canonical='pc-q35-5.2' maxCpus='288'>q35</machine>
-      <machine maxCpus='255'>pc-i440fx-2.12</machine>
-      <machine maxCpus='255'>pc-i440fx-2.0</machine>
-      <machine maxCpus='288'>pc-q35-4.2</machine>
-      <machine maxCpus='255'>pc-i440fx-2.5</machine>
-      <machine maxCpus='255'>pc-i440fx-4.2</machine>
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
-      <machine maxCpus='255'>pc-q35-2.7</machine>
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
-      <machine maxCpus='255'>pc-1.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.7</machine>
-      <machine maxCpus='255'>pc-q35-2.4</machine>
-      <machine maxCpus='288'>pc-q35-2.10</machine>
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
-      <machine maxCpus='288'>pc-q35-5.1</machine>
-      <machine maxCpus='288'>pc-q35-2.9</machine>
-      <machine maxCpus='255'>pc-i440fx-2.11</machine>
-      <machine maxCpus='288'>pc-q35-3.1</machine>
-      <machine maxCpus='288'>pc-q35-4.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.4</machine>
-      <machine maxCpus='255'>pc-1.3</machine>
-      <machine maxCpus='255'>pc-i440fx-4.1</machine>
-      <machine maxCpus='255'>pc-i440fx-5.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.9</machine>
-      <machine maxCpus='1'>isapc</machine>
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
-      <machine maxCpus='255'>pc-q35-2.6</machine>
-      <machine maxCpus='255'>pc-i440fx-3.1</machine>
-      <machine maxCpus='288'>pc-q35-2.12</machine>
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
-      <machine maxCpus='255'>pc-1.0</machine>
-      <machine maxCpus='255'>pc-i440fx-2.6</machine>
-      <machine maxCpus='288'>pc-q35-4.0.1</machine>
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
-      <machine maxCpus='288'>pc-q35-5.0</machine>
-      <machine maxCpus='288'>pc-q35-2.8</machine>
-      <machine maxCpus='255'>pc-i440fx-2.10</machine>
-      <machine maxCpus='288'>pc-q35-3.0</machine>
-      <machine maxCpus='288'>pc-q35-4.0</machine>
-      <machine maxCpus='288'>microvm</machine>
-      <machine maxCpus='255'>pc-i440fx-2.3</machine>
-      <machine maxCpus='255'>pc-1.2</machine>
-      <machine maxCpus='255'>pc-i440fx-4.0</machine>
-      <machine maxCpus='255'>pc-i440fx-5.0</machine>
-      <machine maxCpus='255'>pc-i440fx-2.8</machine>
-      <machine maxCpus='255'>pc-q35-2.5</machine>
-      <machine maxCpus='255'>pc-i440fx-3.0</machine>
-      <machine maxCpus='288'>pc-q35-2.11</machine>
-      <domain type='qemu'/>
-      <domain type='kvm'/>
-    </arch>
-    <features>
-      <pae/>
-      <nonpae/>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='no'/>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='m68k'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-m68k</emulator>
-      <machine maxCpus='1'>mcf5208evb</machine>
-      <machine maxCpus='1'>an5206</machine>
-      <machine maxCpus='1'>q800</machine>
-      <machine maxCpus='1'>next-cube</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='microblaze'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-microblaze</emulator>
-      <machine maxCpus='1'>petalogix-s3adsp1800</machine>
-      <machine maxCpus='1'>petalogix-ml605</machine>
-      <machine maxCpus='1'>xlnx-zynqmp-pmu</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='microblazeel'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-microblazeel</emulator>
-      <machine maxCpus='1'>petalogix-s3adsp1800</machine>
-      <machine maxCpus='1'>petalogix-ml605</machine>
-      <machine maxCpus='1'>xlnx-zynqmp-pmu</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='mips'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-mips</emulator>
-      <machine maxCpus='16'>malta</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='mipsel'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-mipsel</emulator>
-      <machine maxCpus='16'>malta</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='mips64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-mips64</emulator>
-      <machine maxCpus='16'>malta</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='mips64el'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-mips64el</emulator>
-      <machine maxCpus='16'>malta</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <machine maxCpus='16'>boston</machine>
-      <machine maxCpus='1'>fuloong2e</machine>
-      <machine canonical='fuloong2e' maxCpus='1'>fulong2e</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='ppc'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-ppc</emulator>
-      <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='1'>mac99</machine>
-      <machine maxCpus='32'>ppce500</machine>
-      <machine maxCpus='1'>sam460ex</machine>
-      <machine maxCpus='1'>bamboo</machine>
-      <machine maxCpus='1'>40p</machine>
-      <machine maxCpus='1'>ref405ep</machine>
-      <machine maxCpus='15'>mpc8544ds</machine>
-      <machine maxCpus='1'>taihu</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='ppc64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      <machine maxCpus='1024'>pseries-5.2</machine>
-      <machine canonical='pseries-5.2' maxCpus='1024'>pseries</machine>
-      <machine maxCpus='2048'>powernv9</machine>
-      <machine canonical='powernv9' maxCpus='2048'>powernv</machine>
-      <machine maxCpus='1'>taihu</machine>
-      <machine maxCpus='1024'>pseries-4.1</machine>
-      <machine maxCpus='15'>mpc8544ds</machine>
-      <machine maxCpus='1024'>pseries-2.5</machine>
-      <machine maxCpus='2048'>powernv10</machine>
-      <machine maxCpus='1024'>pseries-4.2</machine>
-      <machine maxCpus='1024'>pseries-2.6</machine>
-      <machine maxCpus='32'>ppce500</machine>
-      <machine maxCpus='1024'>pseries-2.7</machine>
-      <machine maxCpus='1024'>pseries-3.0</machine>
-      <machine maxCpus='1024'>pseries-5.0</machine>
-      <machine maxCpus='1'>40p</machine>
-      <machine maxCpus='1024'>pseries-2.8</machine>
-      <machine maxCpus='1024'>pseries-3.1</machine>
-      <machine maxCpus='1024'>pseries-5.1</machine>
-      <machine maxCpus='1024'>pseries-2.9</machine>
-      <machine maxCpus='1'>bamboo</machine>
-      <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1024'>pseries-2.12-sxxm</machine>
-      <machine maxCpus='1024'>pseries-2.10</machine>
-      <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='1024'>pseries-2.11</machine>
-      <machine maxCpus='1024'>pseries-2.1</machine>
-      <machine maxCpus='1024'>pseries-2.12</machine>
-      <machine maxCpus='1024'>pseries-2.2</machine>
-      <machine maxCpus='1'>mac99</machine>
-      <machine maxCpus='1'>sam460ex</machine>
-      <machine maxCpus='1'>ref405ep</machine>
-      <machine maxCpus='1024'>pseries-2.3</machine>
-      <machine maxCpus='2048'>powernv8</machine>
-      <machine maxCpus='1024'>pseries-4.0</machine>
-      <machine maxCpus='1024'>pseries-2.4</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='ppc64le'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      <machine maxCpus='1024'>pseries-5.2</machine>
-      <machine canonical='pseries-5.2' maxCpus='1024'>pseries</machine>
-      <machine maxCpus='2048'>powernv9</machine>
-      <machine canonical='powernv9' maxCpus='2048'>powernv</machine>
-      <machine maxCpus='1'>taihu</machine>
-      <machine maxCpus='1024'>pseries-4.1</machine>
-      <machine maxCpus='15'>mpc8544ds</machine>
-      <machine maxCpus='1024'>pseries-2.5</machine>
-      <machine maxCpus='2048'>powernv10</machine>
-      <machine maxCpus='1024'>pseries-4.2</machine>
-      <machine maxCpus='1024'>pseries-2.6</machine>
-      <machine maxCpus='32'>ppce500</machine>
-      <machine maxCpus='1024'>pseries-2.7</machine>
-      <machine maxCpus='1024'>pseries-3.0</machine>
-      <machine maxCpus='1024'>pseries-5.0</machine>
-      <machine maxCpus='1'>40p</machine>
-      <machine maxCpus='1024'>pseries-2.8</machine>
-      <machine maxCpus='1024'>pseries-3.1</machine>
-      <machine maxCpus='1024'>pseries-5.1</machine>
-      <machine maxCpus='1024'>pseries-2.9</machine>
-      <machine maxCpus='1'>bamboo</machine>
-      <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1024'>pseries-2.12-sxxm</machine>
-      <machine maxCpus='1024'>pseries-2.10</machine>
-      <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='1024'>pseries-2.11</machine>
-      <machine maxCpus='1024'>pseries-2.1</machine>
-      <machine maxCpus='1024'>pseries-2.12</machine>
-      <machine maxCpus='1024'>pseries-2.2</machine>
-      <machine maxCpus='1'>mac99</machine>
-      <machine maxCpus='1'>sam460ex</machine>
-      <machine maxCpus='1'>ref405ep</machine>
-      <machine maxCpus='1024'>pseries-2.3</machine>
-      <machine maxCpus='2048'>powernv8</machine>
-      <machine maxCpus='1024'>pseries-4.0</machine>
-      <machine maxCpus='1024'>pseries-2.4</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='riscv32'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-riscv32</emulator>
-      <machine maxCpus='8'>spike</machine>
-      <machine maxCpus='8'>virt</machine>
-      <machine maxCpus='1'>opentitan</machine>
-      <machine maxCpus='1'>sifive_e</machine>
-      <machine maxCpus='5'>sifive_u</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='riscv64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-riscv64</emulator>
-      <machine maxCpus='8'>spike</machine>
-      <machine maxCpus='8'>virt</machine>
-      <machine maxCpus='1'>sifive_e</machine>
-      <machine maxCpus='5'>sifive_u</machine>
-      <machine maxCpus='5'>microchip-icicle-kit</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='s390x'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-s390x</emulator>
-      <machine maxCpus='248'>s390-ccw-virtio-5.2</machine>
-      <machine canonical='s390-ccw-virtio-5.2' maxCpus='248'>s390-ccw-virtio</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-4.0</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-3.1</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.6</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.12</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.9</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-5.1</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-3.0</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-4.2</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.5</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.11</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.8</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-5.0</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-4.1</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.4</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.10</machine>
-      <machine maxCpus='248'>s390-ccw-virtio-2.7</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='sh4'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-sh4</emulator>
-      <machine maxCpus='1'>shix</machine>
-      <machine maxCpus='1'>r2d</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='sh4eb'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-sh4eb</emulator>
-      <machine maxCpus='1'>shix</machine>
-      <machine maxCpus='1'>r2d</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='sparc'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-sparc</emulator>
-      <machine maxCpus='1'>SS-5</machine>
-      <machine maxCpus='4'>SS-20</machine>
-      <machine maxCpus='1'>LX</machine>
-      <machine maxCpus='1'>SPARCClassic</machine>
-      <machine maxCpus='1'>leon3_generic</machine>
-      <machine maxCpus='1'>SPARCbook</machine>
-      <machine maxCpus='1'>SS-4</machine>
-      <machine maxCpus='4'>SS-600MP</machine>
-      <machine maxCpus='4'>SS-10</machine>
-      <machine maxCpus='1'>Voyager</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='sparc64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-sparc64</emulator>
-      <machine maxCpus='1'>sun4u</machine>
-      <machine maxCpus='1'>niagara</machine>
-      <machine maxCpus='1'>sun4v</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='x86_64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      <machine maxCpus='255'>pc-i440fx-5.2</machine>
-      <machine canonical='pc-i440fx-5.2' maxCpus='255'>pc</machine>
-      <machine maxCpus='288'>pc-q35-5.2</machine>
-      <machine canonical='pc-q35-5.2' maxCpus='288'>q35</machine>
-      <machine maxCpus='255'>pc-i440fx-2.12</machine>
-      <machine maxCpus='255'>pc-i440fx-2.0</machine>
-      <machine maxCpus='288'>pc-q35-4.2</machine>
-      <machine maxCpus='255'>pc-i440fx-2.5</machine>
-      <machine maxCpus='255'>pc-i440fx-4.2</machine>
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
-      <machine maxCpus='255'>pc-q35-2.7</machine>
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
-      <machine maxCpus='255'>pc-1.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.7</machine>
-      <machine maxCpus='255'>pc-q35-2.4</machine>
-      <machine maxCpus='288'>pc-q35-2.10</machine>
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
-      <machine maxCpus='288'>pc-q35-5.1</machine>
-      <machine maxCpus='288'>pc-q35-2.9</machine>
-      <machine maxCpus='255'>pc-i440fx-2.11</machine>
-      <machine maxCpus='288'>pc-q35-3.1</machine>
-      <machine maxCpus='288'>pc-q35-4.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.4</machine>
-      <machine maxCpus='255'>pc-1.3</machine>
-      <machine maxCpus='255'>pc-i440fx-4.1</machine>
-      <machine maxCpus='255'>pc-i440fx-5.1</machine>
-      <machine maxCpus='255'>pc-i440fx-2.9</machine>
-      <machine maxCpus='1'>isapc</machine>
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
-      <machine maxCpus='255'>pc-q35-2.6</machine>
-      <machine maxCpus='255'>pc-i440fx-3.1</machine>
-      <machine maxCpus='288'>pc-q35-2.12</machine>
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
-      <machine maxCpus='255'>pc-1.0</machine>
-      <machine maxCpus='255'>pc-i440fx-2.6</machine>
-      <machine maxCpus='288'>pc-q35-4.0.1</machine>
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
-      <machine maxCpus='288'>pc-q35-5.0</machine>
-      <machine maxCpus='288'>pc-q35-2.8</machine>
-      <machine maxCpus='255'>pc-i440fx-2.10</machine>
-      <machine maxCpus='288'>pc-q35-3.0</machine>
-      <machine maxCpus='288'>pc-q35-4.0</machine>
-      <machine maxCpus='288'>microvm</machine>
-      <machine maxCpus='255'>pc-i440fx-2.3</machine>
-      <machine maxCpus='255'>pc-1.2</machine>
-      <machine maxCpus='255'>pc-i440fx-4.0</machine>
-      <machine maxCpus='255'>pc-i440fx-5.0</machine>
-      <machine maxCpus='255'>pc-i440fx-2.8</machine>
-      <machine maxCpus='255'>pc-q35-2.5</machine>
-      <machine maxCpus='255'>pc-i440fx-3.0</machine>
-      <machine maxCpus='288'>pc-q35-2.11</machine>
-      <domain type='qemu'/>
-      <domain type='kvm'/>
-    </arch>
-    <features>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='no'/>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='xtensa'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-xtensa</emulator>
-      <machine maxCpus='4'>sim</machine>
-      <machine maxCpus='32'>kc705</machine>
-      <machine maxCpus='32'>ml605</machine>
-      <machine maxCpus='32'>ml605-nommu</machine>
-      <machine maxCpus='32'>virt</machine>
-      <machine maxCpus='32'>lx60-nommu</machine>
-      <machine maxCpus='32'>lx200</machine>
-      <machine maxCpus='32'>lx200-nommu</machine>
-      <machine maxCpus='32'>lx60</machine>
-      <machine maxCpus='32'>kc705-nommu</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='xtensaeb'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-xtensaeb</emulator>
-      <machine maxCpus='4'>sim</machine>
-      <machine maxCpus='32'>kc705</machine>
-      <machine maxCpus='32'>ml605</machine>
-      <machine maxCpus='32'>ml605-nommu</machine>
-      <machine maxCpus='32'>virt</machine>
-      <machine maxCpus='32'>lx60-nommu</machine>
-      <machine maxCpus='32'>lx200</machine>
-      <machine maxCpus='32'>lx200-nommu</machine>
-      <machine maxCpus='32'>lx60</machine>
-      <machine maxCpus='32'>kc705-nommu</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-</capabilities>
-
-
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml b/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml
deleted file mode 100644
index 08b9ac71..00000000
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<domain type="kvm">
-  <name>ubuntu-20-04</name>
-  <uuid>8dc5433c-0228-49e4-b019-fa2b606aa544</uuid>
-  <title>Ubuntu 20.04</title>
-  <description>Ubuntu 20.04 desktop installation</description>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://ubuntu.com/ubuntu/20.04"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit="KiB">4194304</memory>
-  <currentMemory unit="KiB">4194304</currentMemory>
-  <vcpu placement="static">2</vcpu>
-  <os>
-    <type arch="x86_64" machine="pc-q35-5.1">hvm</type>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state="off"/>
-  </features>
-  <cpu check="partial" mode="host-model"/>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled="no"/>
-    <suspend-to-disk enabled="no"/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk device="disk" type="block">
-      <driver cache="none" io="native" name="qemu" type="raw"/>
-      <target bus="virtio" dev="vda"/>
-      <address bus="0x03" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </disk>
-    <disk device="cdrom" type="file">
-      <driver name="qemu" type="raw"/>
-      <target bus="sata" dev="sda"/>
-      <readonly/>
-      <address bus="0" controller="0" target="0" type="drive" unit="0"/>
-    </disk>
-    <disk device="floppy" type="file">
-      <driver name="qemu" type="raw"/>
-      <target bus="fdc" dev="fda"/>
-      <address bus="0" controller="0" target="0" type="drive" unit="0"/>
-    </disk>
-    <controller index="0" model="ich9-ehci1" type="usb">
-      <address bus="0x00" domain="0x0000" function="0x7" slot="0x1d" type="pci"/>
-    </controller>
-    <controller index="0" model="ich9-uhci1" type="usb">
-      <master startport="0"/>
-      <address bus="0x00" domain="0x0000" function="0x0" multifunction="on" slot="0x1d" type="pci"/>
-    </controller>
-    <controller index="0" model="ich9-uhci2" type="usb">
-      <master startport="2"/>
-      <address bus="0x00" domain="0x0000" function="0x1" slot="0x1d" type="pci"/>
-    </controller>
-    <controller index="0" model="ich9-uhci3" type="usb">
-      <master startport="4"/>
-      <address bus="0x00" domain="0x0000" function="0x2" slot="0x1d" type="pci"/>
-    </controller>
-    <controller index="0" type="sata">
-      <address bus="0x00" domain="0x0000" function="0x2" slot="0x1f" type="pci"/>
-    </controller>
-    <controller index="0" model="pcie-root" type="pci"/>
-    <controller index="1" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="1" port="0x10"/>
-      <address bus="0x00" domain="0x0000" function="0x0" multifunction="on" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="2" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="2" port="0x11"/>
-      <address bus="0x00" domain="0x0000" function="0x1" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="3" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="3" port="0x12"/>
-      <address bus="0x00" domain="0x0000" function="0x2" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="4" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="4" port="0x13"/>
-      <address bus="0x00" domain="0x0000" function="0x3" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="5" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="5" port="0x14"/>
-      <address bus="0x00" domain="0x0000" function="0x4" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="6" model="pcie-root-port" type="pci">
-      <model name="pcie-root-port"/>
-      <target chassis="6" port="0x15"/>
-      <address bus="0x00" domain="0x0000" function="0x5" slot="0x02" type="pci"/>
-    </controller>
-    <controller index="0" type="virtio-serial">
-      <address bus="0x02" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </controller>
-    <controller index="0" model="virtio-scsi" type="scsi">
-      <address bus="0x06" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </controller>
-    <controller index="0" type="fdc"/>
-    <interface type="network">
-      <mac address="52:54:00:0d:90:0c"/>
-      <source network=""/>
-      <model type="virtio"/>
-      <address bus="0x01" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </interface>
-    <serial type="pty">
-      <target port="0" type="isa-serial">
-        <model name="isa-serial"/>
-      </target>
-    </serial>
-    <console type="pty">
-      <target port="0" type="serial"/>
-    </console>
-    <channel type="unix">
-      <target name="org.qemu.guest_agent.0" type="virtio"/>
-      <address bus="0" controller="0" port="1" type="virtio-serial"/>
-    </channel>
-    <channel type="spicevmc">
-      <target name="com.redhat.spice.0" type="virtio"/>
-      <address bus="0" controller="0" port="2" type="virtio-serial"/>
-    </channel>
-    <input bus="usb" type="tablet">
-      <address bus="0" port="1" type="usb"/>
-    </input>
-    <input bus="ps2" type="mouse"/>
-    <input bus="ps2" type="keyboard"/>
-    <graphics autoport="yes" type="spice">
-      <listen type="address"/>
-      <image compression="off"/>
-    </graphics>
-    <sound model="ich9">
-      <address bus="0x00" domain="0x0000" function="0x0" slot="0x1b" type="pci"/>
-    </sound>
-    <video>
-      <model heads="1" primary="yes" ram="65536" type="qxl" vgamem="16384" vram="65536"/>
-      <address bus="0x00" domain="0x0000" function="0x0" slot="0x01" type="pci"/>
-    </video>
-    <redirdev bus="usb" type="spicevmc">
-      <address bus="0" port="2" type="usb"/>
-    </redirdev>
-    <redirdev bus="usb" type="spicevmc">
-      <address bus="0" port="3" type="usb"/>
-    </redirdev>
-    <memballoon model="virtio">
-      <address bus="0x04" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </memballoon>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
-      <address bus="0x05" domain="0x0000" function="0x0" slot="0x00" type="pci"/>
-    </rng>
-  </devices>
-</domain>
-