*** empty log message ***

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ec36284..3072626 100644 (file)
--- 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)();
 };