X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=c00e10f4f9fad603e2468691cacc9e8f4d8b06eb;hb=0246f0904a4800dbe1e8e23332d49b468a58f751;hp=1f6228e753e69747123ebaa8940d70665d04df71;hpb=8e4b89f4bc2e252e0c1bc7cbc52bf1f4ae2e538c;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 1f6228e..c00e10f 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -59,7 +59,7 @@ int      v3_get_vcore(struct guest_info *);
 	extern struct v3_os_hooks * os_hooks;		        	\
 	void * ptr = 0;					        	\
 	if ((os_hooks) && (os_hooks)->allocate_pages) {	        	\
-	    ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0); \
+	    ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0,0); \
 	}						        	\
 	ptr;						        	\
     })
@@ -70,7 +70,7 @@ int      v3_get_vcore(struct guest_info *);
 	extern struct v3_os_hooks * os_hooks;		        	\
 	void * ptr = 0;					        	\
 	if ((os_hooks) && (os_hooks)->allocate_pages) {	        	\
-	    ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0);  	\
+	    ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0,0);	\
 	}						        	\
 	ptr;						        	\
     })
@@ -81,17 +81,17 @@ int      v3_get_vcore(struct guest_info *);
         extern struct v3_os_hooks * os_hooks;                           \
         void * ptr = 0;                                                 \
         if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-            ptr = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0); \
+            ptr = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0,0); \
         }                                                               \
         ptr;                                                            \
     })
 
-#define V3_AllocPagesExtended(num_pages, align, node_id, constraints)			\
+#define V3_AllocPagesExtended(num_pages, align, node_id, filter_func, filter_state) \
     ({                                                                  \
         extern struct v3_os_hooks * os_hooks;                           \
         void * ptr = 0;                                                 \
         if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-            ptr = (os_hooks)->allocate_pages(num_pages, align, node_id,constraints); \
+            ptr = (os_hooks)->allocate_pages(num_pages, align, node_id, filter_func, filter_state); \
         }                                                               \
         ptr;                                                            \
     })
@@ -147,6 +147,24 @@ int      v3_get_vcore(struct guest_info *);
 	}					\
     } while (0)
 
+#define V3_VMalloc(size) ({				\
+	    extern struct v3_os_hooks * os_hooks;	\
+	    void * var = 0;				\
+	    if ((os_hooks) && (os_hooks)->vmalloc) {	\
+		var = (os_hooks)->vmalloc(size);		\
+	    }						\
+	    if (!var) PrintError(VM_NONE,VCORE_NONE,"VMALLOC FAILURE. Memory LEAK!!\n"); \
+	    var;					\
+	})
+
+#define V3_VFree(addr)				\
+    do {					\
+	extern struct v3_os_hooks * os_hooks;	\
+	if ((os_hooks) && (os_hooks)->vfree) {	\
+	    (os_hooks)->vfree(addr);		\
+	}					\
+    } while (0)
+
 // uint_t V3_CPU_KHZ();
 #define V3_CPU_KHZ() ({							\
 	    unsigned int khz = 0;					\
@@ -338,10 +356,17 @@ struct v3_os_hooks {
     // For page allocation:
     //   - node_id -1 => any node, otherwise the numa node we want to alloc from
     //   - constraint = 0 => no constraints, otherwise a bitwise-or of the following flags
-#define V3_ALLOC_PAGES_CONSTRAINT_4GB  1
-    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int constraint);
+    // Allocates physically contiguous pages
+    //   - with desired alignment
+    //   - that the filter_func returns nonzero on (if filter_func is given)
+    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int (*filter_func)(void *paddr, void *filter_state), void *filter_state);
     void (*free_pages)(void * page, int num_pages);
 
+    // Allocates virtually contiguous memory
+    void *(*vmalloc)(unsigned int size);
+    void (*vfree)(void * addr);
+
+    // Allocates virtually and physically contiguous memory
     void *(*malloc)(unsigned int size);
     void (*free)(void * addr);