X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=ec7a8c9a541874faf29dea41c2e3ac8bb4b2414a;hb=bc2c46a12649344d973e2201271c05390ce924bf;hp=919576a6a577b914fb1ec93b33af6e6c629f4660;hpb=702150ed1fe2151f0fcaa111998f09aa461aaf8e;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 919576a..ec7a8c9 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -1,6 +1,9 @@
 #ifndef __VMM_INTR_H_
 #define __VMM_INTR_H_
 
+
+#ifdef __V3VEE__
+
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
 
@@ -32,40 +35,11 @@ struct guest_info;
 
 
 
-/* We need a way to allow the APIC/PIC to decide when they are supposed to receive interrupts...
- * Maybe a notification call when they have been turned on, to deliver irqs to them...
- * We can rehook the guest raise_irq op, to the appropriate controller
- */
 
 
-struct vm_intr {
-
-  /* We need to rework the exception state, to handle stacking */
-  uint_t excp_pending;
-  uint_t excp_num;
-  uint_t excp_error_code_valid : 1;
-  uint_t excp_error_code;
-  
-  struct intr_ctrl_ops * controller;
-  void * controller_state;
-
-  /* some way to get the [A]PIC intr */
-
-};
-
 
 
 int v3_raise_irq(struct guest_info * info, int irq);
-int hook_irq(struct guest_info * info, int irq);
-
-
-struct vmm_intr_state;
-
-int hook_irq_new(uint_t irq,
-		 void (*handler)(struct vmm_intr_state *state),
-		 void  *opaque);
-
-int hook_irq_for_guest_injection(struct guest_info *info, int irq);
 
 
 struct intr_ctrl_ops {
@@ -77,11 +51,11 @@ struct intr_ctrl_ops {
 
 
 
-void init_interrupt_state(struct guest_info * info);
+
 void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
 
-int raise_exception(struct guest_info * info, uint_t excp);
-int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code);
+int v3_raise_exception(struct guest_info * info, uint_t excp);
+int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code);
 
 int intr_pending(struct guest_info * info);
 uint_t get_intr_number(struct guest_info * info);
@@ -93,4 +67,42 @@ int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type);
 int start_irq(struct vm_intr * intr);
 int end_irq(struct vm_intr * intr, int irq);
 */
+
+#endif // !__V3VEE__
+
+
+
+void init_interrupt_state(struct guest_info * info);
+
+/* We need a way to allow the APIC/PIC to decide when they are supposed to receive interrupts...
+ * Maybe a notification call when they have been turned on, to deliver irqs to them...
+ * We can rehook the guest raise_irq op, to the appropriate controller
+ */
+
+
+struct vm_intr {
+
+  /* We need to rework the exception state, to handle stacking */
+  uint_t excp_pending;
+  uint_t excp_num;
+  uint_t excp_error_code_valid : 1;
+  uint_t excp_error_code;
+  
+  struct intr_ctrl_ops * controller;
+  void * controller_state;
+
+  /* some way to get the [A]PIC intr */
+
+};
+
+
+struct vmm_intr_state;
+
+int v3_hook_irq(uint_t irq,
+		 void (*handler)(struct vmm_intr_state *state),
+		 void  *opaque);
+
+int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq);
+
+
 #endif