moved software interrupt injection to core interrupt code

[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 2a7c294..adf2aa4 100644 (file)
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -58,6 +58,9 @@ struct v3_intr_core_state {
     uint_t irq_started;
     uint_t irq_vector;
 
+    uint_t swintr_posted;
+    uint8_t swintr_vector;
+
     uint8_t virq_map[MAX_IRQ / 8];
 
     v3_lock_t irq_lock;
@@ -67,9 +70,12 @@ struct v3_intr_core_state {
 
 
 
-void v3_init_intr_controllers(struct guest_info * info);
+void v3_init_intr_controllers(struct guest_info * core);
 void v3_init_intr_routers(struct v3_vm_info * vm);
 
+void v3_deinit_intr_controllers(struct guest_info * core);
+void v3_deinit_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);
 
@@ -77,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);
@@ -89,10 +97,14 @@ struct intr_router_ops {
     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 * priv_data);
+void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data);
 
-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);
+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);