more namespace changes

[palacios.git] / palacios / include / palacios / vmm_intr.h

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 0aa7038..fd83edb 100644 (file)
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -26,6 +26,7 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
 
+
 #define DE_EXCEPTION          0x00  
 #define DB_EXCEPTION          0x01
 #define NMI_EXCEPTION         0x02
@@ -50,6 +51,7 @@
 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...
@@ -57,7 +59,13 @@ struct guest_info;
  */
 
 
-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;
@@ -70,20 +78,19 @@ struct vm_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 +103,35 @@ struct intr_ctrl_ops {
 
 
 
-void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+void v3_set_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