Merge pull request #295 from canonical/fix-disable-xsaves

djs55 · web-flow · commit d64481a254dd · 2020-12-16T20:45:14.000Z
Explicitly disable XSAVES
diff --git a/src/include/xhyve/vmm/intel/vmx_controls.h b/src/include/xhyve/vmm/intel/vmx_controls.h
@@ -74,6 +74,7 @@
 #define	PROCBASED2_ENABLE_INVPCID		(1u << 12)
 #define	PROCBASED2_VMCS_SHADOW			(1u << 14)
 #define	PROCBASED2_RDSEED_EXITING		(1u << 16)
+#define	PROCBASED2_XSAVES			(1u << 20)
 
 /* VM Exit Controls */
 #define	VM_EXIT_SAVE_DEBUG_CONTROLS	(1u << 2)
diff --git a/src/lib/vmm/intel/vmx.c b/src/lib/vmm/intel/vmx.c
@@ -92,7 +92,8 @@
 	 PROCBASED2_RDRAND_EXITING | \
 	 PROCBASED2_ENABLE_INVPCID /* FIXME */ | \
 	 PROCBASED2_RDSEED_EXITING | \
-	 PROCBASED2_VMCS_SHADOW)
+	 PROCBASED2_VMCS_SHADOW | \
+	 PROCBASED2_XSAVES)
 #define PINBASED_CTLS_ONE_SETTING \
 	(PINBASED_EXTINT_EXITING | \
 	 PINBASED_NMI_EXITING | \
