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

Timestamp:

May 21, 2019 4:16:30 PM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 task-switch VM-exit handling.

File:

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

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

@@ -12715 +12715 @@
         case VMX_EXIT_MWAIT:
         case VMX_EXIT_MONITOR:
-        case VMX_EXIT_TASK_SWITCH:
         case VMX_EXIT_PREEMPT_TIMER:
 
@@ -12753 +12752 @@
             else
                 rcStrict = hmR0VmxExitWrmsr(pVCpu, pVmxTransient);
+            break;
+        }
+
+        case VMX_EXIT_TASK_SWITCH:
+        {
+            int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+            rc    |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+            rc    |= hmR0VmxReadIdtVectoringInfoVmcs(pVmxTransient);
+            if (VMX_IDT_VECTORING_INFO_IS_VALID(pVmxTransient->uIdtVectoringInfo))
+                rc |= hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
+            else
+            {
+                pVmxTransient->uIdtVectoringInfo      = 0;
+                pVmxTransient->uIdtVectoringErrorCode = 0;
+            }
+            AssertRCReturn(rc, rc);
+
+            VMXVEXITINFO ExitInfo;
+            RT_ZERO(ExitInfo);
+            ExitInfo.cbInstr = pVmxTransient->cbInstr;
+            ExitInfo.u64Qual = pVmxTransient->uExitQual;
+
+            VMXVEXITEVENTINFO ExitEventInfo;
+            RT_ZERO(ExitInfo);
+            ExitEventInfo.uIdtVectoringInfo    = pVmxTransient->uIdtVectoringInfo;
+            ExitEventInfo.uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+
+            rcStrict = IEMExecVmxVmexitTaskSwitch(pVCpu, &ExitInfo, &ExitEventInfo);
             break;
         }