refactored memory map

[palacios.releases.git] / palacios / src / palacios / mmu / vmm_shdw_pg_swapbypass_32.h

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
index c0ce265..15c6d40 100644 (file)
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
@@ -205,7 +205,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     pte32_t * shadow_pte = (pte32_t *)&(shadow_pt[PTE32_INDEX(fault_addr)]);
     addr_t guest_pa = BASE_TO_PAGE_ADDR((addr_t)(guest_pte->page_base_addr)) +  PAGE_OFFSET(fault_addr);
 
-    struct v3_shadow_region * shdw_reg =  v3_get_shadow_region(info->vm_info, info->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(info->vm_info, info->cpu_id, guest_pa);
 
     if (shdw_reg == NULL) {
        // Inject a machine check in the guest
@@ -367,16 +367,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
            }
 
 
-
-           // Write hooks trump all, and are set Read Only
            if (shdw_reg->flags.write == 0) {
                shadow_pte->writable = 0;
            }
 
-       } else if (shdw_reg->flags.hook == 1) {
+       } else {
            // Page fault handled by hook functions
 
-           if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+           if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
                PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
                return -1;
            }
@@ -384,15 +382,16 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
        guest_pte->dirty = 1;
 
-       if (shdw_reg->flags.hook == 1) {
-           if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+
+       if (shdw_reg->flags.write == 1) {
+           PrintDebug("Shadow PTE Write Error\n");
+           shadow_pte->writable = guest_pte->writable;
+       } else {
+           if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
                PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
                return -1;
            }
-       } else {
-           PrintDebug("Shadow PTE Write Error\n");
-           shadow_pte->writable = guest_pte->writable;
-       }
+       } 
 
 
        return 0;
@@ -426,7 +425,7 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
     PrintDebug("Handling 4MB fault (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("ShadowPT=%p, LargeGuestPDE=%p\n", shadow_pt, large_guest_pde);
 
-    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info->vm_info, info->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->cpu_id, guest_fault_pa);
 
  
     if (shdw_reg == NULL) {
@@ -476,21 +475,17 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
            shadow_pte->global_page = large_guest_pde->global_page;
            //
       
-       } else if (shdw_reg->flags.hook == 1) {
-           if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+       } else {
+           if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
                PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
                return -1;
            }
        }
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
-
-       if (shdw_reg->flags.hook == 1) {
-           if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
-               PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
-               return -1;
-           }
-       }
-
+       if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+           PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
+           return -1;
+       }       
     } else {
        PrintError("Error in large page fault handler...\n");
        PrintError("This case should have been handled at the top level handler\n");