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

Timestamp:

Oct 27, 2022 11:29:00 AM (2 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:10092 Keep secondary VM-exit controls naming similar to secondary VM-exec controls.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (4 diffs)

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

@@ -1278 +1278 @@
         VMXFEATDUMP("ExitLoadEferMsr - Load IA32_EFER MSR on VM-exit        ", fVmxExitLoadEferMsr);
         VMXFEATDUMP("SavePreemptTimer - Save VMX-preemption timer           ", fVmxSavePreemptTimer);
-        VMXFEATDUMP("ExitCtls2 - Secondary VM-exit controls                 ", fVmxExitCtls2);
+        VMXFEATDUMP("SecondaryExitCtls - Secondary VM-exit controls         ", fVmxSecondaryExitCtls);
 
         /* Miscellaneous data. */
@@ -1459 +1459 @@
                                  | (pGuestFeatures->fVmxExitLoadEferMsr   << VMX_BF_EXIT_CTLS_LOAD_EFER_MSR_SHIFT       )
                                  | (pGuestFeatures->fVmxSavePreemptTimer  << VMX_BF_EXIT_CTLS_SAVE_PREEMPT_TIMER_SHIFT  )
-                                 | (pGuestFeatures->fVmxExitCtls2         << VMX_BF_EXIT_CTLS_USE_SECONDARY_CTLS_SHIFT  );
+                                 | (pGuestFeatures->fVmxSecondaryExitCtls << VMX_BF_EXIT_CTLS_USE_SECONDARY_CTLS_SHIFT  );
         /* Set the default1 class bits. See Intel spec. A.4 "VM-exit Controls". */
         uint32_t const fAllowed0 = VMX_EXIT_CTLS_DEFAULT1;
@@ -1876 +1876 @@
     EmuFeat.fVmxExitLoadEferMsr       = 1;
     EmuFeat.fVmxSavePreemptTimer      = 0;  /* Cannot be enabled if VMX-preemption timer is disabled. */
-    EmuFeat.fVmxExitCtls2             = 0;
+    EmuFeat.fVmxSecondaryExitCtls     = 0;
     EmuFeat.fVmxExitSaveEferLma       = 1;  /* Cannot be disabled if unrestricted guest is enabled. */
     EmuFeat.fVmxPt                    = 0;
@@ -1958 +1958 @@
     pGuestFeat->fVmxExitLoadEferMsr       = (pBaseFeat->fVmxExitLoadEferMsr       & EmuFeat.fVmxExitLoadEferMsr      );
     pGuestFeat->fVmxSavePreemptTimer      = (pBaseFeat->fVmxSavePreemptTimer      & EmuFeat.fVmxSavePreemptTimer     );
-    pGuestFeat->fVmxExitCtls2             = (pBaseFeat->fVmxExitCtls2             & EmuFeat.fVmxExitCtls2            );
+    pGuestFeat->fVmxSecondaryExitCtls     = (pBaseFeat->fVmxSecondaryExitCtls     & EmuFeat.fVmxSecondaryExitCtls    );
     pGuestFeat->fVmxExitSaveEferLma       = (pBaseFeat->fVmxExitSaveEferLma       & EmuFeat.fVmxExitSaveEferLma      );
     pGuestFeat->fVmxPt                    = (pBaseFeat->fVmxPt                    & EmuFeat.fVmxPt                   );