Changeset 34875 in vbox

Timestamp:

Dec 9, 2010 11:15:06 AM (14 years ago)

Author:

vboxsync

Message:

AHCI: Fix loading older saved states

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (3 diffs)

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

@@ -6911 +6911 @@
     int rc;
 
-    if (    uVersion != AHCI_SAVED_STATE_VERSION
-        &&  uVersion != AHCI_SAVED_STATE_VERSION_PRE_ATAPI
-        &&  uVersion != AHCI_SAVED_STATE_VERSION_VBOX_30)
+    if (   uVersion > AHCI_SAVED_STATE_VERSION
+        || uVersion < AHCI_SAVED_STATE_VERSION_VBOX_30)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
@@ -7034 +7033 @@
                 SSMR3Skip(pSSM, AHCI_NR_COMMAND_SLOTS * sizeof(uint8_t)); /* no active data here */
 
-            if (uVersion <= AHCI_SAVED_STATE_VERSION)
+            if (uVersion < AHCI_SAVED_STATE_VERSION)
             {
                 /* The old positions in the FIFO, not required. */
@@ -7043 +7042 @@
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32TasksFinished);
             SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32QueuedTasksFinished);
-            SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32CurrentCommandSlot);
+            if (uVersion >= AHCI_SAVED_STATE_VERSION)
+                SSMR3GetU32(pSSM, (uint32_t *)&pThis->ahciPort[i].u32CurrentCommandSlot);
 
             if (uVersion > AHCI_SAVED_STATE_VERSION_PRE_ATAPI)