mii/nel_os
1
0
Fork 0
mirror of https://github.com/mii443/nel_os.git synced 2025-08-22 16:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Masato Imai
2025-05-08 05:49:04 +00:00
parent 27be632322
commit 6c4849d1af
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmm/vcpu.rs
View File

@ -6,7 +6,7 @@ use x86::{
msr::{rdmsr, IA32_EFER, IA32_FS_BASE}, msr::{rdmsr, IA32_EFER, IA32_FS_BASE},
vmx::{vmcs, VmFail}, vmx::{vmcs, VmFail},
}; };
use x86_64::VirtAddr; use x86_64::{registers::control::Cr4Flags, VirtAddr};
use crate::{ use crate::{
info, info,
@ -220,6 +220,7 @@ impl VCpu {
primary_exec_ctrl.0 &= (reserved_bits >> 32) as u32; primary_exec_ctrl.0 &= (reserved_bits >> 32) as u32;
primary_exec_ctrl.set_hlt(false); primary_exec_ctrl.set_hlt(false);
primary_exec_ctrl.set_activate_secondary_controls(true); primary_exec_ctrl.set_activate_secondary_controls(true);
primary_exec_ctrl.set_use_tpr_shadow(true);
primary_exec_ctrl.write(); primary_exec_ctrl.write();
@ -356,7 +357,10 @@ impl VCpu {
& !Cr0::CR0_ENABLE_PAGING; & !Cr0::CR0_ENABLE_PAGING;
vmwrite(vmcs::guest::CR0, cr0.bits() as u64)?; vmwrite(vmcs::guest::CR0, cr0.bits() as u64)?;
vmwrite(vmcs::guest::CR3, cr3())?; vmwrite(vmcs::guest::CR3, cr3())?;
vmwrite(vmcs::guest::CR4, cr4().bits() as u64)?; vmwrite(
vmcs::guest::CR4,
vmread(vmcs::guest::CR4)? | Cr4Flags::VIRTUAL_MACHINE_EXTENSIONS.bits(),
)?;
vmwrite(vmcs::guest::CS_BASE, 0)?; vmwrite(vmcs::guest::CS_BASE, 0)?;
vmwrite(vmcs::guest::SS_BASE, 0)?; vmwrite(vmcs::guest::SS_BASE, 0)?;