From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 23 Jun 2015 12:43:52 +0000 (+0200)
Subject: cpu_map.xml: Expand kvm32 CPU model
X-Git-Tag: v1.2.18-rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7e1677cf85290f2737d2de2f13e382d9d290d5e;p=thirdparty%2Flibvirt.git

cpu_map.xml: Expand kvm32 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 b3d7d14539..1114c0cfd7 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -552,10 +552,31 @@
     </model>
 
     <model name='cpu64-rhel5'>
-      <model name='kvm32'/>
+      <feature name='apic'/>
+      <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx8'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='fxsr'/>
       <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='syscall'/>
+      <feature name='tsc'/>
     </model>
 
     <model name='cpu64-rhel6'>