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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ec36284..aebc8ad 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -14,33 +14,55 @@
 //#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)		        \
@@ -82,14 +104,16 @@
     }							\
   } while (0)						\
 
-#define V3_CPU_KHZ(khz)					\
-  do {							\
+#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;						\
+  })							\
+    
 
 /* ** */
 
@@ -111,6 +135,25 @@
 #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, ...);
@@ -126,7 +169,12 @@ 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)(int irq, vmm_intr_handler handler, uint_t opaque);
+
+  int (*hook_interrupt)(struct guest_info *s, int irq);
+
+  int (*hook_interrupt_new)(uint_t irq, void *opaque);
+
   int (*ack_irq)(int irq);
 
 
@@ -148,8 +196,7 @@ struct vmm_ctrl_ops {
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
-
-
+  int (*has_nested_paging)();
 };