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=543084834c4631c9082503d90a024c6dfb4adf90;hpb=881733821ac0efab7d80485e86eb6bbb0e92e59e;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 5430848..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>
 
@@ -25,44 +28,81 @@
 #define SX_EXCEPTION          0x1e
 
 
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE, VIRTUAL} intr_types_t;
+typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL_INTR} intr_type_t;
 
 struct guest_info;
 
-struct vm_intr {
-  uint_t excp_pending;
-  uint_t excp_num;
-  uint_t excp_error_code;
-  
-  struct intr_ctrl_ops * controller;
-  void * controller_state;
 
-  /* some way to get the [A]PIC intr */
 
-};
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code);
-int hook_irq(struct guest_info * info, int irq);
+
+
+
+int v3_raise_irq(struct guest_info * info, int irq);
+
 
 struct intr_ctrl_ops {
   int (*intr_pending)(void * private_data);
   int (*get_intr_number)(void * private_data);
-  int (*raise_intr)(void * private_data, int irq, int error_code);
+  int (*raise_intr)(void * private_data, int irq);
   int (*begin_irq)(void * private_data, int irq);
 };
 
 
 
-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 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 vm_intr * intr);
-uint_t get_intr_number(struct vm_intr * intr);
-intr_types_t get_intr_type(struct vm_intr * intr);
+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 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