Fix interrupt injection bug due to caching irq vectors after vector mappings have...

[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 50e1b22..44de7db 100644 (file)
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -25,10 +25,10 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
+#include <palacios/vmm_lock.h>
 
 
-
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, 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_interrupt;
@@ -40,6 +40,7 @@ struct v3_irq_hook {
     void * priv_data;
 };
 
+#define MAX_IRQ 256
 
 
 
@@ -52,6 +53,10 @@ struct v3_intr_state {
     uint_t irq_started;
     uint_t irq_vector;
 
+    uint8_t virq_map[MAX_IRQ / 8];
+
+    v3_lock_t irq_lock;
+
     /* some way to get the [A]PIC intr */
     struct v3_irq_hook * hooks[256];
   
@@ -62,28 +67,33 @@ struct v3_intr_state {
 void v3_init_interrupt_state(struct guest_info * info);
 
 
+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);
 
 
 
 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 (*raise_intr)(struct guest_info * info, void * private_data, int irq);
+    int (*lower_intr)(struct guest_info * info, void * private_data, int irq);
+    int (*begin_irq)(struct guest_info * info, 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_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);
+v3_intr_type_t v3_intr_pending(struct guest_info * info);
+uint32_t v3_get_intr(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 v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
 
 /*
   int start_irq(struct vm_intr * intr);