[libvirt] [PATCH 05/10] cpu: Sort CPU map features on eax_in

As a side effect this changes the order of CPU features in XMLs generated by libvirt, but that's not a big deal since the order there is insignificant. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu_map.xml | 118 ++++++++++----------- tests/cputestdata/x86-cpuid-A10-5800K-guest.xml | 2 +- tests/cputestdata/x86-cpuid-A10-5800K-host.xml | 2 +- tests/cputestdata/x86-cpuid-A10-5800K-json.xml | 4 +- .../cputestdata/x86-cpuid-Core-i5-4670T-guest.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml | 4 +- .../cputestdata/x86-cpuid-Core-i7-4600U-guest.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml | 2 +- .../cputestdata/x86-cpuid-Core-i7-5600U-guest.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml | 2 +- tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml | 2 +- tests/cputestdata/x86-cpuid-Opteron-6234-json.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml | 2 +- 27 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index e99e72f..b742122 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -188,6 +188,65 @@ <cpuid eax_in='0x01' ecx='0x80000000'/> </feature> + <!-- cpuid function 0x7 ecx 0x0 features --> + <feature name='fsgsbase'> + <cpuid eax_in='0x07' ebx='0x00000001'/> + </feature> + <feature name='tsc_adjust'> + <cpuid eax_in='0x07' ebx='0x00000002'/> + </feature> + <feature name='bmi1'> + <cpuid eax_in='0x07' ebx='0x00000008'/> + </feature> + <feature name='hle'> + <cpuid eax_in='0x07' ebx='0x00000010'/> + </feature> + <feature name='avx2'> + <cpuid eax_in='0x07' ebx='0x00000020'/> + </feature> + <feature name='smep'> + <cpuid eax_in='0x07' ebx='0x00000080'/> + </feature> + <feature name='bmi2'> + <cpuid eax_in='0x07' ebx='0x00000100'/> + </feature> + <feature name='erms'> + <cpuid eax_in='0x07' ebx='0x00000200'/> + </feature> + <feature name='invpcid'> + <cpuid eax_in='0x07' ebx='0x00000400'/> + </feature> + <feature name='rtm'> + <cpuid eax_in='0x07' ebx='0x00000800'/> + </feature> + <feature name='mpx'> + <cpuid eax_in='0x07' ebx='0x00004000'/> + </feature> + <feature name='avx512f'> <!-- AVX-512 Foundation --> + <cpuid eax_in='0x07' ebx='0x00010000'/> + </feature> + <feature name='rdseed'> + <cpuid eax_in='0x07' ebx='0x00040000'/> + </feature> + <feature name='adx'> + <cpuid eax_in='0x07' ebx='0x00080000'/> + </feature> + <feature name='smap'> + <cpuid eax_in='0x07' ebx='0x00100000'/> + </feature> + <feature name='clflushopt'> + <cpuid eax_in='0x07' ebx='0x00800000'/> + </feature> + <feature name='avx512pf'> <!-- AVX-512 Prefetch --> + <cpuid eax_in='0x07' ebx='0x04000000'/> + </feature> + <feature name='avx512er'> <!-- AVX-512 Exponential and Reciprocal --> + <cpuid eax_in='0x07' ebx='0x08000000'/> + </feature> + <feature name='avx512cd'> <!-- AVX-512 Conflict Detection --> + <cpuid eax_in='0x07' ebx='0x10000000'/> + </feature> + <!-- extended features, EDX --> <feature name='syscall'> <!-- CPUID_EXT2_SYSCALL --> <cpuid eax_in='0x80000001' edx='0x00000800'/> @@ -288,65 +347,6 @@ <cpuid eax_in='0x80000001' ecx='0x01000000'/> </feature> - <!-- cpuid function 0x7 ecx 0x0 features --> - <feature name='fsgsbase'> - <cpuid eax_in='0x07' ebx='0x00000001'/> - </feature> - <feature name='tsc_adjust'> - <cpuid eax_in='0x07' ebx='0x00000002'/> - </feature> - <feature name='bmi1'> - <cpuid eax_in='0x07' ebx='0x00000008'/> - </feature> - <feature name='hle'> - <cpuid eax_in='0x07' ebx='0x00000010'/> - </feature> - <feature name='avx2'> - <cpuid eax_in='0x07' ebx='0x00000020'/> - </feature> - <feature name='smep'> - <cpuid eax_in='0x07' ebx='0x00000080'/> - </feature> - <feature name='bmi2'> - <cpuid eax_in='0x07' ebx='0x00000100'/> - </feature> - <feature name='erms'> - <cpuid eax_in='0x07' ebx='0x00000200'/> - </feature> - <feature name='invpcid'> - <cpuid eax_in='0x07' ebx='0x00000400'/> - </feature> - <feature name='rtm'> - <cpuid eax_in='0x07' ebx='0x00000800'/> - </feature> - <feature name='mpx'> - <cpuid eax_in='0x07' ebx='0x00004000'/> - </feature> - <feature name='avx512f'> <!-- AVX-512 Foundation --> - <cpuid eax_in='0x07' ebx='0x00010000'/> - </feature> - <feature name='rdseed'> - <cpuid eax_in='0x07' ebx='0x00040000'/> - </feature> - <feature name='adx'> - <cpuid eax_in='0x07' ebx='0x00080000'/> - </feature> - <feature name='smap'> - <cpuid eax_in='0x07' ebx='0x00100000'/> - </feature> - <feature name='clflushopt'> - <cpuid eax_in='0x07' ebx='0x00800000'/> - </feature> - <feature name='avx512pf'> <!-- AVX-512 Prefetch --> - <cpuid eax_in='0x07' ebx='0x04000000'/> - </feature> - <feature name='avx512er'> <!-- AVX-512 Exponential and Reciprocal --> - <cpuid eax_in='0x07' ebx='0x08000000'/> - </feature> - <feature name='avx512cd'> <!-- AVX-512 Conflict Detection --> - <cpuid eax_in='0x07' ebx='0x10000000'/> - </feature> - <!-- Advanced Power Management edx features --> <feature name='invtsc' migratable='no'> <cpuid eax_in='0x80000007' edx='0x00000100'/> diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml index ded7b30..dacf1d0 100644 --- a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml +++ b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml @@ -6,6 +6,7 @@ <feature policy='require' name='ht'/> <feature policy='require' name='monitor'/> <feature policy='require' name='osxsave'/> + <feature policy='require' name='bmi1'/> <feature policy='require' name='mmxext'/> <feature policy='require' name='fxsr_opt'/> <feature policy='require' name='cmp_legacy'/> @@ -21,6 +22,5 @@ <feature policy='require' name='topoext'/> <feature policy='require' name='perfctr_core'/> <feature policy='require' name='perfctr_nb'/> - <feature policy='require' name='bmi1'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml index 4ee57d2..cb90c96 100644 --- a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml +++ b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml @@ -6,6 +6,7 @@ <feature name='ht'/> <feature name='monitor'/> <feature name='osxsave'/> + <feature name='bmi1'/> <feature name='mmxext'/> <feature name='fxsr_opt'/> <feature name='cmp_legacy'/> @@ -21,6 +22,5 @@ <feature name='topoext'/> <feature name='perfctr_core'/> <feature name='perfctr_nb'/> - <feature name='bmi1'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml index 6ebef60..7a38f0f 100644 --- a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml +++ b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml @@ -4,13 +4,13 @@ <feature policy='require' name='vme'/> <feature policy='require' name='x2apic'/> <feature policy='require' name='hypervisor'/> + <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='tsc_adjust'/> - <feature policy='require' name='bmi1'/> <feature policy='disable' name='rdtscp'/> <feature policy='disable' name='svm'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml index 77b1a18..66ef1e3 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml @@ -21,8 +21,8 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml index 32051e4..31211c1 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml @@ -21,8 +21,8 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> + <feature name='tsc_adjust'/> <feature name='pdpe1gb'/> <feature name='abm'/> - <feature name='tsc_adjust'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml index 32b86a1..1c2aad3 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml @@ -7,7 +7,7 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml index 0001b2d..7820007 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml @@ -21,10 +21,10 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='abm'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='mpx'/> <feature policy='require' name='clflushopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml index 0c2aaee..bdf38d9 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml @@ -21,10 +21,10 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> - <feature name='pdpe1gb'/> - <feature name='abm'/> <feature name='tsc_adjust'/> <feature name='mpx'/> <feature name='clflushopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml index bd54d9d..5409852 100644 --- a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml +++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml @@ -6,9 +6,9 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='abm'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='mpx'/> <feature policy='require' name='clflushopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml index 89c95a8..40cf4c2 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml @@ -21,8 +21,8 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml index 6edbf8f..c5a410c 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml @@ -21,8 +21,8 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> + <feature name='tsc_adjust'/> <feature name='pdpe1gb'/> <feature name='abm'/> - <feature name='tsc_adjust'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml index 2f6a925..ef49a38 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml @@ -7,7 +7,7 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml index 012946d..a538f74 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml @@ -21,8 +21,8 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml index 04e7e78..9c7c791 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml @@ -21,8 +21,8 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> + <feature name='tsc_adjust'/> <feature name='pdpe1gb'/> <feature name='abm'/> - <feature name='tsc_adjust'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml index 9a13e6e..bbe5c77 100644 --- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml +++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml @@ -7,7 +7,7 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml index 2bb59a3..dded6fa 100644 --- a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml +++ b/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml @@ -5,12 +5,12 @@ <feature policy='require' name='x2apic'/> <feature policy='require' name='tsc-deadline'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='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='tsc_adjust'/> <feature policy='disable' name='rdtscp'/> <feature policy='disable' name='svm'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml index 0001b2d..7820007 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml @@ -21,10 +21,10 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='abm'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='mpx'/> <feature policy='require' name='clflushopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml index 0c2aaee..bdf38d9 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml @@ -21,10 +21,10 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> - <feature name='pdpe1gb'/> - <feature name='abm'/> <feature name='tsc_adjust'/> <feature name='mpx'/> <feature name='clflushopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml index 81a41fb..9348334 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml @@ -7,9 +7,9 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='abm'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='mpx'/> <feature policy='require' name='clflushopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml index ce5aa79..048161e 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml @@ -22,8 +22,8 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml index 26a3b90..f2cf8cc 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml @@ -22,8 +22,8 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> + <feature name='tsc_adjust'/> <feature name='pdpe1gb'/> <feature name='abm'/> - <feature name='tsc_adjust'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml index 4cf361e..62aa9a1 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml @@ -6,7 +6,7 @@ <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml index ce5aa79..048161e 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml @@ -22,8 +22,8 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> + <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> - <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml index 26a3b90..f2cf8cc 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml @@ -22,8 +22,8 @@ <feature name='osxsave'/> <feature name='f16c'/> <feature name='rdrand'/> + <feature name='tsc_adjust'/> <feature name='pdpe1gb'/> <feature name='abm'/> - <feature name='tsc_adjust'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml index 67b1dc7..ff6ab65 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml @@ -5,8 +5,8 @@ <feature policy='require' name='ss'/> <feature policy='require' name='pcid'/> <feature policy='require' name='hypervisor'/> - <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='disable' name='xsave'/> <feature policy='disable' name='avx'/> </cpu> diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml index 3292264..1aadbf3 100644 --- a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml +++ b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml @@ -5,6 +5,6 @@ <feature policy='require' name='ss'/> <feature policy='require' name='x2apic'/> <feature policy='require' name='hypervisor'/> - <feature policy='require' name='rdtscp'/> <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='rdtscp'/> </cpu> -- 2.8.4