X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=6fbbe7d391904c0be1bf49ee69eba55a79e16d70;hb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;hp=989806632bae1e6fe04a4dba82e13cdd6312502f;hpb=d34450b1e6fe3c2e1295c268c1722c669ba8d545;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 9898066..6fbbe7d 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -38,57 +38,34 @@
 /* utility definitions */
 
 
+#define V3_Print(fmt, args...)					\
+    do {							\
+	extern struct v3_os_hooks * os_hooks;			\
+	if ((os_hooks) && (os_hooks)->print) {			\
+	    (os_hooks)->print((fmt), ##args);			\
+	}							\
+    } while (0)	
+
+
 #define PrintDebug(fmt, args...)			\
     do {						\
 	extern struct v3_os_hooks * os_hooks;		\
-	if ((os_hooks) && (os_hooks)->print_debug) {	\
-	    (os_hooks)->print_debug((fmt), ##args);	\
+	if ((os_hooks) && (os_hooks)->print) {	\
+	    (os_hooks)->print((fmt), ##args);	\
 	}						\
     } while (0)						
 
-#if 1
-#else
-#define PrintDebug(fmt,args ...)
-#endif
-
-
 
 #define PrintError(fmt, args...)					\
     do {								\
 	extern struct v3_os_hooks * os_hooks;				\
-	if ((os_hooks) && (os_hooks)->print_debug) {			\
-	    (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
+	if ((os_hooks) && (os_hooks)->print) {			\
+	    (os_hooks)->print("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
 	}								\
     } while (0)						
 
 
 
-#ifdef VMM_INFO
-#define PrintInfo(fmt, args...) 		        \
-    do {						\
-	extern struct v3_os_hooks * os_hooks;		\
-	if ((os_hooks) && (os_hooks)->print_info) {	\
-	    (os_hooks)->print_info((fmt), ##args);	\
-	}						\
-    } while (0)						
-#else
-#define PrintInfo(fmt, args...)
-#endif
-
-
-#ifdef VMM_TRACE
-#define PrintTrace(fmt, args...)			\
-    do {						\
-	extern struct v3_os_hooks * os_hooks;		\
-	if ((os_hooks) && (os_hooks)->print_trace) {	\
-	    (os_hooks)->print_trace(fmt, ##args);	\
-	}						\
-    } while (0)						
-#else
-#define PrintTrace(fmt, args...)
-#endif
-
-
 #define V3_AllocPages(num_pages)				\
     ({								\
 	extern struct v3_os_hooks * os_hooks;			\
@@ -221,6 +198,11 @@ void v3_yield(struct guest_info * info);
 void v3_yield_cond(struct guest_info * info);
 
 
+void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu);
+
+int v3_vm_enter(struct guest_info * info);
+
+
 #endif //!__V3VEE__
 
 
@@ -229,11 +211,7 @@ struct guest_info;
 
 /* This will contain function pointers that provide OS services */
 struct v3_os_hooks {
-    void (*print_info)(const char * format, ...)
-  	__attribute__ ((format (printf, 1, 2)));
-    void (*print_debug)(const char * format, ...)
-  	__attribute__ ((format (printf, 1, 2)));
-    void (*print_trace)(const char * format, ...)
+    void (*print)(const char * format, ...)
   	__attribute__ ((format (printf, 1, 2)));
   
     void *(*allocate_pages)(int numPages);
@@ -259,6 +237,10 @@ struct v3_os_hooks {
     void (*mutex_free)(void * mutex);
     void (*mutex_lock)(void * mutex, int must_spin);
     void (*mutex_unlock)(void * mutex);
+
+    void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu);
+    void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
+    void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
 };
 
 
@@ -285,13 +267,15 @@ struct v3_vm_config {
     // so we can specify maximum physical address size
     // (We're screwed if we want to do 32 bit host/64 bit guest)
 
-    int enable_profiling;
+    int enable_telemetry;
     int enable_nested_paging;
 
     int enable_pci;
 
     int enable_swap;
 
+    int guest_cpu;
+
     unsigned long schedule_freq; // in HZ
 
     v3_disk_type_t pri_disk_type;
@@ -336,7 +320,7 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops);
+void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus);
 
 int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);