From 11365e6f4346cfb998ee1d7c408d5849b9696828 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 24 Jan 2022 13:53:23 -0500
Subject: [PATCH] tests: update x86 capabilities data

Using qemu 6.1.0 and libvirt 7.6.0 on Fedora 35

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 .../data/capabilities/kvm-x86_64-domcaps.xml  |  136 ++-
 tests/data/capabilities/kvm-x86_64.xml        | 1062 +++++++++--------
 .../compare/virt-install-aarch64-cdrom.xml    |    6 +
 .../virt-install-aarch64-machdefault.xml      |    3 +
 .../compare/virt-install-aarch64-machvirt.xml |    3 +
 .../compare/virt-install-boot-uefi-notpm.xml  |    2 +-
 .../cli/compare/virt-install-boot-uefi.xml    |    2 +-
 .../virt-install-cdrom-centos-label.xml       |    8 +-
 .../compare/virt-install-cpu-disable-sec.xml  |    8 +-
 .../compare/virt-install-f21-kvm-remote.xml   |    4 +-
 .../virt-install-graphics-usb-disable.xml     |    2 +-
 .../cli/compare/virt-install-kvm-centos7.xml  |    4 +-
 .../virt-install-kvm-cpu-default-fallback.xml |   12 +-
 .../virt-install-kvm-fedoralatest-url.xml     |    4 +-
 .../virt-install-kvm-hostcopy-fallback.xml    |  100 +-
 .../compare/virt-install-kvm-i686-uefi.xml    |    8 +-
 .../cli/compare/virt-install-kvm-rhel5.xml    |    8 +-
 .../cli/compare/virt-install-kvm-rhel6.xml    |    8 +-
 .../cli/compare/virt-install-kvm-rhel7.xml    |    8 +-
 .../virt-install-kvm-session-defaults.xml     |    8 +-
 .../cli/compare/virt-install-kvm-win10.xml    |    4 +-
 .../compare/virt-install-kvm-win2k3-cdrom.xml |    8 +-
 .../cli/compare/virt-install-location-iso.xml |    8 +-
 .../virt-install-location-manual-kernel.xml   |    8 +-
 .../cli/compare/virt-install-many-devices.xml |    2 +-
 ...virt-install-network-install-resources.xml |    4 +-
 .../compare/virt-install-openbsd-defaults.xml |    4 +-
 .../virt-install-osinfo-multiple-short-id.xml |    4 +-
 ...virt-install-osinfo-netinst-unattended.xml |    4 +-
 ...irt-install-osinfo-unattended-treeapis.xml |    8 +-
 .../virt-install-osinfo-url-unattended.xml    |    4 +-
 .../virt-install-osinfo-url-with-disk.xml     |    4 +-
 .../cli/compare/virt-install-osinfo-url.xml   |    4 +-
 .../virt-install-osinfo-win7-unattended.xml   |    4 +-
 .../cli/compare/virt-install-q35-defaults.xml |    4 +-
 .../compare/virt-install-qemu-32-on-64.xml    |    4 +-
 .../cli/compare/virt-install-qemu-plain.xml   |    8 +-
 .../virt-install-singleton-config-1.xml       |   29 +-
 .../virt-install-singleton-config-2.xml       |    8 +
 .../virt-install-singleton-config-3.xml       |    2 +-
 .../cli/compare/virt-install-win7-uefi.xml    |    4 +-
 .../compare/virt-install-x86_64-graphics.xml  |    2 +-
 .../compare/virt-install-x86_64-headless.xml  |    2 +-
 ...nstall-x86_64-launch-security-sev-full.xml |    2 +-
 ...irt-install-x86_64-launch-security-sev.xml |    2 +-
 tests/test_capabilities.py                    |    4 +-
 tests/test_misc.py                            |    2 +-
 47 files changed, 841 insertions(+), 698 deletions(-)

diff --git a/tests/data/capabilities/kvm-x86_64-domcaps.xml b/tests/data/capabilities/kvm-x86_64-domcaps.xml
index 0c6ee524..1d51c3d8 100644
--- a/tests/data/capabilities/kvm-x86_64-domcaps.xml
+++ b/tests/data/capabilities/kvm-x86_64-domcaps.xml
@@ -1,15 +1,17 @@
 <domainCapabilities>
-  <path>/bin/qemu-system-x86_64</path>
+  <path>/usr/bin/qemu-system-x86_64</path>
   <domain>kvm</domain>
-  <machine>pc-i440fx-2.1</machine>
+  <machine>pc-i440fx-6.1</machine>
   <arch>x86_64</arch>
   <vcpu max='255'/>
+  <iothreads supported='yes'/>
   <os supported='yes'>
+    <enum name='firmware'>
+      <value>efi</value>
+    </enum>
     <loader supported='yes'>
-      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+      <value>/usr/share/edk2/ovmf/OVMF_CODE.fd</value>
       <value>/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</value>
-      <value>/usr/share/edk2/arm/QEMU_EFI-pflash.raw</value>
       <enum name='type'>
         <value>rom</value>
         <value>pflash</value>
@@ -18,24 +20,49 @@
         <value>yes</value>
         <value>no</value>
       </enum>
+      <enum name='secure'>
+        <value>no</value>
+      </enum>
     </loader>
   </os>
   <cpu>
-    <mode name='host-passthrough' supported='yes'/>
+    <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'>Broadwell</model>
+      <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
-      <feature policy='require' name='vme'/>
       <feature policy='require' name='ss'/>
-      <feature policy='require' name='f16c'/>
-      <feature policy='require' name='rdrand'/>
+      <feature policy='require' name='vmx'/>
+      <feature policy='require' name='pdcm'/>
       <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='arat'/>
       <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='xsaveopt'/>
+      <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='abm'/>
       <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='ibpb'/>
+      <feature policy='require' name='ibrs'/>
+      <feature policy='require' name='amd-stibp'/>
+      <feature policy='require' name='amd-ssbd'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='disable' name='hle'/>
+      <feature policy='disable' name='rtm'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>
@@ -50,38 +77,58 @@
       <model usable='yes'>coreduo</model>
       <model usable='yes'>core2duo</model>
       <model usable='no'>athlon</model>
+      <model usable='yes'>Westmere-IBRS</model>
       <model usable='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
+      <model usable='no'>Snowridge</model>
+      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
+      <model usable='no'>Skylake-Server</model>
+      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no'>Skylake-Client-IBRS</model>
+      <model usable='no'>Skylake-Client</model>
+      <model usable='yes'>SandyBridge-IBRS</model>
       <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</model>
       <model usable='yes'>Penryn</model>
       <model usable='no'>Opteron_G5</model>
-      <model usable='yes'>Opteron_G4</model>
+      <model usable='no'>Opteron_G4</model>
       <model usable='no'>Opteron_G3</model>
       <model usable='yes'>Opteron_G2</model>
       <model usable='yes'>Opteron_G1</model>
+      <model usable='yes'>Nehalem-IBRS</model>
       <model usable='yes'>Nehalem</model>
-      <model usable='no'>Nehalem-IBRS</model>
+      <model usable='yes'>IvyBridge-IBRS</model>
       <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='yes'>Haswell</model>
+      <model usable='no'>Icelake-Server-noTSX</model>
+      <model usable='no'>Icelake-Server</model>
+      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
+      <model usable='no' deprecated='yes'>Icelake-Client</model>
+      <model usable='yes'>Haswell-noTSX-IBRS</model>
       <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
       <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
+      <model usable='no'>Haswell</model>
+      <model usable='no'>EPYC-Rome</model>
+      <model usable='no'>EPYC-Milan</model>
       <model usable='no'>EPYC-IBPB</model>
