Changeset 107812 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 16, 2025 12:33:14 PM (3 weeks ago)

Author:

vboxsync

Message:

Devices/Security/DevTpm.cpp: Fix loading older saved states with an incorrect 0 vendor ID which was fixed in r165971, bugref:10777

File:

• trunk/src/VBox/Devices/Security/DevTpm.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Security/DevTpm.cpp

@@ -1632 +1632 @@
     rc = pHlp->pfnSSMGetU16(pSSM, &u16);
     AssertRCReturn(rc, rc);
-    if (u16 != pThis->uVenId)
+    /*
+     * r165971 fixes setting the proper vendor ID in the constructor.
+     * In older saved states it was always 0 which would made this check fail.
+     * So just ignore any mismatches if the loaded vendor ID is 0.
+     */
+    if (   u16 != pThis->uVenId
+        && u16 != 0)
         return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS,
                                        N_("Config mismatch - saved uVenId=%#RX16; configured uVenId=%#RX16"),