X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=9fae52eb1f7cb1419303a7a2801ac98ff24cb3d5;hb=3574c981404a1c812d369132db09ec2a27d59a5d;hp=2f264004d4bc0b027ebfeb5bcea98b2e3cf1700f;hpb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 2f26400..9fae52e 100644
--- 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>
@@ -34,7 +35,7 @@
 
 /* utility definitions */
 
-#ifdef VMM_DEBUG
+
 #define PrintDebug(fmt, args...)			\
   do {							\
     extern struct v3_os_hooks * os_hooks;		\
@@ -42,6 +43,8 @@
       (os_hooks)->print_debug((fmt), ##args);		\
     }							\
   } while (0)						
+
+#if 1
 #else
 #define PrintDebug(fmt,args ...)
 #endif
@@ -104,6 +107,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 +214,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);
@@ -212,18 +237,30 @@ struct v3_os_hooks {
   int (*ack_irq)(int irq);
 
 
-  unsigned int (*get_cpu_khz)();
+  unsigned int (*get_cpu_khz)(void);
 
 
-  void (*start_kernel_thread)(); // include pointer to function
+  void (*start_kernel_thread)(void); // include pointer to function
 
-  void (*yield_cpu)();
+  void (*yield_cpu)(void);
 
 };
 
 
 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 enable_profiling;
+
   int use_ramdisk;
   void * ramdisk;
   int ramdisk_size;
@@ -233,14 +270,14 @@ struct v3_vm_config {
 
 /* This will contain Function pointers that control the VMs */
 struct v3_ctrl_ops {
-  struct guest_info *(*allocate_guest)();
+  struct guest_info *(*allocate_guest)(void);
 
   int (*config_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
   int (*init_guest)(struct guest_info * info);
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
-  int (*has_nested_paging)();
+  int (*has_nested_paging)(void);
 
   //  v3_cpu_arch_t (*get_cpu_arch)();
 };