From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 11 Oct 2010 08:57:04 +0000 (+0200)
Subject: cpu: Remove redundant features
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a4deed4a0735103d8f9ba7763dff621009dcfa51;p=libvirt.git

cpu: Remove redundant features

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

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 986c61d2a2..edbb21c193 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -379,20 +379,6 @@
       <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'/>
@@ -426,20 +412,6 @@
       <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'/>
@@ -475,20 +447,6 @@
       <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'/>
@@ -519,20 +477,6 @@
       <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'/>
@@ -563,20 +507,6 @@
       <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'/>
@@ -612,20 +542,6 @@
       <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'/>