X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=a892094f18915b10d7c6b1a86742f5f9a99db9f6;hb=c502aac6baf363d633aca6ec883b05476634e854;hp=df221342df8a1f5264a6da029468c6b5c044695d;hpb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index df22134..a892094 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -2,13 +2,16 @@
 #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 */
 #define PrintDebug(fmt, args...)			\
@@ -40,19 +43,38 @@
 
 
 
+#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,14 +82,35 @@
     }							\
   } 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;						\
+  })							\
+    
 
 /* ** */
 
+#define V3_ASSERT(x)							\
+  do {									\
+    if (!(x)) {							 	\
+      PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n",	\
+		 __func__, #x, __FILE__, __LINE__,			\
+		 (ulong_t) __builtin_return_address(0));                \
+      while(1);								\
+    }									\
+  } while(0)								\
+    
 
 #define VMM_INVALID_CPU 0
 #define VMM_VMX_CPU 1
 #define VMM_SVM_CPU 2
 
+#endif //!__V3VEE__
 
 
 /* This will contain function pointers that provide OS services */
@@ -88,8 +131,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
 };