X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fvnet%2Fvnet_host.h;h=5fe3cff7967a874c3a5ec6f728690f76e87048db;hb=793f9cd53a472668dbeb16341085e5512484485c;hp=f237417f4e1bc34b379a9c8122788b475c917266;hpb=457148fd9d25d45b8048ae558adbc607512b5fbf;p=palacios.releases.git

diff --git a/palacios/include/vnet/vnet_host.h b/palacios/include/vnet/vnet_host.h
index f237417..5fe3cff 100644
--- a/palacios/include/vnet/vnet_host.h
+++ b/palacios/include/vnet/vnet_host.h
@@ -20,6 +20,7 @@
 #ifndef __VNET_HOST_H__
 #define __VNET_HOST_H__
 
+#include <vnet/vnet_base.h>
 #include <vnet/vnet_vmm.h>
 
 struct vnet_thread {
@@ -35,13 +36,19 @@ typedef unsigned long vnet_lock_t;
 
 
 struct vnet_host_hooks {
-    void *(*thread_start)(int (*fn)(void * arg), void * arg, char * thread_name);
+    void *(*thread_start)(int (*fn)(void * arg), 
+			  void * arg, 
+			  char * thread_name);
+
     void (*thread_sleep)(long timeout);
     void (*thread_wakeup)(void * thread);
     void (*thread_stop)(void * thread);
     int (*thread_should_stop)(void);
 
-    void *(*timer_create)(unsigned long interval, void (* timer_fun)(void * priv_data), void * data);
+    void *(*timer_create)(unsigned long interval, 
+			  void (* timer_fun)(void * priv_data), 
+			  void * data);
+
     void (*timer_del)(void * timer);
     void (*timer_start)(void * timer);
     void (*timer_stop)(void * timer);
@@ -133,7 +140,8 @@ static inline void Vnet_Yield(void){
 }
 
 /* THREAD FUNCTIONS */
-struct vnet_thread * vnet_start_thread(int (*func)(void *), void * arg, char * name);
+struct vnet_thread * vnet_start_thread(int (*func)(void *), 
+				       void * arg, char * name);
 
 static inline void vnet_thread_sleep(long timeout){
     if((host_hooks) && host_hooks->thread_sleep){
@@ -170,7 +178,9 @@ static inline void  vnet_udelay(unsigned long usecs){
 
 /* TIMER FUNCTIONS */
 /* interval, in jittes */
-struct vnet_timer * vnet_create_timer(unsigned long interval, void (* timer_fun)(void * priv_data), void * pri_data);
+struct vnet_timer * vnet_create_timer(unsigned long interval, 
+				      void (* timer_fun)(void * priv_data), 
+				      void * pri_data);
 
 static inline void vnet_del_timer(struct vnet_timer * timer){
     if((host_hooks) && host_hooks->timer_del){
@@ -191,7 +201,8 @@ static inline void vnet_stop_timer(struct vnet_timer * timer){
     }
 }
 
-static inline void vnet_reset_timer(struct vnet_timer * timer, unsigned long new_interval){
+static inline void vnet_reset_timer(struct vnet_timer * timer, 
+				    unsigned long new_interval){
     if((host_hooks) && host_hooks->timer_reset){
 	host_hooks->timer_reset(timer->host_timer, new_interval);
     }
@@ -200,23 +211,23 @@ static inline void vnet_reset_timer(struct vnet_timer * timer, unsigned long new
 
 
 #define Vnet_Print(level, fmt, args...)					\
-    do {	\
-	extern int vnet_debug;  \
-	if(level <= vnet_debug) {   \
+    do {								\
+	extern int net_debug;						\
+	if(level <= net_debug) {					\
 	    extern struct vnet_host_hooks * host_hooks;			\
 	    if ((host_hooks) && (host_hooks)->print) {			\
 	    	(host_hooks)->print((fmt), ##args);			\
-	    }							\
-	}							\
+	    }								\
+	}								\
     } while (0)	
 
 
 #define Vnet_Debug(fmt, args...)					\
-    do {	\
+    do {								\
 	    extern struct vnet_host_hooks * host_hooks;			\
 	    if ((host_hooks) && (host_hooks)->print) {			\
 	    	(host_hooks)->print((fmt), ##args);			\
-	    }												\
+	    }			       					\
     } while (0)	
 
 
@@ -251,9 +262,10 @@ static inline void vnet_unlock_irqrestore(vnet_lock_t lock, addr_t irq_state) {
 }
 
 #endif
-
+
 
 void init_vnet(struct vnet_host_hooks * hooks);
+void deinit_vnet(void);
 
 
 #endif