x86, hyper: Change hypervisor detection order
authorAnupam Chanda <achanda@nicira.com>
Fri, 8 Jul 2011 18:42:50 +0000 (11:42 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 8 Jul 2011 23:22:29 +0000 (16:22 -0700)
Detect Xen before HyperV because in Viridian compatibility mode Xen
presents itself as HyperV.  Move Xen to the top since it seems more
likely that Xen would emulate VMware than vice versa.

Signed-off-by: Anupam Chanda <achanda@nicira.com>
Link: http://lkml.kernel.org/r/1310150570-26810-1-git-send-email-achanda@nicira.com
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Yaozu (Eddie) Dong <eddie.dong@intel.com>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/cpu/hypervisor.c

index 8095f8611f8ab1d2c51efcb45d0929842065bc47..755f64fb07432054f35026c74ce7a54ab57e97c9 100644 (file)
  */
 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_vmware,
+       &x86_hyper_ms_hyperv,
 };
 
 const struct hypervisor_x86 *x86_hyper;