qemu: Add virQEMUCaps{Load,Format}Accel

The new functions are designed to load and format capabilities which
depend on the accelerator (host CPU expansion and CPU models).

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5d16e8bf294838b3d3a81d6001f56fed27956fc5..5b32f1732d3bc72a55528dadb314d3ade566b557 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3557,6 +3557,21 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
 }
 
 
+static int
+virQEMUCapsLoadAccel(virQEMUCapsPtr qemuCaps,
+                     xmlXPathContextPtr ctxt,
+                     virDomainVirtType type)
+{
+    if (virQEMUCapsLoadHostCPUModelInfo(qemuCaps, ctxt, type) < 0)
+        return -1;
+
+    if (virQEMUCapsLoadCPUModels(qemuCaps, ctxt, type) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 struct _virQEMUCapsCachePriv {
     char *libDir;
     uid_t runUid;
@@ -3768,12 +3783,8 @@ virQEMUCapsLoadCache(virArch hostArch,
     }
     VIR_FREE(str);
 
-    if (virQEMUCapsLoadHostCPUModelInfo(qemuCaps, ctxt, VIR_DOMAIN_VIRT_KVM) < 0 ||
-        virQEMUCapsLoadHostCPUModelInfo(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0)
-        goto cleanup;
-
-    if (virQEMUCapsLoadCPUModels(qemuCaps, ctxt, VIR_DOMAIN_VIRT_KVM) < 0 ||
-        virQEMUCapsLoadCPUModels(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0)
+    if (virQEMUCapsLoadAccel(qemuCaps, ctxt, VIR_DOMAIN_VIRT_KVM) < 0 ||
+        virQEMUCapsLoadAccel(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0)
         goto cleanup;
 
     if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) {
@@ -4005,6 +4016,16 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
 }
 
 
+static void
+virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps,
+                       virBufferPtr buf,
+                       virDomainVirtType type)
+{
+    virQEMUCapsFormatHostCPUModelInfo(qemuCaps, buf, type);
+    virQEMUCapsFormatCPUModels(qemuCaps, buf, type);
+}
+
+
 static void
 virQEMUCapsFormatSEVInfo(virQEMUCapsPtr qemuCaps, virBufferPtr buf)
 {
@@ -4067,11 +4088,8 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
     virBufferAsprintf(&buf, "<arch>%s</arch>\n",
                       virArchToString(qemuCaps->arch));
 
-    virQEMUCapsFormatHostCPUModelInfo(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
-    virQEMUCapsFormatHostCPUModelInfo(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
-
-    virQEMUCapsFormatCPUModels(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
-    virQEMUCapsFormatCPUModels(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
+    virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
+    virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
 
     for (i = 0; i < qemuCaps->nmachineTypes; i++) {
         virBufferEscapeString(&buf, "<machine name='%s'",

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 10a94a7f1c720fd2bf0aa5db448e5b855fae8786..951e1c85a4e167c9c8e4cde09f76af6f3e63f2b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -420,6 +420,114 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+  </cpu>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -654,114 +762,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-  </cpu>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index fd8e545e6e6d4479acfa308111b8a41a9f6d89d5..96dd9f77c8aa71cc3999a71e73f6547d361e75a1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -428,6 +428,83 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+  </cpu>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -664,83 +741,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-  </cpu>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 14b111e9407502eaa4756db05cb279cd45f1fb61..7f184b06f0a952a834bfac8511f33739c8eeef00 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -446,6 +446,221 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='clflushopt'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='mpx'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+    <blocker name='mpx'/>
+    <blocker name='mpx'/>
+  </cpu>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='clflushopt'/>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='osvw'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='clflushopt'/>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+    <blocker name='xsavec'/>
+    <blocker name='xgetbv1'/>
+  </cpu>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='hle'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='adx'/>
+    <blocker name='smap'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -692,221 +907,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-  </cpu>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='spec-ctrl'/>
-  </cpu>
-  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='osvw'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-  </cpu>
-  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='osvw'/>
-    <blocker name='ibpb'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-  </cpu>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 551f985e0b9384e5c314b79a53cf77a67e9c1b9d..05f7fe9e672440d566952088629df213e6189a3d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -412,6 +412,63 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -644,63 +701,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 587455ff93d6a9d90087b9d5d269be86307d13a5..210f0f89b09dd4b79ed3772310c9f68aa2e8b798 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -459,6 +459,125 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512pf'/>
+    <blocker name='avx512er'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='avx512-4vnniw'/>
+    <blocker name='avx512-4fmaps'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+  </cpu>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -713,125 +832,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512pf'/>
-    <blocker name='avx512er'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='avx512-4vnniw'/>
-    <blocker name='avx512-4fmaps'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-    <blocker name='ibpb'/>
-  </cpu>
-  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-  </cpu>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 36799746b4d2b8019fbb1166f539cfa3fa7eb57f..4687eb7daa1e01e18547838ba7b8ede313dae6a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -474,6 +474,189 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512pf'/>
+    <blocker name='avx512er'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='avx512-4vnniw'/>
+    <blocker name='avx512-4fmaps'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='intel-pt'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name=''/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='la57'/>
+    <blocker name='pconfig'/>
+    <blocker name='ssbd'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
+    <blocker name='intel-pt'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name=''/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='ssbd'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+  </cpu>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='intel-pt'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name=''/>
+    <blocker name='avx512vnni'/>
+    <blocker name='ssbd'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -740,189 +923,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512pf'/>
-    <blocker name='avx512er'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='avx512-4vnniw'/>
-    <blocker name='avx512-4fmaps'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='intel-pt'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='avx512vbmi'/>
-    <blocker name='pku'/>
-    <blocker name=''/>
-    <blocker name='avx512vbmi2'/>
-    <blocker name='gfni'/>
-    <blocker name='vaes'/>
-    <blocker name='vpclmulqdq'/>
-    <blocker name='avx512vnni'/>
-    <blocker name='avx512bitalg'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='la57'/>
-    <blocker name='pconfig'/>
-    <blocker name='ssbd'/>
-    <blocker name='wbnoinvd'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
-    <blocker name='intel-pt'/>
-    <blocker name='avx512vbmi'/>
-    <blocker name='pku'/>
-    <blocker name=''/>
-    <blocker name='avx512vbmi2'/>
-    <blocker name='gfni'/>
-    <blocker name='vaes'/>
-    <blocker name='vpclmulqdq'/>
-    <blocker name='avx512vnni'/>
-    <blocker name='avx512bitalg'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='ssbd'/>
-    <blocker name='wbnoinvd'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-    <blocker name='ibpb'/>
-  </cpu>
-  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-  </cpu>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='intel-pt'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name=''/>
-    <blocker name='avx512vnni'/>
-    <blocker name='ssbd'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 770fe022f20c90e86d28b135b832b3fc13c4070c..96e12204b53ecc380010d24a841fe17087321f12 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -175,40 +175,6 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <hostCPU type='tcg' model='zEC12.2-base' migratability='no'>
-    <property name='dateh2' type='boolean' value='false'/>
-    <property name='aen' type='boolean' value='true'/>
-    <property name='kmac-tdea-192' type='boolean' value='false'/>
-    <property name='kmc-tdea-192' type='boolean' value='false'/>
-    <property name='parseh' type='boolean' value='false'/>
-    <property name='csske' type='boolean' value='false'/>
-    <property name='hfpm' type='boolean' value='false'/>
-    <property name='hfpue' type='boolean' value='false'/>
-    <property name='dfp' type='boolean' value='false'/>
-    <property name='km-dea' type='boolean' value='false'/>
-    <property name='emon' type='boolean' value='false'/>
-    <property name='kimd-sha-1' type='boolean' value='false'/>
-    <property name='cmpsceh' type='boolean' value='false'/>
-    <property name='dfpzc' type='boolean' value='false'/>
-    <property name='dfphp' type='boolean' value='false'/>
-    <property name='kmc-dea' type='boolean' value='false'/>
-    <property name='klmd-sha-1' type='boolean' value='false'/>
-    <property name='asnlxr' type='boolean' value='false'/>
-    <property name='km-tdea-192' type='boolean' value='false'/>
-    <property name='km-tdea-128' type='boolean' value='false'/>
-    <property name='kmac-dea' type='boolean' value='false'/>
-    <property name='stfle53' type='boolean' value='true'/>
-    <property name='kmc-tdea-128' type='boolean' value='false'/>
-    <property name='ais' type='boolean' value='true'/>
-    <property name='kmac-tdea-128' type='boolean' value='false'/>
-    <property name='zpci' type='boolean' value='true'/>
-    <property name='nonqks' type='boolean' value='false'/>
-    <property name='pfpo' type='boolean' value='false'/>
-    <property name='msa4-base' type='boolean' value='true'/>
-    <property name='msa3-base' type='boolean' value='true'/>
-    <property name='msa5-base' type='boolean' value='true'/>
-    <property name='tods' type='boolean' value='false'/>
-  </hostCPU>
   <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
@@ -282,6 +248,40 @@
   <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <hostCPU type='tcg' model='zEC12.2-base' migratability='no'>
+    <property name='dateh2' type='boolean' value='false'/>
+    <property name='aen' type='boolean' value='true'/>
+    <property name='kmac-tdea-192' type='boolean' value='false'/>
+    <property name='kmc-tdea-192' type='boolean' value='false'/>
+    <property name='parseh' type='boolean' value='false'/>
+    <property name='csske' type='boolean' value='false'/>
+    <property name='hfpm' type='boolean' value='false'/>
+    <property name='hfpue' type='boolean' value='false'/>
+    <property name='dfp' type='boolean' value='false'/>
+    <property name='km-dea' type='boolean' value='false'/>
+    <property name='emon' type='boolean' value='false'/>
+    <property name='kimd-sha-1' type='boolean' value='false'/>
+    <property name='cmpsceh' type='boolean' value='false'/>
+    <property name='dfpzc' type='boolean' value='false'/>
+    <property name='dfphp' type='boolean' value='false'/>
+    <property name='kmc-dea' type='boolean' value='false'/>
+    <property name='klmd-sha-1' type='boolean' value='false'/>
+    <property name='asnlxr' type='boolean' value='false'/>
+    <property name='km-tdea-192' type='boolean' value='false'/>
+    <property name='km-tdea-128' type='boolean' value='false'/>
+    <property name='kmac-dea' type='boolean' value='false'/>
+    <property name='stfle53' type='boolean' value='true'/>
+    <property name='kmc-tdea-128' type='boolean' value='false'/>
+    <property name='ais' type='boolean' value='true'/>
+    <property name='kmac-tdea-128' type='boolean' value='false'/>
+    <property name='zpci' type='boolean' value='true'/>
+    <property name='nonqks' type='boolean' value='false'/>
+    <property name='pfpo' type='boolean' value='false'/>
+    <property name='msa4-base' type='boolean' value='true'/>
+    <property name='msa3-base' type='boolean' value='true'/>
+    <property name='msa5-base' type='boolean' value='true'/>
+    <property name='tods' type='boolean' value='false'/>
+  </hostCPU>
   <cpu type='tcg' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index f5c0b3a28d71b1eb453d8d81d875998d8377d0d3..5214be2e34a18707c0c16b68fc23579fc25e41f2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -483,6 +483,187 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512pf'/>
+    <blocker name='avx512er'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='avx512-4vnniw'/>
+    <blocker name='avx512-4fmaps'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='la57'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
     <property name='core-id' type='number' value='-1'/>
@@ -753,187 +934,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-    <blocker name='sse4a'/>
-    <blocker name='npt'/>
-  </cpu>
-  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-    <blocker name='mmxext'/>
-    <blocker name='3dnowext'/>
-    <blocker name='3dnow'/>
-  </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='tbm'/>
-    <blocker name='npt'/>
-    <blocker name='nrip-save'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='xop'/>
-    <blocker name='fma4'/>
-    <blocker name='npt'/>
-    <blocker name='nrip-save'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-  </cpu>
-  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512pf'/>
-    <blocker name='avx512er'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='avx512-4vnniw'/>
-    <blocker name='avx512-4fmaps'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-  </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='avx512vbmi'/>
-    <blocker name='pku'/>
-    <blocker name='avx512vbmi2'/>
-    <blocker name='gfni'/>
-    <blocker name='vaes'/>
-    <blocker name='vpclmulqdq'/>
-    <blocker name='avx512vnni'/>
-    <blocker name='avx512bitalg'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='la57'/>
-    <blocker name='wbnoinvd'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
-    <blocker name='avx512vbmi'/>
-    <blocker name='pku'/>
-    <blocker name='avx512vbmi2'/>
-    <blocker name='gfni'/>
-    <blocker name='vaes'/>
-    <blocker name='vpclmulqdq'/>
-    <blocker name='avx512vnni'/>
-    <blocker name='avx512bitalg'/>
-    <blocker name='avx512-vpopcntdq'/>
-    <blocker name='wbnoinvd'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-    <blocker name='ibpb'/>
-    <blocker name='npt'/>
-    <blocker name='nrip-save'/>
-  </cpu>
-  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-    <blocker name='sha-ni'/>
-    <blocker name='mmxext'/>
-    <blocker name='fxsr-opt'/>
-    <blocker name='cr8legacy'/>
-    <blocker name='sse4a'/>
-    <blocker name='misalignsse'/>
-    <blocker name='osvw'/>
-    <blocker name='npt'/>
-    <blocker name='nrip-save'/>
-  </cpu>
-  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
-    <blocker name='avx512f'/>
-    <blocker name='avx512dq'/>
-    <blocker name='clwb'/>
-    <blocker name='avx512cd'/>
-    <blocker name='avx512bw'/>
-    <blocker name='avx512vl'/>
-    <blocker name='pku'/>
-    <blocker name='avx512vnni'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='avx512f'/>
-    <blocker name='pku'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index b2c4ee61d900acf7e7c86b5e67b5342a6050b56f..c99cca667058a88331c1427df5b774715114fc90 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -416,205 +416,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-    <property name='ia64' type='boolean' value='false'/>
-    <property name='ssb-no' type='boolean' value='false'/>
-    <property name='aes' type='boolean' value='true' migratable='yes'/>
-    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-    <property name='rdpid' type='boolean' value='false'/>
-    <property name='arat' type='boolean' value='true' migratable='yes'/>
-    <property name='gfni' type='boolean' value='false'/>
-    <property name='ibrs-all' type='boolean' value='false'/>
-    <property name='pause-filter' type='boolean' value='false'/>
-    <property name='xsavec' type='boolean' value='false'/>
-    <property name='intel-pt' type='boolean' value='false'/>
-    <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='perfctr-core' type='boolean' value='false'/>
-    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-    <property name='pbe' type='boolean' value='false'/>
-    <property name='avx512cd' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
-    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='family' type='number' value='6'/>
-    <property name='wbnoinvd' type='boolean' value='false'/>
-    <property name='avx512f' type='boolean' value='false'/>
-    <property name='msr' type='boolean' value='true' migratable='yes'/>
-    <property name='mce' type='boolean' value='true' migratable='yes'/>
-    <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='xcrypt' type='boolean' value='false'/>
-    <property name='min-level' type='number' value='13'/>
-    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-    <property name='cid' type='boolean' value='false'/>
-    <property name='ds' type='boolean' value='false'/>
-    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-    <property name='xtpr' type='boolean' value='false'/>
-    <property name='avx512vl' type='boolean' value='false'/>
-    <property name='avx512-vpopcntdq' type='boolean' value='false'/>
-    <property name='phe' type='boolean' value='false'/>
-    <property name='extapic' type='boolean' value='false'/>
-    <property name='3dnowprefetch' type='boolean' value='false'/>
-    <property name='avx512vbmi2' type='boolean' value='false'/>
-    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='stibp' type='boolean' value='false'/>
-    <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='pn' type='boolean' value='false'/>
-    <property name='rsba' type='boolean' value='false'/>
-    <property name='dca' type='boolean' value='false'/>
-    <property name='vendor' type='string' value='AuthenticAMD'/>
-    <property name='pku' type='boolean' value='true' migratable='yes'/>
-    <property name='smx' type='boolean' value='false'/>
-    <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-    <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='npt' type='boolean' value='true' migratable='yes'/>
-    <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-    <property name='lbrv' type='boolean' value='false'/>
-    <property name='adx' type='boolean' value='true' migratable='yes'/>
-    <property name='ss' type='boolean' value='true' migratable='yes'/>
-    <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm-lock' type='boolean' value='false'/>
-    <property name='smep' type='boolean' value='true' migratable='yes'/>
-    <property name='smap' type='boolean' value='true' migratable='yes'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
-    <property name='x2apic' type='boolean' value='false'/>
-    <property name='avx512vbmi' type='boolean' value='false'/>
-    <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='flushbyasid' type='boolean' value='false'/>
-    <property name='f16c' type='boolean' value='false'/>
-    <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pae' type='boolean' value='true' migratable='yes'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
-    <property name='sse' type='boolean' value='true' migratable='yes'/>
-    <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm-nopiodelay' type='boolean' value='false'/>
-    <property name='tm' type='boolean' value='false'/>
-    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='mds-no' type='boolean' value='false'/>
-    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512dq' type='boolean' value='false'/>
-    <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-    <property name='ssbd' type='boolean' value='false'/>
-    <property name='est' type='boolean' value='false'/>
-    <property name='avx512ifma' type='boolean' value='false'/>
-    <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='false'/>
-    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='cldemote' type='boolean' value='false'/>
-    <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='pdcm' type='boolean' value='false'/>
-    <property name='model' type='number' value='6'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-    <property name='nrip-save' type='boolean' value='false'/>
-    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-    <property name='invpcid' type='boolean' value='false'/>
-    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc-deadline' type='boolean' value='false'/>
-    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
-    <property name='fma' type='boolean' value='false'/>
-    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-    <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='stepping' type='number' value='3'/>
-    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-    <property name='skinit' type='boolean' value='false'/>
-    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-    <property name='tce' type='boolean' value='false'/>
-    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='fma4' type='boolean' value='false'/>
-    <property name='la57' type='boolean' value='true' migratable='yes'/>
-    <property name='osvw' type='boolean' value='false'/>
-    <property name='apic' type='boolean' value='true' migratable='yes'/>
-    <property name='pmm' type='boolean' value='false'/>
-    <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvmclock' type='boolean' value='false'/>
-    <property name='lwp' type='boolean' value='false'/>
-    <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='xop' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
-    <property name='avx' type='boolean' value='false'/>
-    <property name='core-capability' type='boolean' value='false'/>
-    <property name='movdiri' type='boolean' value='false'/>
-    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512bw' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-    <property name='ht' type='boolean' value='false'/>
-    <property name='nx' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
-    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
-    <property name='movdir64b' type='boolean' value='false'/>
-    <property name='xsaves' type='boolean' value='false'/>
-    <property name='lm' type='boolean' value='true' migratable='yes'/>
-    <property name='umip' type='boolean' value='false'/>
-    <property name='pse' type='boolean' value='true' migratable='yes'/>
-    <property name='avx2' type='boolean' value='false'/>
-    <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='md-clear' type='boolean' value='false'/>
-    <property name='misalignsse' type='boolean' value='false'/>
-    <property name='split-lock-detect' type='boolean' value='false'/>
-    <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='tsc-scale' type='boolean' value='false'/>
-    <property name='topoext' type='boolean' value='false'/>
-    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512er' type='boolean' value='false'/>
-    <property name='pmm-en' type='boolean' value='false'/>
-    <property name='pcid' type='boolean' value='false'/>
-    <property name='arch-capabilities' type='boolean' value='false'/>
-    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-    <property name='erms' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='vpclmulqdq' type='boolean' value='false'/>
-    <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='xstore' type='boolean' value='false'/>
-    <property name='rtm' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-    <property name='lmce' type='boolean' value='false'/>
-    <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-    <property name='rdseed' type='boolean' value='false'/>
-    <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vme' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
-    <property name='dtes64' type='boolean' value='false'/>
-    <property name='mtrr' type='boolean' value='true' migratable='yes'/>
-    <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
-    <property name='pse36' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-    <property name='tbm' type='boolean' value='false'/>
-    <property name='wdt' type='boolean' value='false'/>
-    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-    <property name='sha-ni' type='boolean' value='false'/>
-    <property name='abm' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512pf' type='boolean' value='false'/>
-    <property name='xstore-en' type='boolean' value='false'/>
-  </hostCPU>
   <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
@@ -1037,6 +838,205 @@
   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <hostCPU type='tcg' model='base' migratability='yes'>
+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
+    <property name='ia64' type='boolean' value='false'/>
+    <property name='ssb-no' type='boolean' value='false'/>
+    <property name='aes' type='boolean' value='true' migratable='yes'/>
+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
+    <property name='rdpid' type='boolean' value='false'/>
+    <property name='arat' type='boolean' value='true' migratable='yes'/>
+    <property name='gfni' type='boolean' value='false'/>
+    <property name='ibrs-all' type='boolean' value='false'/>
+    <property name='pause-filter' type='boolean' value='false'/>
+    <property name='xsavec' type='boolean' value='false'/>
+    <property name='intel-pt' type='boolean' value='false'/>
+    <property name='kvm-asyncpf' type='boolean' value='false'/>
+    <property name='perfctr-core' type='boolean' value='false'/>
+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
+    <property name='pbe' type='boolean' value='false'/>
+    <property name='avx512cd' type='boolean' value='false'/>
+    <property name='decodeassists' type='boolean' value='false'/>
+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
+    <property name='family' type='number' value='6'/>
+    <property name='wbnoinvd' type='boolean' value='false'/>
+    <property name='avx512f' type='boolean' value='false'/>
+    <property name='msr' type='boolean' value='true' migratable='yes'/>
+    <property name='mce' type='boolean' value='true' migratable='yes'/>
+    <property name='mca' type='boolean' value='true' migratable='yes'/>
+    <property name='xcrypt' type='boolean' value='false'/>
+    <property name='min-level' type='number' value='13'/>
+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
+    <property name='cid' type='boolean' value='false'/>
+    <property name='ds' type='boolean' value='false'/>
+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
+    <property name='xtpr' type='boolean' value='false'/>
+    <property name='avx512vl' type='boolean' value='false'/>
+    <property name='avx512-vpopcntdq' type='boolean' value='false'/>
+    <property name='phe' type='boolean' value='false'/>
+    <property name='extapic' type='boolean' value='false'/>
+    <property name='3dnowprefetch' type='boolean' value='false'/>
+    <property name='avx512vbmi2' type='boolean' value='false'/>
+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
+    <property name='stibp' type='boolean' value='false'/>
+    <property name='xcrypt-en' type='boolean' value='false'/>
+    <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
+    <property name='dca' type='boolean' value='false'/>
+    <property name='vendor' type='string' value='AuthenticAMD'/>
+    <property name='pku' type='boolean' value='true' migratable='yes'/>
+    <property name='smx' type='boolean' value='false'/>
+    <property name='cmp-legacy' type='boolean' value='false'/>
+    <property name='avx512-4fmaps' type='boolean' value='false'/>
+    <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='false'/>
+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
+    <property name='amd-no-ssb' type='boolean' value='false'/>
+    <property name='npt' type='boolean' value='true' migratable='yes'/>
+    <property name='rdctl-no' type='boolean' value='false'/>
+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
+    <property name='lbrv' type='boolean' value='false'/>
+    <property name='adx' type='boolean' value='true' migratable='yes'/>
+    <property name='ss' type='boolean' value='true' migratable='yes'/>
+    <property name='pni' type='boolean' value='true' migratable='yes'/>
+    <property name='svm-lock' type='boolean' value='false'/>
+    <property name='smep' type='boolean' value='true' migratable='yes'/>
+    <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
+    <property name='x2apic' type='boolean' value='false'/>
+    <property name='avx512vbmi' type='boolean' value='false'/>
+    <property name='avx512vnni' type='boolean' value='false'/>
+    <property name='flushbyasid' type='boolean' value='false'/>
+    <property name='f16c' type='boolean' value='false'/>
+    <property name='ace2-en' type='boolean' value='false'/>
+    <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
+    <property name='sse' type='boolean' value='true' migratable='yes'/>
+    <property name='phe-en' type='boolean' value='false'/>
+    <property name='kvm-nopiodelay' type='boolean' value='false'/>
+    <property name='tm' type='boolean' value='false'/>
+    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
+    <property name='mds-no' type='boolean' value='false'/>
+    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512dq' type='boolean' value='false'/>
+    <property name='svm' type='boolean' value='true' migratable='yes'/>
+    <property name='invtsc' type='boolean' value='false'/>
+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
+    <property name='ssbd' type='boolean' value='false'/>
+    <property name='est' type='boolean' value='false'/>
+    <property name='avx512ifma' type='boolean' value='false'/>
+    <property name='tm2' type='boolean' value='false'/>
+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
+    <property name='cldemote' type='boolean' value='false'/>
+    <property name='kvm-mmu' type='boolean' value='false'/>
+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
+    <property name='pge' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512bitalg' type='boolean' value='false'/>
+    <property name='pdcm' type='boolean' value='false'/>
+    <property name='model' type='number' value='6'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
+    <property name='nrip-save' type='boolean' value='false'/>
+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
+    <property name='invpcid' type='boolean' value='false'/>
+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
+    <property name='tsc-deadline' type='boolean' value='false'/>
+    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
+    <property name='fma' type='boolean' value='false'/>
+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
+    <property name='de' type='boolean' value='true' migratable='yes'/>
+    <property name='stepping' type='number' value='3'/>
+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
+    <property name='skinit' type='boolean' value='false'/>
+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
+    <property name='tce' type='boolean' value='false'/>
+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
+    <property name='ds-cpl' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
+    <property name='fma4' type='boolean' value='false'/>
+    <property name='la57' type='boolean' value='true' migratable='yes'/>
+    <property name='osvw' type='boolean' value='false'/>
+    <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
+    <property name='spec-ctrl' type='boolean' value='false'/>
+    <property name='tsc-adjust' type='boolean' value='false'/>
+    <property name='kvm-steal-time' type='boolean' value='false'/>
+    <property name='kvmclock' type='boolean' value='false'/>
+    <property name='lwp' type='boolean' value='false'/>
+    <property name='amd-ssbd' type='boolean' value='false'/>
+    <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
+    <property name='avx' type='boolean' value='false'/>
+    <property name='core-capability' type='boolean' value='false'/>
+    <property name='movdiri' type='boolean' value='false'/>
+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
+    <property name='ht' type='boolean' value='false'/>
+    <property name='nx' type='boolean' value='true' migratable='yes'/>
+    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
+    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
+    <property name='movdir64b' type='boolean' value='false'/>
+    <property name='xsaves' type='boolean' value='false'/>
+    <property name='lm' type='boolean' value='true' migratable='yes'/>
+    <property name='umip' type='boolean' value='false'/>
+    <property name='pse' type='boolean' value='true' migratable='yes'/>
+    <property name='avx2' type='boolean' value='false'/>
+    <property name='sep' type='boolean' value='true' migratable='yes'/>
+    <property name='virt-ssbd' type='boolean' value='false'/>
+    <property name='nodeid-msr' type='boolean' value='false'/>
+    <property name='md-clear' type='boolean' value='false'/>
+    <property name='misalignsse' type='boolean' value='false'/>
+    <property name='split-lock-detect' type='boolean' value='false'/>
+    <property name='min-xlevel' type='number' value='2147483658'/>
+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
+    <property name='tsc-scale' type='boolean' value='false'/>
+    <property name='topoext' type='boolean' value='false'/>
+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512er' type='boolean' value='false'/>
+    <property name='pmm-en' type='boolean' value='false'/>
+    <property name='pcid' type='boolean' value='false'/>
+    <property name='arch-capabilities' type='boolean' value='false'/>
+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
+    <property name='erms' type='boolean' value='true' migratable='yes'/>
+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
+    <property name='vpclmulqdq' type='boolean' value='false'/>
+    <property name='fxsr-opt' type='boolean' value='false'/>
+    <property name='xstore' type='boolean' value='false'/>
+    <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
+    <property name='lmce' type='boolean' value='false'/>
+    <property name='perfctr-nb' type='boolean' value='false'/>
+    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
+    <property name='rdseed' type='boolean' value='false'/>
+    <property name='avx512-4vnniw' type='boolean' value='false'/>
+    <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
+    <property name='dtes64' type='boolean' value='false'/>
+    <property name='mtrr' type='boolean' value='true' migratable='yes'/>
+    <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
+    <property name='pse36' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
+    <property name='tbm' type='boolean' value='false'/>
+    <property name='wdt' type='boolean' value='false'/>
+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
+    <property name='abm' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512pf' type='boolean' value='false'/>
+    <property name='xstore-en' type='boolean' value='false'/>
+  </hostCPU>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 8e61a75872d09731c16b18cf53d6b3ef3eacb767..53735a4734e4102926d3c36894ed6f6bf5cd6833 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -196,27 +196,6 @@
     <property name='sve1408' type='boolean' value='false'/>
     <property name='sve1664' type='boolean' value='false'/>
   </hostCPU>
-  <hostCPU type='tcg' model='max' migratability='no'>
-    <property name='sve768' type='boolean' value='true'/>
-    <property name='sve128' type='boolean' value='true'/>
-    <property name='sve1024' type='boolean' value='true'/>
-    <property name='sve1280' type='boolean' value='true'/>
-    <property name='sve896' type='boolean' value='true'/>
-    <property name='sve256' type='boolean' value='true'/>
-    <property name='sve1536' type='boolean' value='true'/>
-    <property name='sve1792' type='boolean' value='true'/>
-    <property name='sve384' type='boolean' value='true'/>
-    <property name='sve' type='boolean' value='true'/>
-    <property name='sve2048' type='boolean' value='true'/>
-    <property name='sve512' type='boolean' value='true'/>
-    <property name='aarch64' type='boolean' value='true'/>
-    <property name='pmu' type='boolean' value='true'/>
-    <property name='sve1920' type='boolean' value='true'/>
-    <property name='sve1152' type='boolean' value='true'/>
-    <property name='sve640' type='boolean' value='true'/>
-    <property name='sve1408' type='boolean' value='true'/>
-    <property name='sve1664' type='boolean' value='true'/>
-  </hostCPU>
   <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
   <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
   <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
@@ -254,6 +233,27 @@
   <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
   <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
   <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
+  <hostCPU type='tcg' model='max' migratability='no'>
+    <property name='sve768' type='boolean' value='true'/>
+    <property name='sve128' type='boolean' value='true'/>
+    <property name='sve1024' type='boolean' value='true'/>
+    <property name='sve1280' type='boolean' value='true'/>
+    <property name='sve896' type='boolean' value='true'/>
+    <property name='sve256' type='boolean' value='true'/>
+    <property name='sve1536' type='boolean' value='true'/>
+    <property name='sve1792' type='boolean' value='true'/>
+    <property name='sve384' type='boolean' value='true'/>
+    <property name='sve' type='boolean' value='true'/>
+    <property name='sve2048' type='boolean' value='true'/>
+    <property name='sve512' type='boolean' value='true'/>
+    <property name='aarch64' type='boolean' value='true'/>
+    <property name='pmu' type='boolean' value='true'/>
+    <property name='sve1920' type='boolean' value='true'/>
+    <property name='sve1152' type='boolean' value='true'/>
+    <property name='sve640' type='boolean' value='true'/>
+    <property name='sve1408' type='boolean' value='true'/>
+    <property name='sve1664' type='boolean' value='true'/>
+  </hostCPU>
   <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
   <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
   <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 65cc19897628438f6a30f65351211d343f3121a0..a92f7520b792f792ad3d81aa765138e2bea6cbcf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -163,46 +163,6 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <hostCPU type='tcg' model='z13.2-base' migratability='no'>
-    <property name='dateh2' type='boolean' value='false'/>
-    <property name='aen' type='boolean' value='true'/>
-    <property name='gen13ptff' type='boolean' value='false'/>
-    <property name='kmac-tdea-192' type='boolean' value='false'/>
-    <property name='kmc-tdea-192' type='boolean' value='false'/>
-    <property name='parseh' type='boolean' value='false'/>
-    <property name='aefsi' type='boolean' value='true'/>
-    <property name='csske' type='boolean' value='false'/>
-    <property name='hfpm' type='boolean' value='false'/>
-    <property name='hfpue' type='boolean' value='false'/>
-    <property name='dfp' type='boolean' value='false'/>
-    <property name='km-dea' type='boolean' value='false'/>
-    <property name='vx' type='boolean' value='true'/>
-    <property name='emon' type='boolean' value='false'/>
-    <property name='kimd-sha-1' type='boolean' value='false'/>
-    <property name='cmpsceh' type='boolean' value='false'/>
-    <property name='dfppc' type='boolean' value='false'/>
-    <property name='dfpzc' type='boolean' value='false'/>
-    <property name='dfphp' type='boolean' value='false'/>
-    <property name='kmc-dea' type='boolean' value='false'/>
-    <property name='klmd-sha-1' type='boolean' value='false'/>
-    <property name='asnlxr' type='boolean' value='false'/>
-    <property name='esop' type='boolean' value='true'/>
-    <property name='km-tdea-192' type='boolean' value='false'/>
-    <property name='km-tdea-128' type='boolean' value='false'/>
-    <property name='kmac-dea' type='boolean' value='false'/>
-    <property name='iep' type='boolean' value='true'/>
-    <property name='kmc-tdea-128' type='boolean' value='false'/>
-    <property name='ais' type='boolean' value='true'/>
-    <property name='kmac-tdea-128' type='boolean' value='false'/>
-    <property name='zpci' type='boolean' value='true'/>
-    <property name='nonqks' type='boolean' value='false'/>
-    <property name='sea_esop2' type='boolean' value='true'/>
-    <property name='pfpo' type='boolean' value='false'/>
-    <property name='msa4-base' type='boolean' value='true'/>
-    <property name='msa3-base' type='boolean' value='true'/>
-    <property name='msa5-base' type='boolean' value='true'/>
-    <property name='tods' type='boolean' value='false'/>
-  </hostCPU>
   <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
   <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
@@ -411,6 +371,46 @@
   <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
     <blocker name='ais'/>
   </cpu>
+  <hostCPU type='tcg' model='z13.2-base' migratability='no'>
+    <property name='dateh2' type='boolean' value='false'/>
+    <property name='aen' type='boolean' value='true'/>
+    <property name='gen13ptff' type='boolean' value='false'/>
+    <property name='kmac-tdea-192' type='boolean' value='false'/>
+    <property name='kmc-tdea-192' type='boolean' value='false'/>
+    <property name='parseh' type='boolean' value='false'/>
+    <property name='aefsi' type='boolean' value='true'/>
+    <property name='csske' type='boolean' value='false'/>
+    <property name='hfpm' type='boolean' value='false'/>
+    <property name='hfpue' type='boolean' value='false'/>
+    <property name='dfp' type='boolean' value='false'/>
+    <property name='km-dea' type='boolean' value='false'/>
+    <property name='vx' type='boolean' value='true'/>
+    <property name='emon' type='boolean' value='false'/>
+    <property name='kimd-sha-1' type='boolean' value='false'/>
+    <property name='cmpsceh' type='boolean' value='false'/>
+    <property name='dfppc' type='boolean' value='false'/>
+    <property name='dfpzc' type='boolean' value='false'/>
+    <property name='dfphp' type='boolean' value='false'/>
+    <property name='kmc-dea' type='boolean' value='false'/>
+    <property name='klmd-sha-1' type='boolean' value='false'/>
+    <property name='asnlxr' type='boolean' value='false'/>
+    <property name='esop' type='boolean' value='true'/>
+    <property name='km-tdea-192' type='boolean' value='false'/>
+    <property name='km-tdea-128' type='boolean' value='false'/>
+    <property name='kmac-dea' type='boolean' value='false'/>
+    <property name='iep' type='boolean' value='true'/>
+    <property name='kmc-tdea-128' type='boolean' value='false'/>
+    <property name='ais' type='boolean' value='true'/>
+    <property name='kmac-tdea-128' type='boolean' value='false'/>
+    <property name='zpci' type='boolean' value='true'/>
+    <property name='nonqks' type='boolean' value='false'/>
+    <property name='sea_esop2' type='boolean' value='true'/>
+    <property name='pfpo' type='boolean' value='false'/>
+    <property name='msa4-base' type='boolean' value='true'/>
+    <property name='msa3-base' type='boolean' value='true'/>
+    <property name='msa5-base' type='boolean' value='true'/>
+    <property name='tods' type='boolean' value='false'/>
+  </hostCPU>
   <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
   <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 294c605df913dfa4891c10883e1f8f1e6d8471cb..b3e9307db29694afe80e2af52c4b7cfe5771f5ac 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -419,208 +419,6 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-    <property name='ia64' type='boolean' value='false'/>
-    <property name='ssb-no' type='boolean' value='false'/>
-    <property name='aes' type='boolean' value='true' migratable='yes'/>
-    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-    <property name='rdpid' type='boolean' value='false'/>
-    <property name='arat' type='boolean' value='true' migratable='yes'/>
-    <property name='gfni' type='boolean' value='false'/>
-    <property name='ibrs-all' type='boolean' value='false'/>
-    <property name='pause-filter' type='boolean' value='false'/>
-    <property name='xsavec' type='boolean' value='false'/>
-    <property name='intel-pt' type='boolean' value='false'/>
-    <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='perfctr-core' type='boolean' value='false'/>
-    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-    <property name='pbe' type='boolean' value='false'/>
-    <property name='avx512cd' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
-    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='family' type='number' value='6'/>
-    <property name='wbnoinvd' type='boolean' value='false'/>
-    <property name='avx512f' type='boolean' value='false'/>
-    <property name='msr' type='boolean' value='true' migratable='yes'/>
-    <property name='mce' type='boolean' value='true' migratable='yes'/>
-    <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='xcrypt' type='boolean' value='false'/>
-    <property name='min-level' type='number' value='13'/>
-    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-    <property name='cid' type='boolean' value='false'/>
-    <property name='ds' type='boolean' value='false'/>
-    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512-bf16' type='boolean' value='false'/>
-    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-    <property name='xtpr' type='boolean' value='false'/>
-    <property name='avx512vl' type='boolean' value='false'/>
-    <property name='avx512-vpopcntdq' type='boolean' value='false'/>
-    <property name='phe' type='boolean' value='false'/>
-    <property name='extapic' type='boolean' value='false'/>
-    <property name='3dnowprefetch' type='boolean' value='false'/>
-    <property name='avx512vbmi2' type='boolean' value='false'/>
-    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='stibp' type='boolean' value='false'/>
-    <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='pn' type='boolean' value='false'/>
-    <property name='rsba' type='boolean' value='false'/>
-    <property name='dca' type='boolean' value='false'/>
-    <property name='vendor' type='string' value='AuthenticAMD'/>
-    <property name='pku' type='boolean' value='true' migratable='yes'/>
-    <property name='smx' type='boolean' value='false'/>
-    <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-    <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='npt' type='boolean' value='true' migratable='yes'/>
-    <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-    <property name='lbrv' type='boolean' value='false'/>
-    <property name='adx' type='boolean' value='true' migratable='yes'/>
-    <property name='ss' type='boolean' value='true' migratable='yes'/>
-    <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm-lock' type='boolean' value='false'/>
-    <property name='smep' type='boolean' value='true' migratable='yes'/>
-    <property name='smap' type='boolean' value='true' migratable='yes'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
-    <property name='x2apic' type='boolean' value='false'/>
-    <property name='avx512vbmi' type='boolean' value='false'/>
-    <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='kvm-pv-sched-yield' type='boolean' value='false'/>
-    <property name='flushbyasid' type='boolean' value='false'/>
-    <property name='f16c' type='boolean' value='false'/>
-    <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pae' type='boolean' value='true' migratable='yes'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
-    <property name='sse' type='boolean' value='true' migratable='yes'/>
-    <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm-nopiodelay' type='boolean' value='false'/>
-    <property name='tm' type='boolean' value='false'/>
-    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='mds-no' type='boolean' value='false'/>
-    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512dq' type='boolean' value='false'/>
-    <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-    <property name='ssbd' type='boolean' value='false'/>
-    <property name='est' type='boolean' value='false'/>
-    <property name='kvm-poll-control' type='boolean' value='false'/>
-    <property name='avx512ifma' type='boolean' value='false'/>
-    <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='false'/>
-    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='cldemote' type='boolean' value='false'/>
-    <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='pdcm' type='boolean' value='false'/>
-    <property name='model' type='number' value='6'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-    <property name='nrip-save' type='boolean' value='false'/>
-    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-    <property name='invpcid' type='boolean' value='false'/>
-    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc-deadline' type='boolean' value='false'/>
-    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
-    <property name='fma' type='boolean' value='false'/>
-    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-    <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='stepping' type='number' value='3'/>
-    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-    <property name='skinit' type='boolean' value='false'/>
-    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-    <property name='tce' type='boolean' value='false'/>
-    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='fma4' type='boolean' value='false'/>
-    <property name='la57' type='boolean' value='true' migratable='yes'/>
-    <property name='osvw' type='boolean' value='false'/>
-    <property name='apic' type='boolean' value='true' migratable='yes'/>
-    <property name='pmm' type='boolean' value='false'/>
-    <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvmclock' type='boolean' value='false'/>
-    <property name='lwp' type='boolean' value='false'/>
-    <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='xop' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
-    <property name='avx' type='boolean' value='false'/>
-    <property name='core-capability' type='boolean' value='false'/>
-    <property name='movdiri' type='boolean' value='false'/>
-    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512bw' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-    <property name='ht' type='boolean' value='false'/>
-    <property name='nx' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
-    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
-    <property name='movdir64b' type='boolean' value='false'/>
-    <property name='xsaves' type='boolean' value='false'/>
-    <property name='lm' type='boolean' value='true' migratable='yes'/>
-    <property name='umip' type='boolean' value='false'/>
-    <property name='pse' type='boolean' value='true' migratable='yes'/>
-    <property name='avx2' type='boolean' value='false'/>
-    <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='md-clear' type='boolean' value='false'/>
-    <property name='misalignsse' type='boolean' value='false'/>
-    <property name='split-lock-detect' type='boolean' value='false'/>
-    <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='tsc-scale' type='boolean' value='false'/>
-    <property name='topoext' type='boolean' value='false'/>
-    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512er' type='boolean' value='false'/>
-    <property name='pmm-en' type='boolean' value='false'/>
-    <property name='pcid' type='boolean' value='false'/>
-    <property name='arch-capabilities' type='boolean' value='false'/>
-    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-    <property name='erms' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='vpclmulqdq' type='boolean' value='false'/>
-    <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='xstore' type='boolean' value='false'/>
-    <property name='rtm' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-    <property name='lmce' type='boolean' value='false'/>
-    <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-    <property name='rdseed' type='boolean' value='false'/>
-    <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vme' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
-    <property name='dtes64' type='boolean' value='false'/>
-    <property name='mtrr' type='boolean' value='true' migratable='yes'/>
-    <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
-    <property name='pse36' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-    <property name='tbm' type='boolean' value='false'/>
-    <property name='wdt' type='boolean' value='false'/>
-    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-    <property name='sha-ni' type='boolean' value='false'/>
-    <property name='abm' type='boolean' value='true' migratable='yes'/>
-    <property name='avx512pf' type='boolean' value='false'/>
-    <property name='xstore-en' type='boolean' value='false'/>
-  </hostCPU>
   <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
@@ -1043,6 +841,208 @@
   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <hostCPU type='tcg' model='base' migratability='yes'>
+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
+    <property name='ia64' type='boolean' value='false'/>
+    <property name='ssb-no' type='boolean' value='false'/>
+    <property name='aes' type='boolean' value='true' migratable='yes'/>
+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
+    <property name='rdpid' type='boolean' value='false'/>
+    <property name='arat' type='boolean' value='true' migratable='yes'/>
+    <property name='gfni' type='boolean' value='false'/>
+    <property name='ibrs-all' type='boolean' value='false'/>
+    <property name='pause-filter' type='boolean' value='false'/>
+    <property name='xsavec' type='boolean' value='false'/>
+    <property name='intel-pt' type='boolean' value='false'/>
+    <property name='kvm-asyncpf' type='boolean' value='false'/>
+    <property name='perfctr-core' type='boolean' value='false'/>
+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
+    <property name='pbe' type='boolean' value='false'/>
+    <property name='avx512cd' type='boolean' value='false'/>
+    <property name='decodeassists' type='boolean' value='false'/>
+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
+    <property name='family' type='number' value='6'/>
+    <property name='wbnoinvd' type='boolean' value='false'/>
+    <property name='avx512f' type='boolean' value='false'/>
+    <property name='msr' type='boolean' value='true' migratable='yes'/>
+    <property name='mce' type='boolean' value='true' migratable='yes'/>
+    <property name='mca' type='boolean' value='true' migratable='yes'/>
+    <property name='xcrypt' type='boolean' value='false'/>
+    <property name='min-level' type='number' value='13'/>
+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
+    <property name='cid' type='boolean' value='false'/>
+    <property name='ds' type='boolean' value='false'/>
+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512-bf16' type='boolean' value='false'/>
+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
+    <property name='xtpr' type='boolean' value='false'/>
+    <property name='avx512vl' type='boolean' value='false'/>
+    <property name='avx512-vpopcntdq' type='boolean' value='false'/>
+    <property name='phe' type='boolean' value='false'/>
+    <property name='extapic' type='boolean' value='false'/>
+    <property name='3dnowprefetch' type='boolean' value='false'/>
+    <property name='avx512vbmi2' type='boolean' value='false'/>
+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
+    <property name='stibp' type='boolean' value='false'/>
+    <property name='xcrypt-en' type='boolean' value='false'/>
+    <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
+    <property name='dca' type='boolean' value='false'/>
+    <property name='vendor' type='string' value='AuthenticAMD'/>
+    <property name='pku' type='boolean' value='true' migratable='yes'/>
+    <property name='smx' type='boolean' value='false'/>
+    <property name='cmp-legacy' type='boolean' value='false'/>
+    <property name='avx512-4fmaps' type='boolean' value='false'/>
+    <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='false'/>
+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
+    <property name='amd-no-ssb' type='boolean' value='false'/>
+    <property name='npt' type='boolean' value='true' migratable='yes'/>
+    <property name='rdctl-no' type='boolean' value='false'/>
+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
+    <property name='lbrv' type='boolean' value='false'/>
+    <property name='adx' type='boolean' value='true' migratable='yes'/>
+    <property name='ss' type='boolean' value='true' migratable='yes'/>
+    <property name='pni' type='boolean' value='true' migratable='yes'/>
+    <property name='svm-lock' type='boolean' value='false'/>
+    <property name='smep' type='boolean' value='true' migratable='yes'/>
+    <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
+    <property name='x2apic' type='boolean' value='false'/>
+    <property name='avx512vbmi' type='boolean' value='false'/>
+    <property name='avx512vnni' type='boolean' value='false'/>
+    <property name='kvm-pv-sched-yield' type='boolean' value='false'/>
+    <property name='flushbyasid' type='boolean' value='false'/>
+    <property name='f16c' type='boolean' value='false'/>
+    <property name='ace2-en' type='boolean' value='false'/>
+    <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
+    <property name='sse' type='boolean' value='true' migratable='yes'/>
+    <property name='phe-en' type='boolean' value='false'/>
+    <property name='kvm-nopiodelay' type='boolean' value='false'/>
+    <property name='tm' type='boolean' value='false'/>
+    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
+    <property name='mds-no' type='boolean' value='false'/>
+    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512dq' type='boolean' value='false'/>
+    <property name='svm' type='boolean' value='true' migratable='yes'/>
+    <property name='invtsc' type='boolean' value='false'/>
+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
+    <property name='ssbd' type='boolean' value='false'/>
+    <property name='est' type='boolean' value='false'/>
+    <property name='kvm-poll-control' type='boolean' value='false'/>
+    <property name='avx512ifma' type='boolean' value='false'/>
+    <property name='tm2' type='boolean' value='false'/>
+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
+    <property name='cldemote' type='boolean' value='false'/>
+    <property name='kvm-mmu' type='boolean' value='false'/>
+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
+    <property name='pge' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512bitalg' type='boolean' value='false'/>
+    <property name='pdcm' type='boolean' value='false'/>
+    <property name='model' type='number' value='6'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
+    <property name='nrip-save' type='boolean' value='false'/>
+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
+    <property name='invpcid' type='boolean' value='false'/>
+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
+    <property name='tsc-deadline' type='boolean' value='false'/>
+    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
+    <property name='fma' type='boolean' value='false'/>
+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
+    <property name='de' type='boolean' value='true' migratable='yes'/>
+    <property name='stepping' type='number' value='3'/>
+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
+    <property name='skinit' type='boolean' value='false'/>
+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
+    <property name='tce' type='boolean' value='false'/>
+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
+    <property name='ds-cpl' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
+    <property name='fma4' type='boolean' value='false'/>
+    <property name='la57' type='boolean' value='true' migratable='yes'/>
+    <property name='osvw' type='boolean' value='false'/>
+    <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
+    <property name='spec-ctrl' type='boolean' value='false'/>
+    <property name='tsc-adjust' type='boolean' value='false'/>
+    <property name='kvm-steal-time' type='boolean' value='false'/>
+    <property name='kvmclock' type='boolean' value='false'/>
+    <property name='lwp' type='boolean' value='false'/>
+    <property name='amd-ssbd' type='boolean' value='false'/>
+    <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
+    <property name='avx' type='boolean' value='false'/>
+    <property name='core-capability' type='boolean' value='false'/>
+    <property name='movdiri' type='boolean' value='false'/>
+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
+    <property name='ht' type='boolean' value='false'/>
+    <property name='nx' type='boolean' value='true' migratable='yes'/>
+    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
+    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
+    <property name='movdir64b' type='boolean' value='false'/>
+    <property name='xsaves' type='boolean' value='false'/>
+    <property name='lm' type='boolean' value='true' migratable='yes'/>
+    <property name='umip' type='boolean' value='false'/>
+    <property name='pse' type='boolean' value='true' migratable='yes'/>
+    <property name='avx2' type='boolean' value='false'/>
+    <property name='sep' type='boolean' value='true' migratable='yes'/>
+    <property name='virt-ssbd' type='boolean' value='false'/>
+    <property name='nodeid-msr' type='boolean' value='false'/>
+    <property name='md-clear' type='boolean' value='false'/>
+    <property name='misalignsse' type='boolean' value='false'/>
+    <property name='split-lock-detect' type='boolean' value='false'/>
+    <property name='min-xlevel' type='number' value='2147483658'/>
+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
+    <property name='tsc-scale' type='boolean' value='false'/>
+    <property name='topoext' type='boolean' value='false'/>
+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512er' type='boolean' value='false'/>
+    <property name='pmm-en' type='boolean' value='false'/>
+    <property name='pcid' type='boolean' value='false'/>
+    <property name='arch-capabilities' type='boolean' value='false'/>
+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
+    <property name='erms' type='boolean' value='true' migratable='yes'/>
+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
+    <property name='vpclmulqdq' type='boolean' value='false'/>
+    <property name='fxsr-opt' type='boolean' value='false'/>
+    <property name='xstore' type='boolean' value='false'/>
+    <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
+    <property name='lmce' type='boolean' value='false'/>
+    <property name='perfctr-nb' type='boolean' value='false'/>
+    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
+    <property name='rdseed' type='boolean' value='false'/>
+    <property name='avx512-4vnniw' type='boolean' value='false'/>
+    <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
+    <property name='dtes64' type='boolean' value='false'/>
+    <property name='mtrr' type='boolean' value='true' migratable='yes'/>
+    <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
+    <property name='pse36' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
+    <property name='tbm' type='boolean' value='false'/>
+    <property name='wdt' type='boolean' value='false'/>
+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
+    <property name='abm' type='boolean' value='true' migratable='yes'/>
+    <property name='avx512pf' type='boolean' value='false'/>
+    <property name='xstore-en' type='boolean' value='false'/>
+  </hostCPU>
   <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
   <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>