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

Timestamp:

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

Author:

vboxsync

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/Network

Files:

• DevE1000.cpp (modified) (1 diff)
• DevPCNet.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -4476 +4476 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion    The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) e1kLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass           The data pass.
+ */
+static DECLCALLBACK(int) e1kLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     if (uVersion != E1K_SAVEDSTATE_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     E1KSTATE* pState = PDMINS_2_DATA(pDevIns, E1KSTATE*);

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -4331 +4331 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion  The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) pcnetLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass       The data pass.
+ */
+static DECLCALLBACK(int) pcnetLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     PCNetState *pThis = PDMINS_2_DATA(pDevIns, PCNetState *);
@@ -4340 +4340 @@
         || SSM_VERSION_MINOR(uVersion) < 7)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /* restore data */