Changeset 107970 in vbox

Timestamp:

Jan 28, 2025 3:43:36 PM (3 months ago)

Author:

vboxsync

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

167222

Message:

DevVirtioSCSI: Load pending requests only for targets with an attached drive, to match the behavior of the function which saves the state.

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp ¶

@@ -2051 +2051 @@
     for (uint16_t uTarget = 0; uTarget < pThis->cTargets; uTarget++)
     {
-        uint16_t cReqsRedo;
-        rc = pHlp->pfnSSMGetU16(pSSM, &cReqsRedo);
-        AssertRCReturn(rc, rc);
-        AssertReturn(cReqsRedo < VIRTQ_SIZE,
-                     pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
-                                              N_("Bad count of I/O transactions to re-do in saved state (%#x, max %#x - 1)"),
-                                              cReqsRedo, VIRTQ_SIZE));
-
-        for (uint16_t uVirtqNbr = VIRTQ_REQ_BASE; uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT; uVirtqNbr++)
+        PVIRTIOSCSITARGET pTarget = &pThisCC->paTargetInstances[uTarget];
+
+        /* Place all suspended requests in the request queue. */
+        if (pTarget->pDrvMediaEx)
         {
-            PVIRTIOSCSIWORKERR3 pWorkerR3 = &pThisCC->aWorkers[uVirtqNbr];
-            pWorkerR3->cRedoDescs = 0;
-        }
-
-        for (int i = 0; i < cReqsRedo; i++)
-        {
-            uint16_t uVirtqNbr;
-            rc = pHlp->pfnSSMGetU16(pSSM, &uVirtqNbr);
+
+            uint16_t cReqsRedo;
+            rc = pHlp->pfnSSMGetU16(pSSM, &cReqsRedo);
             AssertRCReturn(rc, rc);
-            AssertReturn(uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT,
+            AssertReturn(cReqsRedo < VIRTQ_SIZE,
                          pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
-                                                  N_("Bad queue index for re-do in saved state (%#x, max %#x)"),
-                                                  uVirtqNbr, VIRTIOSCSI_VIRTQ_CNT - 1));
-
-            uint16_t idxHead;
-            rc = pHlp->pfnSSMGetU16(pSSM, &idxHead);
-            AssertRCReturn(rc, rc);
-            AssertReturn(idxHead < VIRTQ_SIZE,
-                         pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
-                                                  N_("Bad queue element index for re-do in saved state (%#x, max %#x)"),
-                                                  idxHead, VIRTQ_SIZE - 1));
-
-            PVIRTIOSCSIWORKERR3 pWorkerR3 = &pThisCC->aWorkers[uVirtqNbr];
-            pWorkerR3->auRedoDescs[pWorkerR3->cRedoDescs++] = idxHead;
-            pWorkerR3->cRedoDescs %= VIRTQ_SIZE;
+                                                  N_("Bad count of I/O transactions to re-do in saved state (%#x, max %#x - 1)"),
+                                                  cReqsRedo, VIRTQ_SIZE));
+
+            for (uint16_t uVirtqNbr = VIRTQ_REQ_BASE; uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT; uVirtqNbr++)
+            {
+                PVIRTIOSCSIWORKERR3 pWorkerR3 = &pThisCC->aWorkers[uVirtqNbr];
+                pWorkerR3->cRedoDescs = 0;
+            }
+
+            for (int i = 0; i < cReqsRedo; i++)
+            {
+                uint16_t uVirtqNbr;
+                rc = pHlp->pfnSSMGetU16(pSSM, &uVirtqNbr);
+                AssertRCReturn(rc, rc);
+                AssertReturn(uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT,
+                             pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
+                                                      N_("Bad queue index for re-do in saved state (%#x, max %#x)"),
+                                                      uVirtqNbr, VIRTIOSCSI_VIRTQ_CNT - 1));
+
+                uint16_t idxHead;
+                rc = pHlp->pfnSSMGetU16(pSSM, &idxHead);
+                AssertRCReturn(rc, rc);
+                AssertReturn(idxHead < VIRTQ_SIZE,
+                             pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
+                                                      N_("Bad queue element index for re-do in saved state (%#x, max %#x)"),
+                                                      idxHead, VIRTQ_SIZE - 1));
+
+                PVIRTIOSCSIWORKERR3 pWorkerR3 = &pThisCC->aWorkers[uVirtqNbr];
+                pWorkerR3->auRedoDescs[pWorkerR3->cRedoDescs++] = idxHead;
+                pWorkerR3->cRedoDescs %= VIRTQ_SIZE;
+            }
         }
     }