Changeset 78808 in vbox for trunk/src/VBox/VMM

Timestamp:

May 28, 2019 9:47:11 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Use HMVMX_UNEXPECTED_EXIT_RET consistently.

File:

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

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

@@ -153 +153 @@
 
 /** Helper macro for VM-exit handlers called unexpectedly. */
-#define HMVMX_UNEXPECTED_EXIT_RET(a_pVCpu, a_pVmxTransient) \
+#define HMVMX_UNEXPECTED_EXIT_RET(a_pVCpu, a_HmError) \
     do { \
-        (a_pVCpu)->hm.s.u32HMError = (a_pVmxTransient)->uExitReason; \
+        (a_pVCpu)->hm.s.u32HMError = (a_HmError); \
         return VERR_VMX_UNEXPECTED_EXIT; \
     } while (0)
@@ -13214 +13214 @@
     {
         AssertMsgFailed(("Unexpected NMI-window exit.\n"));
-        HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+        HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
     }
 
@@ -13335 +13335 @@
         return VINF_EM_RAW_EMULATE_INSTR;
 
-    AssertMsgFailed(("hmR0VmxExitGetsec: unexpected VM-exit when CR4.SMXE is 0.\n"));
-    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+    AssertMsgFailed(("hmR0VmxExitGetsec: Unexpected VM-exit when CR4.SMXE is 0.\n"));
+    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
 }
 
@@ -13761 +13761 @@
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
     AssertMsgFailed(("Unexpected VM-exit %u\n", pVmxTransient->uExitReason));
-    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
 }
 
@@ -13780 +13780 @@
         return VERR_EM_INTERPRETER;
     AssertMsgFailed(("Unexpected XDTR access\n"));
-    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
 }
 
@@ -13796 +13796 @@
         return VERR_EM_INTERPRETER;
     AssertMsgFailed(("Unexpected RDRAND exit\n"));
-    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
 }
 
@@ -13833 +13833 @@
         {
             AssertMsgFailed(("Unexpected RDMSR for an MSR in the auto-load/store area in the VMCS. ecx=%#RX32\n", idMsr));
-            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, idMsr);
         }
         if (hmR0VmxIsLazyGuestMsr(pVCpu, idMsr))
@@ -13842 +13842 @@
             {
                 AssertMsgFailed(("Unexpected RDMSR for a passthru lazy-restore MSR. ecx=%#RX32\n", idMsr));
-                HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+                HMVMX_UNEXPECTED_EXIT_RET(pVCpu, idMsr);
             }
         }
@@ -13963 +13963 @@
                 {
                     AssertMsgFailed(("Unexpected WRMSR for an MSR in the VMCS. ecx=%#RX32\n", idMsr));
-                    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+                    HMVMX_UNEXPECTED_EXIT_RET(pVCpu, idMsr);
                 }
 
@@ -13976 +13976 @@
                             AssertMsgFailed(("Unexpected WRMSR for an MSR in the auto-load/store area in the VMCS. ecx=%#RX32\n",
                                              idMsr));
-                            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+                            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, idMsr);
                         }
                     }
@@ -13987 +13987 @@
                         {
                             AssertMsgFailed(("Unexpected WRMSR for passthru, lazy-restore MSR. ecx=%#RX32\n", idMsr));
-                            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+                            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, idMsr);
                         }
                     }
@@ -14181 +14181 @@
         default:
         {
-            pVCpu->hm.s.u32HMError = uAccessType;
-            AssertMsgFailedReturn(("Invalid access-type in Mov CRx VM-exit qualification %#x\n", uAccessType),
-                                  VERR_VMX_UNEXPECTED_EXIT);
+            AssertMsgFailed(("Unrecognized Mov CRX access type %#x\n", uAccessType));
+            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, uAccessType);
         }
     }
@@ -14595 +14594 @@
     {
         AssertMsgFailed(("Unexpected MOV DRx exit\n"));
-        HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient);
+        HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
     }
 
@@ -15945 +15944 @@
             else
             {
-                pVCpu->hm.s.u32HMError = iCrReg;
-                AssertMsgFailedReturn(("MOV from CR%d VM-exit must not happen\n", iCrReg), VERR_VMX_UNEXPECTED_EXIT);
+                AssertMsgFailed(("MOV from CR%d VM-exit must not happen\n", iCrReg));
+                HMVMX_UNEXPECTED_EXIT_RET(pVCpu, iCrReg);
             }
             break;
@@ -16003 +16002 @@
         default:
         {
-            pVCpu->hm.s.u32HMError = uAccessType;
-            AssertMsgFailedReturn(("Invalid access-type in Mov CRx VM-exit qualification %#x\n", uAccessType),
-                                  VERR_VMX_UNEXPECTED_EXIT);
+            AssertMsgFailed(("Unrecognized Mov CRX access type %#x\n", uAccessType));
+            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, uAccessType);
         }
     }