X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=cc3b7c9a5142bf13c73faee5fbfea42db9a65324;hb=7bb4a918835892e9071ffbdef1ea8e57f9a12950;hp=0aa703848b7279a6afc89e782c7bf094e28c2463;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 0aa7038..cc3b7c9 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -23,8 +23,8 @@
 
 #ifdef __V3VEE__
 
-#include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
+#include <palacios/vmm_list.h>
 
 #define DE_EXCEPTION          0x00  
 #define DB_EXCEPTION          0x01
@@ -50,14 +50,20 @@
 typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL_INTR} intr_type_t;
 
 struct guest_info;
+struct v3_interrupt;
 
-/* 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 {
+struct v3_irq_hook {
+  int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data);
+  void * priv_data;
+};
+
+
+
+
+
+struct v3_intr_state {
 
   /* We need to rework the exception state, to handle stacking */
   uint_t excp_pending;
@@ -65,25 +71,23 @@ struct vm_intr {
   uint_t excp_error_code_valid : 1;
   uint_t excp_error_code;
   
-  struct intr_ctrl_ops * controller;
-  void * controller_state;
+  struct list_head controller_list;
 
-  /* some way to get the [A]PIC intr */
 
+  /* some way to get the [A]PIC intr */
+  struct v3_irq_hook * hooks[256];
+  
 };
 
 
 
-void init_interrupt_state(struct guest_info * info);
+void v3_init_interrupt_state(struct guest_info * info);
 
 
 int v3_raise_irq(struct guest_info * info, int irq);
-
-/*Zheng 07/30/2008*/
 int v3_lower_irq(struct guest_info * info, int irq);
 
 
-/*Zheng 07/30/2008*/
 
 struct intr_ctrl_ops {
   int (*intr_pending)(void * private_data);
@@ -96,38 +100,35 @@ struct intr_ctrl_ops {
 
 
 
-void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
 
 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);
-intr_type_t get_intr_type(struct guest_info * info);
+int v3_intr_pending(struct guest_info * info);
+uint_t v3_get_intr_number(struct guest_info * info);
+intr_type_t v3_get_intr_type(struct guest_info * info);
 
-int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type);
+int v3_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__
-
-
 
 
+int v3_hook_irq(struct guest_info * info, 
+		uint_t irq,
+		int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+		void  * priv_data);
 
+int v3_hook_passthrough_irq(struct guest_info *info, uint_t irq);
 
 
 
-struct vmm_intr_state;
-
-int v3_hook_irq(uint_t irq,
-		void (*handler)(struct vmm_intr_state *state),
-		void  *opaque);
+#endif // !__V3VEE__
 
-int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq);
 
 
 #endif