Fixed nested paging to work again, minor change to configuration syntax of shadow...

[palacios-OLD.git] / palacios / src / palacios / vmm_direct_paging_64.h

diff --git a/palacios/src/palacios/vmm_direct_paging_64.h b/palacios/src/palacios/vmm_direct_paging_64.h
index fc94d33..a0408d9 100644 (file)
--- a/palacios/src/palacios/vmm_direct_paging_64.h
+++ b/palacios/src/palacios/vmm_direct_paging_64.h
@@ -46,7 +46,7 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * info,
 
     
 
-    struct v3_shadow_region * region =  v3_get_shadow_region(info->vm_info, info->cpu_id, fault_addr);
+    struct v3_mem_region * region =  v3_get_mem_region(info->vm_info, info->cpu_id, fault_addr);
   
     if (region == NULL) {
        PrintError("Invalid region in passthrough page fault 64, addr=%p\n", 
@@ -54,9 +54,6 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * info,
        return -1;
     }
 
-    host_addr = v3_get_shadow_addr(region, info->cpu_id, fault_addr);
-    //
-
     // Lookup the correct PML address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
        pml = CR3_TO_PML4E64_VA(info->ctrl_regs.cr3);
@@ -122,6 +119,11 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * info,
                pte[pte_index].writable = 0;
            }
 
+           if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+               PrintError("Error Could not translate fault addr (%p)\n", (void *)fault_addr);
+               return -1;
+           }
+
            pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
        } else {
            return region->unhandled(info, fault_addr, fault_addr, region, error_code);