[libvirt PATCH 1/5] cpu_map: Sort cpu features

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 259 ++++++++++++++++++----------------- 1 file changed, 130 insertions(+), 129 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 5845a2331b..8f46549e76 100644 --- 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'/> @@ -517,39 +517,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'/> @@ -626,6 +593,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'/> @@ -732,6 +732,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'/> @@ -776,8 +781,4 @@ <msr index='0x10a' edx='0x00000000' eax='0x01000000'/> </feature> - <!-- IA32_CORE_CAPABILITIES features --> - <feature name='split-lock-detect'> - <msr index='0xcf' edx='0x00000000' eax='0x00000020'/> - </feature> </cpus> -- 2.39.2