Changeset 107969 in vbox for trunk

Timestamp:

Jan 28, 2025 3:37:55 PM (3 months ago)

Author:

vboxsync

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

167221

Message:

DevVirtioSCSI: comment and indentation fixing

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (8 diffs)

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

@@ -1645 +1645 @@
         if (!pThisCC->fQuiescing)
         {
-             /* Process any reqs that were suspended saved to the redo queue in save exec. */
-             for (int i = 0; i < pWorkerR3->cRedoDescs; i++)
-             {
+            /* Process any reqs that were suspended saved to the redo queue in save exec. */
+            for (int i = 0; i < pWorkerR3->cRedoDescs; i++)
+            {
                 PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
                 if (!pVirtqBuf)
@@ -1655 +1655 @@
                 }
                 int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr,
-                                                    pWorkerR3->auRedoDescs[i], pVirtqBuf);
+                                                      pWorkerR3->auRedoDescs[i], pVirtqBuf);
                 if (RT_FAILURE(rc))
                     LogRel(("Error fetching desc chain to redo, %Rrc", rc));
@@ -1663 +1663 @@
                     LogRel(("Error submitting req packet, resetting %Rrc", rc));
 
-                  virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
-             }
-             pWorkerR3->cRedoDescs = 0;
-
-             Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(uVirtqNbr)));
+                virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+            }
+            pWorkerR3->cRedoDescs = 0;
+
+            Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(uVirtqNbr)));
             PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
             if (!pVirtqBuf)
@@ -1700 +1700 @@
 
 /*********************************************************************************************************************************
-*   Sending evnets
+*   Sending events
 *********************************************************************************************************************************/
 
@@ -2146 +2146 @@
     AssertMsg(!pThis->cActiveReqs, ("There are still outstanding requests on this device\n"));
 
-     pHlp->pfnSSMPutU32(pSSM, pThis->cTargets);
-
-     for (uint16_t uTarget = 0; uTarget < pThis->cTargets; uTarget++)
-     {
+    pHlp->pfnSSMPutU32(pSSM, pThis->cTargets);
+
+    for (uint16_t uTarget = 0; uTarget < pThis->cTargets; uTarget++)
+    {
         PVIRTIOSCSITARGET pTarget = &pThisCC->paTargetInstances[uTarget];
 
-         /* Query all suspended requests and store them in the request queue. */
-         if (pTarget->pDrvMediaEx)
-         {
-             uint32_t cReqsRedo = pTarget->pDrvMediaEx->pfnIoReqGetSuspendedCount(pTarget->pDrvMediaEx);
-
-             pHlp->pfnSSMPutU16(pSSM, cReqsRedo);
-
-             if (cReqsRedo)
-             {
-                 PDMMEDIAEXIOREQ hIoReq;
-                 PVIRTIOSCSIREQ pReq;
-
-                 int rc = pTarget->pDrvMediaEx->pfnIoReqQuerySuspendedStart(pTarget->pDrvMediaEx, &hIoReq,
-                                                                            (void **)&pReq);
-                 AssertRCBreak(rc);
-
-                 while(--cReqsRedo)
-                 {
+        /* Query all suspended requests and store them in the request queue. */
+        if (pTarget->pDrvMediaEx)
+        {
+            uint32_t cReqsRedo = pTarget->pDrvMediaEx->pfnIoReqGetSuspendedCount(pTarget->pDrvMediaEx);
+
+            pHlp->pfnSSMPutU16(pSSM, cReqsRedo);
+
+            if (cReqsRedo)
+            {
+                PDMMEDIAEXIOREQ hIoReq;
+                PVIRTIOSCSIREQ pReq;
+
+                int rc = pTarget->pDrvMediaEx->pfnIoReqQuerySuspendedStart(pTarget->pDrvMediaEx, &hIoReq,
+                                                                           (void **)&pReq);
+                AssertRCBreak(rc);
+
+                while(--cReqsRedo)
+                {
                     pHlp->pfnSSMPutU16(pSSM, pReq->uVirtqNbr);
                     pHlp->pfnSSMPutU16(pSSM, pReq->pVirtqBuf->uHeadIdx);
@@ -2176 +2176 @@
                                                                           &hIoReq, (void **)&pReq);
                     AssertRCBreak(rc);
-                 }
-             }
-         }
-     }
+                }
+            }
+        }
+    }
 
     /*
@@ -2484 +2484 @@
                 AssertMsgFailed(("%s Failed to destroythread rc=%Rrc rcThread=%Rrc\n",
                                  __FUNCTION__, rc, rcThread));
-           pThisCC->aWorkers[uVirtqNbr].pThread = NULL;
+            pThisCC->aWorkers[uVirtqNbr].pThread = NULL;
         }
 
@@ -2534 +2534 @@
     rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Bootable", &pThis->fBootable, true);
     if (RT_FAILURE(rc))
-         return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio-scsi configuration error: failed to read Bootable as boolean"));
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio-scsi configuration error: failed to read Bootable as boolean"));
 
     LogRel(("%s: Targets=%u Bootable=%RTbool (unimplemented) R0Enabled=%RTbool RCEnabled=%RTbool\n",