Changeset 22793 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Sep 5, 2009 1:29:24 AM (16 years ago)

Author:

vboxsync

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

51986

Message:

SSM,*: Renamed phase to pass (uPhase/SSM_PHASE_FINAL) and wrote the remainder of the live snapshot / migration SSM code.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (2 diffs)
• DevATA.cpp (modified) (2 diffs)
• DevBusLogic.cpp (modified) (2 diffs)
• DevLsiLogicSCSI.cpp (modified) (2 diffs)
• fdc.c (modified) (2 diffs)

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

@@ -5955 +5955 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion  The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) ahciLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass           The data pass.
+ */
+static DECLCALLBACK(int) ahciLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
@@ -5965 +5965 @@
     if (uVersion != AHCI_SAVED_STATE_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /* Restore data. */

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

@@ -6105 +6105 @@
  * @param   pDevIns     The device instance.
  * @param   pSSMHandle  The handle to the saved state.
- * @param   uVersion  The data unit version number.
- * @param   uPhase      The data phase.
+ * @param   uVersion    The data unit version number.
+ * @param   uPass       The data pass.
  */
-static DECLCALLBACK(int) ataLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+static DECLCALLBACK(int) ataLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
@@ -6122 +6122 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /*

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

@@ -2365 +2365 @@
 }
 
-static DECLCALLBACK(int) buslogicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+static DECLCALLBACK(int) buslogicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
@@ -2372 +2372 @@
     if (uVersion > BUSLOGIC_SAVED_STATE_MINOR_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /* Every device first. */

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

@@ -4896 +4896 @@
 }
 
-static DECLCALLBACK(int) lsilogicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+static DECLCALLBACK(int) lsilogicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     PLSILOGICSCSI pLsiLogic = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
@@ -4903 +4903 @@
     if (uVersion > LSILOGIC_SAVED_STATE_MINOR_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /* Every device first. */

trunk/src/VBox/Devices/Storage/fdc.c

@@ -2432 +2432 @@
                                       PSSMHANDLE pSSMHandle,
                                       uint32_t uVersion,
-                                      uint32_t uPhase)
+                                      uint32_t uPass)
 {
     fdctrl_t *s = PDMINS_2_DATA (pDevIns, fdctrl_t *);
@@ -2439 +2439 @@
 
     AssertMsgReturn(uVersion == 1, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     qemu_get_8s (f, &s->version);