lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, kvm: Switch to use hypervisor_cpuid_base()

Browse Source 
Switch to use hypervisor_cpuid_base() to detect KVM.

Cc: Gleb Natapov <gleb@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/1374742475-2485-3-git-send-email-jasowang@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Jason Wang
2013-07-25 16:54:34 +08:00
committed by H. Peter Anvin
parent 448ac44d56
commit 1085ba7f55
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/include/asm/kvm_para.h
View File

@@ -85,26 +85,20 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
return ret; return ret;
} }
static inline bool kvm_para_available(void) static inline uint32_t kvm_cpuid_base(void)
{ {
unsigned int eax, ebx, ecx, edx;
char signature[13];
if (boot_cpu_data.cpuid_level < 0) if (boot_cpu_data.cpuid_level < 0)
return false; /* So we don't blow up on old processors */ return 0; /* So we don't blow up on old processors */
if (cpu_has_hypervisor) { if (cpu_has_hypervisor)
cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx); return hypervisor_cpuid_base("KVMKVMKVM\0\0\0", 0);
memcpy(signature + 0, &ebx, 4);
memcpy(signature + 4, &ecx, 4);
memcpy(signature + 8, &edx, 4);
signature[12] = 0;
if (strcmp(signature, "KVMKVMKVM") == 0) return 0;
return true;
} }
return false; static inline bool kvm_para_available(void)
{
return kvm_cpuid_base() != 0;
} }
static inline unsigned int kvm_arch_para_features(void) static inline unsigned int kvm_arch_para_features(void)