cpu_map: Sort cpu features

Some feature words were not sorted correctly.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b79ed579b25d663dce518f71f49e94a48fae30da..ded81c3667a7aee103483a7e18a65bf39c4cd2f4 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -5,98 +5,6 @@
 
 -->
 <cpus>
-  <!-- standard features, EDX -->
-  <feature name='fpu'>
-    <cpuid eax_in='0x01' edx='0x00000001'/>
-  </feature>
-  <feature name='vme'>
-    <cpuid eax_in='0x01' edx='0x00000002'/>
-  </feature>
-  <feature name='de'>
-    <cpuid eax_in='0x01' edx='0x00000004'/>
-  </feature>
-  <feature name='pse'>
-    <cpuid eax_in='0x01' edx='0x00000008'/>
-  </feature>
-  <feature name='tsc'>
-    <cpuid eax_in='0x01' edx='0x00000010'/>
-  </feature>
-  <feature name='msr'>
-    <cpuid eax_in='0x01' edx='0x00000020'/>
-  </feature>
-  <feature name='pae'>
-    <cpuid eax_in='0x01' edx='0x00000040'/>
-  </feature>
-  <feature name='mce'>
-    <cpuid eax_in='0x01' edx='0x00000080'/>
-  </feature>
-  <feature name='cx8'>
-    <cpuid eax_in='0x01' edx='0x00000100'/>
-  </feature>
-  <feature name='apic'>
-    <cpuid eax_in='0x01' edx='0x00000200'/>
-  </feature>
-  <feature name='sep'>
-    <cpuid eax_in='0x01' edx='0x00000800'/>
-  </feature>
-  <feature name='mtrr'>
-    <cpuid eax_in='0x01' edx='0x00001000'/>
-  </feature>
-  <feature name='pge'>
-    <cpuid eax_in='0x01' edx='0x00002000'/>
-  </feature>
-  <feature name='mca'>
-    <cpuid eax_in='0x01' edx='0x00004000'/>
-  </feature>
-  <feature name='cmov'>
-    <cpuid eax_in='0x01' edx='0x00008000'/>
-  </feature>
-  <feature name='pat'>
-    <cpuid eax_in='0x01' edx='0x00010000'/>
-  </feature>
-  <feature name='pse36'>
-    <cpuid eax_in='0x01' edx='0x00020000'/>
-  </feature>
-  <feature name='pn'>
-    <cpuid eax_in='0x01' edx='0x00040000'/>
-  </feature>
-  <feature name='clflush'>
-    <cpuid eax_in='0x01' edx='0x00080000'/>
-  </feature>
-  <feature name='ds'>
-    <cpuid eax_in='0x01' edx='0x00200000'/>
-  </feature>
-  <feature name='acpi'>
-    <cpuid eax_in='0x01' edx='0x00400000'/>
-  </feature>
-  <feature name='mmx'>
-    <cpuid eax_in='0x01' edx='0x00800000'/>
-  </feature>
-  <feature name='fxsr'>
-    <cpuid eax_in='0x01' edx='0x01000000'/>
-  </feature>
-  <feature name='sse'>
-    <cpuid eax_in='0x01' edx='0x02000000'/>
-  </feature>
-  <feature name='sse2'>
-    <cpuid eax_in='0x01' edx='0x04000000'/>
-  </feature>
-  <feature name='ss'>
-    <cpuid eax_in='0x01' edx='0x08000000'/>
-  </feature>
-  <feature name='ht'>
-    <cpuid eax_in='0x01' edx='0x10000000'/>
-  </feature>
-  <feature name='tm'>
-    <cpuid eax_in='0x01' edx='0x20000000'/>
-  </feature>
-  <feature name='ia64'>
-    <cpuid eax_in='0x01' edx='0x40000000'/>
-  </feature>
-  <feature name='pbe'>
-    <cpuid eax_in='0x01' edx='0x80000000'/>
-  </feature>
-
   <!-- standard features, ECX -->
   <feature name='pni'>
     <alias name='sse3' source='qemu'/>
@@ -196,6 +104,98 @@
     <cpuid eax_in='0x01' ecx='0x80000000'/>
   </feature>
 
+  <!-- standard features, EDX -->
+  <feature name='fpu'>
+    <cpuid eax_in='0x01' edx='0x00000001'/>
+  </feature>
+  <feature name='vme'>
+    <cpuid eax_in='0x01' edx='0x00000002'/>
+  </feature>
+  <feature name='de'>
+    <cpuid eax_in='0x01' edx='0x00000004'/>
+  </feature>
+  <feature name='pse'>
+    <cpuid eax_in='0x01' edx='0x00000008'/>
+  </feature>
+  <feature name='tsc'>
+    <cpuid eax_in='0x01' edx='0x00000010'/>
+  </feature>
+  <feature name='msr'>
+    <cpuid eax_in='0x01' edx='0x00000020'/>
+  </feature>
+  <feature name='pae'>
+    <cpuid eax_in='0x01' edx='0x00000040'/>
+  </feature>
+  <feature name='mce'>
+    <cpuid eax_in='0x01' edx='0x00000080'/>
+  </feature>
+  <feature name='cx8'>
+    <cpuid eax_in='0x01' edx='0x00000100'/>
+  </feature>
+  <feature name='apic'>
+    <cpuid eax_in='0x01' edx='0x00000200'/>
+  </feature>
+  <feature name='sep'>
+    <cpuid eax_in='0x01' edx='0x00000800'/>
+  </feature>
+  <feature name='mtrr'>
+    <cpuid eax_in='0x01' edx='0x00001000'/>
+  </feature>
+  <feature name='pge'>
+    <cpuid eax_in='0x01' edx='0x00002000'/>
+  </feature>
+  <feature name='mca'>
+    <cpuid eax_in='0x01' edx='0x00004000'/>
+  </feature>
+  <feature name='cmov'>
+    <cpuid eax_in='0x01' edx='0x00008000'/>
+  </feature>
+  <feature name='pat'>
+    <cpuid eax_in='0x01' edx='0x00010000'/>
+  </feature>
+  <feature name='pse36'>
+    <cpuid eax_in='0x01' edx='0x00020000'/>
+  </feature>
+  <feature name='pn'>
+    <cpuid eax_in='0x01' edx='0x00040000'/>
+  </feature>
+  <feature name='clflush'>
+    <cpuid eax_in='0x01' edx='0x00080000'/>
+  </feature>
+  <feature name='ds'>
+    <cpuid eax_in='0x01' edx='0x00200000'/>
+  </feature>
+  <feature name='acpi'>
+    <cpuid eax_in='0x01' edx='0x00400000'/>
+  </feature>
+  <feature name='mmx'>
+    <cpuid eax_in='0x01' edx='0x00800000'/>
+  </feature>
+  <feature name='fxsr'>
+    <cpuid eax_in='0x01' edx='0x01000000'/>
+  </feature>
+  <feature name='sse'>
+    <cpuid eax_in='0x01' edx='0x02000000'/>
+  </feature>
+  <feature name='sse2'>
+    <cpuid eax_in='0x01' edx='0x04000000'/>
+  </feature>
+  <feature name='ss'>
+    <cpuid eax_in='0x01' edx='0x08000000'/>
+  </feature>
+  <feature name='ht'>
+    <cpuid eax_in='0x01' edx='0x10000000'/>
+  </feature>
+  <feature name='tm'>
+    <cpuid eax_in='0x01' edx='0x20000000'/>
+  </feature>
+  <feature name='ia64'>
+    <cpuid eax_in='0x01' edx='0x40000000'/>
+  </feature>
+  <feature name='pbe'>
+    <cpuid eax_in='0x01' edx='0x80000000'/>
+  </feature>
+
   <!-- Termal Power and Management -->
   <feature name='arat'>
     <cpuid eax_in='0x06' eax='0x00000004'/>
@@ -520,39 +520,6 @@
     <cpuid eax_in='0x14' ecx_in='0x00' ecx='0x80000000'/>
   </feature>
 
-  <!-- extended features, EDX -->
-  <feature name='syscall'>
-    <cpuid eax_in='0x80000001' edx='0x00000800'/>
-  </feature>
-  <feature name='nx'>
-    <alias name='xd' source='qemu'/>
-    <cpuid eax_in='0x80000001' edx='0x00100000'/>
-  </feature>
-  <feature name='mmxext'>
-    <cpuid eax_in='0x80000001' edx='0x00400000'/>
-  </feature>
-  <feature name='fxsr_opt'>
-    <alias name='ffxsr' source='qemu'/>
-    <alias name='fxsr-opt' source='qemu'/>
-    <cpuid eax_in='0x80000001' edx='0x02000000'/>
-  </feature>
-  <feature name='pdpe1gb'>
-    <cpuid eax_in='0x80000001' edx='0x04000000'/>
-  </feature>
-  <feature name='rdtscp'>
-    <cpuid eax_in='0x80000001' edx='0x08000000'/>
-  </feature>
-  <feature name='lm'>
-    <alias name='i64' source='qemu'/>
-    <cpuid eax_in='0x80000001' edx='0x20000000'/>
-  </feature>
-  <feature name='3dnowext'>
-    <cpuid eax_in='0x80000001' edx='0x40000000'/>
-  </feature>
-  <feature name='3dnow'>
-    <cpuid eax_in='0x80000001' edx='0x80000000'/>
-  </feature>
-
   <!-- extended features, ECX -->
   <feature name='lahf_lm'>
     <alias name='lahf-lm' source='qemu'/>
