X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=7480da7b7e25e3ee88545a8684c547ea2f295586;hb=a5c5675571882a9b8a7594ef07fe303b195ef9ae;hp=7c2a53a3eb78b69f660e7c54748c7db44c47aa05;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 7c2a53a..7480da7 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -70,15 +70,21 @@ struct vmm_mem_hook * get_mem_hook(struct guest_info * info, addr_t guest_addr)
 }
 
 
-int mem_hook_dispatch(struct guest_info * info, addr_t mem_addr, pf_error_t access_info, struct vmm_mem_hook * hook) {
+/* mem_addr is the guest physical memory address */
+static int mem_hook_dispatch(struct guest_info * info, addr_t fault_addr, addr_t guest_phys_page,  pf_error_t access_info, struct vmm_mem_hook * hook) {
+
+  // emulate and then dispatch 
+  // or dispatch and emulate
+
 
   if (access_info.write == 1) {
     void * src = NULL;
     uint_t length = 0;
+
     PrintDebug("Memory hook write\n");
     return -1;
 
-    if (hook->write(mem_addr, src, length, hook->priv_data) != length) {
+    if (hook->write(fault_addr, src, length, hook->priv_data) != length) {
       return -1;
     }
   } else {
@@ -90,12 +96,12 @@ int mem_hook_dispatch(struct guest_info * info, addr_t mem_addr, pf_error_t acce
 }
 
 
-int handle_special_page_fault(struct guest_info * info, addr_t mem_addr, pf_error_t access_info) {
-  struct shadow_region * reg = get_shadow_region_by_addr(&(info->mem_map), mem_addr);
+int handle_special_page_fault(struct guest_info * info, addr_t fault_addr, addr_t guest_phys_page, pf_error_t access_info) {
+  struct shadow_region * reg = get_shadow_region_by_addr(&(info->mem_map), guest_phys_page);
 
   switch (reg->host_type) {
   case HOST_REGION_HOOK:
-    return mem_hook_dispatch(info, mem_addr, access_info, (struct vmm_mem_hook *)(reg->host_addr));
+    return mem_hook_dispatch(info, fault_addr, guest_phys_page, access_info, (struct vmm_mem_hook *)(reg->host_addr));
   default:
     return -1;
   }
@@ -174,7 +180,6 @@ int add_shadow_region(struct shadow_map * map,
     } else if (cursor->next->guest_end <= region->guest_start) {
       cursor = cursor->next;
     } else {
-      PrintDebug("WTF?\n");
       // This cannot happen!
       // we should panic here
       return -1;
@@ -196,7 +201,7 @@ int delete_shadow_region(struct shadow_map * map,
 
 
 struct shadow_region *get_shadow_region_by_index(struct shadow_map *  map,
-					       uint_t index) {
+						 uint_t index) {
   struct shadow_region * reg = map->head;
   uint_t i = 0;
 
@@ -212,7 +217,7 @@ struct shadow_region *get_shadow_region_by_index(struct shadow_map *  map,
 
 
 struct shadow_region * get_shadow_region_by_addr(struct shadow_map * map,
-					       addr_t addr) {
+						 addr_t addr) {
   struct shadow_region * reg = map->head;
 
   while (reg) {