updated to use pa_to_va address conversion

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 4708cc1..cafc5ab 100644 (file)
--- 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) ({                     \
@@ -223,7 +242,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;