@@ -629,6 +596,39 @@
     <cpuid eax_in='0x80000001' ecx='0x01000000'/>
   </feature>
 
+  <!-- extended features, EDX -->
+  <feature name='syscall'>
+    <cpuid eax_in='0x80000001' edx='0x00000800'/>
+  </feature>
+  <feature name='nx'>
+    <alias name='xd' source='qemu'/>
+    <cpuid eax_in='0x80000001' edx='0x00100000'/>
+  </feature>
+  <feature name='mmxext'>
+    <cpuid eax_in='0x80000001' edx='0x00400000'/>
+  </feature>
+  <feature name='fxsr_opt'>
+    <alias name='ffxsr' source='qemu'/>
+    <alias name='fxsr-opt' source='qemu'/>
+    <cpuid eax_in='0x80000001' edx='0x02000000'/>
+  </feature>
+  <feature name='pdpe1gb'>
+    <cpuid eax_in='0x80000001' edx='0x04000000'/>
+  </feature>
+  <feature name='rdtscp'>
+    <cpuid eax_in='0x80000001' edx='0x08000000'/>
+  </feature>
+  <feature name='lm'>
+    <alias name='i64' source='qemu'/>
+    <cpuid eax_in='0x80000001' edx='0x20000000'/>
+  </feature>
+  <feature name='3dnowext'>
+    <cpuid eax_in='0x80000001' edx='0x40000000'/>
+  </feature>
+  <feature name='3dnow'>
+    <cpuid eax_in='0x80000001' edx='0x80000000'/>
+  </feature>
+
   <!-- Advanced Power Management edx features -->
   <feature name='invtsc' migratable='no'>
     <cpuid eax_in='0x80000007' edx='0x00000100'/>
@@ -735,6 +735,11 @@
     <cpuid eax_in='0x80000021' eax='0x00000100'/>
   </feature>
 
+  <!-- IA32_CORE_CAPABILITIES features -->
+  <feature name='split-lock-detect'>
+    <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
+  </feature>
+
   <!-- IA32_ARCH_CAPABILITIES features -->
   <feature name='rdctl-no'>
     <msr index='0x10a' edx='0x00000000' eax='0x00000001'/>
@@ -782,11 +787,6 @@
     <msr index='0x10a' edx='0x00000000' eax='0x04000000'/>
   </feature>
 
-  <!-- IA32_CORE_CAPABILITIES features -->
-  <feature name='split-lock-detect'>
-    <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
-  </feature>
-
   <feature name='vmx-ins-outs'>
     <msr index='0x480' edx='0x00400000' eax='0x00000000'/>
   </feature>
@@ -880,22 +880,6 @@
     <msr index='0x48b' edx='0x00000000' eax='0x04000000'/>
   </feature>
 
-  <feature name='vmx-invvpid'>
-    <msr index='0x48c' edx='0x00000001' eax='0x00000000'/>
-  </feature>
-  <feature name='vmx-invvpid-single-addr'>
-    <msr index='0x48c' edx='0x00000100' eax='0x00000000'/>
-  </feature>
-  <feature name='vmx-invvpid-single-context'>
-    <msr index='0x48c' edx='0x00000200' eax='0x00000000'/>
-  </feature>
-  <feature name='vmx-invvpid-all-context'>
-    <msr index='0x48c' edx='0x00000400' eax='0x00000000'/>
-  </feature>
-  <feature name='vmx-invvpid-single-context-noglobals'>
-    <alias name='vmx-invept-single-context-noglobals' source='qemu'/>
-    <msr index='0x48c' edx='0x00000800' eax='0x00000000'/>
-  </feature>
   <feature name='vmx-ept-execonly'>
     <msr index='0x48c' edx='0x00000000' eax='0x00000001'/>
   </feature>
@@ -932,6 +916,22 @@
   <feature name='vmx-invept-all-context'>
     <msr index='0x48c' edx='0x00000000' eax='0x04000000'/>
   </feature>
+  <feature name='vmx-invvpid'>
+    <msr index='0x48c' edx='0x00000001' eax='0x00000000'/>
+  </feature>
+  <feature name='vmx-invvpid-single-addr'>
+    <msr index='0x48c' edx='0x00000100' eax='0x00000000'/>
+  </feature>
+  <feature name='vmx-invvpid-single-context'>
+    <msr index='0x48c' edx='0x00000200' eax='0x00000000'/>
+  </feature>
+  <feature name='vmx-invvpid-all-context'>
+    <msr index='0x48c' edx='0x00000400' eax='0x00000000'/>
+  </feature>
+  <feature name='vmx-invvpid-single-context-noglobals'>
+    <alias name='vmx-invept-single-context-noglobals' source='qemu'/>
+    <msr index='0x48c' edx='0x00000800' eax='0x00000000'/>
+  </feature>
 
   <feature name='vmx-intr-exit'>
     <msr index='0x48d' edx='0x00000000' eax='0x00000001'/>

diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
index f5846b1619df442d8551e15447cb28c914e85294..6730ad9cb4f675a109ca6b7c70bf040268e26dcc 100644 (file)
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -1,8 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='x2apic'/>
@@ -11,4 +9,6 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='avx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
index 166833276c2c9dbd97ba9532aff4fd7358e1724b..40e2dfc8fe5736ff463399f44ef12771a436ed99 100644 (file)
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -1,8 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='x2apic'/>
@@ -11,5 +9,7 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='avx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml b/tests/cputestdata/x86_64-baseline-features-result.xml
index 1461a5b43015f6e61ce9528154b70c0d9edf1cce..2e58f84acf98b703ce7d1e05ac410bd8826c0978 100644 (file)
--- a/tests/cputestdata/x86_64-baseline-features-result.xml
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -1,8 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='x2apic'/>
@@ -11,4 +9,6 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='avx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
index 8401e53d30ab2a0ad7b4907f44c5f8dc85903ccb..3a2118522e812a90fe9f8574931c06eb443bf13a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -1,13 +1,11 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='bmi1'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_core'/>
   <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
index 220dfb64675494c70f78d479b3b22ffac910ecff..e4a455df15240c237035d64df7f129935ab72ba0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -3,13 +3,11 @@
   <model>Opteron_G5</model>
   <vendor>AMD</vendor>
   <signature family='21' model='16' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ht'/>
   <feature name='bmi1'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
@@ -23,6 +21,8 @@
   <feature name='topoext'/>
   <feature name='perfctr_core'/>
   <feature name='perfctr_nb'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
index 51e6d2b66061bd29cdac9134413b0972a403faf7..a62263c8bf18a28656c04b7165e91bf1267ff276 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -1,18 +1,18 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='bmi1'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='osvw'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='rdtscp'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
index d2f7a79074e05c2b35cc6d4bc79c521ea12645e3..977607e7fcb182d5f39844b1d67d6b9c1b9ab086 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>n270</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='ds_cpl'/>
   <feature policy='require' name='tm2'/>
@@ -15,6 +8,13 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='movbe'/>
-  <feature policy='require' name='lm'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='lahf_lm'/>
+  <feature policy='require' name='lm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
index 3c8a005122373d18d0e863320566518df445d7c0..1e9c6782e9873cbdda16e14af72ece25acb1d29b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -3,13 +3,6 @@
   <model>n270</model>
   <vendor>Intel</vendor>
   <signature family='6' model='28' stepping='10'/>
-  <feature name='pse36'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='ds_cpl'/>
   <feature name='tm2'/>
@@ -17,6 +10,13 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='movbe'/>
-  <feature name='lm'/>
+  <feature name='pse36'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='lahf_lm'/>
+  <feature name='lm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
index 779faf6cefdb861fa65fcbbc0c07053d0d42d781..7fbaa2d1897df79af7c2ff8160dced7a214f37e7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>n270</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='ds_cpl'/>
   <feature policy='require' name='est'/>
@@ -15,7 +9,13 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='movbe'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='lahf_lm'/>
   <feature policy='require' name='syscall'/>
   <feature policy='require' name='lm'/>
-  <feature policy='require' name='lahf_lm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
index 1f4eb7b7273b896aeedd874c92c0b544d2cd5fdf..4856cf53c40d1e7ca31f36c00f50618c3025ea85 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -3,12 +3,6 @@
   <model>n270</model>
   <vendor>Intel</vendor>
   <signature family='6' model='28' stepping='10'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='ds_cpl'/>
   <feature name='est'/>
@@ -17,7 +11,13 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='movbe'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='lahf_lm'/>
   <feature name='syscall'/>
   <feature name='lm'/>
