[refactor] modify guest_phys_to_host_phys

Author: hky1999

src/page_table.rs

@@ -129,17 +129,14 @@ impl<PTE: GenericPTE, H: PagingHandler, EPT: EPTTranslator> GuestPageTable64<PTE
 // private implements
 impl<PTE: GenericPTE, H: PagingHandler, EPT: EPTTranslator> GuestPageTable64<PTE, H, EPT> {
     fn table_of<'a>(&self, gpa: GuestPhysAddr) -> PagingResult<&'a [PTE]> {
-        let hpa = EPT::guest_phys_to_host_phys(gpa).ok_or_else(|| {
-            warn!("Failed to translate GPA {:?}", gpa);
-            PagingError::NotMapped
-        })?;
+        let hpa = EPT::guest_phys_to_host_phys(gpa)
+            .map(|(hpa, _flags, _pgsize)| hpa)
+            .ok_or_else(|| {
+                warn!("Failed to translate GPA {:?}", gpa);
+                PagingError::NotMapped
+            })?;
         let ptr = H::phys_to_virt(hpa).as_ptr() as _;
 
-        // debug!(
-        //     "GuestPageTable64::table_of gpa: {:?} hpa: {:?} ptr: {:p}",
-        //     gpa, hpa, ptr
-        // );
-
         Ok(unsafe { core::slice::from_raw_parts(ptr, ENTRY_COUNT) })
     }
 

src/vmx/vcpu.rs

@@ -348,7 +348,7 @@ impl<H: AxVCpuHal> VmxVcpu<H> {
             addr += read_size;
             remained_size -= read_size;
 
-            if let Some(hpa) = H::EPTTranslator::guest_phys_to_host_phys(gpa) {
+            if let Some((hpa, _flags, _pgsize)) = H::EPTTranslator::guest_phys_to_host_phys(gpa) {
                 let hva_ptr = H::PagingHandler::phys_to_virt(hpa).as_ptr();
                 for i in 0..read_size {
                     content.push(unsafe { hva_ptr.add(i).read() });