Changeset 79227 in vbox

Timestamp:

Jun 19, 2019 6:09:44 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Comment that hmR0VmxSetupVmcsMiscCtls must be called after setting up the secondary processor-based VM-execution controls, as it sets up the VMCS link pointer if VMCS shadowing is set. Nits.

File:

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

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

@@ -3633 +3633 @@
 #endif
 
-    /* Virtualize-APIC accesses if supported by the CPU. The virtual-APIC page is where the TPR shadow resides. */
+    /* Virtualize-APIC accesses if supported by the CPU. The virtual-APIC page is
+       where the TPR shadow resides. */
     /** @todo VIRT_X2APIC support, it's mutually exclusive with this. So must be
      *        done dynamically. */
@@ -3793 +3794 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pVmcsInfo       The VMCS info. object.
+ *
+ * @remarks Must be called after secondary processor-based VM-execution controls
+ *          have been initialized!
  */
 static int hmR0VmxSetupVmcsMiscCtls(PVMCPU pVCpu, PVMXVMCSINFO pVmcsInfo)
 {
-    /* Set the auto-load/store MSR area addresses in the VMCS. */
-    int rc = hmR0VmxSetupVmcsAutoLoadStoreMsrAddrs(pVCpu, pVmcsInfo);
+    /* Set the VMCS link pointer in the VMCS. */
+    int rc = hmR0VmxSetupVmcsLinkPtr(pVCpu, pVmcsInfo);
     if (RT_SUCCESS(rc))
     {
-        /* Set the VMCS link pointer in the VMCS. */
-        rc = hmR0VmxSetupVmcsLinkPtr(pVCpu, pVmcsInfo);
+        /* Set the auto-load/store MSR area addresses in the VMCS. */
+        rc = hmR0VmxSetupVmcsAutoLoadStoreMsrAddrs(pVCpu, pVmcsInfo);
         if (RT_SUCCESS(rc))
         {
@@ -3818 +3822 @@
         }
         else
-            LogRelFunc(("Failed to initialize VMCS link pointer. rc=%Rrc\n", rc));
+            LogRelFunc(("Failed to initialize VMCS auto-load/store MSR addresses. rc=%Rrc\n", rc));
     }
     else
-        LogRelFunc(("Failed to initialize VMCS auto-load/store MSR addresses. rc=%Rrc\n", rc));
+        LogRelFunc(("Failed to initialize VMCS link pointer. rc=%Rrc\n", rc));
     return rc;
 }