Remove non-multithreaded OS option. Change VM creation to be fully asynchronous....

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 337226f..ad3f952 100644 (file)
--- 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);             \
-       }                                                               \
-    }
+
+#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;                                                     \
+       })
 
 
 
@@ -214,7 +215,15 @@ struct guest_info;
            thread;                                                     \
        })
 
-#endif
+#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;                                                            \
+    })
+    
 
 /* ** */
 
@@ -251,10 +260,8 @@ void v3_yield(struct guest_info * info);
 void v3_yield_cond(struct guest_info * info);
 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);
@@ -301,11 +308,11 @@ 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 (*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);
 };
 
 
@@ -331,6 +338,14 @@ 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_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_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);