Changeset 81019 in vbox

Timestamp:

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

Author:

vboxsync

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

133621

Message:

Storage/DevVirtioSCSI.cpp: Attempt #4 to resolve burns

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevVirtioSCSI.cpp (modified) (3 diffs)
• VirtIO/Virtio_1_0.cpp (modified) (1 diff)
• VirtIO/Virtio_1_0_impl.h (modified) (1 diff)

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

@@ -920 +920 @@
     }
 
+    const char *getReqRespText = virtioGetReqRespText(respHdr.uResponse);
     Log2Func(("status: (%d) %s,   response: (%d) %s\n",
               pReq->uStatus, SCSIStatusText(pReq->uStatus),
-              respHdr.uResponse, virtioGetReqRespText(respHdr.uResponse)));
+              respHdr.uResponse, getReqRespText));
+    RT_NOREF(getReqRespText);
 
     if (RT_FAILURE(rcReq))
@@ -1489 +1491 @@
                 VIRTIOSCSI_EVT_ASYNC_DEVICE_BUSY);
 }
-#endif
 
 DECLINLINE(void) virtioScsiReportParamChange(PVIRTIOSCSI pThis, uint16_t uTarget, uint32_t uSenseCode, uint32_t uSenseQualifier)
@@ -1497 +1498 @@
 
 }
+
+#endif
 
 static DECLCALLBACK(void) virtioScsiNotified(VIRTIOHANDLE hVirtio, void *pClient, uint16_t qIdx)

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -779 +779 @@
        LogFunc(("Bad read access to mapped capabilities region:\n"
                 "                  pVirtio=%#p GCPhysAddr=%RGp cb=%u\n",
-                pVirtio, GCPhysAddr, pv, cb, pv, cb));
+                pVirtio, GCPhysAddr, cb));
     }
     return rc;

trunk/src/VBox/Devices/VirtIO/Virtio_1_0_impl.h

@@ -503 +503 @@
         int primed = 0;
         if (status & VIRTIO_STATUS_ACKNOWLEDGE)
-            Log6(("ACKNOWLEDGE",   primed++));
+            Log6(("%sACKNOWLEDGE", primed++ ? "" : ""));
         if (status & VIRTIO_STATUS_DRIVER)
             Log6(("%sDRIVER",      primed++ ? " | " : ""));