various changes...

[palacios.git] / palacios / include / palacios / vmm_mem.h

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index ae4ca05..f6338df 100644 (file)
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -38,38 +38,47 @@ struct guest_info;
 // These are the types of physical memory address regions
 // from the perspective of the HOST
 typedef enum shdw_region_type { 
-  SHDW_REGION_INVALID,                    // This region is INVALID (this is a return type to denote errors)
-  SHDW_REGION_WRITE_HOOK,                 // This region is mapped as read-only (page faults on write)
-  SHDW_REGION_FULL_HOOK,                  // This region is mapped as not present (always generate page faults)
-  SHDW_REGION_ALLOCATED,                  // Region is a section of host memory
+    SHDW_REGION_WRITE_HOOK,                 // This region is mapped as read-only (page faults on write)
+    SHDW_REGION_FULL_HOOK,                  // This region is mapped as not present (always generate page faults)
+    SHDW_REGION_ALLOCATED,                  // Region is a section of host memory
 } v3_shdw_region_type_t;
 
 
-typedef struct rb_root v3_shdw_map_t;
 
 
 struct v3_shadow_region {
-  addr_t                  guest_start; 
-  addr_t                  guest_end; 
+    addr_t                  guest_start; 
+    addr_t                  guest_end; 
 
-  v3_shdw_region_type_t   host_type;
+    v3_shdw_region_type_t   host_type;
   
-  addr_t                  host_addr; // This either points to a host address mapping
+    addr_t                  host_addr; // This either points to a host address mapping
 
 
-  // Called when data is read from a memory page
-  int (*read_hook)(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
-  // Called when data is written to a memory page
-  int (*write_hook)(addr_t guest_addr, void * src, uint_t length, void * priv_data);
+    // Called when data is read from a memory page
+    int (*read_hook)(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
+    // Called when data is written to a memory page
+    int (*write_hook)(addr_t guest_addr, void * src, uint_t length, void * priv_data);
 
-  void * priv_data;
+    void * priv_data;
 
-  struct rb_node tree_node;
+    struct rb_node tree_node;
 };
 
 
+typedef struct v3_shdw_map {
+    struct v3_shadow_region base_region;
 
-void v3_init_shadow_map(struct guest_info * info);
+
+    addr_t hook_hva;
+
+    struct rb_root shdw_regions;
+} v3_shdw_map_t;
+
+
+
+
+int v3_init_shadow_map(struct guest_info * info);
 void v3_delete_shadow_map(struct guest_info * info);
 
 
@@ -90,12 +99,14 @@ int v3_hook_write_mem(struct guest_info * info, addr_t guest_addr_start, addr_t
 
 
 
-
+int v3_unhook_mem(struct guest_info * info, addr_t guest_addr_start);
 
 
 void v3_delete_shadow_region(struct guest_info * info, struct v3_shadow_region * reg);
 
 
+
+
 struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t guest_addr);
 addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr);
 
@@ -103,7 +114,7 @@ addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr);
 
 
 
-void print_shadow_map(struct guest_info * info);
+void v3_print_mem_map(struct guest_info * info);