Changeset 59538 in vbox for trunk

Timestamp:

Feb 1, 2016 10:33:38 AM (9 years ago)

Author:

vboxsync

Message:

Storage/DrvVD: Add methods to query suspended requests, will be used for saved state handling in the device emulations

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -832 +832 @@
     DECLR3CALLBACKMEMBER(uint32_t, pfnIoReqGetActiveCount, (PPDMIMEDIAEX pInterface));
 
+    /**
+     * Returns the number of suspended requests.
+     *
+     * @returns Number of suspended I/O requests.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(uint32_t, pfnIoReqGetSuspendedCount, (PPDMIMEDIAEX pInterface));
+
+    /**
+     * Gets the first suspended request handle.
+     *
+     * @returns VBox status code.
+     * @retval  VERR_NOT_FOUND if there is no suspended request waiting.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   phIoReq         Where to store the request handle on success.
+     * @param   ppvIoReqAlloc   Where to store the pointer to the allocator specific memory on success.
+     * @thread  Any thread.
+     *
+     * @note This should only be called when the VM is suspended to make sure the request doesn't suddenly
+     *       changes into the active state again. The only purpose for this method for now is to make saving the state
+     *       possible without breaking saved state versions.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoReqQuerySuspendedStart, (PPDMIMEDIAEX pInterface, PPDMMEDIAEXIOREQ phIoReq, void **ppvIoReqAlloc));
+
+    /**
+     * Gets the next suspended request handle.
+     *
+     * @returns VBox status code.
+     * @retval  VERR_NOT_FOUND if there is no suspended request waiting.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   hIoReq          The current request handle.
+     * @param   phIoReqNext     Where to store the request handle on success.
+     * @param   ppvIoReqAllocNext Where to store the pointer to the allocator specific memory on success.
+     * @thread  Any thread.
+     *
+     * @note This should only be called when the VM is suspended to make sure the request doesn't suddenly
+     *       changes into the active state again. The only purpose for this method for now is to make saving the state
+     *       possible without breaking saved state versions.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIoReqQuerySuspendedNext, (PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq,
+                                                           PPDMMEDIAEXIOREQ phIoReqNext, void **ppvIoReqAllocNext));
+
 } PDMIMEDIAEX;
 /** PDMIMEDIAEX interface ID. */
-#define PDMIMEDIAEX_IID                      "d5ee47d8-5f7c-411d-bd9d-1021ee721a88"
+#define PDMIMEDIAEX_IID                      "a1eee1a8-cf51-43ed-a528-9f678a1b2224"
 
 /**

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

@@ -3051 +3051 @@
 
 /**
+ * Returns whether the VM is in a running state.
+ *
+ * @returns Flag indicating whether the VM is currently in a running state.
+ * @param   pThis     VBox disk container instance data.
+ */
+DECLINLINE(bool) drvvdMediaExIoReqIsVmRunning(PVBOXDISK pThis)
+{
+    VMSTATE enmVmState = PDMDrvHlpVMState(pThis->pDrvIns);
+    if (   enmVmState == VMSTATE_RESUMING
+        || enmVmState == VMSTATE_RUNNING
+        || enmVmState == VMSTATE_RUNNING_LS
+        || enmVmState == VMSTATE_RUNNING_FT
+        || enmVmState == VMSTATE_RESETTING
+        || enmVmState == VMSTATE_RESETTING_LS
+        || enmVmState == VMSTATE_SUSPENDING
+        || enmVmState == VMSTATE_SUSPENDING_LS
+        || enmVmState == VMSTATE_SUSPENDING_EXT_LS)
+        return true;
+
+    return false;
+}
+
+/**
  * @copydoc FNVDASYNCTRANSFERCOMPLETE
  */
