Changeset 91703 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 13, 2021 2:24:30 AM (3 years ago)

Author:

vboxsync

Message:

DevVirtioNet_1_0.cpp: Convert VirtIO to be 'transitional' device, that handles both legacy (0.9) guests and modern (1.0+) guests. Various other small improvements and reduction/improved formatting of logging. See BugRef:8561, Comment #137

File:

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

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

@@ -358 +358 @@
 {
     R3PTRTYPE(PPDMTHREAD)           pThread;                    /**< pointer to worker thread's handle                 */
-    uint16_t                        auRedoDescs[VIRTQ_MAX_ENTRIES];/**< List of previously suspended reqs to re-submit    */
+    uint16_t                        auRedoDescs[VIRTQ_SIZE];/**< List of previously suspended reqs to re-submit    */
     uint16_t                        cRedoDescs;                 /**< Number of redo desc chain head desc idxes in list */
 } VIRTIOSCSIWORKERR3;
@@ -457 +457 @@
     uint32_t                        fHasT10pi;
 
-    /** True if VIRTIO_SCSI_F_T10_PI was negotiated */
+    /** True if VIRTIO_SCSI_F_HOTPLUG was negotiated */
     uint32_t                        fHasHotplug;
 
-    /** True if VIRTIO_SCSI_F_T10_PI was negotiated */
+    /** True if VIRTIO_SCSI_F_INOUT was negotiated */
     uint32_t                        fHasInOutBufs;
 
-    /** True if VIRTIO_SCSI_F_T10_PI was negotiated */
+    /** True if VIRTIO_SCSI_F_CHANGE was negotiated */
     uint32_t                        fHasLunChange;
 
@@ -559 +559 @@
     uint16_t                       uVirtqNbr;                   /**< Index of queue this request arrived on            */
     PVIRTQBUF                      pVirtqBuf;                   /**< Prepared desc chain pulled from virtq avail ring  */
-    size_t                         cbDataIn;                    /**< size of dataout buffer                            */
+    size_t                         cbDataIn;                    /**< size of datain buffer                             */
     size_t                         cbDataOut;                   /**< size of dataout buffer                            */
     uint16_t                       uDataInOff;                  /**< Fixed size of respHdr + sense (precede datain)    */
-    uint16_t                       uDataOutOff;                 /**< Fixed size of respHdr + sense (precede datain)    */
+    uint16_t                       uDataOutOff;                 /**< Fixed size of reqhdr + cdb (precede dataout)      */
     uint32_t                       cbSenseAlloc;                /**< Size of sense buffer                              */
     size_t                         cbSenseLen;                  /**< Receives \# bytes written into sense buffer       */
@@ -828 +828 @@
     RTSGSEG aReqSegs[2];
 
-    /* Segment #1: Request header*/
+    /* Segment #1: Response header*/
     aReqSegs[0].pvSeg = pRespHdr;
     aReqSegs[0].cbSeg = sizeof(*pRespHdr);
@@ -1164 +1164 @@
      */
     size_t const cbReqHdr = sizeof(REQ_CMD_HDR_T) + cbCdb;
-    AssertReturn(pVirtqBuf->cbPhysSend >= cbReqHdr, VERR_INVALID_PARAMETER);
+    AssertReturn(pVirtqBuf && pVirtqBuf->cbPhysSend >= cbReqHdr, VERR_INVALID_PARAMETER);
 
     AssertCompile(VIRTIOSCSI_CDB_SIZE_MAX < 4096);
@@ -1714 +1714 @@
         /*
          * BIOS may change these values. When the OS comes up, and KVM driver accessed
-         * through the Windows, assumes they are the default size. So as per the VirtIO 1.0 spec,
+         * through Windows, it assumes they are the default size. So as per the VirtIO 1.0 spec,
          * 5.6.4, these device configuration values must be set to default upon device reset.
          */
@@ -1958 +1958 @@
         rc = pHlp->pfnSSMGetU16(pSSM, &cReqsRedo);
         AssertRCReturn(rc, rc);
-        AssertReturn(cReqsRedo < VIRTQ_MAX_ENTRIES,
+        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_MAX_ENTRIES));
+                                              cReqsRedo, VIRTQ_SIZE));
 
         for (uint16_t uVirtqNbr = VIRTQ_REQ_BASE; uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT; uVirtqNbr++)
@@ -1982 +1982 @@
             rc = pHlp->pfnSSMGetU16(pSSM, &idxHead);
             AssertRCReturn(rc, rc);
-            AssertReturn(idxHead < VIRTQ_MAX_ENTRIES,
+            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_MAX_ENTRIES - 1));
+                                                  idxHead, VIRTQ_SIZE - 1));
 
             PVIRTIOSCSIWORKERR3 pWorkerR3 = &pThisCC->aWorkers[uVirtqNbr];
             pWorkerR3->auRedoDescs[pWorkerR3->cRedoDescs++] = idxHead;
-            pWorkerR3->cRedoDescs %= VIRTQ_MAX_ENTRIES;
+            pWorkerR3->cRedoDescs %= VIRTQ_SIZE;
         }
     }