linux-kernel - [PATCH] Change hypervisor detection order

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri,  8 Jul 2011 11:42:50 -0700
From:	Anupam Chanda <achanda@...ira.com>
To:	tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
	x86@...nel.org, stefano.stabellini@...citrix.com,
	jeremy.fitzhardinge@...rix.com, eddie.dong@...el.com,
	linux-kernel@...r.kernel.org
Cc:	achanda@...ira.com
Subject: [PATCH] Change hypervisor detection order

Detect Xen before HyperV because in Viridian compatibility mode Xen presents
itself as HyperV.

Signed-off-by: Anupam Chanda <achanda@...ira.com>
Acked-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
Acked-by: Yaozu (Eddie) Dong <eddie.dong@...el.com>
Reviewed-by: H. Peter Anvin <hpa@...or.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;
-- 
1.7.2.5

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