Messages in this thread Patch in this message | | | Date | Sat, 9 Jul 2011 00:01:03 GMT | From | tip-bot for Anupam Chanda <> | Subject | [tip:x86/detect-hyper] x86, hyper: Change hypervisor detection order |
| |
Commit-ID: 24a42bae6852d27ae569757f5415c91538e6a255 Gitweb: http://git.kernel.org/tip/24a42bae6852d27ae569757f5415c91538e6a255 Author: Anupam Chanda <achanda@nicira.com> AuthorDate: Fri, 8 Jul 2011 11:42:50 -0700 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Fri, 8 Jul 2011 16:22:29 -0700
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> --- arch/x86/kernel/cpu/hypervisor.c | 4 ++-- 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..755f64f 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;
| |