X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=047f2a6e7e0cf2b77f8119f58f9b977de8a06faf;hb=fd9690bf0f032246f2d2c596e2467cccc45faff6;hp=bfbb4a3f40ea3963d12b3e7ed084162358a2c2cc;hpb=36c1666cf64c49302d906a79d8cafbf760452d86;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index bfbb4a3..047f2a6 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -75,34 +75,26 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	
 	pte[pte_index].user_page = 1;
 	
-	if (region->host_type == SHDW_REGION_ALLOCATED) {
-	    // 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
-	    PrintDebug("Faulted in a write hook page\n");
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
+
 	    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);
-	} else {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
 	}
     }
-    
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	PrintDebug("Triggering Direct paging Write hook\n");
-	return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
-    }
 
+    if (region->flags.hook == 1) {
+	if ((error_code.write == 1) || (region->flags.read == 0))  {
+	    return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);	    
+	}
+    }
     
     return 0;
 }