X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=af932dfdff93eeb0b74c2e4d0ebf5c245eafe172;hb=09ff0bf8fd1eba63b83e1232828f9e99b89eeecc;hp=4708cc102b32733252585190cc34b8a032eb0dff;hpb=851892e9e1db5252d2c03e58e7faf9d80c095f6c;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 4708cc1..af932df 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -23,6 +23,9 @@
 
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_types.h>
+#include <devices/vnic.h>
+
 
 #ifdef __V3VEE__
 
@@ -34,7 +37,7 @@
 
 /* utility definitions */
 
-#ifdef VMM_DEBUG
+
 #define PrintDebug(fmt, args...)			\
   do {							\
     extern struct v3_os_hooks * os_hooks;		\
@@ -42,6 +45,8 @@
       (os_hooks)->print_debug((fmt), ##args);		\
     }							\
   } while (0)						
+
+#if 1
 #else
 #define PrintDebug(fmt,args ...)
 #endif
@@ -104,6 +109,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) ({			\
@@ -173,7 +197,26 @@
   } while(0)								\
     
 
-
+#define V3_REGISTER_PKT_DELIVERY(x) \
+  ({\
+    int ret = 0;\
+    extern struct v3_os_hooks * os_hooks;		\
+    if ((os_hooks) && (os_hooks)->register_pkt_delivery) {		\
+     ret = (os_hooks)->register_pkt_delivery(x);				\
+    }\
+    ret; \
+  } )		
+
+#define V3_SEND_PKT(x, y) \
+  ({\
+    int ret=0; \
+    extern struct v3_os_hooks * os_hooks;		\
+    if ((os_hooks) && (os_hooks)->ne2k_send_packet) {		\
+      ret = (os_hooks)->ne2k_send_packet(x, y);				\
+    }\
+    ret; \
+  })
+  
 
 #define VMM_INVALID_CPU 0
 #define VMM_VMX_CPU 1
@@ -192,9 +235,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);
@@ -219,11 +265,27 @@ struct v3_os_hooks {
 
   void (*yield_cpu)(void);
 
+  //function by network card driver
+  int (*register_pkt_delivery)(int (*rcvd_fn)(uchar_t *packet, uint_t size));
+  int (*ne2k_send_packet)(uchar_t *packet, uint_t size);
+ 
 };
 
 
 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;