+      <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
+      <model usable='no'>Cooperlake</model>
       <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
+      <model usable='no'>Cascadelake-Server-noTSX</model>
+      <model usable='no'>Cascadelake-Server</model>
+      <model usable='yes'>Broadwell-noTSX-IBRS</model>
       <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
       <model usable='no'>Broadwell-IBRS</model>
+      <model usable='no'>Broadwell</model>
       <model usable='yes'>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'>
@@ -98,12 +145,18 @@
         <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'>
@@ -113,7 +166,9 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>none</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>
@@ -132,10 +187,39 @@
         <value>scsi</value>
       </enum>
       <enum name='capsType'/>
-      <enum name='pciBackend'/>
+      <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>
   </devices>
   <features>
     <gic supported='no'/>
+    <vmcoreinfo supported='yes'/>
+    <genid supported='yes'/>
+    <backingStoreInput supported='yes'/>
+    <backup supported='yes'/>
+    <sev supported='no'/>
   </features>
 </domainCapabilities>
+
+
diff --git a/tests/data/capabilities/kvm-x86_64.xml b/tests/data/capabilities/kvm-x86_64.xml
index 6043c7d8..1ee90751 100644
--- a/tests/data/capabilities/kvm-x86_64.xml
+++ b/tests/data/capabilities/kvm-x86_64.xml
@@ -1,40 +1,49 @@
 <capabilities>
-  <!-- From Fedora 22 beta, libvirt-daemon-1.2.13-3.fc22.x86_64 -->
 
   <host>
-    <uuid>39303242-3334-3636-3341-3745ffffffff</uuid>
+    <uuid>c4271571-d892-4ec0-9034-ef2ebc38c943</uuid>
     <cpu>
       <arch>x86_64</arch>
-      <model>Opteron_G4</model>
-      <vendor>AMD</vendor>
-      <topology sockets='1' cores='8' threads='1'/>
-      <feature name='invtsc'/>
-      <feature name='perfctr_nb'/>
-      <feature name='perfctr_core'/>
-      <feature name='topoext'/>
-      <feature name='nodeid_msr'/>
-      <feature name='lwp'/>
-      <feature name='wdt'/>
-      <feature name='skinit'/>
-      <feature name='ibs'/>
-      <feature name='osvw'/>
-      <feature name='cr8legacy'/>
-      <feature name='extapic'/>
-      <feature name='cmp_legacy'/>
-      <feature name='fxsr_opt'/>
-      <feature name='mmxext'/>
-      <feature name='osxsave'/>
-      <feature name='monitor'/>
+      <model>Skylake-Client-noTSX-IBRS</model>
+      <vendor>Intel</vendor>
+      <microcode version='234'/>
+      <counter name='tsc' frequency='3408010000' scaling='no'/>
+      <topology sockets='1' dies='1' cores='4' threads='2'/>
+      <feature name='ds'/>
+      <feature name='acpi'/>
+      <feature name='ss'/>
       <feature name='ht'/>
-      <feature name='vme'/>
+      <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/>
       <suspend_disk/>
       <suspend_hybrid/>
     </power_management>
+    <iommu support='yes'/>
     <migration_features>
       <live/>
       <uri_transports>
@@ -45,25 +54,29 @@
     <topology>
       <cells num='1'>
         <cell id='0'>
-          <memory unit='KiB'>16414544</memory>
-          <pages unit='KiB' size='4'>4103636</pages>
+          <memory unit='KiB'>32731708</memory>
+          <pages unit='KiB' size='4'>8182927</pages>
           <pages unit='KiB' size='2048'>0</pages>
+          <pages unit='KiB' size='1048576'>0</pages>
           <distances>
             <sibling id='0' value='10'/>
           </distances>
           <cpus num='8'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0,3'/>
-            <cpu id='1' socket_id='0' core_id='3' siblings='1,4'/>
-            <cpu id='2' socket_id='0' core_id='7' siblings='2,5'/>
-            <cpu id='3' socket_id='0' core_id='1' siblings='0,3'/>
-            <cpu id='4' socket_id='0' core_id='2' siblings='1,4'/>
-            <cpu id='5' socket_id='0' core_id='6' siblings='2,5'/>
-            <cpu id='6' socket_id='0' core_id='4' siblings='6-7'/>
-            <cpu id='7' socket_id='0' core_id='5' siblings='6-7'/>
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
+            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
+            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
+            <cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
+            <cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
+            <cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
+            <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
           </cpus>
         </cell>
       </cells>
     </topology>
+    <cache>
+      <bank id='0' level='3' type='both' size='8' unit='MiB' cpus='0-7'/>
+    </cache>
     <secmodel>
       <model>selinux</model>
       <doi>0</doi>
@@ -80,13 +93,105 @@
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name='alpha'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/bin/qemu-system-alpha</emulator>
-      <machine maxCpus='4'>clipper</machine>
+    <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'>rainier-bmc</machine>
+      <machine maxCpus='1'>mps3-an547</machine>
+      <machine maxCpus='2'>musca-b1</machine>
+      <machine maxCpus='4'>realview-pbx-a9</machine>
+      <machine maxCpus='1'>versatileab</machine>
+      <machine maxCpus='1'>kzm</machine>
+      <machine maxCpus='255'>virt-2.8</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='1'>stm32vldiscovery</machine>
+      <machine maxCpus='255'>virt-2.9</machine>
+      <machine maxCpus='4'>orangepi-pc</machine>
+      <machine maxCpus='1'>quanta-q71l-bmc</machine>
+      <machine maxCpus='1'>z2</machine>
+      <machine maxCpus='512'>virt-5.2</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='2'>quanta-gbs-bmc</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='1'>g220a-bmc</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='2'>mps3-an524</machine>
+      <machine maxCpus='1' deprecated='yes'>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='512'>virt-6.0</machine>
+      <machine maxCpus='1'>cubieboard</machine>
+      <machine maxCpus='1'>verdex</machine>
+      <machine maxCpus='1'>netduino2</machine>
+      <machine maxCpus='1'>mps2-an386</machine>
+      <machine maxCpus='512'>virt-6.1</machine>
+      <machine canonical='virt-6.1' maxCpus='512'>virt</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>
@@ -97,43 +202,98 @@
     <arch name='armv7l'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-arm</emulator>
-      <machine maxCpus='8'>virt</machine>
       <machine maxCpus='1'>integratorcp</machine>
-      <machine maxCpus='2'>nuri</machine>
-      <machine maxCpus='1'>verdex</machine>
-      <machine maxCpus='2'>smdkc210</machine>
-      <machine maxCpus='1'>collie</machine>
-      <machine maxCpus='1'>spitz</machine>
-      <machine maxCpus='1'>realview-eb</machine>
-      <machine maxCpus='4'>realview-pbx-a9</machine>
-      <machine maxCpus='1'>versatilepb</machine>
-      <machine maxCpus='1'>realview-pb-a8</machine>
-      <machine maxCpus='1'>musicpal</machine>
-      <machine maxCpus='1'>z2</machine>
-      <machine maxCpus='1'>akita</machine>
-      <machine maxCpus='1'>kzm</machine>
-      <machine maxCpus='4'>realview-eb-mpcore</machine>
-      <machine maxCpus='1'>sx1</machine>
-      <machine maxCpus='1'>sx1-v1</machine>
-      <machine maxCpus='1'>cubieboard</machine>
-      <machine maxCpus='4'>highbank</machine>
-      <machine maxCpus='1'>netduino2</machine>
-      <machine maxCpus='1'>terrier</machine>
-      <machine maxCpus='1'>n810</machine>
-      <machine maxCpus='1'>mainstone</machine>
-      <machine maxCpus='4'>midway</machine>
-      <machine maxCpus='1'>cheetah</machine>
-      <machine maxCpus='1'>tosa</machine>
-      <machine maxCpus='4'>vexpress-a15</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'>rainier-bmc</machine>
+      <machine maxCpus='1'>mps3-an547</machine>
+      <machine maxCpus='2'>musca-b1</machine>
+      <machine maxCpus='4'>realview-pbx-a9</machine>
       <machine maxCpus='1'>versatileab</machine>
