X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=a12d2c1a12b628c7ca85a883622f30f94b070cdd;hb=4071a0ced0f209760c73e505c1634512abf29728;hp=d0b533a3c92aa92beed23ce84fbf2ac5dc688707;hpb=96241180a9bfdf5eb59082ce4cfd27a1a898181a;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index d0b533a..a12d2c1 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -151,17 +151,6 @@ struct guest_info;
 	
 
 
-#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_Hook_Interrupt(vm, irq) ({					\
 	    int ret = 0;						\
@@ -173,6 +162,16 @@ struct guest_info;
 	})								\
 	
 
+#define V3_ACK_IRQ(irq)						\
+    do {							\
+	extern struct v3_os_hooks * os_hooks;			\
+	if ((os_hooks) && (os_hooks)->ack_irq) {		\
+	    (os_hooks)->ack_irq(irq);				\
+	}							\
+    } while (0)
+
+
+
 #define V3_Get_CPU() ({  				                \
             int ret = 0;                                                \
             extern struct v3_os_hooks * os_hooks;                       \
@@ -182,6 +181,22 @@ struct guest_info;
             ret;                                                        \
         })
 
+
+#ifdef 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_Call_On_CPU(cpu, fn, arg)    		\
     do {						\
         extern struct v3_os_hooks * os_hooks;           \
@@ -202,27 +217,31 @@ struct guest_info;
 	})
 
 
-#define V3_ACK_IRQ(irq)						\
-    do {							\
-	extern struct v3_os_hooks * os_hooks;			\
-	if ((os_hooks) && (os_hooks)->ack_irq) {		\
-	    (os_hooks)->ack_irq(irq);				\
-	}							\
-    } while (0)
-
+#endif
 
 
 
+#define V3_Reparent_Threadd()					\
+    do {							\
+	if((os_hooks) && (os_hooks)->reparent_threaded) {	\
+	    (os_hooks)->reparent_threaded();			\
+	}							\
+    } while(0)
 
 /* ** */
 
 #define V3_ASSERT(x)							\
     do {								\
+	extern struct v3_os_hooks * os_hooks; 				\
 	if (!(x)) {							\
 	    PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n", \
 		       __func__, #x, __FILE__, __LINE__,		\
 		       (ulong_t) __builtin_return_address(0));		\
-	    while(1);							\
+	    while(1){							\
+		if ((os_hooks) && (os_hooks)->yield_cpu) {		\
+	    		(os_hooks)->yield_cpu();			\
+		}							\
+	    }								\
 	}								\
     } while(0)								\
 	
@@ -246,7 +265,6 @@ void v3_print_cond(const char * fmt, ...);
 
 void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
 
-unsigned int v3_get_cpu_id();
 
 v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
 
@@ -279,7 +297,6 @@ struct v3_os_hooks {
 
     unsigned int (*get_cpu_khz)(void);
 
-    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
     void (*yield_cpu)(void); 
 
@@ -289,10 +306,14 @@ struct v3_os_hooks {
     void (*mutex_unlock)(void * mutex);
 
     unsigned int (*get_cpu)(void);
+
+
+#ifdef CONFIG_MULTITHREAD_OS
+    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);
-
+    void (*reparent_threadd)(void);
 };
 
 
@@ -316,7 +337,7 @@ void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
 
 struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data);
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
-
+int v3_stop_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);