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

Timestamp:

Aug 15, 2019 7:48:27 PM (6 years ago)

Author:

vboxsync

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

132766

Message:

Storage/DevVirtioSCSI.cpp: Some cleanup of r132764

File:

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

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

@@ -83 +83 @@
  * of req queues is variable and determined by virtio_scsi_config.num_queues. See VirtIO 1.0 spec section 5.6.4
  */
-#define VIRTIOSCSI_VIRTQ_CONTROLQ                   0            /* Index of control queue                            */
-#define VIRTIOSCSI_VIRTQ_EVENTQ                     1            /* Index of event queue                              */
+#define VIRTIOSCSI_CONTROLQ_IDX                     0            /* Index of control queue                            */
+#define VIRTIOSCSI_EVENTQ_IDX                       1            /* Index of event queue                              */
 #define VIRTIOSCSI_VIRTQ_REQ_BASE                   2            /* Base index of req queues                          */
 
+#define REQ_NBR_TO_QIDX(uReqQueueNum) (VIRTIOSCSI_VIRTQ_REQ_BASE + uReqQueueNum)
+#define REQ_QIDX_TO_NBR(qIdx)         (qIdx - VIRTIOSCSI_VIRTQ_REQ_BASE)
 /**
  * The following struct is the VirtIO SCSI Host Device device-specific configuration described in section 5.6.4
@@ -539 +541 @@
 
 
-/**
- * Get this callback from the virtio framework when the driver is ready so we know
- * the request for the number of queues is valid (for now presuming the driver(s) aren't
- * dynamically adding req queues but create them all while initializing
- * based on config information on host).
- */
 static DECLCALLBACK(void) virtioScsiStatusChanged(VIRTIOHANDLE hVirtio, bool fVirtioReady)
 {
@@ -553 +549 @@
     {
         Log2Func(("VirtIO reports ready... Initializing queues\n"));
-        virtioQueueAttach(hVirtio, VIRTIOSCSI_VIRTQ_CONTROLQ, "controlq");
-        virtioQueueAttach(hVirtio, VIRTIOSCSI_VIRTQ_EVENTQ,   "eventq");
+        virtioQueueAttach(hVirtio, VIRTIOSCSI_CONTROLQ_IDX, "controlq");
+        virtioQueueAttach(hVirtio, VIRTIOSCSI_EVENTQ_IDX,   "eventq");
         for (uint16_t qIdx = VIRTIOSCSI_VIRTQ_REQ_BASE;
                       qIdx < VIRTIOSCSI_VIRTQ_REQ_BASE + VIRTIOSCSI_REQ_QUEUE_CNT;