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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 92597ff..ec36284 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -46,21 +46,32 @@
 #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)						\
 
 
-
+/*
 #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 V3_Free(addr)					\
@@ -71,6 +82,14 @@
     }							\
   } while (0)						\
 
+#define V3_CPU_KHZ(khz)					\
+  do {							\
+    extern struct vmm_os_hooks * os_hooks;		\
+    if ((os_hooks) && (os_hooks)->get_cpu_khz) {	\
+      khz = (os_hooks)->get_cpu_khz();			\
+    }							\
+  } while (0)						\
+
 
 /* ** */
 
@@ -110,8 +129,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
 };