X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=9010a4c9b7097a89e17d68eed2a76d622c451164;hb=5f957c3aeebed4a07a0862cb5fbf595aa4436e81;hp=0c0a6775e2c4a48c966429782479a31123708756;hpb=603e4c1a451138080ded3d4e3cd3b8716741db89;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 0c0a677..9010a4c 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -26,13 +26,14 @@
 
 #include <palacios/vmm_lock.h>
 
-#ifndef CONFIG_DEBUG_INTERRUPTS
+#ifndef V3_CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
 
 
 
+
 struct intr_controller {
     struct intr_ctrl_ops * ctrl_ops;
     
@@ -49,8 +50,6 @@ struct intr_router {
 
 };
 
-
-
 void v3_init_intr_controllers(struct guest_info * info) {
     struct v3_intr_core_state * intr_state = &(info->intr_core_state);
 
@@ -96,7 +95,6 @@ void v3_deinit_intr_routers(struct v3_vm_info * vm) {
     }  
 }
 
-
 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));
 
@@ -108,7 +106,6 @@ void * v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_op
     return (void *)ctrlr;
 }
 
-
 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;
@@ -131,7 +128,6 @@ void v3_remove_intr_controller(struct guest_info * core, void * handle) {
     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));
 
@@ -143,7 +139,6 @@ void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops *
     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;
@@ -166,6 +161,7 @@ void v3_remove_intr_router(struct v3_vm_info * vm, void * handle) {
 }
 
 
+
 static inline struct v3_irq_hook * get_irq_hook(struct v3_vm_info * vm, uint_t irq) {
     V3_ASSERT(irq <= 256);
     return vm->intr_routers.hooks[irq];
@@ -203,6 +199,7 @@ int v3_hook_irq(struct v3_vm_info * vm,
 }
 
 
+
 static int passthrough_irq_handler(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data) {
     PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", 
 	       intr->irq, (void *)vm);
@@ -210,7 +207,6 @@ static int passthrough_irq_handler(struct v3_vm_info * vm, struct v3_interrupt *
     return v3_raise_irq(vm, intr->irq);
 }
 
-
 int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq) {
     int rc = v3_hook_irq(vm, irq, passthrough_irq_handler, NULL);
 
@@ -224,6 +220,9 @@ int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq) {
 }
 
 
+
+
+
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr) {
     PrintDebug("v3_deliver_irq: irq=%d state=0x%p, \n", intr->irq, (void *)intr);
   
@@ -238,6 +237,21 @@ 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);
     int major = irq / 8;
@@ -248,7 +262,6 @@ int v3_raise_virq(struct guest_info * info, int irq) {
     return 0;
 }
 
-
 int v3_lower_virq(struct guest_info * info, int irq) {
     struct v3_intr_core_state * intr_state = &(info->intr_core_state);
     int major = irq / 8;
@@ -276,7 +289,6 @@ int v3_lower_irq(struct v3_vm_info * vm, int irq) {
     return 0;
 }
 
-
 int v3_raise_irq(struct v3_vm_info * vm, int irq) {
     struct intr_router * router = NULL;
     struct v3_intr_routers * routers = &(vm->intr_routers);
@@ -294,22 +306,13 @@ int v3_raise_irq(struct v3_vm_info * vm, int irq) {
 }
 
 
-int v3_signal_sw_intr(struct guest_info * core, int vec) {
-    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
-
-    PrintDebug("KCH: Signalling a software interrupt in vmm_intr.c\n");
-    PrintDebug("\tINT vector: %d\n", vec);
-    
-    intr_state->sw_intr_pending = 1;
-    intr_state->sw_intr_vector = vec;
-    return 0;
-}
 
 
 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;
+
 }
 
 
@@ -338,12 +341,11 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) {
 	    }
 	}
     }
-
-    // KCH: not sure about this
-    if (intr_state->sw_intr_pending == 1) {
+    
+    /* for swintr injection */
+    if (intr_state->swintr_posted == 1) {
         ret = V3_SOFTWARE_INTR;
     }
-        
 
     v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
@@ -406,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");
     }
@@ -419,6 +421,9 @@ intr_type_t v3_get_intr_type(struct guest_info * info) {
 */
 
 
+
+
+
 int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type) {
     struct v3_intr_core_state * intr_state = &(info->intr_core_state);