summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnupam Chanda <achanda@nicira.com>2011-07-08 11:42:50 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-08 16:22:29 -0700
commit24a42bae6852d27ae569757f5415c91538e6a255 (patch)
tree422cb4383bf5978bf28c11a8621f5ed2f8b06683 /arch
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
downloadop-kernel-dev-24a42bae6852d27ae569757f5415c91538e6a255.zip
op-kernel-dev-24a42bae6852d27ae569757f5415c91538e6a255.tar.gz
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: 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/hypervisor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 8095f86..755f64fb 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -32,11 +32,11 @@
*/
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;
OpenPOWER on IntegriCloud