X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=ad3f95217d30e361e67e574a330bf14830d4fa1b;hb=ce3ab888e2ca5f14a89da45b4dc64122ff1e1050;hp=4243d020baf63b75ec10b5d1e98446a892b20150;hpb=8e9c13c41b0244a8d0029e837a623591a22c5879;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 4243d02..ad3f952 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;							\
+	})
 
 
 
@@ -207,12 +208,12 @@ struct guest_info;
 
 #define V3_CREATE_THREAD_ON_CPU(cpu, fn, arg, name) ({			\
 	    void * thread = NULL;					\
-	extern struct v3_os_hooks * os_hooks;				\
-	if ((os_hooks) && (os_hooks)->start_thread_on_cpu) {		\
-	    thread = (os_hooks)->start_thread_on_cpu(cpu, fn, arg, name); \
-	}								\
-	thread;								\
-    })
+	    extern struct v3_os_hooks * os_hooks;			\
+	    if ((os_hooks) && (os_hooks)->start_thread_on_cpu) {	\
+		thread = (os_hooks)->start_thread_on_cpu(cpu, fn, arg, name); \
+	    }								\
+	    thread;							\
+	})
 
 #define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({				\
 	int ret = -1;							\
@@ -223,7 +224,6 @@ struct guest_info;
 	ret;								\
     })
     
-#endif
 
 /* ** */
 
@@ -260,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);
@@ -310,7 +308,7 @@ 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);
@@ -343,6 +341,9 @@ 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);