Changeset 97776 in vbox

Timestamp:

Dec 12, 2022 12:46:22 PM (2 years ago)

Author:

vboxsync

Message:

VMM/EM: When responding to VINF_EM_RESCHEDULE_HM in the EM loop, we must consult HMCanExecuteGuest before setting the state to EMSTATE_HM otherwise we can get into trouble on systems which doesn't support unrestricted guest mode. In this particular case, the guest HLTed in real mode and after injecting an interrupt we would resume in HM rather than IEM/REM as we ought to. ticketref:21332

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)

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

@@ -2244 +2244 @@
                     if (VM_IS_HM_ENABLED(pVM))
                     {
-                        Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HM: %d -> %d (EMSTATE_HM)\n", enmOldState, EMSTATE_HM));
-                        pVCpu->em.s.enmState = EMSTATE_HM;
+                        if (HMCanExecuteGuest(pVM, pVCpu, &pVCpu->cpum.GstCtx))
+                        {
+                            Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HM: %d -> %d (EMSTATE_HM)\n", enmOldState, EMSTATE_HM));
+                            pVCpu->em.s.enmState = EMSTATE_HM;
+                        }
+                        else
+                        {
+                            Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HM: %d -> %d (EMSTATE_IEM_THEN_REM)\n", enmOldState, EMSTATE_IEM_THEN_REM));
+                            pVCpu->em.s.enmState = EMSTATE_IEM_THEN_REM;
+                        }
                     }
                     else if (VM_IS_NEM_ENABLED(pVM))