Skip to content

Commit

Permalink
target-i386: check/enforce: Check all CPUID.80000001H.EDX bits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ehabkost authored and afaerber committed Jan 8, 2013
1 parent 54830ff commit 2271462
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion target-i386/cpu.c
Expand Up @@ -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}
};
Expand Down

0 comments on commit 2271462

Please sign in to comment.