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

Fixes and ia32 doc

Browse Source
This commit is contained in:
momo5502 2022-03-27 16:21:54 +02:00
parent 2c48c4b595
commit 630b631692
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -5,3 +5,6 @@
path = external/vcrtl path = external/vcrtl
url = https://github.com/avakar/vcrtl.git url = https://github.com/avakar/vcrtl.git
ignore = dirty ignore = dirty
[submodule "external/ia32-doc"]
path = external/ia32-doc
url = https://github.com/wbenny/ia32-doc.git

1
external/ia32-doc vendored Submodule

@ -0,0 +1 @@
Subproject commit 77e021b690633e6274f4ebfc3734fdbd0be3bdf7

38
src/driver/hypervisor.cpp
View File

@ -17,7 +17,7 @@ namespace
bool is_vmx_supported() bool is_vmx_supported()
{ {
int cpuid_data[4] = {0}; int32_t cpuid_data[4] = {0};
__cpuid(cpuid_data, 1); __cpuid(cpuid_data, 1);
return cpuid_data[2] & 0x20; return cpuid_data[2] & 0x20;
} }
@ -35,6 +35,20 @@ namespace
{ {
return is_vmx_supported() && is_vmx_available(); return is_vmx_supported() && is_vmx_available();
} }
bool is_hypervisor_present()
{
int32_t cpuid_data[4] = {0};
__cpuid(cpuid_data, 1);
if ((cpuid_data[2] & 0x80000000) == 0)
{
return false;
}
__cpuid(cpuid_data, 0x40000001);
return cpuid_data[0] == 'momo';
}
} }
hypervisor::hypervisor() hypervisor::hypervisor()
@ -44,10 +58,12 @@ hypervisor::hypervisor()
throw std::runtime_error("Hypervisor already instantiated"); throw std::runtime_error("Hypervisor already instantiated");
} }
auto destructor = utils::finally([]() auto destructor = utils::finally([this]()
{ {
this->free_vm_states();
instance = nullptr; instance = nullptr;
}); });
instance = this; instance = this;
if (!is_virtualization_supported()) if (!is_virtualization_supported())
@ -56,6 +72,7 @@ hypervisor::hypervisor()
} }
debug_log("VMX supported!\n"); debug_log("VMX supported!\n");
this->allocate_vm_states();
this->enable(); this->enable();
destructor.cancel(); destructor.cancel();
} }
@ -63,6 +80,7 @@ hypervisor::hypervisor()
hypervisor::~hypervisor() hypervisor::~hypervisor()
{ {
this->disable(); this->disable();
this->free_vm_states();
instance = nullptr; instance = nullptr;
} }
@ -72,14 +90,10 @@ void hypervisor::disable()
{ {
this->disable_core(); this->disable_core();
}); });
this->free_vm_states();
} }
void hypervisor::enable() void hypervisor::enable()
{ {
this->allocate_vm_states();
const auto cr3 = __readcr3(); const auto cr3 = __readcr3();
bool success = true; bool success = true;
@ -91,6 +105,7 @@ void hypervisor::enable()
if (!success) if (!success)
{ {
this->disable(); this->disable();
throw std::runtime_error("Hypervisor initialization failed");
} }
} }
@ -115,11 +130,20 @@ bool hypervisor::try_enable_core(const uint64_t cr3)
void hypervisor::enable_core(uint64_t /*cr3*/) void hypervisor::enable_core(uint64_t /*cr3*/)
{ {
auto* vm_state = this->get_current_vm_state(); auto* vm_state = this->get_current_vm_state();
throw std::runtime_error("Not implemented!");
if (!is_hypervisor_present())
{
throw std::runtime_error("Hypervisor is not present");
}
} }
void hypervisor::disable_core() void hypervisor::disable_core()
{ {
if (!is_hypervisor_present())
{
return;
}
auto* vm_state = this->get_current_vm_state(); auto* vm_state = this->get_current_vm_state();
} }