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

Timestamp:

Jun 5, 2018 5:45:11 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested hw.virt: Fixes when nested-paging isn't enabled in the outer guest.

File:

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

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

@@ -1716 +1716 @@
                              *        doesn't intercept HLT but intercepts INTR? */
                             *pfResched = true;
-                            return VINF_EM_RESCHEDULE;
+                            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);
                         }
 
@@ -1726 +1730 @@
                     /** @todo this really isn't nice, should properly handle this */
                     int rc = TRPMR3InjectEvent(pVM, pVCpu, TRPM_HARDWARE_INT);
+                    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
@@ -1750 +1758 @@
                          *        doesn't intercept HLT but intercepts VINTR? */
                         *pfResched = true;
-                        return VINF_EM_RESCHEDULE;
+                        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);
                     }
 
@@ -2129 +2141 @@
                         /** @todo this really isn't nice, should properly handle this */
                         rc2 = TRPMR3InjectEvent(pVM, pVCpu, TRPM_HARDWARE_INT);
-Log(("EM: TRPMR3InjectEvent -> %d\n", rc2));
+                        Log(("EM: TRPMR3InjectEvent -> %d\n", rc2));
                         if (pVM->em.s.fIemExecutesAll && (   rc2 == VINF_EM_RESCHEDULE_REM
                                                           || rc2 == VINF_EM_RESCHEDULE_HM