X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=6a4efa7aea1031ee080bd76880357724ac200bed;hb=313214f2f4c8cf8d4bb4e2e3aaa788101d955fce;hp=8364325ca31de174b0e76d7e63676ca28cc012dc;hpb=793f9cd53a472668dbeb16341085e5512484485c;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 8364325..6a4efa7 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -182,15 +182,16 @@ struct guest_info;
         })
 
 
-#ifdef V3_CONFIG_MULTITHREAD_OS
 
-#define V3_CREATE_THREAD(fn, arg, name)					\
-    do {								\
-	extern struct v3_os_hooks * os_hooks;				\
-	if ((os_hooks) && (os_hooks)->start_kernel_thread) {		\
-	    (os_hooks)->start_kernel_thread(fn, arg, name);		\
-	}								\
-    } while (0)
+
+#define V3_CREATE_THREAD(fn, arg, name)	({				\
+	    void * thread = NULL;					\
+	    extern struct v3_os_hooks * os_hooks;			\
+	    if ((os_hooks) && (os_hooks)->start_kernel_thread) {	\
+		thread = (os_hooks)->start_kernel_thread(fn, arg, name); \
+	    }								\
+	    thread;							\
+	})
 
 
 
@@ -223,7 +224,6 @@ struct guest_info;
 	ret;								\
     })
     
-#endif
 
 /* ** */
 
@@ -245,6 +245,32 @@ struct guest_info;
 	
 
 
+#define V3_Yield()					\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->yield_cpu) {	\
+	    (os_hooks)->yield_cpu();			\
+	}						\
+    } while (0)						\
+
+
+#define V3_Sleep(usec)				\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->sleep_cpu) {\
+	    (os_hooks)->sleep_cpu(usec);		\
+	} else {					\
+	    V3_Yield();                                 \
+        }                                               \
+    }  while (0)                                        \
+
+#define V3_Wakeup(cpu)					\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->wakeup_cpu) {	\
+	    (os_hooks)->wakeup_cpu(cpu);			\
+	}						\
+    } while (0)						\
 
 
 typedef enum v3_vm_class {V3_INVALID_VM, V3_PC_VM, V3_CRAY_VM} v3_vm_class_t;
@@ -256,14 +282,12 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 
 v3_cpu_mode_t v3_get_host_cpu_mode();
 
-void v3_yield(struct guest_info * info);
-void v3_yield_cond(struct guest_info * info);
+void v3_yield(struct guest_info * info, int usec);
+void v3_yield_cond(struct guest_info * info, int usec);
 void v3_print_cond(const char * fmt, ...);
 
-
-#ifdef V3_CONFIG_MULTITHREAD_OS
 void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
-#endif
+
 
 
 v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
@@ -298,19 +322,22 @@ struct v3_os_hooks {
 
     unsigned int (*get_cpu_khz)(void);
 
-
     void (*yield_cpu)(void); 
+    void (*sleep_cpu)(unsigned int usec);
+    void (*wakeup_cpu)(void *cpu);
 
     void *(*mutex_alloc)(void);
     void (*mutex_free)(void * mutex);
     void (*mutex_lock)(void * mutex, int must_spin);
     void (*mutex_unlock)(void * mutex);
+    void *(*mutex_lock_irqsave)(void * mutex, int must_spin);
+    void (*mutex_unlock_irqrestore)(void * mutex, void *flags);
 
     unsigned int (*get_cpu)(void);
 
 
 
-    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
+    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);
     void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
@@ -333,7 +360,7 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+void Init_V3(struct v3_os_hooks * hooks, char * cpus, int num_cpus);
 void Shutdown_V3( void );
 
 
@@ -342,12 +369,18 @@ 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_simulate_vm(struct v3_vm_info * vm, unsigned int msecs);
+
 
 int v3_save_vm(struct v3_vm_info * vm, char * store, char * url);
 int v3_load_vm(struct v3_vm_info * vm, char * store, char * url);
 
+int v3_send_vm(struct v3_vm_info * vm, char * store, char * url);
+int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url);
+
 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);