X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=7d6b61b1a8faec4b6a2b2a8492b57af9016ff0b8;hb=39849abeb743c4e6b669a790c307979fa8d51884;hp=931bb9929daf6ed500699c58e434c2fcf7d2f877;hpb=1fe82881720f7f9f64f789871f763aca93b47a7e;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 931bb99..7d6b61b 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -64,19 +64,21 @@ int v3_handle_svm_exit(struct guest_info * info) {
     info->ctrl_regs.efer = guest_state->efer;
     
     get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
-    info->cpu_mode = v3_get_cpu_mode(info);
-    info->mem_mode = v3_get_mem_mode(info);
+    info->cpu_mode = v3_get_vm_cpu_mode(info);
+    info->mem_mode = v3_get_vm_mem_mode(info);
 
 
     exit_code = guest_ctrl->exit_code;
 
 
     if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
-	// Interrupt was taken in the guest
+
 #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 {
 #ifdef DEBUG_INTERRUPTS
@@ -85,14 +87,12 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	}
     }
 
-    info->intr_state.irq_pending = 0;
+
   
 
     // Disable printing io exits due to bochs debug messages
     //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
     
-    
-    //  PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
   
     if ((0) && (exit_code <= VMEXIT_EXCP14)) {
 	uchar_t instr[32];
@@ -139,7 +139,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
     switch (exit_code) {
 	case VMEXIT_IOIO: {
 	    struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
-		
+
 	    if (io_info->type == 0) {
 		if (io_info->str) {
 
@@ -360,8 +360,14 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
 
     // Update the low level state
+    if (info->intr_state.irq_pending == 1) {
+
+	guest_ctrl->guest_ctrl.V_IRQ = 1;
+	guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector;
+	guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+	guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
 
-    if (v3_excp_pending(info)) {
+    } else if (v3_excp_pending(info)) {
 	uint_t excp = v3_get_excp_number(info);
 		
 	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;