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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index d53af85..7aba5de 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -65,24 +65,6 @@ int      v3_get_vcore(struct guest_info *);
     })
 
 
-// Use 32 bit constraints if the vm uses 32bit shadow paging at any point
-// Should be used for shadow page tables and any physical memory
-// mapped into the vm
-#define V3_AllocShadowSafePages(vm,num_pages)				\
-    ({							        	\
-	extern struct v3_os_hooks * os_hooks;		        	\
-	void * ptr = 0;					        	\
-	int c; int shadow=0;                                            \
-        for (c=0;c<(vm)->num_cores && !shadow;c++) {                    \
-            shadow|=vm->cores[c].shdw_pg_mode==SHADOW_PAGING;           \
-        }                                                               \
-	if ((os_hooks) && (os_hooks)->allocate_pages) {	        	\
-	    ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,\
-                    shadow ? V3_ALLOC_PAGES_CONSTRAINT_4GB : 0);        \
-	}						        	\
-	ptr;						        	\
-    })
-
 #define V3_AllocAlignedPages(num_pages, align)		        	\
     ({							        	\
 	extern struct v3_os_hooks * os_hooks;		        	\
@@ -369,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);
@@ -422,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 {
@@ -449,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);
 
@@ -457,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);