-      <machine maxCpus='1'>lm3s6965evb</machine>
-      <machine maxCpus='1'>n800</machine>
-      <machine maxCpus='1'>connex</machine>
-      <machine maxCpus='4'>vexpress-a9</machine>
+      <machine maxCpus='1'>kzm</machine>
+      <machine maxCpus='255'>virt-2.8</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='1'>stm32vldiscovery</machine>
+      <machine maxCpus='255'>virt-2.9</machine>
+      <machine maxCpus='4'>orangepi-pc</machine>
+      <machine maxCpus='1'>quanta-q71l-bmc</machine>
+      <machine maxCpus='1'>z2</machine>
+      <machine maxCpus='512'>virt-5.2</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='2'>quanta-gbs-bmc</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='1'>g220a-bmc</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='2'>mps3-an524</machine>
+      <machine maxCpus='1' deprecated='yes'>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='512'>virt-6.0</machine>
+      <machine maxCpus='1'>cubieboard</machine>
+      <machine maxCpus='1'>verdex</machine>
+      <machine maxCpus='1'>netduino2</machine>
+      <machine maxCpus='1'>mps2-an386</machine>
+      <machine maxCpus='512'>virt-6.1</machine>
+      <machine canonical='virt-6.1' maxCpus='512'>virt</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>
@@ -148,271 +308,184 @@
     <arch name='aarch64'>
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-aarch64</emulator>
-      <machine maxCpus='8'>virt</machine>
       <machine maxCpus='1'>integratorcp</machine>
-      <machine maxCpus='2'>nuri</machine>
-      <machine maxCpus='1'>verdex</machine>
-      <machine maxCpus='2'>smdkc210</machine>
-      <machine maxCpus='1'>collie</machine>
-      <machine maxCpus='1'>spitz</machine>
-      <machine maxCpus='1'>realview-eb</machine>
-      <machine maxCpus='4'>realview-pbx-a9</machine>
-      <machine maxCpus='1'>versatilepb</machine>
-      <machine maxCpus='1'>realview-pb-a8</machine>
-      <machine maxCpus='1'>musicpal</machine>
-      <machine maxCpus='1'>z2</machine>
-      <machine maxCpus='1'>akita</machine>
-      <machine maxCpus='1'>kzm</machine>
-      <machine maxCpus='4'>realview-eb-mpcore</machine>
-      <machine maxCpus='1'>sx1</machine>
-      <machine maxCpus='1'>sx1-v1</machine>
-      <machine maxCpus='1'>cubieboard</machine>
-      <machine maxCpus='4'>highbank</machine>
-      <machine maxCpus='1'>netduino2</machine>
-      <machine maxCpus='1'>terrier</machine>
-      <machine maxCpus='1'>n810</machine>
-      <machine maxCpus='1'>mainstone</machine>
-      <machine maxCpus='4'>midway</machine>
-      <machine maxCpus='1'>cheetah</machine>
-      <machine maxCpus='1'>tosa</machine>
-      <machine maxCpus='4'>vexpress-a15</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'>rainier-bmc</machine>
+      <machine maxCpus='1'>mps3-an547</machine>
+      <machine maxCpus='2'>musca-b1</machine>
+      <machine maxCpus='4'>realview-pbx-a9</machine>
       <machine maxCpus='1'>versatileab</machine>
-      <machine maxCpus='1'>lm3s6965evb</machine>
-      <machine maxCpus='1'>n800</machine>
-      <machine maxCpus='1'>connex</machine>
-      <machine maxCpus='4'>vexpress-a9</machine>
+      <machine maxCpus='1'>kzm</machine>
+      <machine maxCpus='255'>virt-2.8</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='1'>stm32vldiscovery</machine>
+      <machine maxCpus='255'>virt-2.9</machine>
+      <machine maxCpus='4'>orangepi-pc</machine>
+      <machine maxCpus='1'>quanta-q71l-bmc</machine>
+      <machine maxCpus='1'>z2</machine>
+      <machine maxCpus='512'>virt-5.2</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='2'>quanta-gbs-bmc</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='1'>g220a-bmc</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='2'>mps3-an524</machine>
+      <machine maxCpus='1' deprecated='yes'>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='512'>virt-6.0</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='512'>virt-6.1</machine>
+      <machine canonical='virt-6.1' maxCpus='512'>virt</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>
-      <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 canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
-      <machine maxCpus='255'>pc-0.12</machine>
-      <machine maxCpus='255'>pc-1.3</machine>
-      <machine maxCpus='255'>pc-q35-1.6</machine>
-      <machine maxCpus='255'>pc-q35-1.5</machine>
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
-      <machine maxCpus='255'>pc-q35-2.2</machine>
-      <machine maxCpus='1'>xenpv</machine>
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
-      <machine maxCpus='255'>pc-q35-2.1</machine>
-      <machine maxCpus='255'>pc-0.11</machine>
-      <machine maxCpus='255'>pc-0.10</machine>
-      <machine maxCpus='255'>pc-1.2</machine>
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
-      <machine maxCpus='1'>isapc</machine>
-      <machine maxCpus='255'>pc-q35-1.4</machine>
-      <machine maxCpus='128'>xenfv</machine>
-      <machine maxCpus='255'>pc-0.15</machine>
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
-      <machine maxCpus='255'>pc-0.14</machine>
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
-      <machine maxCpus='255'>pc-q35-2.0</machine>
-      <machine maxCpus='255'>pc-1.1</machine>
-      <machine maxCpus='255'>pc-q35-1.7</machine>
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
-      <machine maxCpus='255'>pc-1.0</machine>
+      <machine maxCpus='255'>pc-i440fx-6.1</machine>
+      <machine canonical='pc-i440fx-6.1' maxCpus='255'>pc</machine>
+      <machine maxCpus='288'>pc-q35-5.2</machine>
+      <machine maxCpus='255'>pc-i440fx-2.12</machine>
       <machine maxCpus='255'>pc-i440fx-2.0</machine>
