Changeset 102020 in vbox for trunk/include

Timestamp:

Nov 9, 2023 11:27:42 AM (15 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Discard unused VMCS launch-state bits and update 'VMCLEAR' VMCS launch-state bit to be 0.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (1 diff)
• hmvmxinline.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3816 +3816 @@
 /** @name VMX_V_VMCS_STATE_XXX - Virtual VMCS launch state.
  * @{ */
+/** VMCS launch state clear legacy value -- deprecated!!!. */
+#define VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY                    RT_BIT(0)
 /** VMCS launch state clear. */
-#define VMX_V_VMCS_LAUNCH_STATE_CLEAR                           RT_BIT(0)
-/** VMCS launch state active. */
-#define VMX_V_VMCS_LAUNCH_STATE_ACTIVE                          RT_BIT(1)
-/** VMCS launch state current. */
-#define VMX_V_VMCS_LAUNCH_STATE_CURRENT                         RT_BIT(2)
+#define VMX_V_VMCS_LAUNCH_STATE_CLEAR                           (0)
+/* Bit 1 used to be "active", no longer used. */
+/* Bit 2 used to be "current", no longer used. */
 /** VMCS launch state launched. */
 #define VMX_V_VMCS_LAUNCH_STATE_LAUNCHED                        RT_BIT(3)
-/** The mask of valid VMCS launch states. */
-#define VMX_V_VMCS_LAUNCH_STATE_MASK                            (  VMX_V_VMCS_LAUNCH_STATE_CLEAR \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_ACTIVE \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_CURRENT \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_LAUNCHED)
 /** @} */
 

trunk/include/VBox/vmm/hmvmxinline.h

@@ -289 +289 @@
     switch (fVmcsState)
     {
-        case VMX_V_VMCS_LAUNCH_STATE_CLEAR:     return "Clear";
-        case VMX_V_VMCS_LAUNCH_STATE_LAUNCHED:  return "Launched";
-        default:                                return "Unknown";
+        case VMX_V_VMCS_LAUNCH_STATE_CLEAR:            return "Clear";
+        case VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY:     return "Clear (Legacy(";
+        case VMX_V_VMCS_LAUNCH_STATE_LAUNCHED:         return "Launched";
+        default:                                       return "Unknown";
     }
 }