X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=9010a4c9b7097a89e17d68eed2a76d622c451164;hb=81361b1fc66eb2ca2e1eb80d3c3b98c6accde9d0;hp=0acf777aeed26a1f6035efea083c58a6d5f599bd;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 0acf777..9010a4c 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -26,7 +26,7 @@
 
 #include <palacios/vmm_lock.h>
 
-#ifndef CONFIG_DEBUG_INTERRUPTS
+#ifndef V3_CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -57,9 +57,24 @@ void v3_init_intr_controllers(struct guest_info * info) {
     intr_state->irq_started = 0;
     intr_state->irq_vector = 0;
 
+    v3_lock_init(&(intr_state->irq_lock));
+
     INIT_LIST_HEAD(&(intr_state->controller_list));
 }
 
+
+void v3_deinit_intr_controllers(struct guest_info * core) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+    struct intr_controller * ctrlr;
+    struct intr_controller * tmp;
+
+    // clear out any controllers that were left around
+    list_for_each_entry_safe(ctrlr, tmp, &(intr_state->controller_list), ctrl_node) {
+	v3_remove_intr_controller(core, ctrlr);
+    }
+}
+
+
 void v3_init_intr_routers(struct v3_vm_info * vm) {
     
     INIT_LIST_HEAD(&(vm->intr_routers.router_list));
@@ -70,7 +85,17 @@ void v3_init_intr_routers(struct v3_vm_info * vm) {
 }
 
 
-int v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data) {
+void v3_deinit_intr_routers(struct v3_vm_info * vm) {
+    struct intr_router * rtr = NULL;
+    struct intr_router * tmp = NULL;
+
+    // clear out any controllers that were left around
+    list_for_each_entry_safe(rtr, tmp, &(vm->intr_routers.router_list), router_node) {
+	v3_remove_intr_router(vm, rtr);
+    }  
+}
+
+void * v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data) {
     struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
 
     ctrlr->priv_data = priv_data;
@@ -78,10 +103,32 @@ int v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops *
 
     list_add(&(ctrlr->ctrl_node), &(info->intr_core_state.controller_list));
     
-    return 0;
+    return (void *)ctrlr;
 }
 
-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) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+    struct intr_controller * ctrlr = handle;
+    struct intr_controller * tmp = NULL;
+    int found = 0;
+
+    // search for the entry in the router list
+    list_for_each_entry(tmp, &(intr_state->controller_list), ctrl_node) {
+	if (tmp == ctrlr) {
+	    found = 1;
+	}
+    }
+
+    if (found == 0) {
+	PrintError("Attempted to remove invalid interrupt controller handle\n");
+	return;
+    }
+
+    list_del(&(ctrlr->ctrl_node));
+    V3_Free(ctrlr);
+}
+
+void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data) {
     struct intr_router * router = (struct intr_router *)V3_Malloc(sizeof(struct intr_router));
 
     router->priv_data = priv_data;
@@ -89,7 +136,28 @@ int v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops
 
     list_add(&(router->router_node), &(vm->intr_routers.router_list));
     
-    return 0;
+    return (void *)router;
+}
+
+void v3_remove_intr_router(struct v3_vm_info * vm, void * handle) {
+    struct intr_router * router = handle;
+    struct intr_router * tmp = NULL;
+    int found = 0;
+
+    // search for the entry in the router list
+    list_for_each_entry(tmp, &(vm->intr_routers.router_list), router_node) {
+	if (tmp == router) {
+	    found = 1;
+	}
+    }
+
+    if (found == 0) {
+	PrintError("Attempted to remove invalid interrupt router\n");
+	return;
+    }
+
+    list_del(&(router->router_node));
+    V3_Free(router);
 }
 
 
@@ -171,6 +239,18 @@ int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr) {
 
 
 
+int v3_raise_swintr (struct guest_info * core, uint8_t vector) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+
+    PrintDebug("Signaling software interrupt in v3_signal_swintr()\n");
+    PrintDebug("\tINT vector: %d\n", vector);
+    
+    intr_state->swintr_posted = 1;
+    intr_state->swintr_vector = vector;
+    return 0;
+}
+
+
 
 int v3_raise_virq(struct guest_info * info, int irq) {
     struct v3_intr_core_state * intr_state = &(info->intr_core_state);
@@ -227,6 +307,15 @@ int v3_raise_irq(struct v3_vm_info * vm, int irq) {
 
 
 
+
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+
+    intr_state->irq_pending = 0;
+
+}
+
+
 v3_intr_type_t v3_intr_pending(struct guest_info * info) {
     struct v3_intr_core_state * intr_state = &(info->intr_core_state);
     struct intr_controller * ctrl = NULL;
@@ -252,6 +341,11 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) {
 	    }
 	}
     }
+    
+    /* for swintr injection */
+    if (intr_state->swintr_posted == 1) {
+        ret = V3_SOFTWARE_INTR;
+    }
 
     v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
@@ -314,7 +408,7 @@ intr_type_t v3_get_intr_type(struct guest_info * info) {
 	}
     }
 
-#ifdef CONFIG_DEBUG_INTERRUPTS
+#ifdef V3_CONFIG_DEBUG_INTERRUPTS
     if (type == V3_INVALID_INTR) {
 	PrintError("[get_intr_type] Invalid_Intr\n");
     }