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

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/include/HMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/include/HMInternal.h

@@ -522 +522 @@
         bool                        fUseVmcsShadowingForRing3;
         /** Set if Last Branch Record (LBR) is enabled. */
-        bool                        fLbr;
-        bool                        fAlignment2;
-
-        /** The host LBR TOS (top-of-stack) MSR id. */
-        uint32_t                    idLbrTosMsr;
+        bool                        fLbrCfg;
+        bool                        afAlignment2[5];
 
         /** The first valid host LBR branch-from-IP stack range. */
-        uint32_t                    idLbrFromIpMsrFirst;
+        uint32_t                    idLbrFromIpMsrFirstForRing3;
         /** The last valid host LBR branch-from-IP stack range. */
-        uint32_t                    idLbrFromIpMsrLast;
+        uint32_t                    idLbrFromIpMsrLastForRing3;
 
         /** The first valid host LBR branch-to-IP stack range. */
-        uint32_t                    idLbrToIpMsrFirst;
+        uint32_t                    idLbrToIpMsrFirstForRing3;
         /** The last valid host LBR branch-to-IP stack range. */
-        uint32_t                    idLbrToIpMsrLast;
+        uint32_t                    idLbrToIpMsrLastForRing3;
 
         /** Host-physical address for a failing VMXON instruction (for diagnostics, ring-3). */
@@ -649 +646 @@
         /** Whether to use VMCS shadowing. */
         bool                        fUseVmcsShadowing;
-        bool                        afAlignment1[1];
+        /** Set if Last Branch Record (LBR) is enabled. */
+        bool                        fLbr;
         /** Set if VPID is supported (copy in HM::vmx::fVpidForRing3). */
         bool                        fVpid;
@@ -658 +656 @@
         /** Flush type to use for INVVPID. */
         VMXTLBFLUSHVPID             enmTlbFlushVpid;
+
+        /** The first valid host LBR branch-from-IP stack range. */
+        uint32_t                    idLbrFromIpMsrFirst;
+        /** The last valid host LBR branch-from-IP stack range. */
+        uint32_t                    idLbrFromIpMsrLast;
+
+        /** The first valid host LBR branch-to-IP stack range. */
+        uint32_t                    idLbrToIpMsrFirst;
+        /** The last valid host LBR branch-to-IP stack range. */
+        uint32_t                    idLbrToIpMsrLast;
+
+        /** The host LBR TOS (top-of-stack) MSR id. */
+        uint32_t                    idLbrTosMsr;
+        uint32_t                    u32Alignment1;
 
         /** Virtual address of the APIC-access page. */