Changeset 79764 in vbox for trunk/src/VBox

Timestamp:

Jul 14, 2019 4:13:40 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Fix hmR0VmxRemoveProcCtlsVmcs (use the parameter rather than copy/paste bug hardcoding VMX_PROC_CTLS_RDTSC_EXIT). Added doxygen for hmR0VmxFixUnusableSegRegAttr.

File:

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

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

@@ -974 +974 @@
 static void hmR0VmxRemoveProcCtlsVmcs(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient, uint32_t uProcCtls)
 {
+    PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
+    if (pVmcsInfo->u32ProcCtls & uProcCtls)
+    {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    bool const fRemoveCtls = !pVmxTransient->fIsNestedGuest
-                           ? true
-                           : !CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_RDTSC_EXIT);
+        bool const fRemoveCtls = !pVmxTransient->fIsNestedGuest
+                               ? true
+                               : !CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, uProcCtls);
 #else
-    NOREF(pVCpu);
-    bool const fRemoveCtls = true;
+        NOREF(pVCpu);
+        bool const fRemoveCtls = true;
 #endif
-    PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    if (   fRemoveCtls
-        && (pVmcsInfo->u32ProcCtls & uProcCtls))
-    {
-        pVmcsInfo->u32ProcCtls &= ~uProcCtls;
-        int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVmcsInfo->u32ProcCtls);
-        AssertRC(rc);
+        if (fRemoveCtls)
+        {
+            pVmcsInfo->u32ProcCtls &= ~uProcCtls;
+            int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVmcsInfo->u32ProcCtls);
+            AssertRC(rc);
+        }
     }
 }
@@ -7728 +7730 @@
 
 
+/**
+ * Fixes up attributes for the specified segment register.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pSelReg     The segment register that needs fixing.
+ * @param   idxSel      The VMCS field for the corresponding segment register.
+ */
 static void hmR0VmxFixUnusableSegRegAttr(PVMCPU pVCpu, PCPUMSELREG pSelReg, uint32_t idxSel)
 {