-  <feature name='lahf_lm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index c595f04e322e41bb7cb8853c781f386d7299e960..9077b95178ea12da3e7b8f7134c1e62a7a851ba4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Snowridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 074342911ad974f6e776e9224dc18bb75990e1b2..c830b8a6491e563a8ec0a230fafe53bca7a87230 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='134' stepping='5'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='pclmuldq'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
@@ -26,6 +19,13 @@
   <feature name='xsave'/>
   <feature name='osxsave'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='fsgsbase'/>
   <feature name='tsc_adjust'/>
@@ -58,14 +58,14 @@
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
   <feature name='intel-pt-lip'/>
-  <feature name='rdtscp'/>
   <feature name='3dnowprefetch'/>
+  <feature name='rdtscp'/>
   <feature name='invtsc'/>
+  <feature name='split-lock-detect'/>
   <feature name='rdctl-no'/>
   <feature name='ibrs-all'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>
   <feature name='pschange-mc-no'/>
   <feature name='taa-no'/>
-  <feature name='split-lock-detect'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index ff7ac5b391734d7c2cb65e77b35547cd036e1631..b334e9062c6285195b9a7540a9894800fdd8e6a7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Snowridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='rdpid'/>
   <feature policy='require' name='md-clear'/>
@@ -39,9 +39,6 @@
   <feature policy='require' name='vmx-rdseed-exit'/>
   <feature policy='require' name='vmx-pml'/>
   <feature policy='require' name='vmx-xsaves'/>
-  <feature policy='require' name='vmx-invvpid'/>
-  <feature policy='require' name='vmx-invvpid-single-addr'/>
-  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-ept-execonly'/>
   <feature policy='require' name='vmx-page-walk-4'/>
   <feature policy='require' name='vmx-ept-2mb'/>
@@ -50,6 +47,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-invvpid'/>
+  <feature policy='require' name='vmx-invvpid-single-addr'/>
+  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
index ff516a47c78aeef3cf135fb82407f20075cbcad0..b878e13c6204ed822d975bc66a610f6ca2219c3d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cooperlake</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='mpx'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index 8dfc62a5c169d37bbc50f6b3d13b4d6c337a438a..9ff74bc0291d793caaa86010d46e434e2c59d958 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -3,12 +3,6 @@
   <model>Cooperlake</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='11'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='mpx'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
index 9dbb92e74fe1030252182898c3a998050afdba20..822deb46cf6f37d44f85e2eea077e35135bbcb4c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cooperlake</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='umip'/>
@@ -35,9 +35,6 @@
   <feature policy='require' name='vmx-rdseed-exit'/>
   <feature policy='require' name='vmx-pml'/>
   <feature policy='require' name='vmx-xsaves'/>
-  <feature policy='require' name='vmx-invvpid'/>
-  <feature policy='require' name='vmx-invvpid-single-addr'/>
-  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-ept-execonly'/>
   <feature policy='require' name='vmx-page-walk-4'/>
   <feature policy='require' name='vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-invvpid'/>
+  <feature policy='require' name='vmx-invvpid-single-addr'/>
+  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
index 22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae..ab2c85eede93c5bcafbba8ca95c9bf70ffcd106f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
index cf8b175db11c5588578f4fc4c104bdcc60ba78b5..4d721b4d07b637228f2aee68f1da47e5a938323e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='xsaveopt'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
index c9ae6519222751ceca26fa27892d3f4cab4d7f0e..e83229f5ebb5e431c4bcf9dd5bacb9662eb0ecdd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
index 22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae..ab2c85eede93c5bcafbba8ca95c9bf70ffcd106f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
index cf8b175db11c5588578f4fc4c104bdcc60ba78b5..4d721b4d07b637228f2aee68f1da47e5a938323e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='xsaveopt'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
index c9ae6519222751ceca26fa27892d3f4cab4d7f0e..e83229f5ebb5e431c4bcf9dd5bacb9662eb0ecdd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index 0ccbcd0629ec8258ad5cd19e9581b7e9a50b8cea..e06bafe12a1d89bcf433f9e31609b4112833a8e6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,9 +13,16 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 827b16cb694d63ab90388f2a056e7d9257eeb74b..bb15f84c47b585c10e539ae2ebdb06f119694f8c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family='6' model='60' stepping='3'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,9 +15,16 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
index 489de49fb0aa75bdbe7d6256d31ac67c5dc536fc..6c8aa67f546846e68dbbb55e493d73a25479084a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
index 1c0d44dc0a5ce635934821c96e96a7ae5c28c9d5..8290d2773d57bc423c3b2f0898a8614f5b2235de 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
@@ -18,6 +11,13 @@
   <feature policy='require' name='tm2'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='rdtscp'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
index 4234c4df5a7a3950cf533c2ae749fc8c00856e46..c074a5c6ecbb15440f97b1769aa57a807957df02 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family='6' model='37' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='pclmuldq'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
@@ -20,6 +13,13 @@
   <feature name='tm2'/>
   <feature name='xtpr'/>
   <feature name='pdcm'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='rdtscp'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
index cb21e48a9fac0ad3d683e9092f834e57459a510f..76d96fc1c51a81b84278b982e93e615af170147a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
@@ -1,12 +1,12 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 5777a0bfba991f3cf0c98d9b264f593df80afc57..4cc7ca2d90a4def4b0a4fdb21305d8437d935b2a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c52e8db2350b583f6e01047de5481d017312f3c8..52ae60e86c88372934052b82ab2a9b48220ed24e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family='6' model='94' stepping='3'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='clflushopt'/>
   <feature name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
index 61a52212a62a7535a188897ba5d637f161de1482..8c505d0d8faeb629bd0d0371f1a2a52bf34776db 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
index 22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae..ab2c85eede93c5bcafbba8ca95c9bf70ffcd106f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
index cf8b175db11c5588578f4fc4c104bdcc60ba78b5..4d721b4d07b637228f2aee68f1da47e5a938323e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='xsaveopt'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
index c9ae6519222751ceca26fa27892d3f4cab4d7f0e..e83229f5ebb5e431c4bcf9dd5bacb9662eb0ecdd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
index 9bb60009e8c578c67a57b00a19447074fe7c10ef..ca783d18099fff9fef5a10791777ca56b2eeba2f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='disable' name='xsaveopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
index adcc4b86c55268c2f9e6b7763584411a0a2e5981..32612c78e7fc51d5c8e8d95a9f7933caf549b2e4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
index 3a799052e728bd8164e6f2fa53bd74164e64ea4a..584fb06e51c99ee6397c068b899e74d9bd8113b2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='disable' name='xsaveopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
index fa1a43a8a48a01d41285c9310e1b731d7d60caa7..b9490e69d213bdb12da478ec899678ab3fd8e5d8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
index 94352ee8bf9c9c43b2cef207549addddb2be3d69..0a314507326c3cef7370f5d43e8c890f86427c65 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='58' stepping='9'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='xsaveopt'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
index d52f49d30ab4ca57745e687bf69a8cfcae417899..94bb757b174fdd2a4dada3a0dba884ae0b3ab4df 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
index e2503cd35c1aa2f5a98ea32e4fe6adf7a136ac9a..126eb097869fbb327db8d34452be40a2fc80e595 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='58' stepping='9'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
index 60086b8b14b3465752aff213a1dc1f27aa6357ec..d6f88204de7c325b9ae46c4c798795d40de15464 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
index fa1a43a8a48a01d41285c9310e1b731d7d60caa7..b9490e69d213bdb12da478ec899678ab3fd8e5d8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
index 94352ee8bf9c9c43b2cef207549addddb2be3d69..0a314507326c3cef7370f5d43e8c890f86427c65 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family='6' model='58' stepping='9'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='xsaveopt'/>
   <feature name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
index 1dc866dba11c022cdd970b0e22ff0c293b07e72b..3f7026d46891487b5f2cfc420fe6ad149f7ae326 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index bcce4ece1130fbc8e18b965b3655e27f8db90e05..618b266e416e2e347f773a436c4abc0dc3b4aa36 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -19,11 +12,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='disable' name='x2apic'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index a6307e834e7d8b65332ddc3bd55caeddf0b0ee46..0e994e062350639c650ab265e4dab2a918480818 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family='6' model='69' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='pclmuldq'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
@@ -28,6 +21,13 @@
   <feature name='avx'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='fsgsbase'/>
   <feature name='tsc_adjust'/>
@@ -38,8 +38,8 @@
   <feature name='erms'/>
   <feature name='invpcid'/>
   <feature name='xsaveopt'/>
+  <feature name='abm'/>
   <feature name='pdpe1gb'/>
   <feature name='rdtscp'/>
