x86/kvm/svm: Simplify cpu_has_svm()
authorBorislav Petkov <bp@suse.de>
Mon, 9 May 2016 09:53:06 +0000 (11:53 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 15 Jun 2016 22:04:31 +0000 (00:04 +0200)
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>
arch/x86/include/asm/svm.h
arch/x86/include/asm/virtext.h

index d0fe23ec7e987700f6e1297831369ed3ee80ef48..14824fc78f7e7160fa014979424f111a8a2e40f0 100644 (file)
@@ -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
index cce9ee68e335f86e4bf8ca54784924c4f7202196..0116b2ee9e64f34ebf612a0380410af39b4dd2e5 100644 (file)
@@ -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;