diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 5e7534f433..6cdd97c666 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -639,7 +639,6 @@
     </model>
 
     <model name='qemu64'>
-      <model name='kvm64'/>
       <!-- These are supported only by TCG.  KVM supports them only if the
            host does.  So we leave them out:
 
@@ -648,7 +647,33 @@
            <feature name='popcnt'/>
            <feature name='sse4a'/>
       -->
+      <feature name='apic'/>
+      <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx16'/>
+      <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='svm'/>
+      <feature name='syscall'/>
+      <feature name='tsc'/>
     </model>
 
     <!-- Intel CPU models -->