X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_64.h;h=a0408d9f25d72a2c40367157fa50f128bec9c3b5;hb=293e053b9199b12266c628e9737ecbad2d6497ee;hp=1c819ee4115052709dedaf54209bfb9747fc16f0;hpb=b06d0d0e5e57f5c4163a69efcabe6f96594ad814;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_direct_paging_64.h b/palacios/src/palacios/vmm_direct_paging_64.h
index 1c819ee..a0408d9 100644
--- a/palacios/src/palacios/vmm_direct_paging_64.h
+++ b/palacios/src/palacios/vmm_direct_paging_64.h
@@ -30,8 +30,8 @@
 
 
 static inline int handle_passthrough_pagefault_64(struct guest_info * info, 
-						     addr_t fault_addr, 
-						     pf_error_t error_code) {
+						  addr_t fault_addr, 
+						  pf_error_t error_code) {
     pml4e64_t * pml = NULL;
     pdpe64_t * pdpe = NULL;
     pde64_t * pde = NULL;
@@ -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, 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, 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);
@@ -111,33 +108,31 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * info,
     if (pte[pte_index].present == 0) {
 	pte[pte_index].user_page = 1;
 	
-	if (region->host_type == SHDW_REGION_ALLOCATED) {
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
 	    // Full access
 	    pte[pte_index].present = 1;
-	    pte[pte_index].writable = 1;
 
-	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-	    
-	} else if (region->host_type == SHDW_REGION_WRITE_HOOK) {
-	    // Only trap writes
-	    pte[pte_index].present = 1; 
-	    pte[pte_index].writable = 0;
+	    if (region->flags.write == 1) {
+		pte[pte_index].writable = 1;
+	    } else {
+		pte[pte_index].writable = 0;
+	    }
 
-	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-
-	} else if (region->host_type == SHDW_REGION_FULL_HOOK) {
-	    // trap all accesses
-	    return v3_handle_mem_full_hook(info, fault_addr, fault_addr, region, error_code);
+    	    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 {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
+	    return region->unhandled(info, fault_addr, fault_addr, region, error_code);
 	}
-    }
-   
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
+    } else {
+	// We fix all permissions on the first pass, 
+	// so we only get here if its an unhandled exception
+
+	return region->unhandled(info, fault_addr, fault_addr, region, error_code);
     }
 
     return 0;