From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Mon, 23 Feb 2009 20:28:54 +0000 (-0600)
Subject: fixed write hook handling
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=84373a6580ffe1b3370243112e5a12bf273a63e3;p=palacios.releases.git

fixed write hook handling
---

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index ff421bc..a3a3e4a 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -88,15 +88,14 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
       PrintError("Unknown Region Type...\n");
       return -1;
     }
-  } else {
-    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 {
-      PrintError("Weird...\n");
-      return -1;
-    }
   }
+   
+  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);
+  }
+
 
   return 0;
 }
diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index 7396d9b..ff526ed 100644
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -103,14 +103,11 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
       PrintError("Unknown Region Type...\n");
       return -1;
     }
-  } else {
-    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 {
-      PrintError("Weird...\n");
-      return -1;
-    }
+  }
+   
+  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);
   }
 
   return 0;