[libvirt] [PATCH] cpu: Remove redundant features

[Jiri Denemark]

Some features provided by the recently added CPU models were mentioned
twice for each model. This was a result of automatic generation of the
XML from qemu's CPU configuration file without noticing this redundancy.
---
 src/cpu/cpu_map.xml |   84 ---------------------------------------------------
 1 files changed, 0 insertions(+), 84 deletions(-)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 986c61d..edbb21c 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -357,284 +357,200 @@
     <model name='Conroe'>
       <vendor>Intel</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
       <feature name='ssse3'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='lahf_lm'/>
     </model>
 
     <model name='Penryn'>
       <vendor>Intel</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
       <feature name='cx16'/>
       <feature name='ssse3'/>
       <feature name='sse4.1'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='lahf_lm'/>
     </model>
 
     <model name='Nehalem'>
       <vendor>Intel</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
       <feature name='cx16'/>
       <feature name='ssse3'/>
       <feature name='sse4.1'/>
       <feature name='sse4.2'/>
       <feature name='popcnt'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='lahf_lm'/>
     </model>
 
     <model name='Opteron_G1'>
       <vendor>AMD</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
     </model>
 
     <model name='Opteron_G2'>
       <vendor>AMD</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
       <feature name='cx16'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='rdtscp'/>
       <feature name='svm'/>
       <feature name='lahf_lm'/>
     </model>
 
     <model name='Opteron_G3'>
       <vendor>AMD</vendor>
       <feature name='sse2'/>
       <feature name='sse'/>
       <feature name='fxsr'/>
       <feature name='mmx'/>
       <feature name='pat'/>
       <feature name='cmov'/>
       <feature name='pge'/>
       <feature name='sep'/>
       <feature name='apic'/>
       <feature name='cx8'/>
       <feature name='mce'/>
       <feature name='pae'/>
       <feature name='msr'/>
       <feature name='tsc'/>
       <feature name='pse'/>
       <feature name='de'/>
       <feature name='fpu'/>
       <feature name='mtrr'/>
       <feature name='clflush'/>
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
       <feature name='cx16'/>
       <feature name='monitor'/>
       <feature name='popcnt'/>
-      <feature name='fxsr'/>
-      <feature name='mmx'/>
-      <feature name='pat'/>
-      <feature name='cmov'/>
-      <feature name='pge'/>
-      <feature name='apic'/>
-      <feature name='cx8'/>
-      <feature name='mce'/>
-      <feature name='pae'/>
-      <feature name='msr'/>
-      <feature name='tsc'/>
-      <feature name='pse'/>
-      <feature name='de'/>
-      <feature name='fpu'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='rdtscp'/>
       <feature name='svm'/>
       <feature name='sse4a'/>
       <feature name='abm'/>
       <feature name='misalignsse'/>
       <feature name='lahf_lm'/>
     </model>
   </arch>
 </cpus>
-- 
1.7.3.1