X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=92597ffd19c65ad38e945b547687070931464a63;hb=2b1f4ef19d766727f873476861c64339c8836a40;hp=47bd00bb670fabc3deee42935adeefab5f7f4dd1;hpb=ba112e34a1151ff27c2161c1b7b85fe52392e42d;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 47bd00b..92597ff 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,9 +43,17 @@
 
 
 
+#define V3_AllocPages(ptr, num_pages)		        \
+  do {							\
+    extern struct vmm_os_hooks * os_hooks;		\
+    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;		\
     if ((os_hooks) && (os_hooks)->malloc) {		\
@@ -52,7 +63,7 @@
 
 
 // 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) {		\
@@ -78,6 +89,7 @@
 #define VMM_VMX_CPU 1
 #define VMM_SVM_CPU 2
 
+#endif //!__V3VEE__
 
 
 /* This will contain function pointers that provide OS services */