Changeset 87497 in vbox

Timestamp:

Feb 1, 2021 11:39:30 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMR3ResetCpu: Only touch the vmx fields if we're in vmx mode.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMAll.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -790 +790 @@
      * extra careful if/when the guest switches back to protected mode.
      */
-    if (enmGuestMode == PGMMODE_REAL)
+    if (   enmGuestMode == PGMMODE_REAL
+        && pVM->hm.s.vmx.fEnabled)
     {
         PVMXVMCSINFOSHARED pVmcsInfoShared = hmGetVmxActiveVmcsInfoShared(pVCpu);

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

@@ -2047 +2047 @@
     pVCpu->hm.s.fActive                        = false;
     pVCpu->hm.s.Event.fPending                 = false;
-    pVCpu->hm.s.vmx.u64GstMsrApicBase          = 0;
-    pVCpu->hm.s.vmx.VmcsInfo.fSwitchedTo64on32Obsolete = false;
-    pVCpu->hm.s.vmx.VmcsInfo.fWasInRealMode    = true;
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+    if (pVM->hm.s.vmx.fEnabled)
+    {
+        pVCpu->hm.s.vmx.u64GstMsrApicBase          = 0;
+        pVCpu->hm.s.vmx.VmcsInfo.fSwitchedTo64on32Obsolete = false;
+        pVCpu->hm.s.vmx.VmcsInfo.fWasInRealMode    = true;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    if (pVCpu->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fVmx)
-    {
-        pVCpu->hm.s.vmx.VmcsInfoNstGst.fSwitchedTo64on32Obsolete = false;
-        pVCpu->hm.s.vmx.VmcsInfoNstGst.fWasInRealMode    = true;
-    }
+        if (pVCpu->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fVmx)
+        {
+            pVCpu->hm.s.vmx.VmcsInfoNstGst.fSwitchedTo64on32Obsolete = false;
+            pVCpu->hm.s.vmx.VmcsInfoNstGst.fWasInRealMode    = true;
+        }
 #endif
+    }
 }