small fixes

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 4708cc1..b164213 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -24,6 +24,7 @@
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
 
+
 #ifdef __V3VEE__
 
 //#include <palacios/vmm_types.h>
@@ -104,6 +105,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 +212,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 +246,16 @@ struct v3_os_hooks {
 
 
 struct v3_vm_config {
-  void * vm_kernel;
+  void * rombios;
+  int rombios_size;
+
+  void * vgabios;
+  int vgabios_size;
+
+  unsigned long mem_size; // in bytes, var should be natural size of cpu
+                          // so we can specify maximum physical address size
+                          // (We're screwed if we want to do 32 bit host/64 bit guest)
+
   int use_ramdisk;
   void * ramdisk;
   int ramdisk_size;