Changeset 56705 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 30, 2015 3:29:46 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101347

Message:

HMR0.cpp: Don't call SUPR0EnableVTx(false) in HMR0Term unless we've actually called with with 'true'.

File:

• trunk/src/VBox/VMM/VMMR0/HMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -122 +122 @@
         VMXMSRS                     Msrs;
 
-        /* Last instruction error */
+        /** Last instruction error. */
         uint32_t                    ulLastInstrError;
+
+        /** Set if we've called SUPR0EnableVTx(true) and should disable it during
+         * module termination. */
+        bool                        fCalledSUPR0EnableVTx;
     } vmx;
 
@@ -720 +724 @@
          */
         Assert(g_HmR0.fGlobalInit);
-        rc = SUPR0EnableVTx(false /* fEnable */);
+
+        if (g_HmR0.vmx.fCalledSUPR0EnableVTx)
+        {
+            rc = SUPR0EnableVTx(false /* fEnable */);
+            g_HmR0.vmx.fCalledSUPR0EnableVTx = false;
+        }
 
         for (unsigned iCpu = 0; iCpu < RT_ELEMENTS(g_HmR0.aCpuInfo); iCpu++)
@@ -919 +928 @@
         if (RT_SUCCESS(rc))
         {
+            g_HmR0.vmx.fCalledSUPR0EnableVTx = true;
             /* If the host provides a VT-x init API, then we'll rely on that for global init. */
             g_HmR0.fGlobalInit = pVM->hm.s.fGlobalInit = true;