X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_mem.h;h=775d9ed541ede504afb5a6f9206eb645a75c2169;hb=77472ac6e4de7f87a8d8b8c9a554e1fcb05206a5;hp=651e82e3b087345919c4cff58ab763532d0d2875;hpb=8684ef59c3ede8fe0c33b2f04dbe30a287e7b353;p=palacios.git

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index 651e82e..775d9ed 100644
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -34,6 +34,11 @@
 struct guest_info;
 struct v3_vm_info;
 
+#ifdef V3_CONFIG_SWAPPING
+#include <palacios/vmm_swapping.h>
+#endif
+
+
 
 
 #define V3_MEM_CORE_ANY ((uint16_t)-1)
@@ -44,11 +49,19 @@ typedef struct {
     union {
 	uint16_t value;
 	struct {
+	    // These reflect the VMM's intent for the shadow or nested pts 
+	    // that will implement the region.   The guest's intent is in
+	    // its own page tables.
 	    uint8_t read   : 1;
 	    uint8_t write  : 1;
 	    uint8_t exec   : 1;
 	    uint8_t base   : 1;
 	    uint8_t alloced : 1;
+	    uint8_t limit32 : 1; // must be < 4GB in host
+#ifdef V3_CONFIG_SWAPPING 
+	    uint8_t swapped : 1;
+	    uint8_t pinned : 1;
+#endif 
 	} __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed)) v3_mem_flags_t;
@@ -68,16 +81,23 @@ struct v3_mem_region {
 
     void * priv_data;
 
-    int core_id;
+    int core_id;     // The virtual core this region is assigned to (-1 means all cores)
+    int numa_id;     // The NUMA node this region is allocated from
+
+#ifdef V3_CONFIG_SWAPPING 
+    struct v3_swap_region_state swap_state;
+#endif
 
     struct rb_node tree_node; // This for memory regions mapped to the global map
 };
 
 
 struct v3_mem_map {
-    struct v3_mem_region base_region;
 
     struct rb_root mem_regions;
+    
+    uint32_t num_base_regions;
+    struct v3_mem_region * base_regions;
 };
 
 
@@ -103,17 +123,20 @@ int v3_add_shadow_mem(struct v3_vm_info * vm, uint16_t core_id,
 
 
 struct v3_mem_region * v3_get_mem_region(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr);
-struct v3_mem_region * v3_get_next_mem_region(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr);
+struct v3_mem_region * v3_get_base_region(struct v3_vm_info * vm, addr_t gpa);
+
 
+uint32_t v3_get_max_page_size(struct guest_info * core, addr_t fault_addr, v3_cpu_mode_t mode);
 
 
 void v3_print_mem_map(struct v3_vm_info * vm);
 
-uint32_t v3_get_max_page_size(struct guest_info * core, addr_t fault_addr, uint32_t req_size);
 
+void v3_init_mem();
+void v3_deinit_mem();
 
 
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 
 #endif