Changeset 45091 in vbox for trunk/src/VBox/VMM/VMMR0/HMR0.cpp

Timestamp:

Mar 19, 2013 4:01:32 PM (12 years ago)

Author:

vboxsync

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

84380

Message:

VMM/VMMR0: HM old-code segregation.

File:

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

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

@@ -505 +505 @@
             if (g_HvmR0.vmx.fSupported)
             {
+                /* Call the global VT-x initialization routine. */
+                rc = VMXR0GlobalInit();
+                if (RT_FAILURE(rc))
+                    g_HvmR0.lLastError = rc;
+
                 /*
                  * Install the VT-x methods.
@@ -523 +528 @@
                  * Timer Does Not Count Down at the Rate Specified" erratum.
                  */
-                if (  g_HvmR0.vmx.msr.vmx_pin_ctls.n.allowed1
-                    & VMX_VMCS_CTRL_PIN_EXEC_CONTROLS_PREEMPT_TIMER)
+                if (g_HvmR0.vmx.msr.vmx_pin_ctls.n.allowed1 & VMX_VMCS_CTRL_PIN_EXEC_CONTROLS_PREEMPT_TIMER)
                 {
                     g_HvmR0.vmx.fUsePreemptTimer   = true;
@@ -767 +771 @@
         }
     }
+
+    /** @todo This needs cleaning up. There's no matching hmR0TermIntel() and all
+     *        the VT-x/AMD-V specific bits should move into their respective
+     *        modules. */
+    /* Finally, call global VT-x/AMD-V termination. */
+    if (g_HvmR0.vmx.fSupported)
+        VMXR0GlobalTerm();
+
     return rc;
 }