*** 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 47bd00b..3072626 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -2,57 +2,90 @@
 #define __VMM_H
 
 
+#include <palacios/vm_guest.h>
+#include <palacios/vmm_mem.h>
+
+#ifdef __V3VEE__
+
 //#include <palacios/vmm_types.h>
 #include <palacios/vmm_string.h>
 
-#include <palacios/vmm_mem.h>
-//#include <palacios/vmm_paging.h>
 
-#include <palacios/vm_guest.h>
+//#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)                  \
+  do {                                                 \
+    extern struct vmm_os_hooks * os_hooks;             \
+    ptr = 0;                                           \
+    if ((os_hooks) && (os_hooks)->allocate_pages) {    \
+      ptr = (os_hooks)->allocate_pages(num_pages);     \
+    }                                                  \
+  } while (0)                                          \
 
 
-/* This clearly won't work, we need some way to get a return value out of it */
-#define VMMMalloc(type, var, size)                     \
+/*
+#define V3_Malloc(type, var, size)                     \
   do {                                                 \
     extern struct vmm_os_hooks * os_hooks;             \
+    var = 0;                                           \
     if ((os_hooks) && (os_hooks)->malloc) {            \
       var = (type)(os_hooks)->malloc(size);            \
     }                                                  \
   } while (0)                                          \
+*/
 
+#define V3_Malloc(size) ({                     \
+      extern struct vmm_os_hooks * os_hooks;   \
+      void * var = 0;                          \
+      if ((os_hooks) && (os_hooks)->malloc) {  \
+       var = (os_hooks)->malloc(size);         \
+      }                                                \
+      var;                                     \
+    })
 
 // We need to check the hook structure at runtime to ensure its SAFE
-#define VMMFree(addr)                                  \
+#define V3_Free(addr)                                  \
   do {                                                 \
     extern struct vmm_os_hooks * os_hooks;             \
     if ((os_hooks) && (os_hooks)->free) {              \
@@ -60,6 +93,16 @@
     }                                                  \
   } while (0)                                          \
 
+#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();                 \
+    }                                                  \
+    khz;                                               \
+  })                                                   \
+    
 
 /* ** */
 
@@ -78,6 +121,7 @@
 #define VMM_VMX_CPU 1
 #define VMM_SVM_CPU 2
 
+#endif //!__V3VEE__
 
 
 /* This will contain function pointers that provide OS services */
@@ -98,8 +142,13 @@ struct vmm_os_hooks {
   int (*hook_interrupt)(struct guest_info * info, int irq);
   int (*ack_irq)(int irq);
 
+
+  unsigned int (*get_cpu_khz)();
+
   // Do we need this here?
-  void (*snprintf)(char * dst, char * format, int len, ...);
+  //  void (*snprintf)(char * dst, char * format, int len, ...);
+
+
 
   void (*start_kernel_thread)(); // include pointer to function
 };
@@ -112,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)();
 };