X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=a981c960019daf850b4c871ef0fe08bd62cfcb84;hb=26807ca4c1fd7ea21a615b29626e73a75873bead;hp=5535a6fb095c9074148302de8945ba05dafd8dbe;hpb=78818a71a31b4cbe264c1292f7bcbdbfd2ceb544;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 5535a6f..a981c96 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -44,7 +44,6 @@ int v3_handle_svm_exit(struct guest_info * info) {
     guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
     guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
   
-
     // Update the high level state 
     info->rip = guest_state->rip;
     info->vm_regs.rsp = guest_state->rsp;
@@ -52,7 +51,6 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
     info->cpl = guest_state->cpl;
 
-
     info->ctrl_regs.cr0 = guest_state->cr0;
     info->ctrl_regs.cr2 = guest_state->cr2;
     info->ctrl_regs.cr3 = guest_state->cr3;
@@ -63,39 +61,45 @@ int v3_handle_svm_exit(struct guest_info * info) {
     info->ctrl_regs.rflags = guest_state->rflags;
     info->ctrl_regs.efer = guest_state->efer;
     
-    get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+    v3_get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
     info->cpu_mode = v3_get_vm_cpu_mode(info);
     info->mem_mode = v3_get_vm_mem_mode(info);
 
-
     exit_code = guest_ctrl->exit_code;
 
-
-    //  PrintDebug("SVM Exit: %s (rip=%p)\n", vmexit_code_to_str(exit_code), (void *)info->rip);
+    //    PrintDebug("SVM Exit: %s (rip=%p) (info1=%p)\n", vmexit_code_to_str(exit_code), 
+    //	       (void *)(addr_t)info->rip, (void *)(addr_t)guest_ctrl->exit_info1);
 
     if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
 
 #ifdef DEBUG_INTERRUPTS
+	PrintDebug("INTAK cycle completed for irq %d\n", info->intr_state.irq_vector);
+#endif
+
+	info->intr_state.irq_started = 1;
+	info->intr_state.irq_pending = 0;
+
+	v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
+    }
+
+    if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) {
+#ifdef DEBUG_INTERRUPTS
 	PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector);
 #endif
-	if (!guest_ctrl->exit_int_info.valid) {
-	    info->intr_state.irq_pending = 0;
-	    // PrintDebug("Injected Interrupt %d\n", info->intr_state.irq_vector);
-	    v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
-	} else {
+
+	// Interrupt was taken fully vectored
+	info->intr_state.irq_started = 0;
+
+    } else {
 #ifdef DEBUG_INTERRUPTS
-	    PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector);
+	PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector);
 #endif
-	}
     }
 
 
-  
-
     // Disable printing io exits due to bochs debug messages
     //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
-    
-  
+
     if ((0) && (exit_code <= VMEXIT_EXCP14)) {
 	uchar_t instr[32];
 	int ret;
@@ -103,7 +107,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
 	//PrintDebug("RIP: %x\n", guest_state->rip);
 	PrintDebug("\n\n\nRIP Linear: %p\n", (void *)get_addr_linear(info, info->rip, &(info->segments.cs)));
-	
+
 	v3_print_GPRs(info);
 	v3_print_ctrl_regs(info);
 
@@ -117,7 +121,6 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	} else { 
 	    ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr);
 	}
-	
 
 
 	if (ret != 32) {
@@ -135,7 +138,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	rdtscll(info->profiler.start_time);
     }
 
-  
+
     //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
 
     switch (exit_code) {
@@ -165,7 +168,6 @@ int v3_handle_svm_exit(struct guest_info * info) {
 			return -1;
 		    }
 		}
-
 	    }
 	    break;
 	}
@@ -360,7 +362,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
     }
 
 
-    // Update the low level state
+
     if (v3_excp_pending(info)) {
 	uint_t excp = v3_get_excp_number(info);
 	
@@ -383,7 +385,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		   (void *)(addr_t)info->rip);
 #endif
 	v3_injecting_excp(info, excp);
-    } else if (info->intr_state.irq_pending == 1) {
+    } else if (info->intr_state.irq_started == 1) {
 #ifdef DEBUG_INTERRUPTS
 	PrintDebug("IRQ pending from previous injection\n");
 #endif
@@ -455,7 +457,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
     guest_state->rsp = info->vm_regs.rsp;
 
 
-    set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+    v3_set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
 
     if (exit_code == VMEXIT_INTR) {
 	//PrintDebug("INTR ret IP = %x\n", guest_state->rip);