Changeset 78492 in vbox

Timestamp:

May 14, 2019 5:04:52 AM (6 years ago)

Author:

vboxsync

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

130530

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Use 'uExitReason' to avoid typos/copy-paste issues.

File:

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

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

@@ -12516 +12516 @@
 DECLINLINE(VBOXSTRICTRC) hmR0VmxHandleExitNested(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
 {
-    VBOXSTRICTRC   rcStrict = VINF_SUCCESS;
-    uint32_t const rcReason = pVmxTransient->uExitReason;
-    switch (rcReason)
+    VBOXSTRICTRC   rcStrict;
+    uint32_t const uExitReason = pVmxTransient->uExitReason;
+    switch (uExitReason)
     {
         case VMX_EXIT_EPT_MISCONFIG:
@@ -12546 +12546 @@
                 VMXVEXITINFO ExitInfo;
                 RT_ZERO(ExitInfo);
-                ExitInfo.uReason = pVmxTransient->uExitReason;
+                ExitInfo.uReason = uExitReason;
                 ExitInfo.cbInstr = pVmxTransient->cbInstr;
                 ExitInfo.u64Qual = pVmxTransient->uExitQual;
@@ -12560 +12560 @@
             int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
             AssertRCReturn(rc, rc);
-            rcStrict = IEMExecVmxVmexitInstr(pVCpu, VMX_EXIT_CPUID, pVmxTransient->cbInstr);
+            rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
             break;
         }
@@ -12569 +12569 @@
             AssertRCReturn(rc, rc);
             if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_RDTSC_EXIT))
-                rcStrict = IEMExecVmxVmexitInstr(pVCpu, VMX_EXIT_RDTSC, pVmxTransient->cbInstr);
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
             else
                 rcStrict = hmR0VmxExitRdtsc(pVCpu, pVmxTransient);
@@ -12575 +12575 @@
         }
 
-
         case VMX_EXIT_RDTSCP:
         {
@@ -12581 +12580 @@
             AssertRCReturn(rc, rc);
             if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_RDTSC_EXIT))
-                rcStrict = IEMExecVmxVmexitInstr(pVCpu, VMX_EXIT_RDTSCP, pVmxTransient->cbInstr);
+                rcStrict = IEMExecVmxVmexitInstr(pVCpu, uExitReason, pVmxTransient->cbInstr);
             else
                 rcStrict = hmR0VmxExitRdtsc(pVCpu, pVmxTransient);
@@ -12615 +12614 @@
         case VMX_EXIT_GETSEC:
         case VMX_EXIT_RDPMC:
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
         case VMX_EXIT_VMCLEAR:
         case VMX_EXIT_VMLAUNCH:
@@ -12625 +12623 @@
         case VMX_EXIT_VMXOFF:
         case VMX_EXIT_VMXON:
-#endif
         case VMX_EXIT_TRIPLE_FAULT:
         case VMX_EXIT_NMI_WINDOW:
@@ -12646 +12643 @@
         case VMX_EXIT_PML_FULL:
         default:
-            return hmR0VmxExitErrUndefined(pVCpu, pVmxTransient);
+            rcStrict = hmR0VmxExitErrUndefined(pVCpu, pVmxTransient);
+            break;
     }