X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=824f7d20d1ca445b3dcf8a83c74e5f75c7ef39fe;hb=ff5e516d100f73849193c59c2af2cc3cd3e41f21;hp=dffbdb8c7098d73f6a5ac6321571fb21bd50ffea;hpb=ad78e7627af59b2ebbfebdd05b479a021174efe4;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index dffbdb8..824f7d2 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -424,8 +424,20 @@ static int update_irq_entry_state(struct guest_info * info) {
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
 		break;
 	    case V3_SOFTWARE_INTR:
-		guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
-		break;
+            guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
+#ifdef V3_CONFIG_EXT_SW_INTERRUPTS
+#ifdef V3_CONFIG_DEBUG_EXT_SW_INTERRUPTS
+            PrintDebug("Caught an injected software interrupt\n");
+            PrintDebug("\ttype: %d, vector: %d\n", SVM_INJECTION_SOFT_INTR, info->intr_core_state.swintr_vector);
+#endif
+            guest_ctrl->EVENTINJ.vector = info->intr_core_state.swintr_vector;
+            guest_ctrl->EVENTINJ.valid = 1;
+            
+            /* reset swintr state */
+            info->intr_core_state.swintr_posted = 0;
+            info->intr_core_state.swintr_vector = 0;
+#endif
+            break;
 	    case V3_VIRTUAL_IRQ:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_IRQ;
 		break;
@@ -463,7 +475,9 @@ int v3_svm_enter(struct guest_info * info) {
     // disable global interrupts for vm state transition
     v3_clgi();
 
-    // Update timer devices prior to entering VM.
+    // Update timer devices after being in the VM, with interupts
+    // disabled, but before doing IRQ updates, so that any interrupts they 
+    //raise get seen immediately.
     v3_update_timers(info);
 
     // Synchronize the guest state to the VMCB
@@ -548,13 +562,11 @@ int v3_svm_enter(struct guest_info * info) {
     info->mem_mode = v3_get_vm_mem_mode(info);
     /* ** */
 
-
     // save exit info here
     exit_code = guest_ctrl->exit_code;
     exit_info1 = guest_ctrl->exit_info1;
     exit_info2 = guest_ctrl->exit_info2;
 
-
 #ifdef V3_CONFIG_SYMCALL
     if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_exit_state(info);
@@ -563,20 +575,20 @@ int v3_svm_enter(struct guest_info * info) {
     update_irq_exit_state(info);
 #endif
 
-
     // reenable global interrupts after vm exit
     v3_stgi();
-
  
     // Conditionally yield the CPU if the timeslice has expired
     v3_yield_cond(info);
 
-
-
-    if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) {
-	PrintError("Error in SVM exit handler\n");
-	PrintError("  last exit was %d\n", v3_last_exit);
-	return -1;
+    {
+	int ret = v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2);
+	
+	if (ret != 0) {
+	    PrintError("Error in SVM exit handler (ret=%d)\n", ret);
+	    PrintError("  last Exit was %d (exit code=0x%llx)\n", v3_last_exit, (uint64_t) exit_code);
+	    return -1;
+	}
     }
 
 
@@ -760,11 +772,11 @@ int v3_is_svm_capable() {
 
 static int has_svm_nested_paging() {
     uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
-
+    
     v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
-
+    
     //PrintDebug("CPUID_EXT_FEATURE_IDS_edx=0x%x\n", edx);
-
+    
     if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
 	V3_Print("SVM Nested Paging not supported\n");
 	return 0;
@@ -772,8 +784,8 @@ static int has_svm_nested_paging() {
 	V3_Print("SVM Nested Paging supported\n");
 	return 1;
     }
-}
-
+ }
+ 
 
 
 void v3_init_svm_cpu(int cpu_id) {