moved direct paging implementation over to new memory region flags structure

[palacios.git] / palacios / src / palacios / vmm_direct_paging_32.h

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index f7f8a5a..047f2a6 100644 (file)
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -39,7 +39,7 @@ 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_shadow_region * region = v3_get_shadow_region(info->vm_info, fault_addr);
+    struct v3_shadow_region * region = v3_get_shadow_region(info->vm_info, info->cpu_id, fault_addr);
 
     if (region == NULL) {
        PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
@@ -47,7 +47,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
        return -1;
     }
     
-    host_addr = v3_get_shadow_addr(region, fault_addr);
+    host_addr = v3_get_shadow_addr(region, info->cpu_id, fault_addr);
     
     // Lookup the correct PDE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
@@ -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;
 }