X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=8cc9ae111c407cf4dd2793a7e7223e7e31ac57a7;hb=b580d9fca65a7b6f84eaebb57cad09bc6e941dfd;hp=be407c15aa771e377c67038d202e36099e175559;hpb=0b276ccfe1caf79b6c2752bf26d0e9933e52fb32;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index be407c1..8cc9ae1 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -25,94 +25,81 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
+#include <palacios/vmm_lock.h>
 
-#define DE_EXCEPTION          0x00  
-#define DB_EXCEPTION          0x01
-#define NMI_EXCEPTION         0x02
-#define BP_EXCEPTION          0x03
-#define OF_EXCEPTION          0x04
-#define BR_EXCEPTION          0x05
-#define UD_EXCEPTION          0x06
-#define NM_EXCEPTION          0x07
-#define DF_EXCEPTION          0x08
-#define TS_EXCEPTION          0x0a
-#define NP_EXCEPTION          0x0b
-#define SS_EXCEPTION          0x0c
-#define GPF_EXCEPTION         0x0d
-#define PF_EXCEPTION          0x0e
-#define MF_EXCEPTION          0x10
-#define AC_EXCEPTION          0x11
-#define MC_EXCEPTION          0x12
-#define XF_EXCEPTION          0x13
-#define SX_EXCEPTION          0x1e
-
-
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL_INTR} intr_type_t;
+
+typedef enum {V3_INVALID_INTR, V3_EXTERNAL_IRQ, V3_VIRTUAL_IRQ, V3_NMI, V3_SOFTWARE_INTR} v3_intr_type_t;
 
 struct guest_info;
+struct v3_vm_info;
 struct v3_interrupt;
 
 
 
 struct v3_irq_hook {
-    int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data);
+    int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data);
     void * priv_data;
 };
 
+#define MAX_IRQ 256
 
 
+struct v3_intr_routers {
+    struct list_head router_list;
 
+    v3_lock_t irq_lock;
 
-struct v3_intr_state {
-
-    /* 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 list_head controller_list;
-
+    /* some way to get the [A]PIC intr */
+    struct v3_irq_hook * hooks[256];
+};
 
+struct v3_intr_core_state {
     uint_t irq_pending;
+    uint_t irq_started;
     uint_t irq_vector;
 
-    /* some way to get the [A]PIC intr */
-    struct v3_irq_hook * hooks[256];
-  
+    uint8_t virq_map[MAX_IRQ / 8];
+
+    v3_lock_t irq_lock;
+
+    struct list_head controller_list;
 };
 
 
 
-void v3_init_interrupt_state(struct guest_info * info);
+void v3_init_intr_controllers(struct guest_info * info);
+void v3_init_intr_routers(struct v3_vm_info * vm);
 
+int v3_raise_virq(struct guest_info * info, int irq);
+int v3_lower_virq(struct guest_info * info, int irq);
 
-int v3_raise_irq(struct guest_info * info, int irq);
-int v3_lower_irq(struct guest_info * info, int irq);
+int v3_raise_irq(struct v3_vm_info * vm, int irq);
+int v3_lower_irq(struct v3_vm_info * vm, 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 (*lower_intr)(void * private_data, int irq);
-    int (*begin_irq)(void * private_data, int irq);
+    int (*intr_pending)(struct guest_info * info, void * private_data);
+    int (*get_intr_number)(struct guest_info * info, void * private_data);
+    int (*begin_irq)(struct guest_info * info, void * private_data, int irq);
 };
 
+struct intr_router_ops {
+    int (*raise_intr)(struct v3_vm_info * vm, void * private_data, int irq);
+    int (*lower_intr)(struct v3_vm_info * vm, void * private_data, int irq);
+};
 
+void v3_clear_pending_intr(struct guest_info * core);
 
 
-void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+int v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data);
+int v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data);
 
-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);
+v3_intr_type_t v3_intr_pending(struct guest_info * info);
+uint32_t v3_get_intr(struct guest_info * info);
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
 
-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 v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type);
 
 /*
   int start_irq(struct vm_intr * intr);
@@ -121,12 +108,12 @@ int v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t typ
 
 
 
-int v3_hook_irq(struct guest_info * info, 
+int v3_hook_irq(struct v3_vm_info * vm, 
 		uint_t irq,
-		int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+		int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data),
 		void  * priv_data);
 
-int v3_hook_passthrough_irq(struct guest_info *info, uint_t irq);
+int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq);