VirtualBox

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


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/PC/DevACPI.cpp

    r22480 r22793  
    17741774
    17751775static DECLCALLBACK(int) acpi_load_state(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle,
    1776                                          uint32_t uVersion, uint32_t uPhase)
     1776                                         uint32_t uVersion, uint32_t uPass)
    17771777{
    17781778    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
    17791779
    1780     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
    1781 
     1780
     1781    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    17821782    /*
    17831783     * Unregister PM handlers, will register with actual base
  • trunk/src/VBox/Devices/PC/DevAPIC.cpp

    r22584 r22793  
    23572357 * @copydoc FNSSMDEVLOADEXEC
    23582358 */
    2359 static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
     2359static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
    23602360{
    23612361    APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
    2362     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
     2362    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    23632363
    23642364    /* load all APICs data */ /** @todo: is it correct? */
     
    28082808 * @copydoc FNSSMDEVLOADEXEC
    28092809 */
    2810 static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
     2810static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
    28112811{
    28122812    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     
    28162816        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    28172817    }
    2818     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
     2818    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    28192819
    28202820    return VINF_SUCCESS;
  • trunk/src/VBox/Devices/PC/DevDMA.cpp

    r22480 r22793  
    864864                                      PSSMHANDLE pSSMHandle,
    865865                                      uint32_t uVersion,
    866                                       uint32_t uPhase)
     866                                      uint32_t uPass)
    867867{
    868868    DMAState *s = PDMINS_2_DATA (pDevIns, DMAState *);
    869869
    870870    AssertMsgReturn (uVersion == 1, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
    871     Assert (uPhase == SSM_PHASE_FINAL);
     871    Assert (uPass == SSM_PASS_FINAL); NOREF(uPass);
    872872
    873873    dma_load (pSSMHandle, &s->dma_controllers[0], uVersion);
  • trunk/src/VBox/Devices/PC/DevPIC.cpp

    r22480 r22793  
    829829 * @param   pSSMHandle  The handle to the saved state.
    830830 * @param   uVersion    The data unit version number.
    831  * @param   uPhase      The data phase.
    832  */
    833 static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
     831 * @param   uPass       The data pass.
     832 */
     833static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
    834834{
    835835    PDEVPIC pThis = PDMINS_2_DATA(pDevIns, PDEVPIC);
     
    837837    if (uVersion != 1)
    838838        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    839     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
     839    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    840840
    841841    for (unsigned i = 0; i < RT_ELEMENTS(pThis->aPics); i++)
  • trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

    r22480 r22793  
    760760 * @param   pSSMHandle  The handle to the saved state.
    761761 * @param   uVersion    The data unit version number.
    762  * @param   uPhase      The data phase.
    763  */
    764 static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
     762 * @param   uPass       The data pass.
     763 */
     764static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
    765765{
    766766    PITState *pThis = PDMINS_2_DATA(pDevIns, PITState *);
     
    768768    if (uVersion != PIT_SAVED_STATE_VERSION)
    769769        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    770     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
     770    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    771771
    772772    for (unsigned i = 0; i < RT_ELEMENTS(pThis->channels); i++)
  • trunk/src/VBox/Devices/PC/DevRTC.cpp

    r22480 r22793  
    629629 * @param   pSSMHandle  The handle to the saved state.
    630630 * @param   uVersion    The data unit version number.
    631  * @param   uPhase      The data phase.
    632  */
    633 static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
     631 * @param   uPass       The data pass.
     632 */
     633static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
    634634{
    635635    RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
     
    637637    if (uVersion != 1)
    638638        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    639     Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
     639    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    640640
    641641    SSMR3GetMem(pSSMHandle, pThis->cmos_data, 128);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette