Future/hypervisor
1
0
Fork 0
mirror of https://github.com/momo5502/hypervisor.git synced 2025-04-19 21:52:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
momo5502 2022-04-05 19:05:03 +02:00
parent 7645ffa4b4
commit c807dd2167
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/driver/hypervisor.cpp
View File

@ -354,7 +354,7 @@ void ShvVmxEptInitialize(vmx::state* VpData)
} }
UINT8 bool
ShvVmxEnterRootModeOnVp(vmx::state* VpData) ShvVmxEnterRootModeOnVp(vmx::state* VpData)
{ {
auto* launch_context = &VpData->launch_context; auto* launch_context = &VpData->launch_context;
@ -1025,40 +1025,19 @@ void initialize_msrs(vmx::launch_context& launch_context)
} }
} }
INT32 ShvVmxLaunchOnVp(vmx::state* VpData) void launch_hypervisor(vmx::state& vm_state)
{ {
initialize_msrs(VpData->launch_context); initialize_msrs(vm_state.launch_context);
ShvVmxMtrrInitialize(&vm_state);
ShvVmxEptInitialize(&vm_state);
// if (!ShvVmxEnterRootModeOnVp(&vm_state))
// Initialize all the MTRR-related MSRs by reading their value and build
// range structures to describe their settings
//
ShvVmxMtrrInitialize(VpData);
//
// Initialize the EPT structures
//
ShvVmxEptInitialize(VpData);
//
// Attempt to enter VMX root mode on this processor.
//
if (ShvVmxEnterRootModeOnVp(VpData) == FALSE)
{ {
throw std::runtime_error("Not available"); throw std::runtime_error("Not available");
} }
// ShvVmxSetupVmcsForVp(&vm_state);
// Initialize the VMCS, both guest and host state.
//
ShvVmxSetupVmcsForVp(VpData);
//
// Launch the VMCS, based on the guest data that was loaded into the
// various VMCS fields by ShvVmxSetupVmcsForVp. This will cause the
// processor to jump to ShvVpRestoreAfterLaunch on success, or return
// back to the caller on failure.
//
auto error_code = launch_vmx(); auto error_code = launch_vmx();
throw std::runtime_error(string::va("Failed to launch vmx: %X", error_code)); throw std::runtime_error(string::va("Failed to launch vmx: %X", error_code));
} }
@ -1076,7 +1055,7 @@ void hypervisor::enable_core(const uint64_t system_directory_table_base)
const rflags rflags{.flags = __readeflags()}; const rflags rflags{.flags = __readeflags()};
if (!rflags.alignment_check_flag) if (!rflags.alignment_check_flag)
{ {
ShvVmxLaunchOnVp(vm_state); launch_hypervisor(*vm_state);
} }
if (!is_hypervisor_present()) if (!is_hypervisor_present())