X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=a892094f18915b10d7c6b1a86742f5f9a99db9f6;hb=41d6dcb0a638ebdc01b89a9edf427c75975b2003;hp=d81f4b682ad1d6d4616e646b1396d79f74d3b627;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index d81f4b6..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(size)                                 \
+/*
+#define V3_Malloc(type, var, size)			\
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
+    var = 0;						\
     if ((os_hooks) && (os_hooks)->malloc) {		\
-      (os_hooks)->malloc(size);				\
+      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,21 +82,37 @@
     }							\
   } 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__
 
 
-
-
-
-/* We need a memory map and an IO device map */
-
 /* This will contain function pointers that provide OS services */
 struct vmm_os_hooks {
   void (*print_info)(const char * format, ...);
@@ -90,22 +128,31 @@ struct vmm_os_hooks {
   void *(*paddr_to_vaddr)(void *addr);
   void *(*vaddr_to_paddr)(void *addr);
 
+  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 (*start_kernel_thread)(); // include pointer to function
 };
 
 
 
-
 /* This will contain Function pointers that control the VMs */
 struct vmm_ctrl_ops {
   int (*init_guest)(struct guest_info* info);
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
-};
 
 
 
+};