X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=df1750b119d995f8f5b62fd81ba3150d5c71b236;hb=659151a0b655c619f3acbb98a45e9eeb8002a4b3;hp=62c8667ea6bf77c2ad01c66ca04aed7572fac42a;hpb=dc6b47d05e37e6c3738e1bc6165ec4a107717d2b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 62c8667..df1750b 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -28,26 +28,27 @@
 #include <palacios/vmm_lock.h>
 
 
-typedef enum {V3_INVALID_INTR, V3_EXTERNAL_IRQ, V3_VIRTUAL_IRQ, V3_NMI, V3_SOFTWARE_INTR} v3_intr_type_t;
+typedef enum {V3_INVALID_INTR=0, 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 {
+    uint32_t irq;
 
-struct v3_irq_hook {
-    int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data);
-    void * priv_data;
+    int (*ack)(struct guest_info * core, uint32_t irq, void * private_data);
+    void * private_data;
 };
 
-// KCH
-struct v3_swintr_hook {
-    int (*handler)(struct guest_info * core, uint8_t vector, void * priv_data);
+
+
+struct v3_irq_hook {
+    int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data);
     void * priv_data;
 };
 
-
 #define MAX_IRQ 256
 
 
@@ -65,10 +66,8 @@ struct v3_intr_core_state {
     uint_t irq_started;
     uint_t irq_vector;
 
-    // KCH: for injecting SW Interrupts
     uint_t swintr_posted;
-    uint_t swintr_vector;
-    struct v3_swintr_hook * swintr_hooks[256];
+    uint8_t swintr_vector;
 
     uint8_t virq_map[MAX_IRQ / 8];
 
@@ -91,6 +90,14 @@ int v3_lower_virq(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);
 
+/* The irq structure is passed by value to avoid confusion and 
+ * the possibility that people will dynamically allocate memory for it 
+ */
+int v3_raise_acked_irq(struct v3_vm_info * vm, struct v3_irq irq);
+int v3_lower_acked_irq(struct v3_vm_info * vm, struct v3_irq irq);
+
+
+int v3_raise_swintr(struct guest_info * core, uint8_t vector);
 
 
 struct intr_ctrl_ops {
@@ -100,12 +107,13 @@ struct intr_ctrl_ops {
 };
 
 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);
+    int (*raise_intr)(struct v3_vm_info * vm, void * private_data, struct v3_irq * irq);
+    int (*lower_intr)(struct v3_vm_info * vm, void * private_data, struct v3_irq * 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 * priv_data);
 void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data);
 
@@ -113,7 +121,7 @@ void v3_remove_intr_controller(struct guest_info * core, void * handle);
 void v3_remove_intr_router(struct v3_vm_info * vm, void * handle);
 
 v3_intr_type_t v3_intr_pending(struct guest_info * info);
-uint32_t v3_get_intr(struct guest_info * info);
+int v3_get_intr(struct guest_info * info);
 int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
 
 
@@ -124,6 +132,7 @@ int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t
 */
 
 
+
 int v3_hook_irq(struct v3_vm_info * vm, 
 		uint_t irq,
 		int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data),
@@ -132,16 +141,6 @@ int v3_hook_irq(struct v3_vm_info * vm,
 int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq);
 
 
-int v3_hook_swintr(struct guest_info * core,
-        uint8_t vector,
-        int (*handler)(struct guest_info * core, uint8_t vector, void * priv_data),
-        void * priv_data);
-
-int v3_hook_passthrough_swintr(struct guest_info * core, uint8_t vector);
-
-
-int v3_signal_swintr(struct guest_info * core, int vec);
-int v3_handle_swintr(struct guest_info * core);
 
 #endif // !__V3VEE__