From 1a8f54df4971a49c20d2fda6a571bd837dcaa902 Mon Sep 17 00:00:00 2001 From: Masato Imai Date: Sun, 10 Aug 2025 14:57:56 +0000 Subject: [PATCH] wip --- nel_os_kernel/src/vmm/x86_64/intel/msr.rs | 2 +- nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nel_os_kernel/src/vmm/x86_64/intel/msr.rs b/nel_os_kernel/src/vmm/x86_64/intel/msr.rs index e0da2ab..9263057 100644 --- a/nel_os_kernel/src/vmm/x86_64/intel/msr.rs +++ b/nel_os_kernel/src/vmm/x86_64/intel/msr.rs @@ -169,7 +169,7 @@ impl ShadowMsr { } pub fn phys(&self) -> PhysAddr { - PhysAddr::new(self.ents.as_ptr() as u64) + PhysAddr::new((&self.ents as *const Vec) as u64) } pub fn concat(r1: u64, r2: u64) -> u64 { 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 7c8ef1a..dbaa892 100644 --- a/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs +++ b/nel_os_kernel/src/vmm/x86_64/intel/vcpu.rs @@ -119,7 +119,7 @@ impl IntelVCpu { } fn vmentry(&mut self) -> Result<(), InstructionError> { - msr::update_msrs(self).unwrap(); + //msr::update_msrs(self).unwrap(); let success = { let result: u16;