Index: /trunk/include/VBox/pdmdev.h =================================================================== --- /trunk/include/VBox/pdmdev.h (revision 23914) +++ /trunk/include/VBox/pdmdev.h (revision 23915) @@ -2177,4 +2177,22 @@ /** + * Gets the VM state. + * + * @returns VM state. + * @param pDevIns The device instance. + * @thread Any thread (just keep in mind that it's volatile info). + */ + DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDEVINS pDevIns)); + + /** + * Checks if the VM was teleported and hasn't been fully resumed yet. + * + * @returns true / false. + * @param pDevIns The device instance. + * @thread Any thread. + */ + DECLR3CALLBACKMEMBER(bool, pfnVMTeleportedAndNotFullyResumedYet,(PPDMDEVINS pDevIns)); + + /** * Assert that the current thread is the emulation thread. * @@ -2368,15 +2386,9 @@ DECLR3CALLBACKMEMBER(int, pfnPhysGCPtr2GCPhys, (PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)); - /** - * Gets the VM state. - * - * @returns VM state. - * @param pDevIns The device instance. - * @thread Any thread (just keep in mind that it's volatile info). - */ - DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDEVINS pDevIns)); - /** Space reserved for future members. * @{ */ + DECLR3CALLBACKMEMBER(void, pfnReserved1,(void)); + DECLR3CALLBACKMEMBER(void, pfnReserved2,(void)); + DECLR3CALLBACKMEMBER(void, pfnReserved3,(void)); DECLR3CALLBACKMEMBER(void, pfnReserved4,(void)); DECLR3CALLBACKMEMBER(void, pfnReserved5,(void)); @@ -3672,4 +3684,12 @@ /** + * @copydoc PDMDEVHLPR3::pfnVMTeleportedAndNotFullyResumedYet + */ +DECLINLINE(bool) PDMDevHlpVMTeleportedAndNotFullyResumedYet(PPDMDEVINS pDevIns) +{ + return pDevIns->pDevHlpR3->pfnVMTeleportedAndNotFullyResumedYet(pDevIns); +} + +/** * @copydoc PDMDEVHLPR3::pfnA20Set */ Index: /trunk/include/VBox/pdmdrv.h =================================================================== --- /trunk/include/VBox/pdmdrv.h (revision 23914) +++ /trunk/include/VBox/pdmdrv.h (revision 23915) @@ -501,4 +501,22 @@ /** + * Gets the VM state. + * + * @returns VM state. + * @param pDrvIns The driver instance. + * @thread Any thread (just keep in mind that it's volatile info). + */ + DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDRVINS pDrvIns)); + + /** + * Checks if the VM was teleported and hasn't been fully resumed yet. + * + * @returns true / false. + * @param pDrvIns The driver instance. + * @thread Any thread. + */ + DECLR3CALLBACKMEMBER(bool, pfnVMTeleportedAndNotFullyResumedYet,(PPDMDRVINS pDrvIns)); + + /** * Create a queue. * @@ -698,13 +716,4 @@ DECLR3CALLBACKMEMBER(int, pfnPDMThreadCreate,(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread, PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)); - - /** - * Gets the VM state. - * - * @returns VM state. - * @param pDrvIns The driver instance. - * @thread Any thread (just keep in mind that it's volatile info). - */ - DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDRVINS pDrvIns)); #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION @@ -883,4 +892,20 @@ /** + * @copydoc PDMDRVHLP::pfnVMState + */ +DECLINLINE(VMSTATE) PDMDrvHlpVMState(PPDMDRVINS pDrvIns) +{ + return pDrvIns->pDrvHlp->pfnVMState(pDrvIns); +} + +/** + * @copydoc PDMDRVHLP::pfnVMTeleportedAndNotFullyResumedYet + */ +DECLINLINE(bool) PDMDrvHlpVMTeleportedAndNotFullyResumedYet(PPDMDRVINS pDrvIns) +{ + return pDrvIns->pDrvHlp->pfnVMTeleportedAndNotFullyResumedYet(pDrvIns); +} + +/** * @copydoc PDMDRVHLP::pfnPDMQueueCreate */ @@ -1009,12 +1034,4 @@ } -/** - * @copydoc PDMDRVHLP::pfnVMState - */ -DECLINLINE(VMSTATE) PDMDrvHlpVMState(PPDMDRVINS pDrvIns) -{ - return pDrvIns->pDrvHlp->pfnVMState(pDrvIns); -} - #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION /** Index: /trunk/include/VBox/vmapi.h =================================================================== --- /trunk/include/VBox/vmapi.h (revision 23914) +++ /trunk/include/VBox/vmapi.h (revision 23915) @@ -361,4 +361,5 @@ VMMR3DECL(VMSTATE) VMR3GetState(PVM pVM); VMMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState); +VMMR3DECL(bool) VMR3TeleportedAndNotFullyResumedYet(PVM pVM); VMMR3DECL(int) VMR3AtErrorRegister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser); VMMR3DECL(int) VMR3AtErrorRegisterU(PUVM pVM, PFNVMATERROR pfnAtError, void *pvUser); Index: /trunk/src/VBox/VMM/PDMDevHlp.cpp =================================================================== --- /trunk/src/VBox/VMM/PDMDevHlp.cpp (revision 23914) +++ /trunk/src/VBox/VMM/PDMDevHlp.cpp (revision 23915) @@ -1034,4 +1034,30 @@ +/** @copydoc PDMDEVHLPR3::pfnVMState */ +static DECLCALLBACK(VMSTATE) pdmR3DevHlp_VMState(PPDMDEVINS pDevIns) +{ + PDMDEV_ASSERT_DEVINS(pDevIns); + + VMSTATE enmVMState = VMR3GetState(pDevIns->Internal.s.pVMR3); + + LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, + enmVMState, VMR3GetStateName(enmVMState))); + return enmVMState; +} + + +/** @copydoc PDMDEVHLPR3::pfnVMTeleportedAndNotFullyResumedYet */ +static DECLCALLBACK(bool) pdmR3DevHlp_VMTeleportedAndNotFullyResumedYet(PPDMDEVINS pDevIns) +{ + PDMDEV_ASSERT_DEVINS(pDevIns); + + bool fRc = VMR3TeleportedAndNotFullyResumedYet(pDevIns->Internal.s.pVMR3); + + LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %RTbool\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, + fRc)); + return fRc; +} + + /** @copydoc PDMDEVHLPR3::pfnAssertEMT */ static DECLCALLBACK(bool) pdmR3DevHlp_AssertEMT(PPDMDEVINS pDevIns, const char *pszFile, unsigned iLine, const char *pszFunction) @@ -2274,17 +2300,4 @@ return rc; -} - - -/** @copydoc PDMDEVHLPR3::pfnVMState */ -static DECLCALLBACK(VMSTATE) pdmR3DevHlp_VMState(PPDMDEVINS pDevIns) -{ - PDMDEV_ASSERT_DEVINS(pDevIns); - - VMSTATE enmVMState = VMR3GetState(pDevIns->Internal.s.pVMR3); - - LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, - enmVMState, VMR3GetStateName(enmVMState))); - return enmVMState; } @@ -2783,4 +2796,6 @@ pdmR3DevHlp_VMSetRuntimeError, pdmR3DevHlp_VMSetRuntimeErrorV, + pdmR3DevHlp_VMState, + pdmR3DevHlp_VMTeleportedAndNotFullyResumedYet, pdmR3DevHlp_AssertEMT, pdmR3DevHlp_AssertOther, @@ -2796,5 +2811,7 @@ pdmR3DevHlp_PDMThreadCreate, pdmR3DevHlp_PhysGCPtr2GCPhys, - pdmR3DevHlp_VMState, + 0, + 0, + 0, 0, 0, @@ -3244,4 +3261,6 @@ pdmR3DevHlp_VMSetRuntimeError, pdmR3DevHlp_VMSetRuntimeErrorV, + pdmR3DevHlp_VMState, + pdmR3DevHlp_VMTeleportedAndNotFullyResumedYet, pdmR3DevHlp_AssertEMT, pdmR3DevHlp_AssertOther, @@ -3257,5 +3276,7 @@ pdmR3DevHlp_PDMThreadCreate, pdmR3DevHlp_PhysGCPtr2GCPhys, - pdmR3DevHlp_VMState, + 0, + 0, + 0, 0, 0, Index: /trunk/src/VBox/VMM/PDMDriver.cpp =================================================================== --- /trunk/src/VBox/VMM/PDMDriver.cpp (revision 23914) +++ /trunk/src/VBox/VMM/PDMDriver.cpp (revision 23915) @@ -798,4 +798,30 @@ +/** @copydoc PDMDEVHLPR3::pfnVMState */ +static DECLCALLBACK(VMSTATE) pdmR3DrvHlp_VMState(PPDMDRVINS pDrvIns) +{ + PDMDRV_ASSERT_DRVINS(pDrvIns); + + VMSTATE enmVMState = VMR3GetState(pDrvIns->Internal.s.pVM); + + LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, + enmVMState, VMR3GetStateName(enmVMState))); + return enmVMState; +} + + +/** @copydoc PDMDEVHLPR3::pfnVMTeleportedAndNotFullyResumedYet */ +static DECLCALLBACK(bool) pdmR3DrvHlp_VMTeleportedAndNotFullyResumedYet(PPDMDRVINS pDrvIns) +{ + PDMDRV_ASSERT_DRVINS(pDrvIns); + + bool fRc = VMR3TeleportedAndNotFullyResumedYet(pDrvIns->Internal.s.pVM); + + LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %RTbool)\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, + fRc)); + return fRc; +} + + /** @copydoc PDMDRVHLP::pfnPDMQueueCreate */ static DECLCALLBACK(int) pdmR3DrvHlp_PDMQueueCreate(PPDMDRVINS pDrvIns, RTUINT cbItem, RTUINT cItems, uint32_t cMilliesInterval, @@ -999,17 +1025,4 @@ rc, *ppThread)); return rc; -} - - -/** @copydoc PDMDEVHLPR3::pfnVMState */ -static DECLCALLBACK(VMSTATE) pdmR3DrvHlp_VMState(PPDMDRVINS pDrvIns) -{ - PDMDRV_ASSERT_DRVINS(pDrvIns); - - VMSTATE enmVMState = VMR3GetState(pDrvIns->Internal.s.pVM); - - LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, - enmVMState, VMR3GetStateName(enmVMState))); - return enmVMState; } @@ -1051,4 +1064,6 @@ pdmR3DrvHlp_VMSetRuntimeError, pdmR3DrvHlp_VMSetRuntimeErrorV, + pdmR3DrvHlp_VMState, + pdmR3DrvHlp_VMTeleportedAndNotFullyResumedYet, pdmR3DrvHlp_PDMQueueCreate, pdmR3DrvHlp_TMGetVirtualFreq, @@ -1064,5 +1079,4 @@ pdmR3DrvHlp_USBRegisterHub, pdmR3DrvHlp_PDMThreadCreate, - pdmR3DrvHlp_VMState, #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate, Index: /trunk/src/VBox/VMM/VM.cpp =================================================================== --- /trunk/src/VBox/VMM/VM.cpp (revision 23914) +++ /trunk/src/VBox/VMM/VM.cpp (revision 23915) @@ -1346,4 +1346,5 @@ PDMR3Resume(pVM); vmR3SetState(pVM, VMSTATE_RUNNING, VMSTATE_RESUMING); + pVM->vm.s.fTeleportedAndNotFullyResumedYet = false; } @@ -1612,4 +1613,6 @@ else if (rc == 2 || enmAfter == SSMAFTER_TELEPORT) { + if (enmAfter == SSMAFTER_TELEPORT) + pVM->vm.s.fTeleportedAndNotFullyResumedYet = true; rc = SSMR3LiveSave(pVM, pszFilename, pStreamOps, pvStreamOpsUser, enmAfter, pfnProgress, pvProgressUser, ppSSM); @@ -3180,4 +3183,18 @@ /** + * Checks if the VM was teleported and hasn't been fully resumed yet. + * + * @returns true / false. + * @param pVM The VM handle. + * @thread Any thread. + */ +VMMR3DECL(bool) VMR3TeleportedAndNotFullyResumedYet(PVM pVM) +{ + VM_ASSERT_VALID_EXT_RETURN(pVM, false); + return pVM->vm.s.fTeleportedAndNotFullyResumedYet; +} + + +/** * Registers a VM state change callback. * Index: /trunk/src/VBox/VMM/VMInternal.h =================================================================== --- /trunk/src/VBox/VMM/VMInternal.h (revision 23914) +++ /trunk/src/VBox/VMM/VMInternal.h (revision 23915) @@ -166,4 +166,6 @@ /** VM Runtime Error Message. */ R3PTRTYPE(PVMRUNTIMEERROR) pRuntimeErrorR3; + /** The VM was/is-being teleported and has not yet been fully resumed. */ + bool fTeleportedAndNotFullyResumedYet; } VMINT; /** Pointer to the VM Internal Data (part of the VM structure). */