-  <feature name='abm'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
index 3ca3b0f2436ffdcc0d46d7c8013ba3e8b50b1cad..c56852e96c5cf48912af155a2e192ef64a3a4af5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index 42e7c90112dca162495ea4822b4f4a38cbb096d7..a5cf3a8ebb2e77bc51d50cffc17386eddcf65f48 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,10 +13,17 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 8bbac47a2e379f8da316e7e29ff9c181291b7cb9..fbcb3bd63fac2bee875a779216a07a7d083b84c9 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family='6' model='69' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,10 +15,17 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
index 3ca3b0f2436ffdcc0d46d7c8013ba3e8b50b1cad..c56852e96c5cf48912af155a2e192ef64a3a4af5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index e825e2a0fb15c177b02b9c76536ecc2c19067a67..da6e4f8a9b1cc798abe3d65f2f7085c42825b9a2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,11 +13,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index b39148f37f9835746620f231a95e7bbeca2fc74b..32bfc2521ef1639e70fb269eadaac1c6cf489198 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family='6' model='61' stepping='4'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,11 +15,18 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='intel-pt'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
index 4f253fc08a590e0caf5cd123b60681d13a69b1a9..156765f312d85cd6c8a7f37a138ccd3fdc5ea338 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index e825e2a0fb15c177b02b9c76536ecc2c19067a67..da6e4f8a9b1cc798abe3d65f2f7085c42825b9a2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,11 +13,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index b39148f37f9835746620f231a95e7bbeca2fc74b..32bfc2521ef1639e70fb269eadaac1c6cf489198 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family='6' model='61' stepping='4'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,11 +15,18 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='intel-pt'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 5d3093cec1e08651d73b38f96bbcd7053e0a0005..2fe2645ee3e61bb84c9ea716150007518c829920 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,12 +13,19 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index 2ab8890464073bfd2b07e1b16d4644a2b0c90ca8..aeea45b44467c2356caef754d6f96f7d94e8acce 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='61' stepping='4'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,12 +15,19 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='intel-pt'/>
   <feature name='stibp'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
index a736cdfb04f22ca85ab04b90fcfc40972b1165b8..746165c49610bddacffb946ad82a4a2e148559bb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
@@ -1,15 +1,15 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
index a736cdfb04f22ca85ab04b90fcfc40972b1165b8..746165c49610bddacffb946ad82a4a2e148559bb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index b6e643cd08f677da214fadea0b6221afc5707d0e..fa81abf661c6bf84dfe587d8d951ac81020c08ad 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 2a7493f9419d403d924286406dd18dbc3805e76b..949e8de32796db913a49bdd5ae8224de8cacf7f0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='142' stepping='9'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
index 690081493b5d7ae3237fadaa0765b7a87826de86..a0f4bc07bb1086567048d454d2a6f4108c1f0604 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='umip'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index 60bace9ed6618f1199c67813d4475daecea30e89..073b099b766f782d47cf3b3cb981b0b5783dc8f8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 6b9323842a4455d629e051ca5a01099fe0aa58e9..47294064f2356e1a76c285f62146e189b730aed3 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family='6' model='158' stepping='9'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
index 12424bc67c7e01dc2caec8b5469d58391db612ce..f7976568512b5c353413e0f4008e5b3043f268f7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 5ed8ac37a33e8585dadabeea9054c18a97995351..bbf4ad6c60bbe270dd3245f13a663fbc4bdc2bb6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -16,6 +10,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index 805a31411d7d53a77b332e3243a9ecb242cf2568..e93b04aabd0973edf6433e3f6f795971fe4ad370 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='142' stepping='10'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index e933265248dc8ebd1c74ae6a68f848918018bf5b..685a3aa7e386e49180a5e8934f7450f6e4a2eb0d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='umip'/>
@@ -35,9 +35,6 @@
   <feature policy='require' name='vmx-rdseed-exit'/>
   <feature policy='require' name='vmx-pml'/>
   <feature policy='require' name='vmx-xsaves'/>
-  <feature policy='require' name='vmx-invvpid'/>
-  <feature policy='require' name='vmx-invvpid-single-addr'/>
-  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-ept-execonly'/>
   <feature policy='require' name='vmx-page-walk-4'/>
   <feature policy='require' name='vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-invvpid'/>
+  <feature policy='require' name='vmx-invvpid-single-addr'/>
+  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index 6cedb936336ef6bf861368752b3b9cac1f97f6cd..e1c1311bc21e96dbdba2533cf77e247ce71cbc3c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 0cc65b432269b80a26ae2a5fcb9e90b291483b30..6eb860d82aa6548d517ac8da91ffe19b06989082 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='158' stepping='10'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
index fd7539f7ce533d4b841536cd53a6445f0a4a1139..02c671e5f1f3d89afa6e2282e43a48a5d4f926db 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='umip'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
index 2392de6ce4bb65dd55c72a8e098105c1c8e9294d..c5e2d6da7a35afe7dae4ca73a36ce387b04ff101 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,4 +11,11 @@
   <feature policy='require' name='cx16'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
index e0ec4cd7953277611c59d0abc6061a4051e6029c..dae7f8846e29a51158ed2eb58880fb9b7d99756f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -3,13 +3,6 @@
   <model>Conroe</model>
   <vendor>Intel</vendor>
   <signature family='6' model='15' stepping='11'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,4 +13,11 @@
   <feature name='cx16'/>
   <feature name='xtpr'/>
   <feature name='pdcm'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
index e4117c293f292a0063c072fb01115b1207f45716..735652acc2fc27ff0e34f819b66b76537ef0625e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -1,11 +1,11 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='cx16'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
index aa151bc545d1112ba0b8b4afd5166e8666a8039e..e69f8a64434f4318e6158637062a61f4426e0119 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Penryn</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,4 +11,11 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='xsave'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
index 586b8e0f591cfc83332f929b4dcb54da5a23fedf..dac84ba5fcc09ac3db49fc09b087fdeba67f201f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -3,13 +3,6 @@
   <model>Penryn</model>
   <vendor>Intel</vendor>
   <signature family='6' model='23' stepping='10'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,4 +13,11 @@
   <feature name='pdcm'/>
   <feature name='xsave'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
index 9b4ee7b959591a004f2d4cfc67b7ea9398bc9741..a3d4534cffff4466856c03cd0744727bec405d41 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>EPYC-Rome</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
index e348e0f6f62ce814429fbaf299b02b4ee51934d8..7829e529e739a90629833f890c6ac25c1d443115 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <signature family='23' model='49' stepping='0'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='cmt'/>
   <feature name='xsaves'/>
   <feature name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index 486b41815ded5af7386233469775b710352ae0b3..68fa9565576b3053afd3f4a632dd6432352dd55b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>EPYC</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 94f832071b9c705a5118325c8764dae9e9157d5c..d43aaef6ffc106f3fd7204c4c4577fc5a739b841 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <signature family='23' model='1' stepping='2'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index ca877b867b42cb07485dafd1361ab7e58b21e6a3..7960807d54ce7850acce68102830cd362fb11852 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>EPYC-IBPB</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 42b8b5f9864c5980ae6869f06530cea0a74d449f..c5274892e9f5a74a3198b30ad974658e374b55aa 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-IBPB</model>
   <vendor>AMD</vendor>
   <signature family='23' model='1' stepping='2'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index 45f27a9a1f2b54558975e9b1fd9de729626a6afd..a48cec96c04fda470a8e91812fc889f7df8a1b67 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -8,7 +8,7 @@
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
index ee34ea8547f8f2693abe5fc67cd79b579001e596..1adbaaa499817e86480feaa6ff3f413037fbcc88 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_core'/>
   <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
index 4fb2d3978bb5381371912382ec2390cbbfe59373..d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
+  <feature name='vme'/>
+  <feature name='ht'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name='topoext'/>
   <feature name='perfctr_core'/>
   <feature name='perfctr_nb'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 8669e5bd1ba9dbb1d5bdcd8ef686ee1b64e87fe8..69124529bf9f4d135ddb710ef60ae8f8cb206818 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Dhyana</model>
   <vendor>Hygon</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index ddb14c0440a45290b8febe5c5788e41de8201fd6..8eb40955568563beb47bb52f39d50824ec57f50a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -3,9 +3,9 @@
   <model>Dhyana</model>
   <vendor>Hygon</vendor>
   <signature family='24' model='0' stepping='1'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index 38d95680d3283f4307a50e718e9bd67ebfd04b8a..77d66956f12ae8026f9db52bd90692973af5c8fd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Icelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='cmt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index ccb74f41ef44608ad7d0324416559b8d91b16f0e..6cb3a289103fc00499869175096f500d088c695f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -3,12 +3,6 @@
   <model>Icelake-Server</model>
   <vendor>Intel</vendor>
   <signature family='6' model='106' stepping='0'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='cmt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
index ada11d26085bd2efdf8b39b07d8781cf7ab44cdd..2eded58846b5fd80235424fe2545890a6ecb3a88 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Icelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='avx512ifma'/>
   <feature policy='require' name='sha-ni'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 99c64205796609d7bcf3a32f1c5b1c94b1161776..881f02539323eb9304700fc26492d3e6d617dff8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -1,20 +1,20 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='3dnowprefetch'/>
   <feature policy='require' name='osvw'/>
   <feature policy='require' name='ibs'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index 7b0b3dfe6abf688a751a01c84aa22df2347aab4f..53b98713e5e49412803b126f93eee71c38c16ad8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -3,20 +3,20 @@
   <model>Opteron_G3</model>
   <vendor>AMD</vendor>
   <signature family='16' model='2' stepping='3'/>
+  <feature name='monitor'/>
   <feature name='vme'/>
   <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='3dnowext'/>
-  <feature name='3dnow'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
   <feature name='3dnowprefetch'/>
   <feature name='osvw'/>
   <feature name='ibs'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='3dnowext'/>
