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

Timestamp:

Feb 8, 2018 9:40:29 AM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested Hw.virt: Don't ignore result of PGMFlushTLB.

File:

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

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

@@ -64 +64 @@
      * below doesn't actually change anything.
      */
-    PGMFlushTLB(pVCpu, pCtx->cr3, true);
-
-    /*
-     * Inform PGM about paging mode changes.
-     * We include X86_CR0_PE because PGM doesn't handle paged-real mode yet,
-     * see comment in iemMemPageTranslateAndCheckAccess().
-     */
-    int rc = PGMChangeMode(pVCpu, pCtx->cr0 | X86_CR0_PE, pCtx->cr4, pCtx->msrEFER);
+    int rc = PGMFlushTLB(pVCpu, pCtx->cr3, true);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Inform PGM about paging mode changes.
+         * We include X86_CR0_PE because PGM doesn't handle paged-real mode yet,
+         * see comment in iemMemPageTranslateAndCheckAccess().
+         */
+        rc = PGMChangeMode(pVCpu, pCtx->cr0 | X86_CR0_PE, pCtx->cr4, pCtx->msrEFER);
 #ifdef IN_RING3
-    Assert(rc != VINF_PGM_CHANGE_MODE);
+        Assert(rc != VINF_PGM_CHANGE_MODE);
 #endif
-    AssertRCReturn(rc, rc);
-
-    /* Inform CPUM (recompiler), can later be removed. */
-    CPUMSetChangedFlags(pVCpu, CPUM_CHANGED_ALL);
-
-    /* Re-initialize IEM cache/state after the drastic mode switch. */
-    iemReInitExec(pVCpu);
+        AssertRCReturn(rc, rc);
+
+        /* Inform CPUM (recompiler), can later be removed. */
+        CPUMSetChangedFlags(pVCpu, CPUM_CHANGED_ALL);
+
+        /* Re-initialize IEM cache/state after the drastic mode switch. */
+        iemReInitExec(pVCpu);
+    }
     return rc;
 }