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

Timestamp:

May 31, 2019 3:53:25 AM (6 years ago)

Author:

vboxsync

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

131003

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 VM-exit handling assertion, typo.

File:

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

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

@@ -16374 +16374 @@
         return IEMExecVmxVmexitInstr(pVCpu, pVmxTransient->uExitReason, pVmxTransient->cbInstr);
     }
-    return hmR0VmxExitInvpcid(pVCpu, pVmxTransient);
+    return hmR0VmxExitWbinvd(pVCpu, pVmxTransient);
 }
 
@@ -16387 +16387 @@
     if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INVLPG_EXIT))
     {
+        Assert(CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_INVPCID));
         int rc  = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
         rc     |= hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);