+  <feature name='3dnow'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 99c64205796609d7bcf3a32f1c5b1c94b1161776..881f02539323eb9304700fc26492d3e6d617dff8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -1,20 +1,20 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='3dnowprefetch'/>
   <feature policy='require' name='osvw'/>
   <feature policy='require' name='ibs'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index 7b0b3dfe6abf688a751a01c84aa22df2347aab4f..53b98713e5e49412803b126f93eee71c38c16ad8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -3,20 +3,20 @@
   <model>Opteron_G3</model>
   <vendor>AMD</vendor>
   <signature family='16' model='2' stepping='3'/>
+  <feature name='monitor'/>
   <feature name='vme'/>
   <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='3dnowext'/>
-  <feature name='3dnow'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
   <feature name='3dnowprefetch'/>
   <feature name='osvw'/>
   <feature name='ibs'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='3dnowext'/>
+  <feature name='3dnow'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
index d874bfc0499171edd46298280774fa3a8625640d..5fc5010160b688bc40ea9978c8763cd550e9014f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -1,19 +1,19 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='3dnowext'/>
   <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
   <feature policy='require' name='npt'/>
   <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='monitor'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index ee34ea8547f8f2693abe5fc67cd79b579001e596..1adbaaa499817e86480feaa6ff3f413037fbcc88 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_core'/>
   <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
index 4fb2d3978bb5381371912382ec2390cbbfe59373..d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
+  <feature name='vme'/>
+  <feature name='ht'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name='topoext'/>
   <feature name='perfctr_core'/>
   <feature name='perfctr_nb'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
index abfc8db290907eeda2be3e5bc23b3f658b2a76e6..9ebdddcc8d390293356bdcec9106ebd1db68e8b6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -1,19 +1,19 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='osvw'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='rdtscp'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index ee34ea8547f8f2693abe5fc67cd79b579001e596..1adbaaa499817e86480feaa6ff3f413037fbcc88 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_core'/>
   <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
index 4fb2d3978bb5381371912382ec2390cbbfe59373..d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
+  <feature name='vme'/>
+  <feature name='ht'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>
   <feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name='topoext'/>
   <feature name='perfctr_core'/>
   <feature name='perfctr_nb'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index 20e2fa363a3f0a58227f6433f30cbd2520916a6c..820a1a06c11455371c7a333b0e194fcb94e75ebc 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -16,6 +9,13 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='rdtscp'/>
   <feature policy='require' name='invtsc'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index a70f8ccd462bc7a87e1a70b62452285ea36fe6ab..a1a42d4b8395b9dc7b79a456bdb38f2c1e6af835 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -3,12 +3,6 @@
   <model>core2duo</model>
   <vendor>Intel</vendor>
   <signature family='6' model='37' stepping='5'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='ds_cpl'/>
   <feature name='est'/>
@@ -18,8 +12,14 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='popcnt'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
-  <feature name='rdtscp'/>
   <feature name='lahf_lm'/>
+  <feature name='rdtscp'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
index f6106fdb1f02d9a0b4d3c755013b22036d1abc41..480d62865abe412f92936885106b737f2981e098 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -1,14 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>
   <feature policy='require' name='cr8legacy'/>
@@ -17,6 +12,11 @@
   <feature policy='require' name='ibs'/>
   <feature policy='require' name='skinit'/>
   <feature policy='require' name='wdt'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
   <feature policy='require' name='invtsc'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
index dba7b2b1611ceae63ede603180f41833010b79b3..6a4196b7353765f5c3db970086aba0ddb3169a39 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -3,18 +3,13 @@
   <model>athlon</model>
   <vendor>AMD</vendor>
   <signature family='16' model='4' stepping='2'/>
-  <feature name='mca'/>
-  <feature name='clflush'/>
-  <feature name='ht'/>
   <feature name='pni'/>
   <feature name='monitor'/>
   <feature name='cx16'/>
   <feature name='popcnt'/>
-  <feature name='syscall'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='rdtscp'/>
-  <feature name='lm'/>
+  <feature name='mca'/>
+  <feature name='clflush'/>
+  <feature name='ht'/>
   <feature name='lahf_lm'/>
   <feature name='cmp_legacy'/>
   <feature name='svm'/>
@@ -28,6 +23,11 @@
   <feature name='ibs'/>
   <feature name='skinit'/>
   <feature name='wdt'/>
+  <feature name='syscall'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='rdtscp'/>
+  <feature name='lm'/>
   <feature name='invtsc'/>
   <feature name='npt'/>
   <feature name='lbrv'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
index 7f6289c6d7a6420381df8418c5e5772e1d923484..91bfb6244a721b3089e1d89a34152283f930a92d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -1,17 +1,13 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>athlon</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='clflush'/>
   <feature policy='require' name='pni'/>
   <feature policy='require' name='cx16'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='popcnt'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='lm'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='clflush'/>
   <feature policy='require' name='lahf_lm'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='cr8legacy'/>
@@ -20,6 +16,10 @@
   <feature policy='require' name='misalignsse'/>
   <feature policy='require' name='3dnowprefetch'/>
   <feature policy='require' name='osvw'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='lm'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index 486b41815ded5af7386233469775b710352ae0b3..68fa9565576b3053afd3f4a632dd6432352dd55b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>EPYC</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index 1b0b0d4407805bb6004f886edb9d977d95687e1f..0f7a5ad4e47ab946820817854a7279783e7e7d81 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <signature family='23' model='1' stepping='1'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>
   <feature name='extapic'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index e934f4e8ef8cbb3c445a3a3885fe07ea2955f5cc..8ab0737eb38de5036cae888dddbbd2458903c7d4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>EPYC-Rome</model>
   <vendor>AMD</vendor>
-  <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ht'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index f1f4df11765ec8ac49522676155a46bf2d984a86..25e1f4518629716ce547a7b55b6ec3bf28ebeae0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <signature family='23' model='113' stepping='0'/>
-  <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='ht'/>
   <feature name='cmt'/>
   <feature name='xsaves'/>
   <feature name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
index d1b442d33f62ca65ff29f2be3df597baf0b8c783..7561906d8859275a9697f042c694e583b479d2a7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,4 +10,11 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
index beb465df86f3dacb4d9ee97111727b4d5035d7b9..ec509f92e4c6c40ce6e3805fb44634505130b2ec 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -3,13 +3,6 @@
   <model>Conroe</model>
   <vendor>Intel</vendor>
   <signature family='6' model='15' stepping='6'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,4 +12,11 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='dca'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index ea1c79c0dfd638ae43774cf70af1a625bef23e5e..43038faac3aaff22dfdac2354409964c2caf0c3b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index d7a7f30b9ef08a0e43eceb536662d526c953e933..be752ae7947e8ddb71add66e10ed0bdfa01f42df 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='94' stepping='3'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
index a5591278df4d47d25eb6c49d97dcdb2d6ba63486..9ff862a51bd72448314f3c1064291c5e0063b980 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='md-clear'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index 60bace9ed6618f1199c67813d4475daecea30e89..073b099b766f782d47cf3b3cb981b0b5783dc8f8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index d2f808f9a63748d15063c349f5c1619b01dfe21a..50890d7006d05318ba0057605e306ade4494ee98 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family='6' model='94' stepping='3'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='sgx'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
index ad986790273fe77f0b303c91ecec15350d46142d..df83cf79a0f7d46b12625989840a14a3cdbffcbc 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index d8aaaad29dc9a469f9e367c6a4a4268dcdadf18b..9f7b0376b5838d39b2ed5ef122ee4f9a9f38e527 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,12 +14,19 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index bc39536de90cfd3cea818139e2924389657c57f3..d641d70bbdb849f44a1238db71a0884ea40c4a03 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='63' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,12 +16,19 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='stibp'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
index 20e24c387d83486f7b23df3713f48ba9c394ff2c..07100abac987efd8335d27f268c15e238a1db624 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index a5c6d9b47197968f3927f9d0a2e2d9e39a40db50..49ed41e47310fab6cb879c9d237c02d594d86414 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
@@ -29,7 +29,7 @@
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 70419d79444f87848a29096acbdad448c04016a3..ab7c422861664fa964020ba316fd9e537de6d0af 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='79' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
@@ -31,7 +31,7 @@
   <feature name='xsaveopt'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
index de082dbd93f3845f1b3ff592e72669ffdb5b390c..c76a4b4cd41adfc61c9b9bf054df7c2fd384fe7b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 980af0789065f60ee462f73f6c065c60e26d0d91..833b8590482619374d94567f56e375884ab59377 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 6d959eedc35c4e31546fc749cde0146abed186c6..b8bafccab39a5bb5d9075ea4442db42f702f6eee 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family='6' model='63' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
index 78b8be1118281aada0ff31fe88651d6303c1d1ce..53cfd07643b6a8299781043c966f5105ebf46d4f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
@@ -1,13 +1,13 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index e2999db8e985a4a1e2251296de96b2d00ffda441..2cd43087108d36f5ad4974c4e62acb6f0b00b3ff 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
@@ -28,7 +28,7 @@
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index e2ace9021bf0ca35c2be8229f84d41e83dc1c68d..feb5514d2227c8e7c27393aaf63c8b5161a8553b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family='6' model='79' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
@@ -30,7 +30,7 @@
   <feature name='xsaveopt'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
