Changeset 63657 in vbox

Timestamp:

Aug 30, 2016 10:03:36 AM (8 years ago)

Author:

vboxsync

Message:

VBoxSCSI: fix loading a saved state from before r104155 (or r104311 for 5.0.x)

File:

• trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp

@@ -29 +29 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pgm.h>
+#include <VBox/version.h>
 #include <iprt/asm.h>
 #include <iprt/mem.h>
@@ -470 +471 @@
     SSMR3GetU8  (pSSM, &pVBoxSCSI->uTxDir);
     SSMR3GetU8  (pSSM, &pVBoxSCSI->cbCDB);
-    SSMR3GetMem (pSSM, &pVBoxSCSI->abCDB[0], sizeof(pVBoxSCSI->abCDB));
+
+    /*
+     * The CDB buffer was increased with r104155 in trunk (backported to 5.0
+     * in r104311) without bumping the SSM state versions which leaves us
+     * with broken saved state restoring for older VirtualBox releases
+     * (up to 5.0.10).
+     */
+    if (   (   SSMR3HandleRevision(pSSM) < 104311
+            && SSMR3HandleVersion(pSSM)  < VBOX_FULL_VERSION_MAKE(5, 0, 12))
+        || (   SSMR3HandleRevision(pSSM) < 104155
+            && SSMR3HandleVersion(pSSM)  >= VBOX_FULL_VERSION_MAKE(5, 0, 51)))
+    {
+        memset(&pVBoxSCSI->abCDB[0], 0, sizeof(pVBoxSCSI->abCDB));
+        SSMR3GetMem (pSSM, &pVBoxSCSI->abCDB[0], 12);
+    }
+    else
+        SSMR3GetMem (pSSM, &pVBoxSCSI->abCDB[0], sizeof(pVBoxSCSI->abCDB));
+
     SSMR3GetU8  (pSSM, &pVBoxSCSI->iCDB);
     SSMR3GetU32 (pSSM, &pVBoxSCSI->cbBufLeft);