Changeset 42325 in vbox for trunk/src/VBox

Timestamp:

Jul 23, 2012 2:23:53 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79398

Message:

DevAHCI: Saved state restore fix (untested). Made ahciR3LoadLegacyEmulationState static (everything shall be static unless it *REALLY* needs to be global).

File:

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

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -6723 +6723 @@
  * @param   pSSM  The handle to the saved state.
  */
-int ahciR3LoadLegacyEmulationState(PSSMHANDLE pSSM)
+static int ahciR3LoadLegacyEmulationState(PSSMHANDLE pSSM)
 {
     int             rc;
@@ -6735 +6735 @@
     LogFlow(("LoadOldSavedStates u32Version = %d\n", u32Version));
 
-    if (u32Version != ATA_CTL_SAVED_STATE_VERSION
+    if (   u32Version != ATA_CTL_SAVED_STATE_VERSION
         && u32Version != ATA_CTL_SAVED_STATE_VERSION_WITHOUT_FULL_SENSE
         && u32Version != ATA_CTL_SAVED_STATE_VERSION_WITHOUT_EVENT_STATUS)
@@ -6750 +6750 @@
 
         if (u32Version > ATA_CTL_SAVED_STATE_VERSION_WITHOUT_FULL_SENSE)
-        {
             SSMR3Skip(pSSM, 64);
-        }
         else
-        {
             SSMR3Skip(pSSM, 2);
-        }
         /** @todo triple-check this hack after passthrough is working */
         SSMR3Skip(pSSM, 1);
@@ -6800 +6796 @@
         || uVersion < AHCI_SAVED_STATE_VERSION_VBOX_30)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+
+    /* Deal with the priod after removing the saved IDE bits where the saved
+       state version remained unchanged. */
+    if (   uVersion == AHCI_SAVED_STATE_VERSION_IDE_EMULATION
+        && SSMR3HandleRevision(pSSM) >= 79045
+        && SSMR3HandleRevision(pSSM) <  79201)
+        uVersion++;
 
     /* Verify config. */
@@ -7548 +7551 @@
         if (   pAhciPort->pDrvBlockAsync
             && !pAhciPort->fATAPI)
-        {
             pAhciPort->fAsyncInterface = true;
-        }
         else
         {