index 5b8891093aa7425ac0354f0ee4d5330e089aa932..ffa518e2a44143f69d8670bcd70fa1fadae2588f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
index db1efe054970c7fa151a186e07dee555e6084dfb..d68171737224236990c2d7d8b62211f022b99ecf 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -20,6 +13,13 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 6f2de0ca5b354f564c7f06a962ef023bd964b91d..8f56d42213064823fdc5fedcabcddde1d941de44 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='45' stepping='7'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -22,6 +15,13 @@
   <feature name='pcid'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
index bf587d3ffcf51e84631fbb7497e93fc97eb2cd73..b7e18912251900b2664da80d90635e17d23b17ea 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='stibp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 980af0789065f60ee462f73f6c065c60e26d0d91..833b8590482619374d94567f56e375884ab59377 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 6d959eedc35c4e31546fc749cde0146abed186c6..b8bafccab39a5bb5d9075ea4442db42f702f6eee 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family='6' model='63' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
index 2227ed0031418c6e64e318fd1a22dd311f21e8b8..db42950fe6364ee61cd804dd1b2638fb5bba9b7a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
@@ -1,12 +1,12 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index e2999db8e985a4a1e2251296de96b2d00ffda441..2cd43087108d36f5ad4974c4e62acb6f0b00b3ff 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
@@ -28,7 +28,7 @@
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index e2ace9021bf0ca35c2be8229f84d41e83dc1c68d..feb5514d2227c8e7c27393aaf63c8b5161a8553b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family='6' model='79' stepping='1'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
@@ -30,7 +30,7 @@
   <feature name='xsaveopt'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
index 5b8891093aa7425ac0354f0ee4d5330e089aa932..ffa518e2a44143f69d8670bcd70fa1fadae2588f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
index 659779687a52395c09eb6b4210c22f077907c996..b7ddd7e1d75bcbb22ef97e98e883ffd39d8fae30 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
@@ -21,6 +14,13 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 58468cd09600485787ff9066caf9ceb2b85fbd86..728c9c4264ca4aaa777553438e36e4e5c32bc376 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family='6' model='47' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='pclmuldq'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
@@ -23,6 +16,13 @@
   <feature name='pcid'/>
   <feature name='dca'/>
   <feature name='x2apic'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='pdpe1gb'/>
   <feature name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
index e8b74c5c30d7f6854023ffbe1c1f36fffb009594..f9d226917b3e918c1aa7f7933e38fdd2db5cb474 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,13 +1,13 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
index 659779687a52395c09eb6b4210c22f077907c996..b7ddd7e1d75bcbb22ef97e98e883ffd39d8fae30 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
@@ -21,6 +14,13 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 58468cd09600485787ff9066caf9ceb2b85fbd86..728c9c4264ca4aaa777553438e36e4e5c32bc376 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family='6' model='47' stepping='2'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='pclmuldq'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
@@ -23,6 +16,13 @@
   <feature name='pcid'/>
   <feature name='dca'/>
   <feature name='x2apic'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='pdpe1gb'/>
   <feature name='rdtscp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
index da949ad25ea657bfcd2da61a2ffabeafa95d8de8..7e9b5f2ba47d1323f1fee0f9c5801e5f35b61134 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -1,13 +1,13 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='pclmuldq'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index 16d333aa266de0ab17afc3c4a5ae9c95f8438267..dc91fceaef2214b3335ed9dd2bf959d836d77f9e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index 6a18204c02202a6022ec709408752a5852a2173e..92d920624243829b1d3f1c0fc3c014a5a7ecb6ed 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell</model>
   <vendor>Intel</vendor>
   <signature family='6' model='63' stepping='4'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
   <feature name='abm'/>
+  <feature name='pdpe1gb'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
index e542456c8bcd1df5c9c75f433eaa2e8e0d278a3f..9d49bb9aa68af0961f74667ea97aaccaed1cee22 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
index fbc05fe0d8f6b2c012217bef3c093ebec19a42c2..18211373a9fb15f56f6c3387963329b0f1420b6c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +11,13 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='ssbd'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
index 15fea29e06d2c0e3f2e9647231185ebb7de75377..3575991eae5aea78518a52685f8aa205bb4a773c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -3,13 +3,6 @@
   <model>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='46' stepping='6'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +13,13 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='x2apic'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
   <feature name='ssbd'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
index 32cd1000c8850f1462d03ab7e50c9a7d18038506..d2acd9cabffa69140a6f1f0ba0d48835bb76094a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
@@ -1,11 +1,11 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='stibp'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 8f014f6e280505445c9a668b7ce2aacf64e9eae8..d0fdec76914f5a6859b2b894892aca5a7a986d8c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index e004747ada01dc2b10503dbfc6e35588490d5a73..bbf82dfd9ff9edb8e4b997f41cb0a9df0e9aa43e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='4'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
index 7c7e95ce0d9c8992d7965c75fda783560151a5a0..e92cfaba48c1c6e5fbeb1c5ff5b0c2658a33f02d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index f4f0199607665ee9dd075db42844136778287cab..4a42d170c2c04fef54beaead0b0c1b5e80cfabd9 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 325c2fe26f1662afd2acec470829d4d110cdb759..44a0e1a30f87abc043d6847344f4a36d3ce32f13 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='4'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
index b482043ccf455e8e598e837fe42f97de51dcec50..a1b79e7e1845a75dead7126a8846e79c49c8caa9 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='umip'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index f31ca1ffc502ba3872a4dc8e48f0a0192f52a3e9..4b2d012e72cca2e0e6596bf5c06f9ace81d088fd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index da7e96e533982113d6f787d4901ee50a2a15ab1d..2959878fe616b688801b29f53c00cf61c0f8b8ff 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='4'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='clflushopt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index 1dfad4a0cbf0bed3ecd84e124559302f790688a9..ccf9875dc9d24e5442322f654c26a274c45f4408 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 8fd1611842ddf26db5e7b8634c5425333a4743f9..d707faf63d6f1cc8e621a553dab2ebd5a40fc7e2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 7055c72112b0bcab9e6f6d70989a4afd010f61e1..6cb65b2a90e2b5d83a7dd0fc23f1804382f905db 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -3,12 +3,6 @@
   <model>Cascadelake-Server</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='6'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
index 78863c61d1379b1831f47c52e64ccdea12597a30..d8ac5f373f1262827ecf923aea3e98825d8dc8fc 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='umip'/>
   <feature policy='require' name='pku'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index 88c2d84d6575632ec0d2a084827d223764473761..f86d2889c690513771eda7b3261243d080ebd855 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 5e59520919b1ce16a38c47ad73db88b494650364..7289d4cda57af17c79b588dbe8a48d12c6168c3c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -3,12 +3,6 @@
   <model>Cascadelake-Server</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='7'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name='pdcm'/>
   <feature name='dca'/>
   <feature name='osxsave'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
   <feature name='intel-pt'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index ac0e52076723afed6bc9213ad4a8fca328b45d2c..bd187b3d727cc69278a0fd288b1659d2cbce6ee4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='umip'/>
   <feature policy='require' name='pku'/>
@@ -41,9 +41,6 @@
   <feature policy='require' name='vmx-rdseed-exit'/>
   <feature policy='require' name='vmx-pml'/>
   <feature policy='require' name='vmx-xsaves'/>
-  <feature policy='require' name='vmx-invvpid'/>
-  <feature policy='require' name='vmx-invvpid-single-addr'/>
-  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-ept-execonly'/>
   <feature policy='require' name='vmx-page-walk-4'/>
   <feature policy='require' name='vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-invvpid'/>
+  <feature policy='require' name='vmx-invvpid-single-addr'/>
+  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 9c975c679229575067528bdba2c37596e8eaf181..f5ce1183c6fcebe11da587e2de3ea9a9161b66fc 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,6 +10,13 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='rdtscp'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
index 35dd63f3603dd75bcb59e588a0f522176fe22461..453b56ff1f708e27bf679d0299c4df4aaf9aa275 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -3,13 +3,6 @@
   <model>Nehalem</model>
   <vendor>Intel</vendor>
   <signature family='6' model='26' stepping='5'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='dca'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
   <feature name='rdtscp'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
index 038c98e1d11240eb3a69214d3205c70d85c2f48c..b708bae41d4a4fc46819e8b57b4e27758711d849 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,10 +1,10 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='rdtscp'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
index a97efc5657f83fe2eb30171c4a3945cabf618be1..b02cca7595748537448c5c67b955651476cd069d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Penryn</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='dtes64'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='ds_cpl'/>
@@ -17,4 +10,11 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
index 91ab9726dac06c069ef3d5be51b57d037e6f37b9..b7bc4cbb5bfb8e53b6f5c67638e80e1ff156f0fb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -3,13 +3,6 @@
   <model>Penryn</model>
   <vendor>Intel</vendor>
   <signature family='6' model='23' stepping='6'/>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
   <feature name='dtes64'/>
   <feature name='monitor'/>
   <feature name='ds_cpl'/>
