From: Haozhong Zhang <haozhong.zhang@intel.com>
Date: Wed, 1 Mar 2017 09:30:32 +0000 (+0100)
Subject: x86/hvm: check HAP before enabling nested VMX
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2626
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77751ed79e3c615f3d85dbf2b1573c3f5ed6aa5c;p=xen.git

x86/hvm: check HAP before enabling nested VMX

The current implementation of nested VMX cannot work without HAP.

Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 9eeb0a2ff2..3d623ecc7a 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4156,7 +4156,7 @@ static int hvmop_set_param(
          * Remove the check below once we have
          * shadow-on-shadow.
          */
-        if ( cpu_has_svm && !paging_mode_hap(d) && a.value )
+        if ( !paging_mode_hap(d) && a.value )
             rc = -EINVAL;
         if ( a.value &&
              d->arch.hvm_domain.params[HVM_PARAM_ALTP2M] )