@@ -3404 +3427 @@
     PVBOXDISK pThis = RT_FROM_MEMBER(pInterface, VBOXDISK, IMediaEx);
     return ASMAtomicReadU32(&pThis->cIoReqsActive);
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqGetSuspendedCount}
+ */
+static DECLCALLBACK(uint32_t) drvvdIoReqGetSuspendedCount(PPDMIMEDIAEX pInterface)
+{
+    PVBOXDISK pThis = RT_FROM_MEMBER(pInterface, VBOXDISK, IMediaEx);
+
+    AssertReturn(!drvvdMediaExIoReqIsVmRunning(pThis), 0);
+
+    uint32_t cIoReqSuspended = 0;
+    PPDMMEDIAEXIOREQINT pIoReq;
+    RTCritSectEnter(&pThis->CritSectIoReqRedo);
+    RTListForEach(&pThis->LstIoReqRedo, pIoReq, PDMMEDIAEXIOREQINT, NdLstWait)
+    {
+        cIoReqSuspended++;
+    }
+    RTCritSectLeave(&pThis->CritSectIoReqRedo);
+
+    return cIoReqSuspended;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedFirst}
+ */
+static DECLCALLBACK(int) drvvdIoReqQuerySuspendedStart(PPDMIMEDIAEX pInterface, PPDMMEDIAEXIOREQ phIoReq,
+                                                       void **ppvIoReqAlloc)
+{
+    PVBOXDISK pThis = RT_FROM_MEMBER(pInterface, VBOXDISK, IMediaEx);
+
+    AssertReturn(!drvvdMediaExIoReqIsVmRunning(pThis), VERR_INVALID_STATE);
+    AssertReturn(!RTListIsEmpty(&pThis->LstIoReqRedo), VERR_NOT_FOUND);
+
+    RTCritSectEnter(&pThis->CritSectIoReqRedo);
+    PPDMMEDIAEXIOREQINT pIoReq = RTListGetFirst(&pThis->LstIoReqRedo, PDMMEDIAEXIOREQINT, NdLstWait);
+    *phIoReq       = pIoReq;
+    *ppvIoReqAlloc = &pIoReq->abAlloc[0];
+    RTCritSectLeave(&pThis->CritSectIoReqRedo);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedNext}
+ */
+static DECLCALLBACK(int) drvvdIoReqQuerySuspendedNext(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq,
+                                                      PPDMMEDIAEXIOREQ phIoReqNext, void **ppvIoReqAllocNext)
+{
+    PVBOXDISK pThis = RT_FROM_MEMBER(pInterface, VBOXDISK, IMediaEx);
+    PPDMMEDIAEXIOREQINT pIoReq = hIoReq;
+
+    AssertReturn(!drvvdMediaExIoReqIsVmRunning(pThis), VERR_INVALID_STATE);
+    AssertPtrReturn(pIoReq, VERR_INVALID_HANDLE);
+    AssertReturn(!RTListNodeIsLast(&pThis->LstIoReqRedo, &pIoReq->NdLstWait), VERR_NOT_FOUND);
+
+    RTCritSectEnter(&pThis->CritSectIoReqRedo);
+    PPDMMEDIAEXIOREQINT pIoReqNext = RTListNodeGetNext(&pIoReq->NdLstWait, PDMMEDIAEXIOREQINT, NdLstWait);
+    *phIoReqNext       = pIoReqNext;
+    *ppvIoReqAllocNext = &pIoReqNext->abAlloc[0];
+    RTCritSectLeave(&pThis->CritSectIoReqRedo);
+
+    return VINF_SUCCESS;
 }
 
@@ -3940 +4026 @@
 
     /* IMediaEx */
-    pThis->IMediaEx.pfnIoReqAllocSizeSet   = drvvdIoReqAllocSizeSet;
-    pThis->IMediaEx.pfnIoReqAlloc          = drvvdIoReqAlloc;
-    pThis->IMediaEx.pfnIoReqFree           = drvvdIoReqFree;
-    pThis->IMediaEx.pfnIoReqCancel         = drvvdIoReqCancel;
-    pThis->IMediaEx.pfnIoReqRead           = drvvdIoReqRead;
-    pThis->IMediaEx.pfnIoReqWrite          = drvvdIoReqWrite;
-    pThis->IMediaEx.pfnIoReqFlush          = drvvdIoReqFlush;
-    pThis->IMediaEx.pfnIoReqDiscard        = drvvdIoReqDiscard;
-    pThis->IMediaEx.pfnIoReqGetActiveCount = drvvdIoReqGetActiveCount;
+    pThis->IMediaEx.pfnIoReqAllocSizeSet        = drvvdIoReqAllocSizeSet;
+    pThis->IMediaEx.pfnIoReqAlloc               = drvvdIoReqAlloc;
+    pThis->IMediaEx.pfnIoReqFree                = drvvdIoReqFree;
+    pThis->IMediaEx.pfnIoReqCancel              = drvvdIoReqCancel;
+    pThis->IMediaEx.pfnIoReqRead                = drvvdIoReqRead;
+    pThis->IMediaEx.pfnIoReqWrite               = drvvdIoReqWrite;
+    pThis->IMediaEx.pfnIoReqFlush               = drvvdIoReqFlush;
+    pThis->IMediaEx.pfnIoReqDiscard             = drvvdIoReqDiscard;
+    pThis->IMediaEx.pfnIoReqGetActiveCount      = drvvdIoReqGetActiveCount;
+    pThis->IMediaEx.pfnIoReqGetSuspendedCount   = drvvdIoReqGetSuspendedCount;
+    pThis->IMediaEx.pfnIoReqQuerySuspendedStart = drvvdIoReqQuerySuspendedStart;
+    pThis->IMediaEx.pfnIoReqQuerySuspendedNext  = drvvdIoReqQuerySuspendedNext;
 
     /* Initialize supported VD interfaces. */