X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_mem.h;h=f8b8d0df686eb2ffb84e3b779a59fef51f2133d2;hp=8a32f5f5a24470e528bf1528bf65b6e339269940;hb=b527f44a71d32952d7b129a7ce5dbeb3969fb8d2;hpb=68cac210354f03675feb5370dfa7fae1fb97ceee

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index 8a32f5f..f8b8d0d 100644
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -5,8 +5,7 @@
 
 #include <palacios/vmm_types.h>
 
-
-typedef ulong_t addr_t;
+#include <palacios/vmm_paging.h>
 
 struct guest_info;
 
@@ -33,7 +32,7 @@ typedef enum guest_region_type {
 // from the perspective of the HOST
 typedef enum host_region_type { 
   HOST_REGION_INVALID,                    // This region is INVALID (this is a return type, to denote errors)
-  HOST_REGION_NOTHING,                    // This region is mapped as not present (always generate page faults)
+  HOST_REGION_HOOK,                       // This region is mapped as not present (always generate page faults)
   HOST_REGION_PHYSICAL_MEMORY,            // Region is a section of host memory
   HOST_REGION_MEMORY_MAPPED_DEVICE,       // Region is allocated for DMA
   HOST_REGION_UNALLOCATED,                // Region is mapped on demand
@@ -45,38 +44,35 @@ typedef enum host_region_type {
 
 #define shadow_mem_type_t host_region_type_t
 
-typedef struct shadow_region {
+struct shadow_region {
   guest_region_type_t     guest_type;
   addr_t                  guest_start; 
   addr_t                  guest_end; 
 
   host_region_type_t      host_type;
-  union host_addr_t {
-    struct physical_addr { 
-       addr_t                  host_start; 
-    }                     phys_addr;
-    // Other addresses, like on disk, etc, would go here
-  }                       host_addr;
+  addr_t                  host_addr; // This either points to a host address mapping, 
+                                     // or a structure holding the map info 
+
   struct shadow_region *next, *prev;
-} shadow_region_t;
+};
 
 
 
 struct shadow_map {
   uint_t num_regions;
 
-  shadow_region_t * head;
+  struct shadow_region * head;
 };
 
 
-void init_shadow_region(shadow_region_t * entry,
+void init_shadow_region(struct shadow_region * entry,
 			   addr_t               guest_addr_start,
 			   addr_t               guest_addr_end,
 			   guest_region_type_t  guest_region_type,
 			   host_region_type_t   host_region_type);
 
 /*
-void init_shadow_region_physical(shadow_region_t * entry,
+void init_shadow_region_physical(struct shadow_region * entry,
 				    addr_t               guest_addr_start,
 				    addr_t               guest_addr_end,
 				    guest_region_type_t  guest_region_type,
@@ -87,14 +83,14 @@ void init_shadow_region_physical(shadow_region_t * entry,
 int add_shadow_region_passthrough(struct guest_info * guest_info, 
 				  addr_t guest_addr_start,
 				  addr_t guest_addr_end,
-				  addr_t host_addr_start);
+				  addr_t host_addr);
 
 void init_shadow_map(struct shadow_map * map);
 void free_shadow_map(struct shadow_map * map);
 
-shadow_region_t * get_shadow_region_by_addr(struct shadow_map * map, addr_t guest_addr);
+struct shadow_region * get_shadow_region_by_addr(struct shadow_map * map, addr_t guest_addr);
 
-shadow_region_t * get_shadow_region_by_index(struct shadow_map * map, uint_t index);
+struct shadow_region * get_shadow_region_by_index(struct shadow_map * map, uint_t index);
 
 host_region_type_t lookup_shadow_map_addr(struct shadow_map * map, addr_t guest_addr, addr_t * host_addr);
 
@@ -104,7 +100,7 @@ addr_t get_shadow_addr(struct guest_info * info, addr_t guest_addr);
 // Semantics:
 // Adding a region that overlaps with an existing region results is undefined
 // and will probably fail
-int add_shadow_region(struct shadow_map * map, shadow_region_t * entry);
+int add_shadow_region(struct shadow_map * map, struct shadow_region * entry);
 
 // Semantics:
 // Deletions result in splitting
@@ -118,4 +114,32 @@ void print_shadow_map(struct shadow_map * map);
 
 
 
+
+struct vmm_mem_hook {
+  // Called when data is read from a memory page
+  int (*read)(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
+  
+  // Called when data is written to a memory page
+  int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data);
+
+  void * priv_data;
+  struct shadow_region * region;
+};
+
+
+
+struct vmm_mem_hook * get_mem_hook(struct guest_info * info, addr_t guest_addr);
+
+int hook_guest_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
+		   int (*read)(addr_t guest_addr, void * dst, uint_t length, void * priv_data),
+		   int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
+		   void * priv_data);
+int unhook_guest_mem(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);
+int handle_special_page_fault(struct guest_info * info, addr_t mem_addr, pf_error_t access_info);
+
 #endif