From b394808012b6a3d5d2c42ce68a5897a88b0b983d Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Sun, 3 Feb 2013 17:22:38 -0800 Subject: [PATCH] --- yaml --- r: 350234 b: refs/heads/master c: db34bbb767bdfa1ebed7214b876fe01c5b7ee457 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mshyperv.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 267f75619439..329ec488c59a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32068f6527b8f1822a30671dedaf59c567325026 +refs/heads/master: db34bbb767bdfa1ebed7214b876fe01c5b7ee457 diff --git a/trunk/arch/x86/kernel/cpu/mshyperv.c b/trunk/arch/x86/kernel/cpu/mshyperv.c index 646d192b18a2..4dab317f79b9 100644 --- a/trunk/arch/x86/kernel/cpu/mshyperv.c +++ b/trunk/arch/x86/kernel/cpu/mshyperv.c @@ -30,6 +30,13 @@ static bool __init ms_hyperv_platform(void) if (!boot_cpu_has(X86_FEATURE_HYPERVISOR)) return false; + /* + * Xen emulates Hyper-V to support enlightened Windows. + * Check to see first if we are on a Xen Hypervisor. + */ + if (xen_cpuid_base()) + return false; + cpuid(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS, &eax, &hyp_signature[0], &hyp_signature[1], &hyp_signature[2]);