@@ -19,4 +12,11 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='dca'/>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
index 99bce8db877c4036a2e200696d94c51a69403c64..8d75dc29fbd84c4163c08e28e080dbc3db72fe55 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
index 071c799ba20566bf930aae1c4472f42256162ced..bdc005acc563619db33caa1c21cbe7ea838a1779 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='umip'/>
   <feature policy='require' name='pku'/>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
index 5e42876b3982c2f59ba99bf372f68159e061df87..28992ac163394e9bb7dbbcebfee44adef6113e89 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='umip'/>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
index 906259df0bdb82e2c50ba8882759ef784ed71e53..98b1c48e70db970281a8f1c40c1d886761623b9a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index f9e9c476b5857f884e460cf0d463d5ba18662cd3..833de33a2d5b4f4caa2ed0c5d79fb6008d62c138 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -1,9 +1,9 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='umip'/>
   <feature policy='require' name='pku'/>
@@ -41,9 +41,6 @@
   <feature policy='require' name='vmx-rdseed-exit'/>
   <feature policy='require' name='vmx-pml'/>
   <feature policy='require' name='vmx-xsaves'/>
-  <feature policy='require' name='vmx-invvpid'/>
-  <feature policy='require' name='vmx-invvpid-single-addr'/>
-  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-ept-execonly'/>
   <feature policy='require' name='vmx-page-walk-4'/>
   <feature policy='require' name='vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-invvpid'/>
+  <feature policy='require' name='vmx-invvpid-single-addr'/>
+  <feature policy='require' name='vmx-invvpid-all-context'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
index 071c799ba20566bf930aae1c4472f42256162ced..bdc005acc563619db33caa1c21cbe7ea838a1779 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='umip'/>
   <feature policy='require' name='pku'/>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
index e687a679b3b4155514145c9e43b481a0bdb55c81..a81ba24fa7268059e6a8e66d19f933ae591bf0f0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
index 651457b17a5423b633e02dfa7fe3eca1891e6c80..b937c49fa43d1a49bdbdbe4ea6030f596c4788f6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
index 8bda1c02e23282bfaebc8716d5219627720377a3..1d9e49f109087e20a91248b477a6cb9eaa5088e3 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
index 651457b17a5423b633e02dfa7fe3eca1891e6c80..b937c49fa43d1a49bdbdbe4ea6030f596c4788f6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
+  <feature policy='require' name='pdpe1gb'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
index d46ff26eebf9c3bc21bdfb4941ff0549da9792aa..34331b0f15f57aa9d09f7eb532f350b6b045c924 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
@@ -1,8 +1,8 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='ss'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
index b533f22b88005d8014e6291682057eb23300d5a5..07fc300fe6901dcdf6420ab7a47252706dd0d9c1 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
@@ -1,6 +1,13 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>486</model>
   <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='force' name='monitor'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='sse4.1'/>
   <feature policy='require' name='de'/>
   <feature policy='require' name='tsc'/>
   <feature policy='require' name='msr'/>
@@ -20,19 +27,12 @@
   <feature policy='require' name='fxsr'/>
   <feature policy='require' name='sse2'/>
   <feature policy='force' name='pbe'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='force' name='monitor'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='force' name='svm'/>
   <feature policy='require' name='syscall'/>
   <feature policy='require' name='nx'/>
   <feature policy='require' name='lm'/>
   <feature policy='force' name='3dnowext'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='force' name='svm'/>
   <feature policy='disable' name='vme'/>
   <feature policy='disable' name='sse4.2'/>
   <feature policy='disable' name='3dnow'/>

diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
index e975d9bc18125661e95492d019882578e4ef354c..92405750d829e830b8ffd85f5e46031eef4feea6 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
@@ -1,14 +1,14 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>qemu64</model>
   <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/>
-  <feature policy='force' name='pbe'/>
   <feature policy='force' name='monitor'/>
   <feature policy='require' name='ssse3'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='sse4.1'/>
-  <feature policy='force' name='3dnowext'/>
+  <feature policy='force' name='pbe'/>
   <feature policy='require' name='lahf_lm'/>
+  <feature policy='force' name='3dnowext'/>
   <feature policy='disable' name='sse'/>
   <feature policy='disable' name='sse4.2'/>
   <feature policy='disable' name='3dnow'/>

diff --git a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
index 4be4701c6e66094d7d12ed085a796fdba3d74a75..7ccdad5e3a411b92b2c1a437558d6b3d21e5348f 100644 (file)
--- a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
+++ b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
@@ -1,12 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>core2duo</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='pbe'/>
   <feature policy='require' name='ds_cpl'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='est'/>
@@ -15,6 +9,12 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
   <feature policy='require' name='lahf_lm'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='vme'/>

diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 152f201ff97928d68cb1beb6374272fe042337af..5ac1c405f24256ffcfc25dd33542ea21030f7792 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='vmx'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='umip'/>
@@ -79,9 +79,6 @@
       <feature policy='require' name='vmx-rdseed-exit'/>
       <feature policy='require' name='vmx-pml'/>
       <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-ept-execonly'/>
       <feature policy='require' name='vmx-page-walk-4'/>
       <feature policy='require' name='vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-invvpid'/>
+      <feature policy='require' name='vmx-invvpid-single-addr'/>
+      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-intr-exit'/>
       <feature policy='require' name='vmx-nmi-exit'/>
       <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index cea9377cfe5da2487451660d3733d2e935307f0e..5766bcc428858445d9c47524db650b6ae4fc15fa 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy='require' name='la57'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 8b7cf44d6d7c5e805c5f091d47ef4fe9f854aa5d..7b13d3ba3a077ce51f2fad2f3556c1f14a5cef6d 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -43,9 +43,9 @@
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='vmx'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='umip'/>
@@ -78,9 +78,6 @@
       <feature policy='require' name='vmx-rdseed-exit'/>
       <feature policy='require' name='vmx-pml'/>
       <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-ept-execonly'/>
       <feature policy='require' name='vmx-page-walk-4'/>
       <feature policy='require' name='vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-invvpid'/>
+      <feature policy='require' name='vmx-invvpid-single-addr'/>
+      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-intr-exit'/>
       <feature policy='require' name='vmx-nmi-exit'/>
       <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 1d29a40f74c5edebe086acfe1a7705073c2178fd..edc36e2a84c89e6340c5d4c74ab14be4d8992145 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='vmx'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='umip'/>
@@ -79,9 +79,6 @@
       <feature policy='require' name='vmx-rdseed-exit'/>
       <feature policy='require' name='vmx-pml'/>
       <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-ept-execonly'/>
       <feature policy='require' name='vmx-page-walk-4'/>
       <feature policy='require' name='vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-invvpid'/>
+      <feature policy='require' name='vmx-invvpid-single-addr'/>
+      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-intr-exit'/>
       <feature policy='require' name='vmx-nmi-exit'/>
       <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 7b7420ff8e22fc4c987c730274a6f696835d4663..d2b82e5581db9786115f6c38e6f58e3775f0a8d3 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy='require' name='la57'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index f3b3adb19e0feddaceb1d5877cbf7684339faf2f..7fe44b5e9797c4dffe593f810eecfc7775fb666d 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -43,9 +43,9 @@
       <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='vmx'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='umip'/>
@@ -78,9 +78,6 @@
       <feature policy='require' name='vmx-rdseed-exit'/>
       <feature policy='require' name='vmx-pml'/>
       <feature policy='require' name='vmx-xsaves'/>
-      <feature policy='require' name='vmx-invvpid'/>
-      <feature policy='require' name='vmx-invvpid-single-addr'/>
-      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-ept-execonly'/>
       <feature policy='require' name='vmx-page-walk-4'/>
       <feature policy='require' name='vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-invvpid'/>
+      <feature policy='require' name='vmx-invvpid-single-addr'/>
+      <feature policy='require' name='vmx-invvpid-all-context'/>
       <feature policy='require' name='vmx-intr-exit'/>
       <feature policy='require' name='vmx-nmi-exit'/>
       <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 272d9bed08ac8091d2badbb49180c3cbe22b1c97..2743f914319c058aa70b40864f2c0b26186dc46b 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy='require' name='la57'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 526f39254e327b331a4dcba19665422287e22846..7e5f3c8c2b5deaf3c26e544aca7d71da64244249 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy='require' name='la57'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 0ffd95aee6a3c5cd747319041ad3de1269f1c5b1..169e777644ed793c9f746a5fb6c699aa6502dd67 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy='require' name='pks'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index a80c86df4f6af71d861b3982050eeb441af30e67..35f31f4ae81e1a57b577adbbb9f7842a9083f722 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy='require' name='pks'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='disable' name='misalignsse'/>
     </mode>

diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 7ed62fb522ac4edb23c8a538d481684d8772a62c..fa1c32f138c4f47de198ae9b9b203be0c21e1a4a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy='require' name='pks'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='require' name='vgif'/>
       <feature policy='require' name='svme-addr-chk'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index 3a71b54847af2e002b4d26a389853776ae743e4c..8a98f7ed87caec99c7bb2afbf963ca9654616fc0 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -67,11 +67,11 @@
       <feature policy='require' name='pks'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='require' name='vgif'/>
       <feature policy='require' name='svme-addr-chk'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 1ae2a7c342330149b71b90872fcb3d219b3fff00..47411643709a79a111399521ac4c6ceba6d79788 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='pclmuldq'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy='require' name='xsave'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='arat'/>
       <feature policy='require' name='fsgsbase'/>
       <feature policy='require' name='bmi1'/>
