From e7a16e6804911001e7c1efd403d88cc995c7898b Mon Sep 17 00:00:00 2001 From: Chris Townsend Date: Wed, 16 Sep 2020 15:27:31 -0400 Subject: [PATCH] Explicitly disable XSAVES MacOS 11 hypervisor framework support XSAVES Add the XSAVES control bit to the list of disabled controls. Signed-off-by: Chris Townsend --- src/include/xhyve/vmm/intel/vmx_controls.h | 1 + src/lib/vmm/intel/vmx.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/include/xhyve/vmm/intel/vmx_controls.h b/src/include/xhyve/vmm/intel/vmx_controls.h index cd97cbb5..2b2b41c0 100644 --- 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 index 1aa62d24..ac214a50 100644 --- 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 | \