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

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index 7a6a81c..8a32f5f 100644
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -2,10 +2,15 @@
 #define __VMM_MEM_H
 
 
+
 #include <palacios/vmm_types.h>
 
+
 typedef ulong_t addr_t;
 
+struct guest_info;
+
+
 /*
 
         Guest                  Shadow                 Host
@@ -38,6 +43,8 @@ typedef enum host_region_type {
 
 
 
+#define shadow_mem_type_t host_region_type_t
+
 typedef struct shadow_region {
   guest_region_type_t     guest_type;
   addr_t                  guest_start; 
@@ -55,11 +62,11 @@ typedef struct shadow_region {
 
 
 
-typedef struct shadow_map {
+struct shadow_map {
   uint_t num_regions;
 
   shadow_region_t * head;
-} shadow_map_t;
+};
 
 
 void init_shadow_region(shadow_region_t * entry,
@@ -68,36 +75,45 @@ void init_shadow_region(shadow_region_t * entry,
 			   guest_region_type_t  guest_region_type,
 			   host_region_type_t   host_region_type);
 
+/*
 void init_shadow_region_physical(shadow_region_t * entry,
 				    addr_t               guest_addr_start,
 				    addr_t               guest_addr_end,
 				    guest_region_type_t  guest_region_type,
 				    addr_t               host_addr_start,
 				    host_region_type_t   host_region_type);
-  
-void init_shadow_map(shadow_map_t * map);
-void free_shadow_map(shadow_map_t * map);
+*/
+
+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);
+
+void init_shadow_map(struct shadow_map * map);
+void free_shadow_map(struct shadow_map * map);
 
-shadow_region_t * get_shadow_region_by_addr(shadow_map_t * map, addr_t guest_addr);
+shadow_region_t * get_shadow_region_by_addr(struct shadow_map * map, addr_t guest_addr);
 
-shadow_region_t * get_shadow_region_by_index(shadow_map_t * map, uint_t index);
+shadow_region_t * get_shadow_region_by_index(struct shadow_map * map, uint_t index);
 
-host_region_type_t lookup_shadow_map_addr(shadow_map_t * map, addr_t guest_addr, addr_t * host_addr);
+host_region_type_t lookup_shadow_map_addr(struct shadow_map * map, addr_t guest_addr, addr_t * host_addr);
 
+host_region_type_t get_shadow_addr_type(struct guest_info * info, addr_t guest_addr);
+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(shadow_map_t * map, shadow_region_t * entry);
+int add_shadow_region(struct shadow_map * map, shadow_region_t * entry);
 
 // Semantics:
 // Deletions result in splitting
-int delete_shadow_region(shadow_map_t * map,
+int delete_shadow_region(struct shadow_map * map,
 			     addr_t guest_start, 
 			     addr_t guest_end);
 
 
-void print_shadow_map(shadow_map_t * map);
+void print_shadow_map(struct shadow_map * map);