Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db34bbb7 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by H. Peter Anvin
Browse files

X86: Add a check to catch Xen emulation of Hyper-V



Xen emulates Hyper-V to host enlightened Windows. Looks like this
emulation may be turned on by default even for Linux guests. Check and
fail Hyper-V detection if we are on Xen.

[ hpa: the problem here is that Xen doesn't emulate Hyper-V well
  enough, and if the Xen support isn't compiled in, we end up stubling
  over the Hyper-V emulation and try to activate it -- and it fails. ]

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Link: http://lkml.kernel.org/r/1359940959-32168-2-git-send-email-kys@microsoft.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 32068f65
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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]);