diff --git a/nel_os_kernel/src/vmm/x86_64/intel/ept.rs b/nel_os_kernel/src/vmm/x86_64/intel/ept.rs index ee8d12b..c4486e1 100644 --- a/nel_os_kernel/src/vmm/x86_64/intel/ept.rs +++ b/nel_os_kernel/src/vmm/x86_64/intel/ept.rs @@ -105,7 +105,7 @@ impl EPT { &mut self, gpa: u64, hpa: u64, - allocator: &mut impl FrameAllocator, + allocator: &mut dyn FrameAllocator, ) -> Result<(), &'static str> { let lv4_index = (gpa >> 39) & 0x1FF; let lv3_index = (gpa >> 30) & 0x1FF; diff --git a/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs b/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs index 4caaff5..f04151c 100644 --- a/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs +++ b/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs @@ -144,8 +144,8 @@ impl IntelVCpu { let frame = frame_allocator.allocate_frame().ok_or("No free frames")?; let hpa = frame.start_address().as_u64(); - self.ept.map_2m(gpa, hpa, frame_allocator)?; - gpa += (4 * 1024) << 9; + self.ept.map_4k(gpa, hpa, frame_allocator)?; + gpa += 0x1000; pages -= 1; }