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

cpu_map.xml: Expand pentium 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 7b1ee6a14d..c21c7e015f 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -353,16 +353,24 @@
     </model>
 
     <model name='pentium2'>
-      <model name='pentium'/>
       <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='msr'/>
       <feature name='mtrr'/>
       <feature name='pae'/>
       <feature name='pat'/>
       <feature name='pge'/>
+      <feature name='pse'/>
       <feature name='pse36'/>
       <feature name='sep'/>
+      <feature name='tsc'/>
+      <feature name='vme'/>
     </model>
 
     <model name='pentium3'>