-      <machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
-      <machine maxCpus='255'>pc-0.13</machine>
+      <machine maxCpus='1'>xenpv</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-5.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-i440fx-2.7</machine>
+      <machine maxCpus='288'>pc-q35-6.1</machine>
+      <machine canonical='pc-q35-6.1' maxCpus='288'>q35</machine>
+      <machine maxCpus='128'>xenfv-3.1</machine>
+      <machine canonical='xenfv-3.1' maxCpus='128'>xenfv</machine>
+      <machine maxCpus='255'>pc-q35-2.4</machine>
+      <machine maxCpus='288'>pc-q35-2.10</machine>
+      <machine maxCpus='1'>x-remote</machine>
+      <machine maxCpus='288'>pc-q35-5.1</machine>
+      <machine maxCpus='255'>pc-i440fx-1.7</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-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='288'>pc-q35-6.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='255'>pc-i440fx-6.0</machine>
+      <machine maxCpus='288'>pc-q35-4.0</machine>
+      <machine maxCpus='128'>xenfv-4.2</machine>
+      <machine maxCpus='288'>microvm</machine>
+      <machine maxCpus='255'>pc-i440fx-2.3</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'>
-        <emulator>/usr/bin/qemu-kvm</emulator>
-        <machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
-        <machine maxCpus='255'>pc-1.3</machine>
-        <machine maxCpus='255'>pc-0.12</machine>
-        <machine maxCpus='255'>pc-q35-1.6</machine>
-        <machine maxCpus='255'>pc-q35-1.5</machine>
-        <machine maxCpus='255'>pc-i440fx-1.6</machine>
-        <machine maxCpus='255'>pc-q35-2.2</machine>
-        <machine maxCpus='255'>pc-i440fx-1.7</machine>
-        <machine maxCpus='1'>xenpv</machine>
-        <machine maxCpus='255'>pc-q35-2.1</machine>
-        <machine maxCpus='255'>pc-0.11</machine>
-        <machine maxCpus='255'>pc-0.10</machine>
-        <machine maxCpus='255'>pc-i440fx-2.2</machine>
-        <machine maxCpus='255'>pc-1.2</machine>
-        <machine maxCpus='1'>isapc</machine>
-        <machine maxCpus='255'>pc-q35-1.4</machine>
-        <machine maxCpus='128'>xenfv</machine>
-        <machine maxCpus='255'>pc-0.15</machine>
-        <machine maxCpus='255'>pc-i440fx-1.5</machine>
-        <machine maxCpus='255'>pc-i440fx-1.4</machine>
-        <machine maxCpus='255'>pc-q35-2.0</machine>
-        <machine maxCpus='255'>pc-0.14</machine>
-        <machine maxCpus='255'>pc-1.1</machine>
-        <machine maxCpus='255'>pc-q35-1.7</machine>
-        <machine maxCpus='255'>pc-i440fx-2.1</machine>
-        <machine maxCpus='255'>pc-1.0</machine>
-        <machine maxCpus='255'>pc-i440fx-2.0</machine>
-        <machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
-        <machine maxCpus='255'>pc-0.13</machine>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='no'/>
       <pae/>
       <nonpae/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='lm32'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-lm32</emulator>
-      <machine maxCpus='1'>lm32-evr</machine>
-      <machine maxCpus='1'>milkymist</machine>
-      <machine maxCpus='1'>lm32-uclinux</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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'>dummy</machine>
-      <machine maxCpus='1'>an5206</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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'>mips</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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'>mips</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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'>mips</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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'>mips</machine>
-      <machine maxCpus='1'>magnum</machine>
-      <machine maxCpus='1'>mipssim</machine>
-      <machine maxCpus='1'>pica61</machine>
-      <machine maxCpus='1'>fulong2e</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
+      <acpi default='on' toggle='yes'/>
+      <apic default='on' toggle='no'/>
+      <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
     </features>
@@ -424,13 +497,15 @@
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-ppc</emulator>
       <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1'>ref405ep</machine>
       <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='32'>ppce500</machine>
-      <machine maxCpus='15'>mpc8544ds</machine>
-      <machine maxCpus='1'>bamboo</machine>
-      <machine maxCpus='1'>prep</machine>
       <machine maxCpus='1'>mac99</machine>
+      <machine maxCpus='32'>ppce500</machine>
+      <machine maxCpus='1'>sam460ex</machine>
+      <machine maxCpus='1'>pegasos2</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>
@@ -446,18 +521,45 @@
     <arch name='ppc64'>
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      <machine canonical='pseries-2.3' maxCpus='255'>pseries</machine>
-      <machine maxCpus='1'>ref405ep</machine>
-      <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='32'>ppce500</machine>
+      <machine maxCpus='2147483647'>pseries-6.1</machine>
+      <machine canonical='pseries-6.1' maxCpus='2147483647'>pseries</machine>
+      <machine maxCpus='2048'>powernv9</machine>
+      <machine canonical='powernv9' maxCpus='2048'>powernv</machine>
+      <machine maxCpus='1'>taihu</machine>
+      <machine maxCpus='2147483647'>pseries-4.1</machine>
       <machine maxCpus='15'>mpc8544ds</machine>
+      <machine maxCpus='2147483647'>pseries-2.5</machine>
+      <machine maxCpus='2048'>powernv10</machine>
+      <machine maxCpus='2147483647'>pseries-4.2</machine>
+      <machine maxCpus='2147483647'>pseries-2.6</machine>
+      <machine maxCpus='32'>ppce500</machine>
+      <machine maxCpus='2147483647'>pseries-2.7</machine>
+      <machine maxCpus='2147483647'>pseries-3.0</machine>
+      <machine maxCpus='2147483647'>pseries-5.0</machine>
+      <machine maxCpus='1'>40p</machine>
+      <machine maxCpus='2147483647'>pseries-2.8</machine>
+      <machine maxCpus='1'>pegasos2</machine>
+      <machine maxCpus='2147483647'>pseries-3.1</machine>
+      <machine maxCpus='2147483647'>pseries-5.1</machine>
+      <machine maxCpus='2147483647'>pseries-2.9</machine>
       <machine maxCpus='1'>bamboo</machine>
       <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1'>prep</machine>
-      <machine maxCpus='255'>pseries-2.1</machine>
-      <machine maxCpus='255'>pseries-2.2</machine>
+      <machine maxCpus='2147483647'>pseries-5.2</machine>
+      <machine maxCpus='2147483647'>pseries-2.12-sxxm</machine>
+      <machine maxCpus='2147483647'>pseries-2.10</machine>
+      <machine maxCpus='1'>virtex-ml507</machine>
+      <machine maxCpus='2147483647'>pseries-2.11</machine>
+      <machine maxCpus='2147483647'>pseries-2.1</machine>
+      <machine maxCpus='2147483647'>pseries-2.12</machine>
+      <machine maxCpus='2147483647'>pseries-2.2</machine>
       <machine maxCpus='1'>mac99</machine>
-      <machine maxCpus='1'>taihu</machine>
+      <machine maxCpus='1'>sam460ex</machine>
+      <machine maxCpus='1'>ref405ep</machine>
+      <machine maxCpus='2147483647'>pseries-2.3</machine>
+      <machine maxCpus='2048'>powernv8</machine>
+      <machine maxCpus='2147483647'>pseries-4.0</machine>
+      <machine maxCpus='2147483647'>pseries-6.0</machine>
+      <machine maxCpus='2147483647'>pseries-2.4</machine>
       <domain type='qemu'/>
     </arch>
     <features>
@@ -472,36 +574,45 @@
     <arch name='ppc64le'>
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      <machine canonical='pseries-2.3' maxCpus='255'>pseries</machine>
-      <machine maxCpus='1'>ref405ep</machine>
-      <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='32'>ppce500</machine>
+      <machine maxCpus='2147483647'>pseries-6.1</machine>
+      <machine canonical='pseries-6.1' maxCpus='2147483647'>pseries</machine>
+      <machine maxCpus='2048'>powernv9</machine>
+      <machine canonical='powernv9' maxCpus='2048'>powernv</machine>
+      <machine maxCpus='1'>taihu</machine>
+      <machine maxCpus='2147483647'>pseries-4.1</machine>
       <machine maxCpus='15'>mpc8544ds</machine>
