Changeset 81815 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Nov 12, 2019 6:46:14 PM (5 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioSCSI.cpp: Fix burn caused by casting error that didn't err out on my local Linux build

File:

• trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp (modified) (4 diffs)

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

@@ -597 +597 @@
     PVIRTQSTATE pVirtq  = &pVirtio->virtqState[idxQueue];
 
-    PVIRTIOSGSEG paSegsIn = (PVIRTIOSGSEG)RTMemAlloc(VIRTQ_MAX_SIZE * sizeof(VIRTIOSGSEG));
+    PCVIRTIOSGSEG paSegsIn = (PVIRTIOSGSEG)RTMemAlloc(VIRTQ_MAX_SIZE * sizeof(VIRTIOSGSEG));
     AssertReturn(paSegsIn, VERR_NO_MEMORY);
 
-    PVIRTIOSGSEG paSegsOut = (PVIRTIOSGSEG)RTMemAlloc(VIRTQ_MAX_SIZE * sizeof(VIRTIOSGSEG));
+    PCVIRTIOSGSEG paSegsOut = (PVIRTIOSGSEG)RTMemAlloc(VIRTQ_MAX_SIZE * sizeof(VIRTIOSGSEG));
     AssertReturn(paSegsOut, VERR_NO_MEMORY);
 
@@ -652 +652 @@
             Log3Func(("%s IN  desc_idx=%u seg=%u addr=%RGp cb=%u\n", QUEUE_NAME(pVirtio, idxQueue), uDescIdx, cSegsIn, desc.GCPhysBuf, desc.cb));
             cbIn += desc.cb;
-            pSeg = &(paSegsIn[cSegsIn++]);
+            pSeg = (PVIRTIOSGSEG)&(paSegsIn[cSegsIn++]);
         }
         else
@@ -658 +658 @@
             Log3Func(("%s OUT desc_idx=%u seg=%u addr=%RGp cb=%u\n", QUEUE_NAME(pVirtio, idxQueue), uDescIdx, cSegsOut, desc.GCPhysBuf, desc.cb));
             cbOut += desc.cb;
-            pSeg = &(paSegsOut[cSegsOut++]);
+            pSeg = (PVIRTIOSGSEG)&(paSegsOut[cSegsOut++]);
         }
 
@@ -670 +670 @@
     AssertReturn(pSgPhysIn, VERR_NO_MEMORY);
 
-    virtioCoreSgBufInit(pSgPhysIn, (PCVIRTIOSGSEG)paSegsIn, cSegsIn);
+    virtioCoreSgBufInit(pSgPhysIn, paSegsIn, cSegsIn);
 
     PVIRTIOSGBUF pSgPhysOut = (PVIRTIOSGBUF)RTMemAllocZ(sizeof(VIRTIOSGBUF));
     AssertReturn(pSgPhysOut, VERR_NO_MEMORY);
 
-    virtioCoreSgBufInit(pSgPhysOut, (PCVIRTIOSGSEG)paSegsOut, cSegsOut);
+    virtioCoreSgBufInit(pSgPhysOut, paSegsOut, cSegsOut);
 
     PVIRTIO_DESC_CHAIN_T pDescChain = (PVIRTIO_DESC_CHAIN_T)RTMemAllocZ(sizeof(VIRTIO_DESC_CHAIN_T));