X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=5b0b7619d11fbf3ed934916771de86d5ade37760;hb=18cc68af5caa15264a853167e9d2d885cb79317a;hp=6d38fb7cc38bbf79f05d22bbc3b6448056ff5558;hpb=a7dc3322984b3c76fe990de506418e180ec1b0de;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 6d38fb7..5b0b761 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -64,13 +64,16 @@ 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;
 
 
+    //    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
@@ -342,7 +345,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	    
 	    
 	    if (info->shdw_pg_mode == SHADOW_PAGING) {
-		PrintHostPageTables(info, info->ctrl_regs.cr3);
+		//	PrintHostPageTables(info, info->ctrl_regs.cr3);
 		//PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3);
 	    }
 	    
@@ -356,20 +359,12 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	rdtscll(info->profiler.end_time);
 	v3_profile_exit(info, exit_code);
     }
-      
-
 
-    // 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;
 
-    } else if (v3_excp_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) {
@@ -389,6 +384,15 @@ 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) {
+#ifdef DEBUG_INTERRUPTS
+	PrintDebug("IRQ pending from previous injection\n");
+#endif
+	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;
+
     } else if (v3_intr_pending(info)) {
 
 	switch (v3_get_intr_type(info)) {
@@ -430,6 +434,8 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		return -1;
 	}
 	
+    } else {
+	//PrintDebug("Not interrupts or exceptions pending\n");
     }