add thread sleep and wakeup to host os hooks

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index a0827fd..5cb1db1 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -22,13 +22,13 @@
 
 
 /*#include <palacios/vm_guest.h>*/
-#include <palacios/vmm_mem.h>
-#include <palacios/vmm_types.h>
 
 struct guest_info;
 
 
 #ifdef __V3VEE__
+#include <palacios/vmm_mem.h>
+#include <palacios/vmm_types.h>
 
 //#include <palacios/vmm_types.h>
 #include <palacios/vmm_string.h>
@@ -184,13 +184,33 @@ struct guest_info;
 
 #ifdef CONFIG_MULTITHREAD_OS
 
-#define V3_CREATE_THREAD(fn, arg, name)                                \
-    do {                                                       \
+#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) {    \
-           (os_hooks)->start_kernel_thread(fn, arg, name);     \
+           thread = (os_hooks)->start_kernel_thread(fn, arg, name);    \
        }                                                       \
-    } while (0)
+       thread;                                         \
+    })
+
+
+#define V3_THREAD_SLEEP()              \
+    do{                                                        \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->kernel_thread_sleep) {    \
+           (os_hooks)->kernel_thread_sleep();  \
+       }                                                       \
+    }while(0)
+
+
+#define V3_THREAD_WAKEUP(thread)               \
+    do{                                                        \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->kernel_thread_wakeup) {   \
+           (os_hooks)->kernel_thread_wakeup(thread);   \
+       }                                                       \
+    }while(0)
+
 
 
 #define V3_Call_On_CPU(cpu, fn, arg)                   \
@@ -250,7 +270,9 @@ void v3_yield_cond(struct guest_info * info);
 void v3_print_cond(const char * fmt, ...);
 
 
+#ifdef 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);
@@ -296,7 +318,9 @@ struct v3_os_hooks {
 
 
 
-    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 (*kernel_thread_sleep)(void);
+    void (*kernel_thread_wakeup)(void * thread);
     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);
@@ -320,11 +344,13 @@ struct v3_interrupt {
 
 
 void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+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_free_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);