X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=8a754989b01239bcce2f99e19212a6b18ca1bfbb;hb=6ee36e0a7e4585bd0e4235eeb60644fffe230af3;hp=8d3d2624aca58bb3957ab3d6e0264ad0f23c94eb;hpb=fcc9962fe5d3b877f8f25de8745d0d4d1eaf394e;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 8d3d262..8a75498 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -182,7 +182,7 @@ struct guest_info;
         })
 
 
-#ifdef CONFIG_MULTITHREAD_OS
+#ifdef V3_CONFIG_MULTITHREAD_OS
 
 #define V3_CREATE_THREAD(fn, arg, name)					\
     do {								\
@@ -190,7 +190,7 @@ struct guest_info;
 	if ((os_hooks) && (os_hooks)->start_kernel_thread) {		\
 	    (os_hooks)->start_kernel_thread(fn, arg, name);		\
 	}								\
-    }
+    } while (0)
 
 
 
@@ -214,6 +214,15 @@ struct guest_info;
 	    thread;							\
 	})
 
+#define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({				\
+	int ret = -1;							\
+	extern struct v3_os_hooks * os_hooks;				\
+	if((os_hooks) && (os_hooks)->move_thread_to_cpu) {		\
+	    ret = (os_hooks)->move_thread_to_cpu(pcpu, thread);		\
+	}								\
+	ret;								\
+    })
+    
 #endif
 
 /* ** */
@@ -252,7 +261,7 @@ void v3_yield_cond(struct guest_info * info);
 void v3_print_cond(const char * fmt, ...);
 
 
-#ifdef CONFIG_MULTITHREAD_OS
+#ifdef V3_CONFIG_MULTITHREAD_OS
 void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
 #endif
 
@@ -261,6 +270,7 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
 
 
 int v3_vm_enter(struct guest_info * info);
+int v3_reset_vm_core(struct guest_info * core, addr_t rip);
 
 
 #endif /*!__V3VEE__ */
@@ -304,7 +314,7 @@ struct v3_os_hooks {
     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);
     void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
-
+    int (*move_thread_to_cpu)(int cpu_id,  void * thread);
 };
 
 
@@ -330,6 +340,11 @@ void Shutdown_V3( void );
 struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name);
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
 int v3_stop_vm(struct v3_vm_info * vm);
+int v3_pause_vm(struct v3_vm_info * vm);
+int v3_continue_vm(struct v3_vm_info * vm);
+
+int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu);
+
 int v3_free_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);