From 448ac44d561f0aba5baac54bac62fe40d07230b6 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Thu, 25 Jul 2013 16:54:33 +0800 Subject: [PATCH] xen: Switch to use hypervisor_cpuid_base() Switch to use hypervisor_cpuid_base() to detect Xen. Cc: Konrad Rzeszutek Wilk Cc: Jeremy Fitzhardinge Cc: Paolo Bonzini Signed-off-by: Jason Wang Link: http://lkml.kernel.org/r/1374742475-2485-2-git-send-email-jasowang@redhat.com Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/xen/hypervisor.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 125f344f06a9..d866959e5685 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h @@ -40,21 +40,7 @@ extern struct start_info *xen_start_info; static inline uint32_t xen_cpuid_base(void) { - uint32_t base, eax, ebx, ecx, edx; - char signature[13]; - - for (base = 0x40000000; base < 0x40010000; base += 0x100) { - cpuid(base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature + 0) = ebx; - *(uint32_t *)(signature + 4) = ecx; - *(uint32_t *)(signature + 8) = edx; - signature[12] = 0; - - if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) - return base; - } - - return 0; + return hypervisor_cpuid_base("XenVMMXenVMM", 2); } #ifdef CONFIG_XEN -- 2.20.1