Changeset 87558 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 3, 2021 11:21:28 AM (4 years ago)

Author:

vboxsync

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

142585

Message:

VMM/HMVMX: Moved/copy last branch stuff from HM::vmxUse to HMR0PERVM::vmx. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -373 +373 @@
      * Whether to enable LBR for the guest. This is disabled by default as it's only
      * useful while debugging and enabling it causes a noticeable performance hit. */
-    rc = CFGMR3QueryBoolDef(pCfgHm, "VmxLbr", &pVM->hm.s.vmx.fLbr, false);
+    rc = CFGMR3QueryBoolDef(pCfgHm, "VmxLbr", &pVM->hm.s.vmx.fLbrCfg, false);
     AssertRCReturn(rc, rc);
 
@@ -3333 +3333 @@
     if (HMIsVmxActive(pVM))
     {
-        if (pVM->hm.s.vmx.fLbr)
+        if (pVM->hm.s.vmx.fLbrCfg)
         {
             PCVMXVMCSINFOSHARED pVmcsInfoShared = hmGetVmxActiveVmcsInfoShared(pVCpu);
-            uint32_t const      cLbrStack       = pVM->hm.s.vmx.idLbrFromIpMsrLast - pVM->hm.s.vmx.idLbrFromIpMsrFirst + 1;
+            uint32_t const      cLbrStack       = pVM->hm.s.vmx.idLbrFromIpMsrLastForRing3 - pVM->hm.s.vmx.idLbrFromIpMsrFirstForRing3 + 1;
 
             /** @todo r=ramshankar: The index technically varies depending on the CPU, but
@@ -3359 +3359 @@
             for (;;)
             {
-                if (pVM->hm.s.vmx.idLbrToIpMsrFirst)
-                {
+                if (pVM->hm.s.vmx.idLbrToIpMsrFirstForRing3)
                     pHlp->pfnPrintf(pHlp, "  Branch (%2u): From IP=%#016RX64 - To IP=%#016RX64\n", idxCurrent,
                                     pVmcsInfoShared->au64LbrFromIpMsr[idxCurrent], pVmcsInfoShared->au64LbrToIpMsr[idxCurrent]);
-                }
                 else
                     pHlp->pfnPrintf(pHlp, "  Branch (%2u): LBR=%#RX64\n", idxCurrent, pVmcsInfoShared->au64LbrFromIpMsr[idxCurrent]);