diff options
author | Alex Ionescu <aionescu@gmail.com> | 2017-03-15 18:34:06 +0300 |
---|---|---|
committer | Alex Ionescu <aionescu@gmail.com> | 2017-03-15 18:34:06 +0300 |
commit | d2894e306403cb00428c6c1fd943ebeee0118f4c (patch) | |
tree | bcb88e5ae170ef43d17f2493529ae80f1beb9733 | |
parent | da15fb2990add069c6a659b4248122b46b09f4a4 (diff) |
Final RS2 Fix and Disable EPTs -- WHEA errors on some systems.
-rw-r--r-- | nt/shvos.c | 11 | ||||
-rw-r--r-- | shv_x.h | 2 | ||||
-rw-r--r-- | shvvmx.c | 4 |
3 files changed, 12 insertions, 5 deletions
@@ -51,10 +51,9 @@ KeSignalCallDpcSynchronize ( ); DECLSPEC_NORETURN -NTSYSAPI VOID __cdecl -RtlRestoreContext ( +ShvOsRestoreContext2 ( _In_ PCONTEXT ContextRecord, _In_opt_ struct _EXCEPTION_RECORD * ExceptionRecord ); @@ -244,6 +243,14 @@ ShvOsRunCallbackOnProcessors ( } VOID +ShvOsRestoreContext( + _In_ PCONTEXT ContextRecord + ) +{ + ShvOsRestoreContext2(ContextRecord, NULL); +} + +VOID ShvOsCaptureContext ( _In_ PCONTEXT ContextRecord ) @@ -25,8 +25,6 @@ Environment: #include "vmx.h" -#define ShvOsRestoreContext RtlRestoreContext - #define SHV_STATUS_SUCCESS 0 #define SHV_STATUS_NOT_AVAILABLE -1 #define SHV_STATUS_NO_RESOURCES -2 @@ -93,8 +93,10 @@ ShvVmxEnterRootModeOnVp ( { // // Enable EPT if these features are supported + // Temporarily Disable // - VpData->EptControls = SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_ENABLE_VPID; + VpData->EptControls = 0; + //VpData->EptControls = SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_ENABLE_VPID; } // |