X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=549ccb15f5f8fcc17136eea16a643439c0ae5457;hb=da0f0deecf22754656bad2a95640461ec3ac4f1d;hp=cafc5abbad7ded3151af3435402ae93fcb8303e0;hpb=a2b7cc4f2d739213d1edefb85ff941c41c86907b;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index cafc5ab..549ccb1 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
@@ -211,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);
@@ -248,6 +254,10 @@ struct v3_vm_config {
   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;