+      <machine maxCpus='2147483647'>pseries-2.5</machine>
+      <machine maxCpus='2048'>powernv10</machine>
+      <machine maxCpus='2147483647'>pseries-4.2</machine>
+      <machine maxCpus='2147483647'>pseries-2.6</machine>
+      <machine maxCpus='32'>ppce500</machine>
+      <machine maxCpus='2147483647'>pseries-2.7</machine>
+      <machine maxCpus='2147483647'>pseries-3.0</machine>
+      <machine maxCpus='2147483647'>pseries-5.0</machine>
+      <machine maxCpus='1'>40p</machine>
+      <machine maxCpus='2147483647'>pseries-2.8</machine>
+      <machine maxCpus='1'>pegasos2</machine>
+      <machine maxCpus='2147483647'>pseries-3.1</machine>
+      <machine maxCpus='2147483647'>pseries-5.1</machine>
+      <machine maxCpus='2147483647'>pseries-2.9</machine>
       <machine maxCpus='1'>bamboo</machine>
       <machine maxCpus='1'>g3beige</machine>
-      <machine maxCpus='1'>prep</machine>
-      <machine maxCpus='255'>pseries-2.1</machine>
-      <machine maxCpus='255'>pseries-2.2</machine>
-      <machine maxCpus='1'>mac99</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='ppcemb'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-ppcemb</emulator>
-      <machine maxCpus='1'>ref405ep</machine>
+      <machine maxCpus='2147483647'>pseries-5.2</machine>
+      <machine maxCpus='2147483647'>pseries-2.12-sxxm</machine>
+      <machine maxCpus='2147483647'>pseries-2.10</machine>
       <machine maxCpus='1'>virtex-ml507</machine>
-      <machine maxCpus='1'>bamboo</machine>
-      <machine maxCpus='1'>taihu</machine>
+      <machine maxCpus='2147483647'>pseries-2.11</machine>
+      <machine maxCpus='2147483647'>pseries-2.1</machine>
+      <machine maxCpus='2147483647'>pseries-2.12</machine>
+      <machine maxCpus='2147483647'>pseries-2.2</machine>
+      <machine maxCpus='1'>mac99</machine>
+      <machine maxCpus='1'>sam460ex</machine>
+      <machine maxCpus='1'>ref405ep</machine>
+      <machine maxCpus='2147483647'>pseries-2.3</machine>
+      <machine maxCpus='2048'>powernv8</machine>
+      <machine maxCpus='2147483647'>pseries-4.0</machine>
+      <machine maxCpus='2147483647'>pseries-6.0</machine>
+      <machine maxCpus='2147483647'>pseries-2.4</machine>
       <domain type='qemu'/>
     </arch>
     <features>
@@ -516,8 +627,26 @@
     <arch name='s390x'>
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
-      <machine canonical='s390-virtio' maxCpus='255'>s390</machine>
-      <machine canonical='s390-ccw-virtio' maxCpus='255'>s390-ccw</machine>
+      <machine maxCpus='248'>s390-ccw-virtio-6.1</machine>
+      <machine canonical='s390-ccw-virtio-6.1' maxCpus='248'>s390-ccw-virtio</machine>
+      <machine maxCpus='248'>s390-ccw-virtio-4.0</machine>
+      <machine maxCpus='248'>s390-ccw-virtio-5.2</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-6.0</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>
@@ -527,196 +656,79 @@
     </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>
-      <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>
-      <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='1'>SS-4</machine>
-      <machine maxCpus='1'>SPARCbook</machine>
-      <machine maxCpus='4'>SS-600MP</machine>
-      <machine maxCpus='1'>Voyager</machine>
-      <machine maxCpus='4'>SS-10</machine>
-      <machine maxCpus='1'>SPARCClassic</machine>
-      <machine maxCpus='4'>SS-20</machine>
-      <machine maxCpus='1'>leon3_generic</machine>
-      <machine maxCpus='1'>LX</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='unicore32'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-unicore32</emulator>
-      <machine maxCpus='1'>puv3</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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 canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
-      <machine maxCpus='255'>pc-1.3</machine>
-      <machine maxCpus='255'>pc-0.12</machine>
-      <machine maxCpus='255'>pc-q35-1.6</machine>
-      <machine maxCpus='255'>pc-q35-1.5</machine>
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
-      <machine maxCpus='255'>pc-q35-2.2</machine>
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
-      <machine maxCpus='1'>xenpv</machine>
-      <machine maxCpus='255'>pc-q35-2.1</machine>
-      <machine maxCpus='255'>pc-0.11</machine>
-      <machine maxCpus='255'>pc-0.10</machine>
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
-      <machine maxCpus='255'>pc-1.2</machine>
-      <machine maxCpus='1'>isapc</machine>
-      <machine maxCpus='255'>pc-q35-1.4</machine>
-      <machine maxCpus='128'>xenfv</machine>
-      <machine maxCpus='255'>pc-0.15</machine>
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
-      <machine maxCpus='255'>pc-q35-2.0</machine>
-      <machine maxCpus='255'>pc-0.14</machine>
-      <machine maxCpus='255'>pc-1.1</machine>
-      <machine maxCpus='255'>pc-q35-1.7</machine>
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
-      <machine maxCpus='255'>pc-1.0</machine>
+      <machine maxCpus='255'>pc-i440fx-6.1</machine>
+      <machine canonical='pc-i440fx-6.1' maxCpus='255'>pc</machine>
+      <machine maxCpus='288'>pc-q35-5.2</machine>
+      <machine maxCpus='255'>pc-i440fx-2.12</machine>
       <machine maxCpus='255'>pc-i440fx-2.0</machine>
-      <machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
-      <machine maxCpus='255'>pc-0.13</machine>
+      <machine maxCpus='1'>xenpv</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-5.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-i440fx-2.7</machine>
+      <machine maxCpus='288'>pc-q35-6.1</machine>
+      <machine canonical='pc-q35-6.1' maxCpus='288'>q35</machine>
+      <machine maxCpus='128'>xenfv-3.1</machine>
+      <machine canonical='xenfv-3.1' maxCpus='128'>xenfv</machine>
+      <machine maxCpus='255'>pc-q35-2.4</machine>
+      <machine maxCpus='288'>pc-q35-2.10</machine>
+      <machine maxCpus='1'>x-remote</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-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='288'>pc-q35-6.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='255'>pc-i440fx-6.0</machine>
+      <machine maxCpus='288'>pc-q35-4.0</machine>
+      <machine maxCpus='128'>xenfv-4.2</machine>
+      <machine maxCpus='288'>microvm</machine>
+      <machine maxCpus='255'>pc-i440fx-2.3</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'>
-        <emulator>/usr/bin/qemu-kvm</emulator>
-        <machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
-        <machine maxCpus='255'>pc-1.3</machine>
-        <machine maxCpus='255'>pc-0.12</machine>
-        <machine maxCpus='255'>pc-q35-1.6</machine>
-        <machine maxCpus='255'>pc-q35-1.5</machine>
-        <machine maxCpus='255'>pc-i440fx-1.6</machine>
-        <machine maxCpus='255'>pc-q35-2.2</machine>
-        <machine maxCpus='255'>pc-i440fx-1.7</machine>
-        <machine maxCpus='1'>xenpv</machine>
-        <machine maxCpus='255'>pc-q35-2.1</machine>
-        <machine maxCpus='255'>pc-0.11</machine>
-        <machine maxCpus='255'>pc-0.10</machine>
-        <machine maxCpus='255'>pc-i440fx-2.2</machine>
-        <machine maxCpus='255'>pc-1.2</machine>
-        <machine maxCpus='1'>isapc</machine>
-        <machine maxCpus='255'>pc-q35-1.4</machine>
-        <machine maxCpus='128'>xenfv</machine>
-        <machine maxCpus='255'>pc-0.15</machine>
-        <machine maxCpus='255'>pc-i440fx-1.5</machine>
-        <machine maxCpus='255'>pc-i440fx-1.4</machine>
-        <machine maxCpus='255'>pc-q35-2.0</machine>
-        <machine maxCpus='255'>pc-0.14</machine>
-        <machine maxCpus='255'>pc-1.1</machine>
-        <machine maxCpus='255'>pc-q35-1.7</machine>
-        <machine maxCpus='255'>pc-i440fx-2.1</machine>
-        <machine maxCpus='255'>pc-1.0</machine>
-        <machine maxCpus='255'>pc-i440fx-2.0</machine>
-        <machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
-        <machine maxCpus='255'>pc-0.13</machine>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
-      <cpuselection/>
-      <deviceboot/>
-      <disksnapshot default='on' toggle='no'/>
       <acpi default='on' toggle='yes'/>
       <apic 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='4'>kc705</machine>
