X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=3b57710f7e1690d14f9d8c40daed4e7996b0d7e6;hb=03a41b18bdb6ce4bf666f18acdaf302e2360efdc;hp=4708cc102b32733252585190cc34b8a032eb0dff;hpb=851892e9e1db5252d2c03e58e7faf9d80c095f6c;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 4708cc1..3b57710 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -104,6 +104,25 @@
   } while(0)					\
 
 
+#define V3_VAddr(addr) ({				\
+      extern struct v3_os_hooks * os_hooks;		\
+      void * var = 0;					\
+      if ((os_hooks) && (os_hooks)->paddr_to_vaddr) {	\
+	var = (os_hooks)->paddr_to_vaddr(addr);		\
+      }							\
+      var;						\
+    })
+
+
+#define V3_PAddr(addr) ({				\
+      extern struct v3_os_hooks * os_hooks;		\
+      void * var = 0;					\
+      if ((os_hooks) && (os_hooks)->vaddr_to_paddr) {	\
+	var = (os_hooks)->vaddr_to_paddr(addr);		\
+      }							\
+      var;						\
+    })
+
 
 
 #define V3_Malloc(size) ({			\
@@ -192,9 +211,12 @@ struct guest_info;
 
 /* This will contain function pointers that provide OS services */
 struct v3_os_hooks {
-  void (*print_info)(const char * format, ...);
-  void (*print_debug)(const char * format, ...);
-  void (*print_trace)(const char * format, ...);
+  void (*print_info)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
+  void (*print_debug)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
+  void (*print_trace)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
   
   void *(*allocate_pages)(int numPages);
   void (*free_page)(void * page);
@@ -223,7 +245,12 @@ struct v3_os_hooks {
 
 
 struct v3_vm_config {
-  void * vm_kernel;
+  void * rombios;
+  int rombios_size;
+
+  void * vgabios;
+  int vgabios_size;
+
   int use_ramdisk;
   void * ramdisk;
   int ramdisk_size;