Changeset 90914 in vbox

Timestamp:

Aug 26, 2021 2:56:29 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:10092 Renamed CPUM_SAVED_STATE_VERSION_HWVIRT_VMX_IEM macro to CPUM_SAVED_STATE_VERSION_HWVIRT_VMX, no functional change.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CPUM.cpp (modified) (2 diffs)
• include/CPUMInternal.h (modified) (1 diff)

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

@@ -2693 +2693 @@
      * Validate version.
      */
-    if (    uVersion != CPUM_SAVED_STATE_VERSION_HWVIRT_VMX_IEM
+    if (    uVersion != CPUM_SAVED_STATE_VERSION_HWVIRT_VMX
         &&  uVersion != CPUM_SAVED_STATE_VERSION_HWVIRT_SVM
         &&  uVersion != CPUM_SAVED_STATE_VERSION_XSAVE
@@ -2895 +2895 @@
                     }
                 }
-                if (uVersion >= CPUM_SAVED_STATE_VERSION_HWVIRT_VMX_IEM)
+                if (uVersion >= CPUM_SAVED_STATE_VERSION_HWVIRT_VMX)
                 {
                     if (pVM->cpum.s.GuestFeatures.fVmx)

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

@@ -115 +115 @@
  * @{ */
 /** The current saved state version. */
-#define CPUM_SAVED_STATE_VERSION                CPUM_SAVED_STATE_VERSION_HWVIRT_VMX_IEM
-/** The saved state version including VMX hardware virtualization state (IEM only
- *  execution). */
-#define CPUM_SAVED_STATE_VERSION_HWVIRT_VMX_IEM 19
+#define CPUM_SAVED_STATE_VERSION                CPUM_SAVED_STATE_VERSION_HWVIRT_VMX
+/** The saved state version including VMX hardware virtualization state. */
+#define CPUM_SAVED_STATE_VERSION_HWVIRT_VMX     19
 /** The saved state version including SVM hardware virtualization state. */
 #define CPUM_SAVED_STATE_VERSION_HWVIRT_SVM     18