cpu_map.xml: Expand pentiumpro CPU model

Inheritance among CPU model is cool but it makes reviewing CPU model
definitions and comparing them to CPU models from QEMU rather hard and
unpleasant. Let's define all CPU models from scratch.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-06-23 14:38:06 +02:00
parent 0556d32cff
commit 272ef5be93

View File

@ -416,14 +416,30 @@
</model> </model>
<model name='coreduo'> <model name='coreduo'>
<model name='pentiumpro'/>
<vendor name='Intel'/> <vendor name='Intel'/>
<feature name='apic'/>
<feature name='clflush'/> <feature name='clflush'/>
<feature name='cmov'/>
<feature name='cx8'/>
<feature name='de'/>
<feature name='fpu'/>
<feature name='fxsr'/>
<feature name='mca'/> <feature name='mca'/>
<feature name='mce'/>
<feature name='mmx'/>
<feature name='monitor'/> <feature name='monitor'/>
<feature name='msr'/>
<feature name='mtrr'/> <feature name='mtrr'/>
<feature name='nx'/> <feature name='nx'/>
<feature name='pae'/>
<feature name='pat'/>
<feature name='pge'/>
<feature name='pni'/> <feature name='pni'/>
<feature name='pse'/>
<feature name='sep'/>
<feature name='sse'/>
<feature name='sse2'/>
<feature name='tsc'/>
<feature name='vme'/> <feature name='vme'/>
</model> </model>
@ -441,8 +457,24 @@
<!-- Generic QEMU CPU models --> <!-- Generic QEMU CPU models -->
<model name='qemu32'> <model name='qemu32'>
<model name='pentiumpro'/> <feature name='apic'/>
<feature name='cmov'/>
<feature name='cx8'/>
<feature name='de'/>
<feature name='fpu'/>
<feature name='fxsr'/>
<feature name='mce'/>
<feature name='mmx'/>
<feature name='msr'/>
<feature name='pae'/>
<feature name='pat'/>
<feature name='pge'/>
<feature name='pni'/> <feature name='pni'/>
<feature name='pse'/>
<feature name='sep'/>
<feature name='sse'/>
<feature name='sse2'/>
<feature name='tsc'/>
</model> </model>
<model name='kvm32'> <model name='kvm32'>
@ -486,18 +518,34 @@
<!-- Intel CPU models --> <!-- Intel CPU models -->
<model name='Conroe'> <model name='Conroe'>
<model name='pentiumpro'/>
<vendor name='Intel'/> <vendor name='Intel'/>
<feature name='apic'/>
<feature name='clflush'/> <feature name='clflush'/>
<feature name='cmov'/>
<feature name='cx8'/>
<feature name='de'/>
<feature name='fpu'/>
<feature name='fxsr'/>
<feature name='lahf_lm'/> <feature name='lahf_lm'/>
<feature name='lm'/> <feature name='lm'/>
<feature name='mca'/> <feature name='mca'/>
<feature name='mce'/>
<feature name='mmx'/>
<feature name='msr'/>
<feature name='mtrr'/> <feature name='mtrr'/>
<feature name='nx'/> <feature name='nx'/>
<feature name='pae'/>
<feature name='pat'/>
<feature name='pge'/>
<feature name='pni'/> <feature name='pni'/>
<feature name='pse'/>
<feature name='pse36'/> <feature name='pse36'/>
<feature name='sep'/>
<feature name='sse'/>
<feature name='sse2'/>
<feature name='ssse3'/> <feature name='ssse3'/>
<feature name='syscall'/> <feature name='syscall'/>
<feature name='tsc'/>
</model> </model>
<model name='Penryn'> <model name='Penryn'>
@ -563,13 +611,29 @@
<!-- AMD CPUs --> <!-- AMD CPUs -->
<model name='athlon'> <model name='athlon'>
<model name='pentiumpro'/>
<vendor name='AMD'/> <vendor name='AMD'/>
<feature name='3dnow'/> <feature name='3dnow'/>
<feature name='3dnowext'/> <feature name='3dnowext'/>
<feature name='apic'/>
<feature name='cmov'/>
<feature name='cx8'/>
<feature name='de'/>
<feature name='fpu'/>
<feature name='fxsr'/>
<feature name='mce'/>
<feature name='mmx'/>
<feature name='mmxext'/> <feature name='mmxext'/>
<feature name='msr'/>
<feature name='mtrr'/> <feature name='mtrr'/>
<feature name='pae'/>
<feature name='pat'/>
<feature name='pge'/>
<feature name='pse'/>
<feature name='pse36'/> <feature name='pse36'/>
<feature name='sep'/>
<feature name='sse'/>
<feature name='sse2'/>
<feature name='tsc'/>
<feature name='vme'/> <feature name='vme'/>
</model> </model>