X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=adf2aa4b6af9314172d31bba053db6b28ec52948;hb=ed0e255bee17901009000903d6059cf1e8335cfb;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..adf2aa4 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -41,13 +41,6 @@ struct v3_irq_hook {
     void * priv_data;
 };
 
-// KCH
-struct v3_swintr_hook {
-    int (*handler)(struct guest_info * core, uint8_t vector, void * priv_data);
-    void * priv_data;
-};
-
-
 #define MAX_IRQ 256
 
 
@@ -65,10 +58,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];
 
@@ -92,6 +83,8 @@ int v3_raise_irq(struct v3_vm_info * vm, int irq);
 int v3_lower_irq(struct v3_vm_info * vm, int irq);
 
 
+int v3_raise_swintr(struct guest_info * core, uint8_t vector);
+
 
 struct intr_ctrl_ops {
     int (*intr_pending)(struct guest_info * info, void * private_data);
@@ -106,6 +99,7 @@ struct intr_router_ops {
 
 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);
 
@@ -124,6 +118,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 +127,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__