X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=e90c3da46fc9587b96ec4fccb5ef4a0060f047d2;hb=6cff7c8b0ec58e3b94d9583f709ca9056ae928dd;hp=9dee55039f7e940cae13563331963fbf7e1900b9;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index 9dee550..e90c3da 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -47,11 +47,6 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	return -1;
     }
     
-    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
-	PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
-	return -1;
-    }
-
     // Lookup the correct PDE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
 	pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
@@ -89,6 +84,11 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	    } else {
 		pte[pte_index].writable = 0;
 	    }
+
+    	    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+		PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
+		return -1;
+    	    }
 	    
 	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
 	} else {
@@ -129,12 +129,16 @@ static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr)
 	return 0;
     } else if (pde[pde_index].large_page) {
 	pde[pde_index].present = 0;
+	pde[pde_index].writable = 0;
+	pde[pde_index].user_page = 0;
 	return 0;
     }
 
     pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
 
     pte[pte_index].present = 0;
+    pte[pte_index].writable = 0;
+    pte[pte_index].user_page = 0;
 
     return 0;
 }