refactoring to the point of compilation

[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 f6338df..153c04c 100644 (file)
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -29,9 +29,10 @@
 
 #include <palacios/vmm_paging.h>
 #include <palacios/vmm_rbtree.h>
-
+#include <palacios/vmm_list.h>
 
 struct guest_info;
+struct v3_vm_info;
 
 
 
@@ -54,7 +55,6 @@ struct v3_shadow_region {
   
     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
@@ -62,59 +62,62 @@ struct v3_shadow_region {
 
     void * priv_data;
 
-    struct rb_node tree_node;
+    int core_id;
+
+    struct rb_node tree_node; // This for memory regions mapped to the global map
 };
 
 
-typedef struct v3_shdw_map {
+struct v3_mem_map {
     struct v3_shadow_region base_region;
 
-
-    addr_t hook_hva;
-
     struct rb_root shdw_regions;
-} v3_shdw_map_t;
+
+    void * hook_hvas; // this is an array of pages, equal to the number of cores
+}; 
 
 
+int v3_init_mem_map(struct guest_info * info);
+void v3_delete_mem_map(struct guest_info * info);
 
 
-int v3_init_shadow_map(struct guest_info * info);
-void v3_delete_shadow_map(struct guest_info * info);
 
 
-int v3_add_shadow_mem(struct guest_info * guest_info, 
+int v3_add_shadow_mem(struct v3_vm_info * vm, 
                      addr_t guest_addr_start,
                      addr_t guest_addr_end,
                      addr_t host_addr);
 
-int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
+int v3_hook_full_mem(struct v3_vm_info * vm, 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 v3_hook_write_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
+int v3_hook_write_mem(struct v3_vm_info * vm, addr_t guest_addr_start, addr_t guest_addr_end,
                      addr_t host_addr,
                      int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
                      void * priv_data);
 
 
+int v3_unhook_mem(struct v3_vm_info * vm, addr_t guest_addr_start);
+
+
 
-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);
+void v3_delete_shadow_region(struct v3_vm_info * vm, struct v3_shadow_region * reg);
 
 
 
 
-struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t guest_addr);
+struct v3_shadow_region * v3_get_shadow_region(struct v3_vm_info * vm, addr_t guest_addr /*, int core_id */);
 addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr);
 
 
 
 
 
-void v3_print_mem_map(struct guest_info * info);
+void v3_print_mem_map(struct v3_vm_info * vm);