From: Martin Kletzander <mkletzan@redhat.com>
Date: Fri, 9 Mar 2012 13:31:47 +0000 (+0100)
Subject: Removed more AMD-specific features from cpu64-rhel* models
X-Git-Tag: v0.9.11-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e235026bdaff4122b6dd74e5642ecc536712f4;p=thirdparty%2Flibvirt.git

Removed more AMD-specific features from cpu64-rhel* models

We found few more AMD-specific features in cpu64-rhel* models that
made it impossible to start qemu guest on Intel host (with this
setting) even though qemu itself starts correctly with them.
This impacts one test, thus the fix in tests/cputestdata/.
---

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 7ef230ed85..6a6603bc9b 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -347,7 +347,6 @@
     </model>
 
     <model name='cpu64-rhel6'>
-      <feature name='abm'/>
       <feature name='apic'/>
       <feature name='clflush'/>
       <feature name='cmov'/>
@@ -373,7 +372,6 @@
       <feature name='sse'/>
       <feature name='sse2'/>
       <feature name='pni'/>
-      <feature name='sse4a'/>
       <feature name='syscall'/>
       <feature name='tsc'/>
     </model>
diff --git a/tests/cputestdata/x86-baseline-no-vendor-result.xml b/tests/cputestdata/x86-baseline-no-vendor-result.xml
index 4b4921cf93..00e03b2152 100644
--- a/tests/cputestdata/x86-baseline-no-vendor-result.xml
+++ b/tests/cputestdata/x86-baseline-no-vendor-result.xml
@@ -1,4 +1,3 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>kvm64</model>
-  <feature policy='require' name='lahf_lm'/>
+  <model fallback='allow'>cpu64-rhel6</model>
 </cpu>