-      <machine maxCpus='4'>lx200</machine>
-      <machine maxCpus='4'>lx60</machine>
-      <machine maxCpus='4'>ml605</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
-      <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='4'>kc705</machine>
-      <machine maxCpus='4'>lx200</machine>
-      <machine maxCpus='4'>lx60</machine>
-      <machine maxCpus='4'>ml605</machine>
-      <domain type='qemu'/>
-    </arch>
-    <features>
+      <cpuselection/>
+      <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
     </features>
   </guest>
 
 </capabilities>
+
+
diff --git a/tests/data/cli/compare/virt-install-aarch64-cdrom.xml b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
index d41b95f2..7dc6379e 100644
--- a/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
@@ -11,6 +11,9 @@
     <boot dev="cdrom"/>
     <boot dev="hd"/>
   </os>
+  <features>
+    <acpi/>
+  </features>
   <clock offset="utc"/>
   <on_poweroff>restart</on_poweroff>
   <on_reboot>destroy</on_reboot>
@@ -66,6 +69,9 @@
     <nvram template="VARS.fd"/>
     <boot dev="hd"/>
   </os>
+  <features>
+    <acpi/>
+  </features>
   <clock offset="utc"/>
   <on_poweroff>restart</on_poweroff>
   <on_reboot>destroy</on_reboot>
diff --git a/tests/data/cli/compare/virt-install-aarch64-machdefault.xml b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml
index fc5d195a..e2e3b4f1 100644
--- a/tests/data/cli/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml
@@ -10,6 +10,9 @@
     <initrd>/f19-arm.initrd</initrd>
     <cmdline>console=ttyAMA0,1234 rw root=/dev/vda3</cmdline>
   </os>
+  <features>
+    <acpi/>
+  </features>
   <cpu mode="custom" match="exact">
     <model>cortex-a57</model>
   </cpu>
diff --git a/tests/data/cli/compare/virt-install-aarch64-machvirt.xml b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml
index fc5d195a..e2e3b4f1 100644
--- a/tests/data/cli/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml
@@ -10,6 +10,9 @@
     <initrd>/f19-arm.initrd</initrd>
     <cmdline>console=ttyAMA0,1234 rw root=/dev/vda3</cmdline>
   </os>
+  <features>
+    <acpi/>
+  </features>
   <cpu mode="custom" match="exact">
     <model>cortex-a57</model>
   </cpu>
diff --git a/tests/data/cli/compare/virt-install-boot-uefi-notpm.xml b/tests/data/cli/compare/virt-install-boot-uefi-notpm.xml
index 301b09cc..9f51dd13 100644
--- a/tests/data/cli/compare/virt-install-boot-uefi-notpm.xml
+++ b/tests/data/cli/compare/virt-install-boot-uefi-notpm.xml
@@ -26,7 +26,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/var/lib/libvirt/images/disk.qcow2"/>
diff --git a/tests/data/cli/compare/virt-install-boot-uefi.xml b/tests/data/cli/compare/virt-install-boot-uefi.xml
index b598ddd0..87df74f1 100644
--- a/tests/data/cli/compare/virt-install-boot-uefi.xml
+++ b/tests/data/cli/compare/virt-install-boot-uefi.xml
@@ -26,7 +26,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-cdrom-centos-label.xml b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml
index 7b060470..a0bc4a12 100644
--- a/tests/data/cli/compare/virt-install-cdrom-centos-label.xml
+++ b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="cdrom"/>
     <boot dev="hd"/>
   </os>
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -90,7 +90,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -109,7 +109,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-cpu-disable-sec.xml b/tests/data/cli/compare/virt-install-cpu-disable-sec.xml
index f83191b4..e6ddee20 100644
--- a/tests/data/cli/compare/virt-install-cpu-disable-sec.xml
+++ b/tests/data/cli/compare/virt-install-cpu-disable-sec.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
   </os>
   <features>
@@ -26,7 +26,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
@@ -52,7 +52,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
   </os>
   <features>
@@ -72,7 +72,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-f21-kvm-remote.xml b/tests/data/cli/compare/virt-install-f21-kvm-remote.xml
index c5a9a407..5c38039b 100644
--- a/tests/data/cli/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/data/cli/compare/virt-install-f21-kvm-remote.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -29,7 +29,7 @@
     <suspend-to-mem enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-graphics-usb-disable.xml b/tests/data/cli/compare/virt-install-graphics-usb-disable.xml
index d5948518..a7b02c1e 100644
--- a/tests/data/cli/compare/virt-install-graphics-usb-disable.xml
+++ b/tests/data/cli/compare/virt-install-graphics-usb-disable.xml
@@ -29,7 +29,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/var/lib/libvirt/images/fedora26.qcow2"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-centos7.xml b/tests/data/cli/compare/virt-install-kvm-centos7.xml
index 8cf905dc..f9b0b234 100644
--- a/tests/data/cli/compare/virt-install-kvm-centos7.xml
+++ b/tests/data/cli/compare/virt-install-kvm-centos7.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -98,7 +98,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml b/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
index d3b862cb..6b5ac252 100644
--- a/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
+++ b/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
     <boot dev="hd"/>
   </os>
@@ -20,7 +20,7 @@
     <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
-    <model>Opteron_G4</model>
+    <model>Skylake-Client-noTSX-IBRS</model>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -33,7 +33,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -80,7 +80,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -89,7 +89,7 @@
     <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
-    <model>Opteron_G4</model>
+    <model>Skylake-Client-noTSX-IBRS</model>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -101,7 +101,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml b/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
index a55e7cee..6ddce04f 100644
--- a/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
+++ b/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
@@ -32,7 +32,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -89,7 +89,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml b/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
index ca28ba42..6457303d 100644
--- a/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
+++ b/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
   </os>
   <features>
@@ -14,27 +14,33 @@
     <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
-    <model>Opteron_G4</model>
-    <vendor>AMD</vendor>
-    <feature name="invtsc"/>
-    <feature name="perfctr_nb"/>
-    <feature name="perfctr_core"/>
-    <feature name="topoext"/>
-    <feature name="nodeid_msr"/>
-    <feature name="lwp"/>
-    <feature name="wdt"/>
-    <feature name="skinit"/>
-    <feature name="ibs"/>
-    <feature name="osvw"/>
-    <feature name="cr8legacy"/>
-    <feature name="extapic"/>
-    <feature name="cmp_legacy"/>
-    <feature name="fxsr_opt"/>
-    <feature name="mmxext"/>
-    <feature name="osxsave"/>
-    <feature name="monitor"/>
+    <model>Skylake-Client-noTSX-IBRS</model>
+    <vendor>Intel</vendor>
+    <feature name="ds"/>
+    <feature name="acpi"/>
+    <feature name="ss"/>
     <feature name="ht"/>
