diff options
| author |   Martin Kletzander <mkletzan@redhat.com> | 2012-03-09 14:31:47 +0100 |
|---|---|---|
| committer |   Jiri Denemark <jdenemar@redhat.com> | 2012-03-09 14:36:31 +0100 |
| commit | 19e235026bdaff4122b6dd74e5642ecc536712f4 (patch) | |
| tree | 5f51208e181e4d213df7db6d6f1a14e2ebc532fb | |
| parent | conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts. (diff) | |
| download | libvirt-19e235026bdaff4122b6dd74e5642ecc536712f4.tar.gz libvirt-19e235026bdaff4122b6dd74e5642ecc536712f4.tar.bz2 libvirt-19e235026bdaff4122b6dd74e5642ecc536712f4.zip | |
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/.
| -rw-r--r-- | src/cpu/cpu_map.xml | 2 | ||||
| -rw-r--r-- | tests/cputestdata/x86-baseline-no-vendor-result.xml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 7ef230ed8..6a6603bc9 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 4b4921cf9..00e03b215 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> |