Changeset 85025 in vbox

Timestamp:

Jul 1, 2020 1:38:37 PM (5 years ago)

Author:

vboxsync

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

138926

Message:

Minor fixes to last integration

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevVirtioSCSI.cpp (modified) (1 diff)
• VirtIO/VirtioCore.cpp (modified) (7 diffs)

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

@@ -1295 +1295 @@
     pReq->hIoReq      = hIoReq;
     pReq->pTarget     = pTarget;
-    pReq->uVirtqNbr    = uVirtqNbr;
+    pReq->uVirtqNbr   = uVirtqNbr;
     pReq->cbDataIn    = cbDataIn;
     pReq->cbDataOut   = cbDataOut;
-    pReq->pVirtqBuf  = pVirtqBuf;
+    pReq->pVirtqBuf   = pVirtqBuf;
     virtioCoreR3VirtqBufRetain(pVirtqBuf); /* (For pReq->pVirtqBuf. Released by virtioScsiR3FreeReq.) */
     pReq->uDataInOff  = offDataIn;

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

@@ -43 +43 @@
 *********************************************************************************************************************************/
 #define INSTANCE(a_pVirtio)                 ((a_pVirtio)->szInstance)
-#define VIRTQNAME(a_pVirtio, a_uVirtqNbr)    ((a_pVirtio)->aVirtqState[(a_uVirtqNbr)].szVirtqName)
+#define VIRTQNAME(a_pVirtio, a_uVirtqNbr)   ((a_pVirtio)->aVirtqState[(a_uVirtqNbr)].szVirtqName)
 #define IS_DRIVER_OK(a_pVirtio)             ((a_pVirtio)->fDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
 #define IS_VIRTQ_EMPTY(pDevIns, pVirtio, pVirtqState) \
@@ -244 +244 @@
 
 #ifdef IN_RING3
-
 DECLINLINE(uint16_t) virtioReadUsedRingIdx(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t uVirtqNbr)
 {
@@ -273 +272 @@
                           &uAvailEventIdx, sizeof(uAvailEventIdx));
 }
-
-
 #endif
 
@@ -1508 +1505 @@
     {
 #ifdef IN_RING3
-LogFunc(("IN_RING3\n"));
         /*
          * Callback to client to manage device-specific configuration.
@@ -1538 +1534 @@
         return rcStrict;
 #else
-Log7Func(("return VINF_IOM_R3_MMIO_READ\n"));
         return VINF_IOM_R3_MMIO_READ;
 #endif
@@ -1544 +1539 @@
 
     if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocCommonCfgCap))
-{
-#ifdef IN_RING3
         return virtioCommonCfgAccessed(pDevIns, pVirtio, pVirtioCC, false /* fWrite */, uOffset, cb, pv);
-#else
-        return virtioCommonCfgAccessed(pDevIns, pVirtio, pVirtioCC, false /* fWrite */, uOffset, cb, pv);
-#endif
-}
+
     if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocIsrCap) && cb == sizeof(uint8_t))
     {
@@ -1594 +1584 @@
 
     if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocCommonCfgCap))
-    {
-#ifdef IN_RING3
         return virtioCommonCfgAccessed(pDevIns, pVirtio, pVirtioCC, true /* fWrite */, uOffset, cb, (void *)pv);
-#else
-        return virtioCommonCfgAccessed(pDevIns, pVirtio, pVirtioCC, true /* fWrite */, uOffset, cb, (void *)pv);
-#endif
-    }
+
     if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocIsrCap) && cb == sizeof(uint8_t))
     {