Changeset 48998 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Oct 9, 2013 11:41:26 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89720

Message:

VMM/HMVMXR0: Propagate all unexpected exits to release log, slight changes to error macro names.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (16 diffs)

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

@@ -184 +184 @@
                                                     ("Illegal migration! Entered on CPU %u Current %u\n", \
                                                     pVCpu->hm.s.idEnteredCpu, RTMpCpuId())); \
+
+/** Helper macro for VM-exit handlers called unexpectedly. */
+#define HMVMX_RETURN_UNEXPECTED_EXIT() \
+    do { \
+        pVCpu->hm.s.u32HMError = pVmxTransient->uExitReason; \
+        return VERR_VMX_UNEXPECTED_EXIT; \
+    } while (0)
+
 
 /*******************************************************************************
@@ -8866 +8874 @@
         {
             pVCpu->hm.s.u32HMError = uExitIntrInfo;
-            rc = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE;
-            AssertMsgFailed(("Unexpected interruption code %#x\n", VMX_EXIT_INTERRUPTION_INFO_TYPE(uExitIntrInfo)));
+            rc = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE;
+            AssertMsgFailed(("Unexpected interruption info %#x\n", VMX_EXIT_INTERRUPTION_INFO_TYPE(uExitIntrInfo)));
             break;
         }
@@ -8902 +8910 @@
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
     AssertMsgFailed(("Unexpected NMI-window exit.\n"));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_NMI_WINDOW;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -8965 +8972 @@
 
     AssertMsgFailed(("hmR0VmxExitGetsec: unexpected VM-exit when CR4.SMXE is 0.\n"));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_GETSEC;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9158 +9164 @@
      */
     AssertMsgFailed(("Unexpected RSM VM-exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_RSM;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9175 +9180 @@
      */
     AssertMsgFailed(("Unexpected SMI VM-exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_SMI;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9187 +9191 @@
     /* Same treatment as VMX_EXIT_SMI. See comment in hmR0VmxExitSmi(). */
     AssertMsgFailed(("Unexpected IO SMI VM-exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_IO_SMI;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9203 +9206 @@
      */
     AssertMsgFailed(("Unexpected SIPI VM-exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    pVCpu->hm.s.u32HMError = VMX_EXIT_SIPI;
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9374 +9376 @@
 {
     AssertMsgFailed(("Unexpected MSR-load exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9385 +9387 @@
 {
     AssertMsgFailed(("Unexpected machine-check event exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9414 +9416 @@
         return VERR_EM_INTERPRETER;
     AssertMsgFailed(("Unexpected XDTR access. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9430 +9432 @@
         return VERR_EM_INTERPRETER;
     AssertMsgFailed(("Unexpected RDRAND exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -9531 +9533 @@
                 {
                     AssertMsgFailed(("Unexpected WRMSR for an MSR in the VMCS. ecx=%#RX32\n", pMixedCtx->ecx));
-                    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+                    HMVMX_RETURN_UNEXPECTED_EXIT();
                 }
 
@@ -9542 +9544 @@
                     AssertMsgFailed(("Unexpected WRMSR for an MSR in the auto-load/store area in the VMCS. ecx=%#RX32\n",
                                      pMixedCtx->ecx));
-                    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+                    HMVMX_RETURN_UNEXPECTED_EXIT();
                 }
             }
@@ -9564 +9566 @@
         return VERR_EM_INTERPRETER;
     AssertMsgFailed(("Unexpected PAUSE exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-    return VERR_VMX_UNEXPECTED_EXIT_CODE;
+    HMVMX_RETURN_UNEXPECTED_EXIT();
 }
 
@@ -10100 +10102 @@
     {
         AssertMsgFailed(("Unexpected MOV DRx exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));
-        return VERR_VMX_UNEXPECTED_EXIT_CODE;
+        HMVMX_RETURN_UNEXPECTED_EXIT();
     }