@@ -67,11 +67,11 @@
       <feature policy='require' name='pks'/>
       <feature policy='require' name='xsaveopt'/>
       <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='mmxext'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='cr8legacy'/>
       <feature policy='require' name='npt'/>
       <feature policy='require' name='vgif'/>
       <feature policy='require' name='svme-addr-chk'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 69b6be76166ce332f23cd22dec9261494a47f6d7..bba0e5069ba2e0be931427d6d40273154135f39b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -59,11 +59,11 @@
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='3dnowprefetch'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index 69b6be76166ce332f23cd22dec9261494a47f6d7..bba0e5069ba2e0be931427d6d40273154135f39b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -59,11 +59,11 @@
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='3dnowprefetch'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index efb5fcb99d5937b4bd33b4f67cc71748280f24ba..ce9035cb9be89df6df7910f88cffa8cf3bc3b864 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -63,11 +63,11 @@
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='3dnowprefetch'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index e32cd80c17813ec5c39a9d77733e204a603e37ea..b8a566920f8a89b1783930192bcc570c61b83e58 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -65,10 +65,10 @@
       <feature policy='disable' name='vme'/>
       <feature policy='disable' name='sha-ni'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 784a29acd98f98b9211799bf87e09ff7402e447a..e215b5d946962746e222944245fba058c0bf3876 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -64,10 +64,10 @@
       <feature policy='require' name='svme-addr-chk'/>
       <feature policy='disable' name='vme'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index ab81e0751050587d12e0b030ddc3107b3aa11b2b..53a28902a7b831e43fc52de03d41e5e2e9b5802f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
       <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='ss'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='pcommit'/>
@@ -65,10 +65,10 @@
       <feature policy='require' name='svme-addr-chk'/>
       <feature policy='disable' name='vme'/>
       <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='misalignsse'/>
       <feature policy='disable' name='osvw'/>
       <feature policy='disable' name='topoext'/>
+      <feature policy='disable' name='fxsr_opt'/>
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
index f5f0e818afefbbe3c6280c63a120f5cc19f64414..52d2ac7b33a4204d1f8472371d98d5725088a681 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
index 699f48fbaab9f827be3151d22c6ab972c3a54d30..ca8bff10803fd8187a07ee56ebd66ffe0cd7fec2 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
index cf7ad7b5f40d05a110c4e3985adb4681829994c0..e4c805bf4ef3adc877ca178a9c514d7c7ce628aa 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
index 257b271386e4f7719c9559399e2cd4b3012f4530..b90e177dce8ea500ec7e8b8c7afb602e811d84ce 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
index 71551b51a303c63d1510763ad85c5a22ed592332..837fb78129ef3fc7fea5077d143b485bc4ee29df 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.1,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
index 834d92c35a1afbbc7762ef57e1f475a4b804ef15..5f356d87d40b908998d9b6f47478685b4d35e45f 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object memory-backend-ram,id=pc.ram,size=224395264 \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
index 611bf05482596fce1637d6291a4639963830c149..c929861cfabb29193a662baab313b6c3d72326c1 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
index 79ae00e993f0870e6aef755164e0ae46ceb0bd09..c19affe3c61c02d2f9622266e1154cb856547222 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
index 9c8331629ac4d669660f6fa1c86a517b464812b9..09d287f68aae5f8dc83ecea047963183dfe5fff3 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
index 5929c9a87b7c7b8c28e8e6da529d959de49d981f..771ef9e4533e893283217fc93c4f6732bc437041 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
index 141c2e36eb9a60a8c42e7ed2622c7bf841125ef7..40cc53482e967875bb2abbc69775f1dba4bb9ec7 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
index 1e7f444d733d5fb90d7e686b01bbfb538d736db6..20b3865d00986c2119979c294ccd76c4a23a311f 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
index 943b0d477be258da7dbc46441e2ed4ec883149c3..7e1a3a8be8a97758d5910003c434f48f6766d47d 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
index 177f7da2b5f1820fb683d92793129983a3a44098..2c81adbb2352c8a56cc14fd49f9ab0dd2df6e756 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
index e0b49dc3186e42228c19468c85945c94cd55f00f..85117194f4a6af0ab3f3472e16c8a95c4915fd9c 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
index aacba803e8df24fe8056af2d99dcba78c91b61f8..42619fdff365ec5d7a3efccf819a2acd3fd7dd81 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
index a2415bb667b26cbac5b88ee03825988c7c4198a2..baceda1d3d6ec35294caba5d4f30da0cd131986d 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
index f5f0e818afefbbe3c6280c63a120f5cc19f64414..52d2ac7b33a4204d1f8472371d98d5725088a681 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
index 699f48fbaab9f827be3151d22c6ab972c3a54d30..ca8bff10803fd8187a07ee56ebd66ffe0cd7fec2 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
+-cpu Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
index cf7ad7b5f40d05a110c4e3985adb4681829994c0..e4c805bf4ef3adc877ca178a9c514d7c7ce628aa 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
index 257b271386e4f7719c9559399e2cd4b3012f4530..b90e177dce8ea500ec7e8b8c7afb602e811d84ce 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
index 71551b51a303c63d1510763ad85c5a22ed592332..837fb78129ef3fc7fea5077d143b485bc4ee29df 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.1,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
index 834d92c35a1afbbc7762ef57e1f475a4b804ef15..5f356d87d40b908998d9b6f47478685b4d35e45f 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object memory-backend-ram,id=pc.ram,size=224395264 \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
index 611bf05482596fce1637d6291a4639963830c149..c929861cfabb29193a662baab313b6c3d72326c1 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
index 79ae00e993f0870e6aef755164e0ae46ceb0bd09..c19affe3c61c02d2f9622266e1154cb856547222 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
index 9c8331629ac4d669660f6fa1c86a517b464812b9..09d287f68aae5f8dc83ecea047963183dfe5fff3 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
index 5929c9a87b7c7b8c28e8e6da529d959de49d981f..771ef9e4533e893283217fc93c4f6732bc437041 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
index 141c2e36eb9a60a8c42e7ed2622c7bf841125ef7..40cc53482e967875bb2abbc69775f1dba4bb9ec7 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
index 1e7f444d733d5fb90d7e686b01bbfb538d736db6..20b3865d00986c2119979c294ccd76c4a23a311f 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
index 943b0d477be258da7dbc46441e2ed4ec883149c3..7e1a3a8be8a97758d5910003c434f48f6766d47d 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
index 177f7da2b5f1820fb683d92793129983a3a44098..2c81adbb2352c8a56cc14fd49f9ab0dd2df6e756 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
index e0b49dc3186e42228c19468c85945c94cd55f00f..85117194f4a6af0ab3f3472e16c8a95c4915fd9c 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
index e419c1734dc42459809f7f0c7a164a5892032e91..425a0d3a7c81a2ee0672b41a7ec479f484aaf5f1 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
index a7fd187f1203bde3e77d286dd2ed60bd03d90015..4e1912f76e0816cecfc1b14b57d15b7d38b7132e 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
index 71b61fbbc5165b9d0faf478b7a1d851a73e5cd28..35c764045e4c642d36e8d4991656aa9016388891 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.1,usb=off,dump-guest-core=off \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
index e48bcd61e3e901dd86e96f102ef741fc305e1e48..1f976ddedacc33f9e260483a794409745fe7b853 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object memory-backend-ram,id=pc.ram,size=224395264 \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
index b3deb63cf0e821ed2b72f8a276fd257c79cc724a..bdc3d5f20d0cd20a36ebaa94eede2969994e46ac 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
index 5835958a550a7517bf3fbbdd90f0cf7cef567efb..057a8aabe64ada4312d3264ab454ce37188f1b54 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
index 6b1a1a6055b3f8a40d6a3d1b2e0adb3fdfbcf83f..262aa05e4691b6089313d656790761a01e7f01be 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
index b023c9e280211d5921cc24f8ac166cb48dcd9275..abba7d38baf0caadb4140b6fb356e92d67268885 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
index 4c2255868dfc08b3f394244f961d8e18b5cde73f..f698ad8f3cc83b75ec8c6f1d90836967ef95e800 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
+-cpu Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
index 4f411a718ab1d09bff9d57096f3491efd9da6ef9..87eab5218eb3c352eb8477a7f9066529eb2202bf 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
index ae10640e4d91bd7f02a8ef2bead9b4852555258e..7ca5d33b42af1e7640b813f14f7374f948dd36a7 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
index 4d132a9da03ed471a93c58a5125328b8d0b1d038..9763f7370b2dcf93663161c0d327d226825afe93 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
index edd492b222ac27323463b920fcbfabf8a410616a..69d278c72c82a0400b2e881a68217313942eef7d 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
--cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \
+-cpu EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \