X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=30726261beca1f3d1126373650ce259500b5554f;hb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;hp=ec36284ea1055e15bb64e78586217879d51d0480;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ec36284..3072626 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -14,33 +14,44 @@
 //#include <palacios/vmm_paging.h>
 
 /* utility definitions */
+
+#if VMM_DEBUG
 #define PrintDebug(fmt, args...)			\
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_debug) {	\
       (os_hooks)->print_debug((fmt), ##args);		\
     }							\
-  } while (0)						\
-
+  } while (0)						
+#else
+#define PrintDebug(fmt,args ...)
+#endif
 
 
+#if VMM_INFO
 #define PrintInfo(fmt, args...) 		        \
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_info) {		\
       (os_hooks)->print_info((fmt), ##args);		\
     }							\
-  } while (0)						\
+  } while (0)						
+#else
+#define PrintInfo(fmt, args...)
+#endif
 
 
+#if VMM_TRACE
 #define PrintTrace(fmt, args...)			\
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_trace) {	\
       (os_hooks)->print_trace((fmt), ##args);		\
     }							\
-  } while (0)						\
-
+  } while (0)						
+#else
+#define PrintTrace(fmt, args...)
+#endif
 
 
 #define V3_AllocPages(ptr, num_pages)		        \
@@ -82,14 +93,16 @@
     }							\
   } while (0)						\
 
-#define V3_CPU_KHZ(khz)					\
-  do {							\
+#define V3_CPU_KHZ()					\
+  ({ 							\
+    unsigned int khz = 0;				\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->get_cpu_khz) {	\
       khz = (os_hooks)->get_cpu_khz();			\
     }							\
-  } while (0)						\
-
+    khz;						\
+  })							\
+    
 
 /* ** */
 
@@ -148,8 +161,7 @@ struct vmm_ctrl_ops {
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
-
-
+  int (*has_nested_paging)();
 };