From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 23 Jun 2015 12:38:06 +0000 (+0200)
Subject: cpu_map.xml: Expand pentiumpro CPU model
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=272ef5be93f0fc4c440488d9bb37add86d002e3f;p=libvirt.git

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>
---

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 22c7928abb..af2d96e0d2 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -416,14 +416,30 @@
     </model>
 
     <model name='coreduo'>
-      <model name='pentiumpro'/>
       <vendor name='Intel'/>
+      <feature name='apic'/>
       <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx8'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='fxsr'/>
       <feature name='mca'/>
+      <feature name='mce'/>
+      <feature name='mmx'/>
       <feature name='monitor'/>
+      <feature name='msr'/>
       <feature name='mtrr'/>
       <feature name='nx'/>
+      <feature name='pae'/>
+      <feature name='pat'/>
+      <feature name='pge'/>
       <feature name='pni'/>
+      <feature name='pse'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
+      <feature name='tsc'/>
       <feature name='vme'/>
     </model>
 
@@ -441,8 +457,24 @@
 
     <!-- Generic QEMU CPU models -->
     <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='pse'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
+      <feature name='tsc'/>
     </model>
 
     <model name='kvm32'>
@@ -486,18 +518,34 @@
 
     <!-- Intel CPU models -->
     <model name='Conroe'>
-      <model name='pentiumpro'/>
       <vendor name='Intel'/>
+      <feature name='apic'/>
       <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx8'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='fxsr'/>
       <feature name='lahf_lm'/>
       <feature name='lm'/>
       <feature name='mca'/>
+      <feature name='mce'/>
+      <feature name='mmx'/>
+      <feature name='msr'/>
       <feature name='mtrr'/>
       <feature name='nx'/>
+      <feature name='pae'/>
+      <feature name='pat'/>
+      <feature name='pge'/>
       <feature name='pni'/>
+      <feature name='pse'/>
       <feature name='pse36'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
       <feature name='ssse3'/>
       <feature name='syscall'/>
+      <feature name='tsc'/>
     </model>
 
     <model name='Penryn'>
@@ -563,13 +611,29 @@
 
     <!-- AMD CPUs -->
     <model name='athlon'>
-      <model name='pentiumpro'/>
       <vendor name='AMD'/>
       <feature name='3dnow'/>
       <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='msr'/>
       <feature name='mtrr'/>
+      <feature name='pae'/>
+      <feature name='pat'/>
+      <feature name='pge'/>
+      <feature name='pse'/>
       <feature name='pse36'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
+      <feature name='tsc'/>
       <feature name='vme'/>
     </model>