Re: [PATCH] Change hypervisor detection order

From: H. Peter Anvin
Date: Thu Jul 07 2011 - 20:29:32 EST


On 07/07/2011 11:19 AM, Anupam Chanda wrote:
> Detect Xen before HyperV because in Viridian compatibility mode Xen presents
> itself as HyperV.
>
> Signed-off-by: Anupam Chanda <achanda@xxxxxxxxxx>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> ---
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
> index 8095f86..ca23091 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -33,10 +33,10 @@
> static const __initconst struct hypervisor_x86 * const hypervisors[] =
> {
> &x86_hyper_vmware,
> - &x86_hyper_ms_hyperv,
> #ifdef CONFIG_XEN_PVHVM
> &x86_hyper_xen_hvm,
> #endif
> + &x86_hyper_ms_hyperv,
> };
>
> const struct hypervisor_x86 *x86_hyper;

Any reason to not hoist it to the top? I'm guessing Xen emulating
VMware is more likely than the opposite...

-hpa
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/