Changeset 87548 in vbox

Timestamp:

Feb 2, 2021 6:16:20 PM (4 years ago)

Author:

vboxsync

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

142574

Message:

VMM/HMVMX: Moved fUnrestrictedGuest member from HM::vmx to HMR0PERVM::vmx. [build fix] bugref:9217

File:

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

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

@@ -4128 +4128 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pVmcsInfo   The VMCS info. object.
  */
-static int hmR0VmxSetupVmcsCtlsNested(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
+static int hmR0VmxSetupVmcsCtlsNested(PVMXVMCSINFO pVmcsInfo)
 {
     Assert(pVmcsInfo->u64VmcsLinkPtr == NIL_RTHCPHYS);
@@ -4148 +4147 @@
         return VINF_SUCCESS;
     }
-    else
-        LogRelFunc(("Failed to set up the VMCS link pointer in the nested-guest VMCS. rc=%Rrc\n", rc));
+    LogRelFunc(("Failed to set up the VMCS link pointer in the nested-guest VMCS. rc=%Rrc\n", rc));
     return rc;
 }
@@ -4306 +4304 @@
             {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-                rc = hmR0VmxSetupVmcsCtlsNested(pVCpu, pVmcsInfo);
+                rc = hmR0VmxSetupVmcsCtlsNested(pVmcsInfo);
                 if (RT_SUCCESS(rc))
                 { /* likely */ }
@@ -8241 +8239 @@
  * cause a VM-exit as soon as the guest is in a state to receive interrupts.
  *
- * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pVmcsInfo   The VMCS info. object.
  */
-static void hmR0VmxSetIntWindowExitVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
+static void hmR0VmxSetIntWindowExitVmcs(PVMXVMCSINFO pVmcsInfo)
 {
     if (g_HmMsrs.u.vmx.ProcCtls.n.allowed1 & VMX_PROC_CTLS_INT_WINDOW_EXIT)
@@ -8278 +8275 @@
  * cause a VM-exit as soon as the guest is in a state to receive NMIs.
  *
- * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pVmcsInfo   The VMCS info. object.
  */
-static void hmR0VmxSetNmiWindowExitVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
+static void hmR0VmxSetNmiWindowExitVmcs(PVMXVMCSINFO pVmcsInfo)
 {
     if (g_HmMsrs.u.vmx.ProcCtls.n.allowed1 & VMX_PROC_CTLS_NMI_WINDOW_EXIT)
@@ -9035 +9031 @@
             }
             else if (!fIsNestedGuest)
-                hmR0VmxSetNmiWindowExitVmcs(pVCpu, pVmcsInfo);
+                hmR0VmxSetNmiWindowExitVmcs(pVmcsInfo);
         }
 
@@ -9107 +9103 @@
                 return VINF_SUCCESS;
             }
-            else if (!fIsNestedGuest)
-                hmR0VmxSetIntWindowExitVmcs(pVCpu, pVmcsInfo);
+            if (!fIsNestedGuest)
+                hmR0VmxSetIntWindowExitVmcs(pVmcsInfo);
         }
     }
@@ -9119 +9115 @@
          */
         if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NMI))
-            hmR0VmxSetNmiWindowExitVmcs(pVCpu, pVmcsInfo);
+            hmR0VmxSetNmiWindowExitVmcs(pVmcsInfo);
         else if (   VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
                  && !pVCpu->hm.s.fSingleInstruction)
-            hmR0VmxSetIntWindowExitVmcs(pVCpu, pVmcsInfo);
+            hmR0VmxSetIntWindowExitVmcs(pVmcsInfo);
     }
     /* else: for nested-guests, NMI/interrupt-window exiting will be picked up when merging VMCS controls. */