X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=7aba5de14bf1ebca71820c42b03a5696d6a9a8c3;hb=4a8f339db9b852ccd1d4d785906ef71b6b848350;hp=a8f321cb75e00a2d4e262fcfc68146f5edb55f68;hpb=16db015d4bcec7b3f9e25eb8dbb6796c4d85550a;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index a8f321c..7aba5de 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -22,7 +22,6 @@
 
 
 
-
 #ifdef __V3VEE__
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
@@ -60,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);	\
+	    ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0); \
 	}						        	\
 	ptr;						        	\
     })
@@ -71,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);  	\
+	    ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0);  	\
 	}						        	\
 	ptr;						        	\
     })
@@ -82,7 +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); \
+            ptr = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0); \
+        }                                                               \
+        ptr;                                                            \
+    })
+
+#define V3_AllocPagesExtended(num_pages, align, node_id, constraints)			\
+    ({                                                                  \
+        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;                                                            \
     })
@@ -304,14 +313,18 @@ struct v3_vm_info;
 
 /* This will contain function pointers that provide OS services */
 struct v3_os_hooks {
-  // the vm pointer is the host os's "priv_data" from v3_create_vm
-  // if vm is null, this is a general palacios printout
-  // if vm is not null, and vcore is negative, this is a general print form the vm
-  // if vm is not null, and vcore is non-negative, this is a print from a specific vcore
+    // the vm pointer is the host os's "priv_data" from v3_create_vm
+    // if vm is null, this is a general palacios printout
+    // if vm is not null, and vcore is negative, this is a general print form the vm
+    // if vm is not null, and vcore is non-negative, this is a print from a specific vcore
     void (*print)(void *vm, int vcore, const char * format, ...)
   	__attribute__ ((format (printf, 3, 4)));
-  
-    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id);
+
+    // 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);
     void (*free_pages)(void * page, int num_pages);
 
     void *(*malloc)(unsigned int size);
@@ -338,8 +351,6 @@ struct v3_os_hooks {
 
     unsigned int (*get_cpu)(void);
 
-
-
     void * (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
     void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu, int vector);
     void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
@@ -391,6 +402,8 @@ struct v3_vm_core_state {
 struct v3_vm_mem_region {
     void               *host_paddr;
     unsigned long long  size;
+    int                 swapped;
+    int                 pinned;
 };
 
 struct v3_vm_mem_state {
@@ -418,6 +431,7 @@ int v3_send_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long l
 int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts);
 
 int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu);
+int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu);
 
 int v3_free_vm(struct v3_vm_info * vm);
 
@@ -426,6 +440,7 @@ int v3_get_state_vm(struct v3_vm_info        *vm,
 		    struct v3_vm_core_state  *core,
 		    struct v3_vm_mem_state   *mem);
 
+char *v3_lookup_option(char *key);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);