moved memory hooks out of core memory map implementation,

[palacios.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 0511754..fc94d33 100644 (file)
--- 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;
@@ -111,33 +111,26 @@ 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);
-
        } 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;