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

cpu_map.xml: Expand Opteron_G2 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 2cfb075ef2..ba1418d4aa 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -1200,31 +1200,87 @@
     </model>
 
     <model name='Opteron_G3'>
-      <model name='Opteron_G2'/>
+      <vendor name='AMD'/>
       <feature name='abm'/>
+      <feature name='apic'/>
+      <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx16'/>
+      <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='misalignsse'/>
+      <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='popcnt'/>
+      <feature name='pse'/>
+      <feature name='pse36'/>
+      <feature name='rdtscp'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
       <feature name='sse4a'/>
+      <feature name='svm'/>
+      <feature name='syscall'/>
+      <feature name='tsc'/>
     </model>
 
     <model name='Opteron_G4'>
-      <model name='Opteron_G2'/>
-      <!-- Can't inherit from G3 because of missing "monitor"
-           feature -->
+      <vendor name='AMD'/>
       <feature name='3dnowprefetch'/>
       <feature name='abm'/>
       <feature name='aes'/>
+      <feature name='apic'/>
       <feature name='avx'/>
+      <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx16'/>
+      <feature name='cx8'/>
+      <feature name='de'/>
       <feature name='fma4'/>
+      <feature name='fpu'/>
+      <feature name='fxsr'/>
+      <feature name='lahf_lm'/>
+      <feature name='lm'/>
+      <feature name='mca'/>
+      <feature name='mce'/>
       <feature name='misalignsse'/>
+      <feature name='mmx'/>
+      <feature name='msr'/>
+      <feature name='mtrr'/>
+      <feature name='nx'/>
+      <feature name='pae'/>
+      <feature name='pat'/>
       <feature name='pclmuldq'/>
       <feature name='pdpe1gb'/>
+      <feature name='pge'/>
+      <feature name='pni'/>
       <feature name='popcnt'/>
+      <feature name='pse'/>
+      <feature name='pse36'/>
+      <feature name='rdtscp'/>
+      <feature name='sep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
       <feature name='sse4.1'/>
       <feature name='sse4.2'/>
       <feature name='sse4a'/>
       <feature name='ssse3'/>
+      <feature name='svm'/>
+      <feature name='syscall'/>
+      <feature name='tsc'/>
       <feature name='xop'/>
       <feature name='xsave'/>
     </model>