Changeset 81314 in vbox for trunk

Timestamp:

Oct 17, 2019 1:43:44 PM (5 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioSCSI.cpp: Fix burns for unused variables

File:

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

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

@@ -1292 +1292 @@
         case VIRTIOSCSI_T_TMF: /* Task Management Functions */
         {
-            uint8_t  uTarget  = pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[1];
-            uint32_t uScsiLun = (pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[2] << 8
-                               | pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[3]) & 0x3fff;
 
             if (LogIs2Enabled())
             {
+                uint8_t  uTarget  = pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[1];
+                uint32_t uScsiLun = (pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[2] << 8
+                                   | pScsiCtrlUnion->scsiCtrlTmf.uScsiLun[3]) & 0x3fff;
                 const char *pszTmfTypeText = virtioGetTMFTypeText(pScsiCtrlUnion->scsiCtrlTmf.uSubtype);
                 Log2Func(("[%s] (Target: %d LUN: %d)  Task Mgt Function: %s\n",
                     uTarget, uScsiLun, pszTmfTypeText));
-                RT_NOREF(pszTmfTypeText);
+                RT_NOREF3(pszTmfTypeText, uTarget, uScsiLun);
             }
-            RT_NOREF2(uTarget, uScsiLun);
 
             switch(pScsiCtrlUnion->scsiCtrlTmf.uSubtype)
@@ -1346 +1345 @@
             PVIRTIOSCSI_CTRL_AN_T pScsiCtrlAnQuery = &pScsiCtrlUnion->scsiCtrlAsyncNotify;
 
-            uint8_t  uTarget  = pScsiCtrlAnQuery->uScsiLun[1];
-            uint32_t uScsiLun = (pScsiCtrlAnQuery->uScsiLun[2] << 8 | pScsiCtrlAnQuery->uScsiLun[3]) & 0x3fff;
 
             uSubscribedEvents &= pScsiCtrlAnQuery->uEventsRequested;
@@ -1354 +1351 @@
             if (LogIs3Enabled())
             {
+                uint8_t  uTarget  = pScsiCtrlAnQuery->uScsiLun[1];
+                uint32_t uScsiLun = (pScsiCtrlAnQuery->uScsiLun[2] << 8 | pScsiCtrlAnQuery->uScsiLun[3]) & 0x3fff;
                 char szTypeText[128];
                 virtioGetControlAsyncMaskText(szTypeText, sizeof(szTypeText),
@@ -1359 +1358 @@
                 Log3Func(("[%s] (Target: %d LUN: %d)  Asyc. Notification Queury: %s\n",
                     uTarget, uScsiLun, szTypeText));
-                RT_NOREF(szTypeText);
+                RT_NOREF3(szTypeText, uTarget, uScsiLun);
 
             }
-            RT_NOREF2(uTarget, uScsiLun);
             RTSGSEG aReqSegs[] = { { &uSubscribedEvents, sizeof(uSubscribedEvents) },  { &uResponse, sizeof(uResponse)  } };
             RTSgBufInit(&reqSegBuf, aReqSegs, sizeof(aReqSegs) / sizeof(RTSGSEG));
@@ -1373 +1371 @@
             PVIRTIOSCSI_CTRL_AN_T pScsiCtrlAnSubscribe = &pScsiCtrlUnion->scsiCtrlAsyncNotify;
 
-            uint8_t  uTarget  = pScsiCtrlAnSubscribe->uScsiLun[1];
-            uint32_t uScsiLun = (pScsiCtrlAnSubscribe->uScsiLun[2] << 8
-                               | pScsiCtrlAnSubscribe->uScsiLun[3]) & 0x3fff;
-
             if (pScsiCtrlAnSubscribe->uEventsRequested & ~SUBSCRIBABLE_EVENTS)
                 LogFunc(("Unsupported bits in event subscription event mask: 0x%x\n",
@@ -1386 +1380 @@
             if (LogIs2Enabled())
             {
+                uint8_t  uTarget  = pScsiCtrlAnSubscribe->uScsiLun[1];
+                uint32_t uScsiLun = (pScsiCtrlAnSubscribe->uScsiLun[2] << 8
+                                   | pScsiCtrlAnSubscribe->uScsiLun[3]) & 0x3fff;
                 char szTypeText[128];
                 virtioGetControlAsyncMaskText(szTypeText, sizeof(szTypeText), pScsiCtrlAnSubscribe->uEventsRequested);
                 Log2Func(("[%s] (Target: %d LUN: %d)  Async. Notification Subscribe: %s\n",
                     uTarget, uScsiLun, szTypeText));
-                RT_NOREF(szTypeText);
+                RT_NOREF3(szTypeText, uTarget, uScsiLun);
 
             }
-            RT_NOREF2(uTarget, uScsiLun);
 
             /*