X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=7c278d36ab0b52dad396eda88aee153c3042a9e5;hb=4db5b116275d135e67c67b0781fc8c184e884001;hp=9102c16bc1d13e886c80efa27de9adbcbd3f55b2;hpb=d4101540fb62c0459cacca0b3b8299e7ada91306;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 9102c16..7c278d3 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -73,7 +73,9 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
     if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
 	// Interrupt was taken in the guest
-	PrintDebug("Interrupt taken by guest\n");
+#ifdef DEBUG_INTERRUPTS
+	    PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector);
+#endif
 	v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
     }
 
@@ -345,7 +347,29 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
     // Update the low level state
 
-    if (v3_intr_pending(info)) {
+    if (v3_excp_pending(info)) {
+	uint_t excp = v3_get_excp_number(info);
+		
+	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
+	
+	if (info->excp_state.excp_error_code_valid) {
+	    guest_ctrl->EVENTINJ.error_code = info->excp_state.excp_error_code;
+	    guest_ctrl->EVENTINJ.ev = 1;
+#ifdef DEBUG_INTERRUPTS
+	    PrintDebug("Injecting exception %d with error code %x\n", excp, guest_ctrl->EVENTINJ.error_code);
+#endif
+	}
+	
+	guest_ctrl->EVENTINJ.vector = excp;
+	
+	guest_ctrl->EVENTINJ.valid = 1;
+#ifdef DEBUG_INTERRUPTS
+	PrintDebug("Injecting Exception %d (EIP=%p)\n", 
+		   guest_ctrl->EVENTINJ.vector, 
+		   (void *)(addr_t)info->rip);
+#endif
+	v3_injecting_excp(info, excp);
+    } else if (v3_intr_pending(info)) {
 
 	switch (v3_get_intr_type(info)) {
 	    case EXTERNAL_IRQ: {
@@ -353,54 +377,26 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		    
 		// check to see if ==-1 (non exists)
 		    
-		/*	
-		  guest_ctrl->EVENTINJ.vector = irq;
-		  guest_ctrl->EVENTINJ.valid = 1;
-		  guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
-		*/
 		    
 		guest_ctrl->guest_ctrl.V_IRQ = 1;
 		guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq;
 		guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
 		guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
 #ifdef DEBUG_INTERRUPTS
 		PrintDebug("Injecting Interrupt %d (EIP=%p)\n", 
 			   guest_ctrl->guest_ctrl.V_INTR_VECTOR, 
 			   (void *)(addr_t)info->rip);
 #endif
+
 		info->intr_state.irq_pending = 1;
 		info->intr_state.irq_vector = irq;
-
 		    
 		break;
 	    }
 	    case NMI:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
 		break;
-	    case EXCEPTION: {
-		uint_t excp = v3_get_intr_number(info);
-		
-		guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-		
-		if (info->intr_state.excp_error_code_valid) {  //PAD
-		    guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
-		    guest_ctrl->EVENTINJ.ev = 1;
-#ifdef DEBUG_INTERRUPTS
-		    PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code);
-#endif
-		}
-		
-		guest_ctrl->EVENTINJ.vector = excp;
-		
-		guest_ctrl->EVENTINJ.valid = 1;
-#ifdef DEBUG_INTERRUPTS
-		PrintDebug("Injecting Interrupt %d (EIP=%p)\n", 
-			   guest_ctrl->EVENTINJ.vector, 
-			   (void *)(addr_t)info->rip);
-#endif
-		v3_injecting_intr(info, excp, EXCEPTION);
-		break;
-	    }
 	    case SOFTWARE_INTR:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
 		break;
@@ -414,12 +410,9 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		return -1;
 	}
 	
-    } else {
-#ifdef DEBUG_INTERRUPTS
-	PrintDebug("No interrupts/exceptions pending\n");
-#endif
     }
-    
+
+
     guest_state->cr0 = info->ctrl_regs.cr0;
     guest_state->cr2 = info->ctrl_regs.cr2;
     guest_state->cr3 = info->ctrl_regs.cr3;