From ef00a05e515f93f681c1546fad5d90757b986dc2 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 27 Jan 2012 14:49:47 +0100
Subject: [PATCH] x86: add kvm32 and kvm64, update qemu64

Recently (or not so recently) QEMU added the kvm32 and kvm64
architectures, representing a least common denominator of all
hosts that can run KVM.  Add them to the machine map.

Also, some features that TCG supports were added to qemu64.
Add them to the cpu_map.xml whenever KVM is guaranteed to support
those.  We still have to leave some out, because they would not
be available to guests running on older hosts.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 src/cpu/cpu_map.xml                           | 31 +++++++++++++++++++
 .../x86-baseline-no-vendor-result.xml         |  5 ++-
 .../x86-host+guest,models,qemu64-result.xml   |  1 -
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 693caf1144..3e6810fccf 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -303,6 +303,15 @@
       <feature name='pni'/>
     </model>
 
+    <model name='kvm32'>
+      <model name='pentiumpro'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+    </model>
+
     <model name='coreduo'>
       <model name='pentiumpro'/>
       <feature name='vme'/>
@@ -321,10 +330,32 @@
       <feature name='mca'/>
       <feature name='pse36'/>
       <feature name='pni'/>
+      <feature name='cx16'/>
       <feature name='lm'/>
       <feature name='syscall'/>
       <feature name='nx'/>
       <feature name='svm'/>
+      <!-- These are supported only by TCG.  KVM supports them only if the
+           host does.  So we leave them out:
+
+           <feature name='popcnt'/>
+           <feature name='lahf_lm'/>
+           <feature name='sse4a'/>
+           <feature name='abm'/>
+      -->
+    </model>
+
+    <model name='kvm64'>
+      <model name='pentiumpro'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='cx16'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
     </model>
 
     <model name='core2duo'>
diff --git a/tests/cputestdata/x86-baseline-no-vendor-result.xml b/tests/cputestdata/x86-baseline-no-vendor-result.xml
index a14bb7e6af..4b4921cf93 100644
--- a/tests/cputestdata/x86-baseline-no-vendor-result.xml
+++ b/tests/cputestdata/x86-baseline-no-vendor-result.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>Opteron_G2</model>
-  <feature policy='disable' name='svm'/>
-  <feature policy='disable' name='rdtscp'/>
+  <model fallback='allow'>kvm64</model>
+  <feature policy='require' name='lahf_lm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml b/tests/cputestdata/x86-host+guest,models,qemu64-result.xml
index 1f15d6ec8b..469d39ac79 100644
--- a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml
+++ b/tests/cputestdata/x86-host+guest,models,qemu64-result.xml
@@ -6,7 +6,6 @@
   <feature policy='require' name='sse4.1'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='cx16'/>
   <feature policy='require' name='ssse3'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='pbe'/>