X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=2caba33a4ba2dc2554a8bd52e4dd0b251308b1d2;hb=a1e0475bbefa968791679c5e71232ddca522868b;hp=ec36284ea1055e15bb64e78586217879d51d0480;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ec36284..2caba33 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -14,55 +14,78 @@
 //#include <palacios/vmm_paging.h>
 
 /* utility definitions */
+
+#if VMM_DEBUG
 #define PrintDebug(fmt, args...)			\
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_debug) {	\
       (os_hooks)->print_debug((fmt), ##args);		\
     }							\
-  } while (0)						\
+  } while (0)						
+#else
+#define PrintDebug(fmt,args ...)
+#endif
+
+
+
+#define PrintError(fmt, args...)			\
+  do {							\
+    extern struct vmm_os_hooks * os_hooks;		\
+    if ((os_hooks) && (os_hooks)->print_debug) {	\
+      (os_hooks)->print_debug((fmt), ##args);		\
+    }							\
+  } while (0)						
 
 
 
+#if VMM_INFO
 #define PrintInfo(fmt, args...) 		        \
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_info) {		\
       (os_hooks)->print_info((fmt), ##args);		\
     }							\
-  } while (0)						\
+  } while (0)						
+#else
+#define PrintInfo(fmt, args...)
+#endif
 
 
+#if VMM_TRACE
 #define PrintTrace(fmt, args...)			\
   do {							\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_trace) {	\
       (os_hooks)->print_trace((fmt), ##args);		\
     }							\
-  } while (0)						\
-
+  } while (0)						
+#else
+#define PrintTrace(fmt, args...)
+#endif
 
 
-#define V3_AllocPages(ptr, num_pages)		        \
-  do {							\
+#define V3_AllocPages(num_pages)		        \
+  ({							\
     extern struct vmm_os_hooks * os_hooks;		\
-    ptr = 0;						\
+    void * ptr = 0;					\
     if ((os_hooks) && (os_hooks)->allocate_pages) {	\
       ptr = (os_hooks)->allocate_pages(num_pages);	\
     }							\
-  } while (0)						\
+    ptr;						\
+  })							\
+
+
+#define V3_FreePage(page)			\
+  do {						\
+    extern struct vmm_os_hooks * os_hooks;	\
+    if ((os_hooks) && (os_hooks)->free_page) {	\
+      (os_hooks)->free_page(page);		\
+    }						\
+  } while(0)					\
+
 
 
-/*
-#define V3_Malloc(type, var, size)			\
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    var = 0;						\
-    if ((os_hooks) && (os_hooks)->malloc) {		\
-      var = (type)(os_hooks)->malloc(size);		\
-    }							\
-  } while (0)						\
-*/
 
 #define V3_Malloc(size) ({			\
       extern struct vmm_os_hooks * os_hooks;	\
@@ -82,13 +105,29 @@
     }							\
   } while (0)						\
 
-#define V3_CPU_KHZ(khz)					\
-  do {							\
+
+// uint_t V3_CPU_KHZ();
+#define V3_CPU_KHZ()					\
+  ({ 							\
+    unsigned int khz = 0;				\
     extern struct vmm_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->get_cpu_khz) {	\
       khz = (os_hooks)->get_cpu_khz();			\
     }							\
-  } while (0)						\
+    khz;						\
+  })							\
+    
+
+
+#define V3_Hook_Interrupt(irq, opaque)				\
+  ({								\
+    int ret = 0;							\
+    extern struct vmm_os_hooks * os_hooks;			\
+    if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
+      ret = (os_hooks)->hook_interrupt(irq, opaque);		\
+    }								\
+    ret;							\
+  })								\
 
 
 /* ** */
@@ -104,12 +143,45 @@
   } while(0)								\
     
 
+
+
 #define VMM_INVALID_CPU 0
 #define VMM_VMX_CPU 1
 #define VMM_SVM_CPU 2
 
+
+// Maybe make this a define....
+typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU} v3_cpu_arch_t;
+
+
 #endif //!__V3VEE__
 
+#ifdef __V3VEE__
+typedef struct guest_info v3_guest_t;
+#else
+typedef void v3_guest_t;
+#endif
+
+
+
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct vmm_intr_state {
+  unsigned int irq;
+  unsigned int error;
+
+  unsigned int should_ack;  // Should the vmm ack this interrupt, or will
+                      // the host OS do it?
+
+  // This is the value given when the interrupt is hooked.
+  // This will never be NULL
+  void *opaque;
+};
+
+void deliver_interrupt_to_vmm(struct vmm_intr_state *state);
+
 
 /* This will contain function pointers that provide OS services */
 struct vmm_os_hooks {
@@ -126,36 +198,43 @@ struct vmm_os_hooks {
   void *(*paddr_to_vaddr)(void *addr);
   void *(*vaddr_to_paddr)(void *addr);
 
-  int (*hook_interrupt)(struct guest_info * info, int irq);
+  //  int (*hook_interrupt)(struct guest_info *s, int irq);
+
+  int (*hook_interrupt)(unsigned int irq, void *opaque);
+
   int (*ack_irq)(int irq);
 
 
   unsigned int (*get_cpu_khz)();
 
-  // Do we need this here?
-  //  void (*snprintf)(char * dst, char * format, int len, ...);
 
+  void (*start_kernel_thread)(); // include pointer to function
 
 
-  void (*start_kernel_thread)(); // include pointer to function
-};
 
+  // Filled in by initialization
+
+};
 
 
 /* This will contain Function pointers that control the VMs */
 struct vmm_ctrl_ops {
-  int (*init_guest)(struct guest_info* info);
-  int (*start_guest)(struct guest_info * info);
-  //  int (*stop_vm)(uint_t vm_id);
+  void *(*allocate_guest)();
 
+  int (*config_guest)(v3_guest_t * info, void * config_ptr);
+  int (*init_guest)(v3_guest_t * info);
+  int (*start_guest)(v3_guest_t * info);
+  //  int (*stop_vm)(uint_t vm_id);
 
+  int (*has_nested_paging)();
 
+  //  v3_cpu_arch_t (*get_cpu_arch)();
 };
 
 
 
 
-void Init_VMM(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);
+void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);