Commit 24a42bae authored by Anupam Chanda's avatar Anupam Chanda Committed by H. Peter Anvin

x86, hyper: Change hypervisor detection order

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: default avatarAnupam Chanda <achanda@nicira.com>
Link: http://lkml.kernel.org/r/1310150570-26810-1-git-send-email-achanda@nicira.comAcked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarYaozu (Eddie) Dong <eddie.dong@intel.com>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent fe0d4220
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
*/ */
static const __initconst struct hypervisor_x86 * const hypervisors[] = static const __initconst struct hypervisor_x86 * const hypervisors[] =
{ {
&x86_hyper_vmware,
&x86_hyper_ms_hyperv,
#ifdef CONFIG_XEN_PVHVM #ifdef CONFIG_XEN_PVHVM
&x86_hyper_xen_hvm, &x86_hyper_xen_hvm,
#endif #endif
&x86_hyper_vmware,
&x86_hyper_ms_hyperv,
}; };
const struct hypervisor_x86 *x86_hyper; const struct hypervisor_x86 *x86_hyper;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment