On Tue, Jul 23, 2013 at 05:41:03PM +0800, Jason Wang wrote:
> Switch to use hypervisor_cpuid_base() to detect Xen.
> 
> Cc: Konrad Rzeszutek Wilk <[email protected]>

Acked-by: Konrad Rzeszutek Wilk <[email protected]>
> Cc: Jeremy Fitzhardinge <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: "H. Peter Anvin" <[email protected]>
> Cc: [email protected]
> Cc: Paolo Bonzini <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Jason Wang <[email protected]>
> ---
>  arch/x86/include/asm/xen/hypervisor.h |   16 +---------------
>  1 files changed, 1 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/x86/include/asm/xen/hypervisor.h 
> b/arch/x86/include/asm/xen/hypervisor.h
> index 125f344..d866959 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
> -- 
> 1.7.1
> 
> --
> 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/
> 
--
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/

Reply via email to