diff options
| author |   Eduardo Habkost <ehabkost@redhat.com> | 2013-01-04 20:01:08 -0200 |
|---|---|---|
| committer |   Andreas Färber <afaerber@suse.de> | 2013-01-08 21:03:44 +0100 |
| commit | 227146259e8deb14b7b30e7718e61512e0f524a9 (patch) | |
| tree | 1fb864c76115fc73bbe4f21bbb816c0e421ab9ec | |
| parent | target-i386: check/enforce: Do not ignore "hypervisor" flag (diff) | |
| download | qemu-227146259e8deb14b7b30e7718e61512e0f524a9.tar.xz qemu-227146259e8deb14b7b30e7718e61512e0f524a9.zip | |
target-i386: check/enforce: Check all CPUID.80000001H.EDX bits
I have no idea why PPRO_FEATURES was being ignored on the check of the
CPUID.80000001H.EDX bits. I believe it was a mistake, and it was
supposed to be ~(PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) or just
~CPUID_EXT2_AMD_ALIASES, because some time ago kvm_cpu_fill_host() used
the CPUID instruction directly (instead of
kvm_arch_get_supported_cpuid()).
But now kvm_cpu_fill_host() uses kvm_arch_get_supported_cpuid(), and
kvm_arch_get_supported_cpuid() returns all supported bits for
CPUID.80000001H.EDX, even the AMD aliases (that are explicitly copied
from CPUID.01H.EDX), so we can make the code check/enforce all the
CPUID.80000001H.EDX bits.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-i386/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a3d104d7dc..a2971d27eb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -961,7 +961,7 @@ static int kvm_check_features_against_host(x86_def_t *guest_def) {&guest_def->ext_features, &host_def.ext_features, ~0, ext_feature_name, 0x00000001, R_ECX}, {&guest_def->ext2_features, &host_def.ext2_features, - ~PPRO_FEATURES, ext2_feature_name, 0x80000001, R_EDX}, + ~0, ext2_feature_name, 0x80000001, R_EDX}, {&guest_def->ext3_features, &host_def.ext3_features, ~CPUID_EXT3_SVM, ext3_feature_name, 0x80000001, R_ECX} }; |