Changeset 65347 in vbox for trunk/src

Timestamp:

Jan 17, 2017 9:39:30 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112933

Message:

Devices/Storage/DrvVD: Fix cancelling active requests

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)

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

@@ -2757 +2757 @@
         RTListForEach(&pThis->aIoReqAllocBins[idxBin].LstIoReqAlloc, pIt, PDMMEDIAEXIOREQINT, NdAllocatedList)
         {
-            if (RT_UNLIKELY(pIt->uIoReqId == pIoReq->uIoReqId))
+            if (RT_UNLIKELY(   pIt->uIoReqId == pIoReq->uIoReqId
+                            && pIt->enmState != VDIOREQSTATE_CANCELED))
             {
                 rc = VERR_PDM_MEDIAEX_IOREQID_CONFLICT;
@@ -3500 +3501 @@
 static bool drvvdMediaExIoReqCancel(PVBOXDISK pThis, PPDMMEDIAEXIOREQINT pIoReq)
 {
-    bool fXchg = true;
+    bool fXchg = false;
     VDIOREQSTATE enmStateOld = (VDIOREQSTATE)ASMAtomicReadU32((volatile uint32_t *)&pIoReq->enmState);
 
@@ -3515 +3516 @@
     {
         fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pIoReq->enmState, VDIOREQSTATE_CANCELED, enmStateOld);
-        if (!fXchg)
-            enmStateOld = (VDIOREQSTATE)ASMAtomicReadU32((volatile uint32_t *)&pIoReq->enmState);
+        if (fXchg)
+            break;
+
+        enmStateOld = (VDIOREQSTATE)ASMAtomicReadU32((volatile uint32_t *)&pIoReq->enmState);
     }