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

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

Files:

• DevACPI.cpp (modified) (1 diff)
• DevAPIC.cpp (modified) (3 diffs)
• DevDMA.cpp (modified) (1 diff)
• DevPIC.cpp (modified) (2 diffs)
• DevPit-i8254.cpp (modified) (2 diffs)
• DevRTC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1774 +1774 @@
 
 static DECLCALLBACK(int) acpi_load_state(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle,
-                                         uint32_t uVersion, uint32_t uPhase)
+                                         uint32_t uVersion, uint32_t uPass)
 {
     ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
 
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
-
+
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
     /*
      * Unregister PM handlers, will register with actual base

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -2357 +2357 @@
  * @copydoc FNSSMDEVLOADEXEC
  */
-static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     /* load all APICs data */ /** @todo: is it correct? */
@@ -2808 +2808 @@
  * @copydoc FNSSMDEVLOADEXEC
  */
-static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
@@ -2816 +2816 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/PC/DevDMA.cpp

@@ -864 +864 @@
                                       PSSMHANDLE pSSMHandle,
                                       uint32_t uVersion,
-                                      uint32_t uPhase)
+                                      uint32_t uPass)
 {
     DMAState *s = PDMINS_2_DATA (pDevIns, DMAState *);
 
     AssertMsgReturn (uVersion == 1, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-    Assert (uPhase == SSM_PHASE_FINAL);
+    Assert (uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     dma_load (pSSMHandle, &s->dma_controllers[0], uVersion);

trunk/src/VBox/Devices/PC/DevPIC.cpp

@@ -829 +829 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion    The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass       The data pass.
+ */
+static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     PDEVPIC pThis = PDMINS_2_DATA(pDevIns, PDEVPIC);
@@ -837 +837 @@
     if (uVersion != 1)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aPics); i++)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -760 +760 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion    The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass       The data pass.
+ */
+static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     PITState *pThis = PDMINS_2_DATA(pDevIns, PITState *);
@@ -768 +768 @@
     if (uVersion != PIT_SAVED_STATE_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->channels); i++)

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -629 +629 @@
  * @param   pSSMHandle  The handle to the saved state.
  * @param   uVersion    The data unit version number.
- * @param   uPhase      The data phase.
- */
-static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+ * @param   uPass       The data pass.
+ */
+static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
@@ -637 +637 @@
     if (uVersion != 1)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
     SSMR3GetMem(pSSMHandle, pThis->cmos_data, 128);