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>

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 693caf1144538494b0364c6ac22809ac824424be..3e6810fccf15d183ac529707cbd53fa843c0e708 100644 (file)
--- 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 a14bb7e6afb4aba9c29b59e74f631c4396dee9fc..4b4921cf9308bf67e51570f4b54b6e05d05fae12 100644 (file)
--- 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 1f15d6ec8b67970ea886388d1ec001dc91b72fd6..469d39ac796d27348a78f97aa0d8a5dd243e30bd 100644 (file)
--- 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'/>