Changeset 87504 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 1, 2021 3:12:21 PM (4 years ago)

Author:

vboxsync

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

142528

Message:

VMM/HMSVM: Moving more stuff to HMR0PERVCPU. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (9 diffs)

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

@@ -2107 +2107 @@
                every #VMEXIT if we should update the TPR. */
             Assert(pVmcb->ctrl.IntCtrl.n.u1VIntrMasking);
-            pVCpu->hm.s.svm.fSyncVTpr = false;
+            pVCpu->hmr0.s.svm.fSyncVTpr = false;
 
             if (!pVM->hm.s.fTPRPatchingActive)
@@ -2121 +2121 @@
                 {
                     pVmcb->ctrl.u16InterceptWrCRx &= ~RT_BIT(8);
-                    pVCpu->hm.s.svm.fSyncVTpr = true;
+                    pVCpu->hmr0.s.svm.fSyncVTpr = true;
                 }
 
@@ -2138 +2138 @@
                 {
                     hmR0SvmSetMsrPermission(pVCpu, pbMsrBitmap, MSR_K8_LSTAR, SVMMSREXIT_PASSTHRU_READ, SVMMSREXIT_PASSTHRU_WRITE);
-                    pVCpu->hm.s.svm.fSyncVTpr = true;
+                    pVCpu->hmr0.s.svm.fSyncVTpr = true;
                 }
                 pVmcb->ctrl.u32VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_IOPM_MSRPM;
@@ -2571 +2571 @@
          * to the nested-guest intercepts and we always run with V_INTR_MASKING.
          */
-        pVCpu->hm.s.svm.fSyncVTpr = false;
+        pVCpu->hmr0.s.svm.fSyncVTpr = false;
 
 #ifdef DEBUG_ramshankar
@@ -2602 +2602 @@
     else
     {
-        Assert(!pVCpu->hm.s.svm.fSyncVTpr);
+        Assert(!pVCpu->hmr0.s.svm.fSyncVTpr);
         Assert(pVmcbNstGstCtrl->u64IOPMPhysAddr == g_HCPhysIOBitmap);
         Assert(RT_BOOL(pVmcbNstGstCtrl->NestedPagingCtrl.n.u1NestedPaging) == pVCpu->CTX_SUFF(pVM)->hm.s.fNestedPaging);
@@ -4129 +4129 @@
      * world-switch so we can update it on the way back if the guest changed the TPR.
      */
-    if (pVCpu->hm.s.svm.fSyncVTpr)
+    if (pVCpu->hmr0.s.svm.fSyncVTpr)
     {
         Assert(!pSvmTransient->fIsNestedGuest);
@@ -4285 +4285 @@
     {
         uint64_t const uGuestTscAux = CPUMGetGuestTscAux(pVCpu);
-        pVCpu->hm.s.svm.u64HostTscAux   = ASMRdMsr(MSR_K8_TSC_AUX);
-        if (uGuestTscAux != pVCpu->hm.s.svm.u64HostTscAux)
+        pVCpu->hmr0.s.svm.u64HostTscAux = ASMRdMsr(MSR_K8_TSC_AUX);
+        if (uGuestTscAux != pVCpu->hmr0.s.svm.u64HostTscAux)
             ASMWrMsr(MSR_K8_TSC_AUX, uGuestTscAux);
         hmR0SvmSetMsrPermission(pVCpu, pbMsrBitmap, MSR_K8_TSC_AUX, SVMMSREXIT_PASSTHRU_READ, SVMMSREXIT_PASSTHRU_WRITE);
@@ -4368 +4368 @@
         uint64_t u64GuestTscAuxMsr = ASMRdMsr(MSR_K8_TSC_AUX);
         CPUMSetGuestTscAux(pVCpu, u64GuestTscAuxMsr);
-        if (u64GuestTscAuxMsr != pVCpu->hm.s.svm.u64HostTscAux)
-            ASMWrMsr(MSR_K8_TSC_AUX, pVCpu->hm.s.svm.u64HostTscAux);
+        if (u64GuestTscAuxMsr != pVCpu->hmr0.s.svm.u64HostTscAux)
+            ASMWrMsr(MSR_K8_TSC_AUX, pVCpu->hmr0.s.svm.u64HostTscAux);
     }
 
@@ -4421 +4421 @@
 
     if (   pSvmTransient->u64ExitCode != SVM_EXIT_INVALID
-        && pVCpu->hm.s.svm.fSyncVTpr)
+        && pVCpu->hmr0.s.svm.fSyncVTpr)
     {
         Assert(!pSvmTransient->fIsNestedGuest);