X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fgeekos%2Fvmm.h;h=896598f367f37109795ea8c8b3cf6929b1e44e8d;hb=b85f79b8030114370851ed3422c078debe630570;hp=3b0b1e086381499e962c32792794b4017619e032;hpb=701de97007c8b6776998eeab78469a4304f6b871;p=palacios.releases.git

diff --git a/palacios/include/geekos/vmm.h b/palacios/include/geekos/vmm.h
index 3b0b1e0..896598f 100644
--- a/palacios/include/geekos/vmm.h
+++ b/palacios/include/geekos/vmm.h
@@ -6,7 +6,9 @@
 #include <geekos/string.h>
 
 #include <geekos/vmm_mem.h>
+//#include <geekos/vmm_paging.h>
 
+#include <geekos/vm_guest.h>
 
 /* utility definitions */
 #define PrintDebug(fmt, args...)			\
@@ -68,16 +70,6 @@
 
 
 
-typedef struct guest_info {
-  ullong_t rip;
-  ullong_t rsp;
-
-  vmm_mem_list_t mem_list;
-  vmm_mem_layout_t mem_layout;
-  // device_map
-
-  void * vmm_data;
-} guest_info_t;
 
 
 
@@ -89,12 +81,15 @@ struct vmm_os_hooks {
   void (*print_debug)(const char * format, ...);
   void (*print_trace)(const char * format, ...);
   
-  void *(*Allocate_Pages)(int numPages);
-  void (*Free_Page)(void * page);
+  void *(*allocate_pages)(int numPages);
+  void (*free_page)(void * page);
 
   void *(*malloc)(uint_t size);
   void (*free)(void * addr);
 
+  void *(*paddr_to_vaddr)(void *addr);
+  void *(*vaddr_to_paddr)(void *addr);
+
 
   void (*start_kernel_thread)(); // include pointer to function
 };