-    <feature name="vme"/>
+    <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"/>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -47,7 +53,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
@@ -86,7 +92,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
   </os>
   <features>
@@ -95,27 +101,33 @@
     <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
-    <model>Opteron_G4</model>
-    <vendor>AMD</vendor>
-    <feature name="invtsc"/>
-    <feature name="perfctr_nb"/>
-    <feature name="perfctr_core"/>
-    <feature name="topoext"/>
-    <feature name="nodeid_msr"/>
-    <feature name="lwp"/>
-    <feature name="wdt"/>
-    <feature name="skinit"/>
-    <feature name="ibs"/>
-    <feature name="osvw"/>
-    <feature name="cr8legacy"/>
-    <feature name="extapic"/>
-    <feature name="cmp_legacy"/>
-    <feature name="fxsr_opt"/>
-    <feature name="mmxext"/>
-    <feature name="osxsave"/>
-    <feature name="monitor"/>
+    <model>Skylake-Client-noTSX-IBRS</model>
+    <vendor>Intel</vendor>
+    <feature name="ds"/>
+    <feature name="acpi"/>
+    <feature name="ss"/>
     <feature name="ht"/>
-    <feature name="vme"/>
+    <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"/>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -127,7 +139,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml b/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
index 9c86bde8..bd7b6e8b 100644
--- a/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
+++ b/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="i686" machine="pc">hvm</type>
+    <type arch="i686" machine="pc-i440fx-6.1">hvm</type>
     <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</loader>
     <kernel>/VIRTINST-TESTSUITE/httpkernel</kernel>
     <initrd>/VIRTINST-TESTSUITE/ftpinitrd</initrd>
@@ -27,7 +27,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
@@ -66,7 +66,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="i686" machine="pc">hvm</type>
+    <type arch="i686" machine="pc-i440fx-6.1">hvm</type>
     <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</loader>
     <boot dev="hd"/>
   </os>
@@ -86,7 +86,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-rhel5.xml b/tests/data/cli/compare/virt-install-kvm-rhel5.xml
index ef09190c..8c92ad02 100644
--- a/tests/data/cli/compare/virt-install-kvm-rhel5.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel5.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
     <boot dev="hd"/>
   </os>
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -79,7 +79,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -98,7 +98,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-rhel6.xml b/tests/data/cli/compare/virt-install-kvm-rhel6.xml
index bef67674..0b1322b6 100644
--- a/tests/data/cli/compare/virt-install-kvm-rhel6.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel6.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/fake-win7.iso</kernel>
     <initrd>/VIRTINST-TESTSUITE/fake-centos65-label.iso</initrd>
     <cmdline>foo bar</cmdline>
@@ -32,7 +32,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -85,7 +85,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -104,7 +104,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-rhel7.xml b/tests/data/cli/compare/virt-install-kvm-rhel7.xml
index ed21e080..d9ed1e40 100644
--- a/tests/data/cli/compare/virt-install-kvm-rhel7.xml
+++ b/tests/data/cli/compare/virt-install-kvm-rhel7.xml
@@ -10,7 +10,7 @@
   <currentMemory>1572864</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
     <cmdline>test overwrite</cmdline>
@@ -32,7 +32,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -79,7 +79,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -98,7 +98,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-session-defaults.xml b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
index 0c91b849..f53954fd 100644
--- a/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="cdrom"/>
     <boot dev="hd"/>
   </os>
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>
@@ -84,7 +84,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -103,7 +103,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-win10.xml b/tests/data/cli/compare/virt-install-kvm-win10.xml
index 9197de73..39d20adf 100644
--- a/tests/data/cli/compare/virt-install-kvm-win10.xml
+++ b/tests/data/cli/compare/virt-install-kvm-win10.xml
@@ -37,7 +37,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -108,7 +108,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
index f5bef098..8a2f48d4 100644
--- a/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="cdrom"/>
     <boot dev="hd"/>
   </os>
@@ -37,7 +37,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -83,7 +83,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -108,7 +108,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-location-iso.xml b/tests/data/cli/compare/virt-install-location-iso.xml
index 366478a5..2b3bef30 100644
--- a/tests/data/cli/compare/virt-install-location-iso.xml
+++ b/tests/data/cli/compare/virt-install-location-iso.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
   </os>
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -89,7 +89,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -108,7 +108,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-location-manual-kernel.xml b/tests/data/cli/compare/virt-install-location-manual-kernel.xml
index f9fc1e12..6199710f 100644
--- a/tests/data/cli/compare/virt-install-location-manual-kernel.xml
+++ b/tests/data/cli/compare/virt-install-location-manual-kernel.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/frib.img</kernel>
     <initrd>/VIRTINST-TESTSUITE/frob.img</initrd>
   </os>
@@ -26,7 +26,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
       <source file="tests/data/fakemedia/fake-no-osinfo.iso"/>
@@ -71,7 +71,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="cdrom"/>
   </os>
   <features>
@@ -90,7 +90,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <target dev="hda" bus="ide"/>
       <readonly/>
diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index 7e1cdf0c..0df75ebd 100644
--- a/tests/data/cli/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
@@ -37,7 +37,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="block" device="disk">
       <driver name="qemu" type="raw" cache="writeback" io="threads" iothread="3" queues="8"/>
       <source dev="/dev/default-pool/UPPER"/>
diff --git a/tests/data/cli/compare/virt-install-network-install-resources.xml b/tests/data/cli/compare/virt-install-network-install-resources.xml
index 03595873..8e7750de 100644
--- a/tests/data/cli/compare/virt-install-network-install-resources.xml
+++ b/tests/data/cli/compare/virt-install-network-install-resources.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
@@ -79,7 +79,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
diff --git a/tests/data/cli/compare/virt-install-openbsd-defaults.xml b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
index ecaf1270..7f3c00d0 100644
--- a/tests/data/cli/compare/virt-install-openbsd-defaults.xml
+++ b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -29,7 +29,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/var/lib/libvirt/images/disk.qcow2"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml b/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
index 13d9a59d..1d720bd1 100644
--- a/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
@@ -30,7 +30,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -83,7 +83,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml
index 6863ad07..14dbe38b 100644
--- a/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
       <source file="tests/data/fakemedia/fake-f26-netinst.iso"/>
@@ -85,7 +85,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <target dev="sda" bus="sata"/>
       <readonly/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
index a46d6675..b2877072 100644
--- a/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
     <cmdline>ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
@@ -70,7 +70,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="hd"/>
   </os>
   <features>
@@ -88,7 +88,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
index 35f3c6ca..5f1ecf9b 100644
--- a/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
@@ -79,7 +79,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
index 28ebf653..6aee76d2 100644
--- a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -89,7 +89,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-url.xml b/tests/data/cli/compare/virt-install-osinfo-url.xml
index 68a7932c..840b8e20 100644
--- a/tests/data/cli/compare/virt-install-osinfo-url.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url.xml
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
@@ -79,7 +79,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml
index cb698e60..ee5afe63 100644
--- a/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml
@@ -35,7 +35,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
       <source file="tests/data/fakemedia/fake-win7.iso"/>
@@ -110,7 +110,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="cdrom">
       <driver name="qemu"/>
       <source file="tests/data/fakemedia/fake-win7.iso"/>
