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

Timestamp:

Sep 6, 2019 9:20:04 PM (5 years ago)

Author:

vboxsync

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

133178

Message:

Storage/DevVirtioSCSI.cpp: Fixed problem with Assert closing VM in semaphore. Other small cleanups

File:

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

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

@@ -131 +131 @@
 
 #define SCSI_CONFIG_ACCESSOR(member) \
+    do \
     { \
         uint32_t uIntraOffset = uOffset - RT_UOFFSETOF(VIRTIOSCSI_CONFIG_T, member); \
@@ -138 +139 @@
             memcpy((char *)pv, (const char *)(((char *)&pThis->virtioScsiConfig.member) + uIntraOffset), cb); \
         LOG_ACCESSOR(member); \
-    }
+    } while(0)
 
 #define SCSI_CONFIG_ACCESSOR_READONLY(member) \
+    do \
     { \
         uint32_t uIntraOffset = uOffset - RT_UOFFSETOF(VIRTIOSCSI_CONFIG_T, member); \
@@ -150 +152 @@
             LOG_ACCESSOR(member); \
         } \
-    }
+    } while(0)
 
 #define VIRTIO_IN_DIRECTION(pMediaExTxDirEnumValue) \
@@ -1450 +1452 @@
     int rc = VINF_SUCCESS;
     if (MATCH_SCSI_CONFIG(uNumQueues))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uNumQueues);
-    }
     else
     if (MATCH_SCSI_CONFIG(uSegMax))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uSegMax);
-    }
     else
     if (MATCH_SCSI_CONFIG(uMaxSectors))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uMaxSectors);
-    }
     else
     if (MATCH_SCSI_CONFIG(uCmdPerLun))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uCmdPerLun);
-    }
     else
     if (MATCH_SCSI_CONFIG(uEventInfoSize))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uEventInfoSize);
-    }
     else
     if (MATCH_SCSI_CONFIG(uSenseSize))
-    {
         SCSI_CONFIG_ACCESSOR(uSenseSize);
-    }
     else
     if (MATCH_SCSI_CONFIG(uCdbSize))
-    {
         SCSI_CONFIG_ACCESSOR(uCdbSize);
-    }
     else
     if (MATCH_SCSI_CONFIG(uMaxChannel))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uMaxChannel);
-    }
     else
     if (MATCH_SCSI_CONFIG(uMaxTarget))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uMaxTarget);
-    }
     else
     if (MATCH_SCSI_CONFIG(uMaxLun))
-    {
         SCSI_CONFIG_ACCESSOR_READONLY(uMaxLun);
-    }
     else
     {
@@ -2110 +2092 @@
     PVIRTIOSCSI  pThis = PDMINS_2_DATA(pDevIns, PVIRTIOSCSI);
 
-    for (int qIdx = 0; qIdx < VIRTQ_MAX_CNT; qIdx++)
+    for (int qIdx = 0; qIdx < VIRTIOSCSI_QUEUE_CNT; qIdx++)
     {
         PWORKER pWorker = &pThis->aWorker[qIdx];