儲存庫 vbox 的更動 13542

時間撮記:

2008-10-23 下午04:25:44 (16 年 以前)

作者:

vboxsync

訊息:

Additional release logging for two more VT-x error cases.

位置:

trunk/src/VBox/VMM

檔案:

• EM.cpp (修改) (1 筆差異)
• HWACCM.cpp (修改) (1 筆差異)
• HWACCMInternal.h (修改) (1 筆差異)
• VMMR0/HWVMXR0.cpp (修改) (6 筆差異)

trunk/src/VBox/VMM/EM.cpp

@@ -2378 +2378 @@
         case VERR_VMX_UNEXPECTED_EXIT_CODE:
         case VERR_VMX_INVALID_GUEST_STATE:
+        case VERR_VMX_UNABLE_TO_START_VM:
+        case VERR_VMX_UNABLE_TO_RESUME_VM:
             HWACCMR3CheckError(pVM, rc);
             break;

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1042 +1042 @@
         break;
 
+    case VERR_VMX_UNABLE_TO_START_VM:
+        LogRel(("VERR_VMX_UNABLE_TO_START_VM: instruction error %x\n", pVM->hwaccm.s.vmx.lasterror.ulLastInstrError));
+        LogRel(("VERR_VMX_UNABLE_TO_START_VM: exit reason       %x\n", pVM->hwaccm.s.vmx.lasterror.ulLastExitReason));
+        break;
+
+    case VERR_VMX_UNABLE_TO_RESUME_VM:
+        LogRel(("VERR_VMX_UNABLE_TO_RESUME_VM: instruction error %x\n", pVM->hwaccm.s.vmx.lasterror.ulLastInstrError));
+        LogRel(("VERR_VMX_UNABLE_TO_RESUME_VM: exit reason       %x\n", pVM->hwaccm.s.vmx.lasterror.ulLastExitReason));
+        break;
+
     case VERR_VMX_INVALID_VMXON_PTR:
         break;

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -352 +352 @@
             uint64_t                u64VMCSPhys;
             uint32_t                ulVMCSRevision;
+            uint32_t                ulLastInstrError;
+            uint32_t                ulLastExitReason;
             uint32_t                padding;
         } lasterror;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -51 +51 @@
 *   Local Functions                                                            *
 *******************************************************************************/
-#ifdef VBOX_STRICT
 static void VMXR0ReportWorldSwitchError(PVM pVM, int rc, PCPUMCTX pCtx);
-#else
-#define VMXR0ReportWorldSwitchError(a, b, c)      do { } while (0);
-#endif /* VBOX_STRICT */
 static void vmxR0SetupTLBEPT(PVM pVM);
 static void vmxR0SetupTLBVPID(PVM pVM);
@@ -3113 +3109 @@
 }
 
-#ifdef VBOX_STRICT
 /**
  * Report world switch error and dump some useful debug info
@@ -3140 +3135 @@
         if (rc == VINF_SUCCESS)
         {
+            Log(("Unable to start/resume VM for reason: %x. Instruction error %x\n", (uint32_t)exitReason, (uint32_t)instrError));
+            Log(("Current stack %08x\n", &rc));
+            
+            pVM->hwaccm.s.vmx.lasterror.ulLastInstrError = instrError;
+            pVM->hwaccm.s.vmx.lasterror.ulLastExitReason = exitReason;
+
+#ifdef VBOX_STRICT
             RTGDTR     gdtr;
             PX86DESCHC pDesc;
 
             ASMGetGDTR(&gdtr);
-
-            Log(("Unable to start/resume VM for reason: %x. Instruction error %x\n", (uint32_t)exitReason, (uint32_t)instrError));
-            Log(("Current stack %08x\n", &rc));
-
 
             VMXReadVMCS(VMX_VMCS_GUEST_RIP, &val);
@@ -3251 +3249 @@
             Log(("VMX_VMCS_HOST_RIP %VHv\n", val));
 
-#if HC_ARCH_BITS == 64
+# if HC_ARCH_BITS == 64
             Log(("MSR_K6_EFER       = %VX64\n", ASMRdMsr(MSR_K6_EFER)));
             Log(("MSR_K6_STAR       = %VX64\n", ASMRdMsr(MSR_K6_STAR)));
@@ -3257 +3255 @@
             Log(("MSR_K8_CSTAR      = %VX64\n", ASMRdMsr(MSR_K8_CSTAR)));
             Log(("MSR_K8_SF_MASK    = %VX64\n", ASMRdMsr(MSR_K8_SF_MASK)));
-#endif
+# endif
+#endif /* VBOX_STRICT */
         }
         break;
@@ -3268 +3267 @@
     }
 }
-#endif /* VBOX_STRICT */