Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


source code clean up,
[palacios.git] / palacios / include / palacios / vmm.h
index 01d4d35..8e64a04 100644 (file)
 //#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)                  \
   } while (0)                                          \
 
 
+#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;   \
+      void * var = 0;                          \
+      if ((os_hooks) && (os_hooks)->malloc) {  \
+       var = (os_hooks)->malloc(size);         \
+      }                                                \
+      var;                                     \
+    })
 
 // We need to check the hook structure at runtime to ensure its SAFE
 #define V3_Free(addr)                                  \
   } while (0)                                          \
 
 
+// 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();                 \
+    }                                                  \
+    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;                                                       \
+  })                                                           \
+
+
 /* ** */
 
 #define V3_ASSERT(x)                                                   \
   } while(0)                                                           \
     
 
+
+
 #define VMM_INVALID_CPU 0
 #define VMM_VMX_CPU 1
 #define VMM_SVM_CPU 2
 #endif //!__V3VEE__
 
 
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct vmm_intr_state {
+  uint_t irq;
+  uint_t error;
+
+  uint_t 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 {
   void (*print_info)(const char * format, ...);
@@ -109,11 +185,15 @@ 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)(uint_t irq, void *opaque);
+
   int (*ack_irq)(int irq);
 
-  // Do we need this here?
-  void (*snprintf)(char * dst, char * format, int len, ...);
+
+  unsigned int (*get_cpu_khz)();
+
 
   void (*start_kernel_thread)(); // include pointer to function
 };
@@ -126,14 +206,13 @@ struct vmm_ctrl_ops {
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
-
-
+  int (*has_nested_paging)();
 };
 
 
 
 
-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);