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

Timestamp:

Jan 28, 2021 4:33:07 PM (4 years ago)

Author:

vboxsync

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

142486

Message:

VMM/HM,gvm: Started splitting up the HVMCPU and HVM structures. Created assembly version of gvm.h. bugref:9217

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (4 diffs)
• HMVMXR0.cpp (modified) (4 diffs)

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

@@ -735 +735 @@
                         | (pVCpu->cpum.GstCtx.fWorldSwitcher & CPUMCTX_WSF_IBPB_EXIT  ? 4 : 0);
     PFNHMSVMVMRUN const pfnVMRun = s_aHmR0SvmVmRunFunctions[idx].pfn;
-    if (pVCpu->hm.s.svm.pfnVMRun != pfnVMRun)
-        pVCpu->hm.s.svm.pfnVMRun = pfnVMRun;
+    if (pVCpu->hmr0.s.svm.pfnVMRun != pfnVMRun)
+        pVCpu->hmr0.s.svm.pfnVMRun = pfnVMRun;
 }
 
@@ -746 +746 @@
 {
     hmR0SvmUpdateVmRunFunction(pVCpu);
-    return pVCpu->hm.s.svm.pfnVMRun(pVM, pVCpu, HCPhysVMCB);
+    return pVCpu->hmr0.s.svm.pfnVMRun(pVM, pVCpu, HCPhysVMCB);
 }
 
@@ -791 +791 @@
          * We now use a single handler for both 32-bit and 64-bit guests, see @bugref{6208#c73}.
          */
-        pVCpu->hm.s.svm.pfnVMRun = hmR0SvmVMRunSelector;
+        pVCpu->hmr0.s.svm.pfnVMRun = hmR0SvmVMRunSelector;
 
         /*
@@ -4319 +4319 @@
     /* Mark that HM is the keeper of all guest-CPU registers now that we're going to execute guest code. */
     pVCpu->cpum.GstCtx.fExtrn |= HMSVM_CPUMCTX_EXTRN_ALL | CPUMCTX_EXTRN_KEEPER_HM;
-    return pVCpu->hm.s.svm.pfnVMRun(pVCpu->CTX_SUFF(pVM), pVCpu, HCPhysVmcb);
+    return pVCpu->hmr0.s.svm.pfnVMRun(pVCpu->CTX_SUFF(pVM), pVCpu, HCPhysVmcb);
 }
 

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

@@ -4183 +4183 @@
                         | (pVCpu->cpum.GstCtx.fWorldSwitcher & CPUMCTX_WSF_IBPB_EXIT  ? 16 : 0);
     PFNHMVMXSTARTVM const pfnStartVm = s_aHmR0VmxStartVmFunctions[idx].pfn;
-    if (pVCpu->hm.s.vmx.pfnStartVm != pfnStartVm)
-        pVCpu->hm.s.vmx.pfnStartVm = pfnStartVm;
+    if (pVCpu->hmr0.s.vmx.pfnStartVm != pfnStartVm)
+        pVCpu->hmr0.s.vmx.pfnStartVm = pfnStartVm;
 }
 
@@ -4194 +4194 @@
 {
     hmR0VmxUpdateStartVmFunction(pVCpu);
-    return pVCpu->hm.s.vmx.pfnStartVm(pVM, pVCpu, fResume);
+    return pVCpu->hmr0.s.vmx.pfnStartVm(pVM, pVCpu, fResume);
 }
 
@@ -4542 +4542 @@
         Log4Func(("pVCpu=%p idCpu=%RU32\n", pVCpu, pVCpu->idCpu));
 
-        pVCpu->hm.s.vmx.pfnStartVm = hmR0VmxStartVmSelector;
+        pVCpu->hmr0.s.vmx.pfnStartVm = hmR0VmxStartVmSelector;
 
         rc = hmR0VmxSetupVmcs(pVCpu, &pVCpu->hm.s.vmx.VmcsInfo,  false /* fIsNstGstVmcs */);
@@ -6850 +6850 @@
     /** @todo Add stats for VMRESUME vs VMLAUNCH. */
     bool const fResumeVM = RT_BOOL(pVmxTransient->pVmcsInfo->fVmcsState & VMX_V_VMCS_LAUNCH_STATE_LAUNCHED);
-    int rc = pVCpu->hm.s.vmx.pfnStartVm(NULL /*pVCpu->CTX_SUFF(pVM) - unused*/, pVCpu, fResumeVM);
+    int rc = pVCpu->hmr0.s.vmx.pfnStartVm(NULL /*pVCpu->CTX_SUFF(pVM) - unused*/, pVCpu, fResumeVM);
     AssertMsg(rc <= VINF_SUCCESS, ("%Rrc\n", rc));
     return rc;