Merge pull request #174 from dx9/disable-vmcs-shadowing

Explicitly disable VMCS shadowing
machyve · Oct 1, 2019 · 1f46a3d · 1f46a3d
2 parents ce875de + 0c3c50a
commit 1f46a3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/xhyve/vmm/intel/vmx_controls.h b/include/xhyve/vmm/intel/vmx_controls.h
@@ -72,6 +72,7 @@
 #define	PROCBASED2_PAUSE_LOOP_EXITING		(1u << 10)
 #define	PROCBASED2_RDRAND_EXITING		(1u << 11)
 #define	PROCBASED2_ENABLE_INVPCID		(1u << 12)
+#define	PROCBASED2_VMCS_SHADOW			(1u << 14)
 #define	PROCBASED2_RDSEED_EXITING		(1u << 16)
 
 /* VM Exit Controls */

diff --git a/src/vmm/intel/vmx.c b/src/vmm/intel/vmx.c
@@ -89,7 +89,8 @@
 	 PROCBASED2_PAUSE_LOOP_EXITING /* FIXME */ | \
 	 PROCBASED2_RDRAND_EXITING | \
 	 PROCBASED2_ENABLE_INVPCID /* FIXME */ | \
-	 PROCBASED2_RDSEED_EXITING)
+	 PROCBASED2_RDSEED_EXITING | \
+	 PROCBASED2_VMCS_SHADOW )
 #define PINBASED_CTLS_ONE_SETTING \
 	(PINBASED_EXTINT_EXITING | \
 	 PINBASED_NMI_EXITING | \