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

Timestamp:

Feb 3, 2021 10:54:26 AM (4 years ago)

Author:

vboxsync

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

142582

Message:

VMM/HMVMX: Use g_uHmVmxHostMsrEfer instead of pVM->hm.s.vmx.u64HostMsrEfer in ring-0. [build fix] bugref:9217

File:

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

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

@@ -2458 +2458 @@
 static void hmR0VmxUpdateAutoLoadHostMsrs(PCVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo)
 {
+    RT_NOREF(pVCpu);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -2703 +2704 @@
  * @param   pVmcsInfo   The VMCS info. object.
  */
-static void hmR0VmxCheckHostEferMsr(PCVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo)
+static void hmR0VmxCheckHostEferMsr(PCVMXVMCSINFO pVmcsInfo)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -11081 +11082 @@
     Assert(pVCpu->hmr0.s.vmx.fUpdatedHostAutoMsrs);
     hmR0VmxCheckAutoLoadStoreMsrs(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest);
-    hmR0VmxCheckHostEferMsr(pVCpu, pVmcsInfo);
+    hmR0VmxCheckHostEferMsr(pVmcsInfo);
     AssertRC(hmR0VmxCheckCachedVmcsCtls(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest));
 #endif
@@ -11137 +11138 @@
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
 
-    pVCpu->hmr0.s.vmx.fRestoreHostFlags |= VMX_RESTORE_HOST_REQUIRED;     /* Some host state messed up by VMX needs restoring. */
+    pVCpu->hmr0.s.vmx.fRestoreHostFlags |= VMX_RESTORE_HOST_REQUIRED;   /* Some host state messed up by VMX needs restoring. */
     pVmcsInfo->fVmcsState |= VMX_V_VMCS_LAUNCH_STATE_LAUNCHED;          /* Use VMRESUME instead of VMLAUNCH in the next run. */
 #ifdef VBOX_STRICT
-    hmR0VmxCheckHostEferMsr(pVCpu, pVmcsInfo);                          /* Verify that the host EFER MSR wasn't modified. */
+    hmR0VmxCheckHostEferMsr(pVmcsInfo);                                 /* Verify that the host EFER MSR wasn't modified. */
 #endif
     Assert(!ASMIntAreEnabled());