X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=7f9ed8442a1460fc2940f112cd2c4459cdb52218;hb=c53e6ed4d6903df3c8351b8334848c466076d5b0;hp=b211ad95c01288cd592e4c3b4cb8b1852bdd95f4;hpb=293e053b9199b12266c628e9737ecbad2d6497ee;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index b211ad9..7f9ed84 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -39,10 +39,10 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     int pde_index = PDE32_INDEX(fault_addr);
     int pte_index = PTE32_INDEX(fault_addr);
     
-    struct v3_mem_region * region = v3_get_mem_region(info->vm_info, info->cpu_id, fault_addr);
+    struct v3_mem_region * region = v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
 
     if (region == NULL) {
-	PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
+        PrintError(info->vm_info, info, "Invalid region in passthrough page fault 32, addr=%p\n", 
 		   (void *)fault_addr);
 	return -1;
     }
@@ -86,7 +86,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	    }
 
     	    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
-		PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
+		PrintError(info->vm_info, info, "Could not translate fault address (%p)\n", (void *)fault_addr);
 		return -1;
     	    }
 	    
@@ -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;
 }