mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
x86/kvm/svm: Simplify cpu_has_svm()
Use already cached CPUID information instead of querying CPUID again. No functionality change. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Joerg Roedel <joro@8bytes.org> Cc: kvm@vger.kernel.org Cc: x86@kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
4e10b764e2
commit
682a810887
2 changed files with 2 additions and 7 deletions
|
@ -193,7 +193,6 @@ struct __attribute__ ((__packed__)) vmcb {
|
|||
struct vmcb_save_area save;
|
||||
};
|
||||
|
||||
#define SVM_CPUID_FEATURE_SHIFT 2
|
||||
#define SVM_CPUID_FUNC 0x8000000a
|
||||
|
||||
#define SVM_VM_CR_SVM_DISABLE 4
|
||||
|
|
|
@ -83,23 +83,19 @@ static inline void cpu_emergency_vmxoff(void)
|
|||
*/
|
||||
static inline int cpu_has_svm(const char **msg)
|
||||
{
|
||||
uint32_t eax, ebx, ecx, edx;
|
||||
|
||||
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) {
|
||||
if (msg)
|
||||
*msg = "not amd";
|
||||
return 0;
|
||||
}
|
||||
|
||||
cpuid(0x80000000, &eax, &ebx, &ecx, &edx);
|
||||
if (eax < SVM_CPUID_FUNC) {
|
||||
if (boot_cpu_data.extended_cpuid_level < SVM_CPUID_FUNC) {
|
||||
if (msg)
|
||||
*msg = "can't execute cpuid_8000000a";
|
||||
return 0;
|
||||
}
|
||||
|
||||
cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
|
||||
if (!(ecx & (1 << SVM_CPUID_FEATURE_SHIFT))) {
|
||||
if (!boot_cpu_has(X86_FEATURE_SVM)) {
|
||||
if (msg)
|
||||
*msg = "svm not available";
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue