Changeset 79220 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 19, 2019 5:28:37 AM (6 years ago)

Author:

vboxsync

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

131398

Message:

VMM/IEM: Nested VMX: bugref:9180 VMPTRLD nit.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -8207 +8207 @@
      * different current VMCS.
      */
-    bool fLoadVmcsFromMem;
-    if (IEM_VMX_HAS_CURRENT_VMCS(pVCpu))
-    {
-        if (IEM_VMX_GET_CURRENT_VMCS(pVCpu) != GCPhysVmcs)
+    if (IEM_VMX_GET_CURRENT_VMCS(pVCpu) != GCPhysVmcs)
+    {
+        if (IEM_VMX_HAS_CURRENT_VMCS(pVCpu))
         {
             iemVmxCommitCurrentVmcsToMemory(pVCpu);
             Assert(!IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
-            fLoadVmcsFromMem = true;
-        }
-        else
-            fLoadVmcsFromMem = false;
-    }
-    else
-        fLoadVmcsFromMem = true;
-
-    if (fLoadVmcsFromMem)
-    {
+        }
+
         /* Finally, cache the new VMCS from guest memory and mark it as the current VMCS. */
         rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), (void *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs), GCPhysVmcs,