X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fvnet%2Fvnet_host.h;h=548a2520dd6ff352aa049313c6e758bb32e6f72c;hb=541bd219aaa76d3b00de8060affbc62a5692162a;hp=5ace72943c150b21ae9cc41723a70136e4d352f4;hpb=f31b4ee024b09ded6a5be33a33cca0e2e756b63d;p=palacios.git

diff --git a/palacios/include/vnet/vnet_host.h b/palacios/include/vnet/vnet_host.h
index 5ace729..548a252 100644
--- a/palacios/include/vnet/vnet_host.h
+++ b/palacios/include/vnet/vnet_host.h
@@ -58,10 +58,10 @@ struct vnet_host_hooks {
 
     /* duplicate part from os_hooks */
     void (*yield_cpu)(void); 
-    void (*print)(const char * format, ...)
-  	__attribute__ ((format (printf, 1, 2)));
+    void (*print)(void *vm , int core, const char * format, ...)
+  	__attribute__ ((format (printf, 3, 4)));
   
-    void *(*allocate_pages)(int num_pages, unsigned int alignment);
+    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int constraints);
     void (*free_pages)(void * page, int num_pages);
 
     void *(*malloc)(unsigned int size);
@@ -92,7 +92,7 @@ extern struct vnet_host_hooks * host_hooks;
 /* 4KB-aligned */
 static inline void * Vnet_AllocPages(int num_pages){
     if ((host_hooks) && host_hooks->allocate_pages) {
-	return host_hooks->allocate_pages(num_pages, PAGE_SIZE_4KB);
+	return host_hooks->allocate_pages(num_pages, PAGE_SIZE_4KB,-1,0); // any zone, no constraints
     }
 
     return NULL;
@@ -217,17 +217,17 @@ static inline void vnet_reset_timer(struct vnet_timer * timer,
 	if(level <= net_debug) {					\
 	    extern struct vnet_host_hooks * host_hooks;			\
 	    if ((host_hooks) && (host_hooks)->print) {			\
-	    	(host_hooks)->print((fmt), ##args);			\
+	      (host_hooks)->print(0, -1, (fmt), ##args);			\
 	    }								\
 	}								\
     } while (0)	
 
 
-#define Vnet_Debug(fmt, args...)					\
+#define Vnet_Debug(fmt, args...) 				\
     do {								\
 	    extern struct vnet_host_hooks * host_hooks;			\
 	    if ((host_hooks) && (host_hooks)->print) {			\
-	    	(host_hooks)->print((fmt), ##args);			\
+	      (host_hooks)->print(0, -1, (fmt), ##args);			\
 	    }			       					\
     } while (0)