Changeset 81016 in vbox

Timestamp:

Sep 26, 2019 12:20:00 PM (6 years ago)

Author:

vboxsync

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

133618

Message:

Storage/DevVirtioSCSI.cpp: Attempt 1 to fix some burns, hopefully on Darwin and Linux

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Storage/DevVirtioSCSI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -524 +524 @@
   VBoxDD_DEFS           += VBOX_WITH_VIRTIO_SCSI
   VBoxDD_SOURCES        += \
-        Virtio/Virtio_1_0.cpp \
+        VirtIO/Virtio_1_0.cpp \
         Storage/DevVirtioSCSI.cpp
  endif

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

@@ -803 +803 @@
     AssertReturn(abSenseBuf, VERR_NO_MEMORY);
 
+    const char *pszCtrlRespText = virtioGetCtrlRespText(pRespHdr->uResponse);
     Log2Func(("   status: %s    response: %s\n",
-              SCSIStatusText(pRespHdr->uStatus),  virtioGetReqRespText(pRespHdr->uResponse)));
+              SCSIStatusText(pRespHdr->uStatus),  pszCtrlRespText));
 
     RTSGSEG aReqSegs[2];
@@ -928 +929 @@
                   pReq->cbDataIn, pReq->cbDataOut, pReq->pDescChain->cbPhysDst, pReq->pDescChain->cbVirtSrc));
         LogFunc(("xfer = %lu, residual = %u\n", cbXfer, cbResidual));
+        const char *pszTxDirText = virtioGetTxDirText(pReq->enmTxDir);
         LogFunc(("xfer direction: %s, sense written = %d, sense size = %d\n",
-             virtioGetTxDirText(pReq->enmTxDir), respHdr.uSenseLen, pThis->virtioScsiConfig.uSenseSize));
+             pszTxDirText, respHdr.uSenseLen, pThis->virtioScsiConfig.uSenseSize));
     }
 
@@ -1218 +1220 @@
         {
             PVIRTIOSCSI_CTRL_TMF_T pScsiCtrlTmf = (PVIRTIOSCSI_CTRL_TMF_T)pScsiCtrl;
+            const char *pszTmfTypeText = virtioGetTMFTypeText(pScsiCtrlTmf->uSubtype);
             LogFunc(("%s, VirtIO LUN: %.8Rhxs\n%*sTask Mgt Function: %s (not yet implemented)\n",
                 QUEUENAME(qIdx), pScsiCtrlTmf->uScsiLun,
-                CBQUEUENAME(qIdx) + 18, "", virtioGetTMFTypeText(pScsiCtrlTmf->uSubtype)));
+                CBQUEUENAME(qIdx) + 18, "", pszTmfTypeText));
 
             switch(pScsiCtrlTmf->uSubtype)
@@ -1321 +1324 @@
     }
 
-    LogFunc(("Response code: %s\n", virtioGetCtrlRespText(uResponse)));
+    const char *pszCtrlRespText = virtioGetCtrlRespText(uResponse);
+    LogFunc(("Response code: %s\n", pszCtrlRespText));
     virtioQueuePut (pThis->hVirtio, qIdx, &reqSegBuf, pDescChain, true);
     virtioQueueSync(pThis->hVirtio, qIdx);
@@ -1412 +1416 @@
 }
 
+#if 0
 /* Only invoke this if VIRTIOSCSI_F_HOTPLUG is negotiated during intiailization
  * This effectively removes the SCSI Target/LUN on the guest side
@@ -1479 +1484 @@
                 VIRTIOSCSI_EVT_ASYNC_DEVICE_BUSY);
 }
-
+#endif
 
 DECLINLINE(void) virtioScsiReportParamChange(PVIRTIOSCSI pThis, uint16_t uTarget, uint32_t uSenseCode, uint32_t uSenseQualifier)