Il 23/07/2013 11:41, Jason Wang ha scritto: > Switch to use hypervisor_cpuid_base() to detect KVM. > > Cc: Gleb Natapov <[email protected]> > Cc: Paolo Bonzini <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: "H. Peter Anvin" <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Jason Wang <[email protected]> > --- > arch/x86/include/asm/kvm_para.h | 17 ++--------------- > 1 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h > index 695399f..79bd075 100644 > --- a/arch/x86/include/asm/kvm_para.h > +++ b/arch/x86/include/asm/kvm_para.h > @@ -2,6 +2,7 @@ > #define _ASM_X86_KVM_PARA_H > > #include <asm/processor.h> > +#include <asm/hypervisor.h> > #include <uapi/asm/kvm_para.h> > > extern void kvmclock_init(void); > @@ -87,24 +88,10 @@ static inline long kvm_hypercall4(unsigned int nr, > unsigned long p1, > > static inline bool kvm_para_available(void) > { > - unsigned int eax, ebx, ecx, edx; > - char signature[13]; > - > if (boot_cpu_data.cpuid_level < 0) > return false; /* So we don't blow up on old processors */ > > - if (cpu_has_hypervisor) { > - cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx); > - memcpy(signature + 0, &ebx, 4); > - memcpy(signature + 4, &ecx, 4); > - memcpy(signature + 8, &edx, 4); > - signature[12] = 0; > - > - if (strcmp(signature, "KVMKVMKVM") == 0) > - return true; > - } > - > - return false; > + return hypervisor_cpuid_base("KVMKVMKVM", 0); > } > > static inline unsigned int kvm_arch_para_features(void) >
Reviewed-by: Paolo Bonzini <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
