Changeset 72449 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 5, 2018 10:52:38 AM (7 years ago)

Author:

vboxsync

Message:

VMM/EM: VINF_PGM_CHANGE_MODE fixes in ring-3 caused by bug addressed in r122925.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1716 +1716 @@
                              *        doesn't intercept HLT but intercepts INTR? */
                             *pfResched = true;
+                            Assert(rcStrict != VINF_PGM_CHANGE_MODE);
                             if (rcStrict == VINF_SVM_VMEXIT)
                                 return VINF_SUCCESS;
-                            if (rcStrict == VINF_PGM_CHANGE_MODE)
-                                return PGMChangeMode(pVCpu, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
                             return VBOXSTRICTRC_VAL(rcStrict);
                         }
@@ -1730 +1729 @@
                     /** @todo this really isn't nice, should properly handle this */
                     int rc = TRPMR3InjectEvent(pVM, pVCpu, TRPM_HARDWARE_INT);
+                    Assert(rc != VINF_PGM_CHANGE_MODE);
                     if (rc == VINF_SVM_VMEXIT)
                         rc = VINF_SUCCESS;
-                    else if (rc == VINF_PGM_CHANGE_MODE)
-                        rc = PGMChangeMode(pVCpu, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
                     if (pVM->em.s.fIemExecutesAll && (   rc == VINF_EM_RESCHEDULE_REM
                                                       || rc == VINF_EM_RESCHEDULE_HM
@@ -1758 +1756 @@
                          *        doesn't intercept HLT but intercepts VINTR? */
                         *pfResched = true;
+                        Assert(rcStrict != VINF_PGM_CHANGE_MODE);
                         if (rcStrict == VINF_SVM_VMEXIT)
                             return VINF_SUCCESS;
-                        if (rcStrict == VINF_PGM_CHANGE_MODE)
-                            return PGMChangeMode(pVCpu, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
                         return VBOXSTRICTRC_VAL(rcStrict);
                     }