diff --git a/tests/data/cli/compare/virt-install-q35-defaults.xml b/tests/data/cli/compare/virt-install-q35-defaults.xml
index d75e2869..3defcf5a 100644
--- a/tests/data/cli/compare/virt-install-q35-defaults.xml
+++ b/tests/data/cli/compare/virt-install-q35-defaults.xml
@@ -26,7 +26,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -95,7 +95,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-qemu-32-on-64.xml b/tests/data/cli/compare/virt-install-qemu-32-on-64.xml
index 19955f0e..c828e992 100644
--- a/tests/data/cli/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/data/cli/compare/virt-install-qemu-32-on-64.xml
@@ -10,7 +10,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="i686" machine="pc">hvm</type>
+    <type arch="i686" machine="pc-i440fx-6.1">hvm</type>
     <boot dev="network"/>
   </os>
   <features>
@@ -29,7 +29,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
diff --git a/tests/data/cli/compare/virt-install-qemu-plain.xml b/tests/data/cli/compare/virt-install-qemu-plain.xml
index 094a3d82..260a05a2 100644
--- a/tests/data/cli/compare/virt-install-qemu-plain.xml
+++ b/tests/data/cli/compare/virt-install-qemu-plain.xml
@@ -10,8 +10,8 @@
   <currentMemory>65536</currentMemory>
   <vcpu>2</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
-    <loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
+    <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
+    <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <boot dev="cdrom"/>
   </os>
   <features>
@@ -20,6 +20,10 @@
   </features>
   <cpu mode="custom" match="exact">
     <model>Penryn</model>
+    <feature policy="require" name="ibpb"/>
+    <feature policy="require" name="md-clear"/>
+    <feature policy="require" name="spec-ctrl"/>
+    <feature policy="require" name="ssbd"/>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
diff --git a/tests/data/cli/compare/virt-install-singleton-config-1.xml b/tests/data/cli/compare/virt-install-singleton-config-1.xml
index cf8f0eb6..aeeead2c 100644
--- a/tests/data/cli/compare/virt-install-singleton-config-1.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-1.xml
@@ -23,7 +23,7 @@
   </resource>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
-    <loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
+    <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <initarg>foo</initarg>
     <initarg>bar=baz</initarg>
     <boot dev="network"/>
@@ -35,20 +35,31 @@
     <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
-    <model fallback="forbid">Broadwell</model>
+    <model fallback="forbid">Skylake-Client-IBRS</model>
     <vendor>Intel</vendor>
     <topology sockets="2" dies="1" cores="2" threads="1"/>
-    <feature policy="require" name="vme"/>
     <feature policy="require" name="ss"/>
-    <feature policy="require" name="f16c"/>
-    <feature policy="require" name="rdrand"/>
+    <feature policy="require" name="vmx"/>
+    <feature policy="require" name="pdcm"/>
     <feature policy="require" name="hypervisor"/>
-    <feature policy="require" name="arat"/>
     <feature policy="require" name="tsc_adjust"/>
-    <feature policy="require" name="xsaveopt"/>
+    <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="abm"/>
     <feature policy="require" name="invtsc"/>
+    <feature policy="require" name="ibpb"/>
+    <feature policy="require" name="ibrs"/>
+    <feature policy="require" name="amd-stibp"/>
+    <feature policy="require" name="amd-ssbd"/>
+    <feature policy="require" name="skip-l1dfl-vmentry"/>
+    <feature policy="require" name="pschange-mc-no"/>
+    <feature policy="disable" name="hle"/>
+    <feature policy="disable" name="rtm"/>
   </cpu>
   <clock offset="localtime">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -61,7 +72,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml
index 3cc03905..86504a6c 100644
--- a/tests/data/cli/compare/virt-install-singleton-config-2.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml
@@ -132,6 +132,10 @@
     <model>foobar</model>
     <vendor>meee</vendor>
     <cache level="3" mode="emulate"/>
+    <feature policy="require" name="ibpb"/>
+    <feature policy="require" name="md-clear"/>
+    <feature policy="require" name="spec-ctrl"/>
+    <feature policy="require" name="ssbd"/>
     <feature policy="force" name="x2apic"/>
     <feature policy="force" name="x2apicagain"/>
     <feature policy="require" name="reqtest"/>
@@ -416,6 +420,10 @@
     <model>foobar</model>
     <vendor>meee</vendor>
     <cache level="3" mode="emulate"/>
+    <feature policy="require" name="ibpb"/>
+    <feature policy="require" name="md-clear"/>
+    <feature policy="require" name="spec-ctrl"/>
+    <feature policy="require" name="ssbd"/>
     <feature policy="force" name="x2apic"/>
     <feature policy="force" name="x2apicagain"/>
     <feature policy="require" name="reqtest"/>
diff --git a/tests/data/cli/compare/virt-install-singleton-config-3.xml b/tests/data/cli/compare/virt-install-singleton-config-3.xml
index f903c2c9..da653b12 100644
--- a/tests/data/cli/compare/virt-install-singleton-config-3.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-3.xml
@@ -94,7 +94,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="testsuitebr0"/>
diff --git a/tests/data/cli/compare/virt-install-win7-uefi.xml b/tests/data/cli/compare/virt-install-win7-uefi.xml
index 6a341f5e..4062e2e0 100644
--- a/tests/data/cli/compare/virt-install-win7-uefi.xml
+++ b/tests/data/cli/compare/virt-install-win7-uefi.xml
@@ -33,7 +33,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
@@ -109,7 +109,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-x86_64-graphics.xml b/tests/data/cli/compare/virt-install-x86_64-graphics.xml
index c1b06ca1..5f46516e 100644
--- a/tests/data/cli/compare/virt-install-x86_64-graphics.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-graphics.xml
@@ -28,7 +28,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-x86_64-headless.xml b/tests/data/cli/compare/virt-install-x86_64-headless.xml
index 8234c958..f2e868a6 100644
--- a/tests/data/cli/compare/virt-install-x86_64-headless.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-headless.xml
@@ -28,7 +28,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
       <source file="/dev/default-pool/testvol1.img"/>
diff --git a/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
index b58294ed..ec57aa41 100644
--- a/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
@@ -25,7 +25,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
index 21355954..7627e2d5 100644
--- a/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
+++ b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
@@ -25,7 +25,7 @@
     <suspend-to-disk enabled="no"/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type="usb" model="ich9-ehci1"/>
     <controller type="usb" model="ich9-uhci1">
       <master startport="0"/>
diff --git a/tests/test_capabilities.py b/tests/test_capabilities.py
index 0182e20f..3f7273cb 100644
--- a/tests/test_capabilities.py
+++ b/tests/test_capabilities.py
@@ -87,10 +87,10 @@ def testDomainCapabilitiesx86():
     xml = open(DATADIR + "/kvm-x86_64-domcaps.xml").read()
     caps = DomainCapabilities(utils.URIs.open_testdriver_cached(), xml)
 
-    assert caps.machine == "pc-i440fx-2.1"
+    assert caps.machine == "pc-i440fx-6.1"
     assert caps.arch == "x86_64"
     assert caps.domain == "kvm"
-    assert caps.path == "/bin/qemu-system-x86_64"
+    assert caps.path == "/usr/bin/qemu-system-x86_64"
 
     custom_mode = caps.cpu.get_mode("custom")
     assert bool(custom_mode)
diff --git a/tests/test_misc.py b/tests/test_misc.py
index aeb00ae5..aa610f4d 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -148,7 +148,7 @@ def test_misc_cpu_cornercases():
     guest = virtinst.Guest(kvmconn)
     guest.x86_cpu_default = guest.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
     guest.set_defaults(guest)
-    assert guest.cpu.model == "Opteron_G4"
+    assert guest.cpu.model == "Skylake-Client-noTSX-IBRS"
 
     # pylint: disable=protected-access
     guest.cpu.model = "idontexist"