Changeset 81654 in vbox

Timestamp:

Nov 4, 2019 1:50:45 PM (5 years ago)

Author:

vboxsync

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

134412

Message:

virtio_1_0: Unused inlines (clang is a pain). bugref:9218 bugref:9440

File:

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

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

@@ -119 +119 @@
  * @{ */
 
+#if 0 /* unused */
 DECLINLINE(int) virtqIsEventNeeded(uint16_t uEventIdx, uint16_t uDescIdxNew, uint16_t uDescIdxOld)
 {
     return (uint16_t)(uDescIdxNew - uEventIdx - 1) < (uint16_t)(uDescIdxNew - uDescIdxOld);
 }
+#endif
 
 /**
@@ -165 +167 @@
 }
 
+#if 0 /* unused */
 DECLINLINE(uint16_t) virtioReadAvailFlags(PVIRTIOSTATE pVirtio, uint16_t qIdx)
 {
@@ -174 +177 @@
     return fFlags;
 }
+#endif
 
 DECLINLINE(uint16_t) virtioReadAvailUsedEvent(PVIRTIOSTATE pVirtio, uint16_t qIdx)
@@ -185 +189 @@
     return uUsedEventIdx;
 }
-
-/**
- * Accessors for virtq used ring
+/** @} */
+
+/** @name Accessors for virtq used ring
+ * @{
  */
 DECLINLINE(void) virtioWriteUsedElem(PVIRTIOSTATE pVirtio, uint16_t qIdx, uint32_t usedIdx, uint32_t uDescIdx, uint32_t uLen)
@@ -207 +212 @@
 }
 
-DECLINLINE(uint16_t)virtioReadUsedRingIdx(PVIRTIOSTATE pVirtio, uint16_t qIdx)
+DECLINLINE(uint16_t) virtioReadUsedRingIdx(PVIRTIOSTATE pVirtio, uint16_t qIdx)
 {
     uint16_t uIdx;
@@ -227 +232 @@
 }
 
+#if 0 /* unused */
 DECLINLINE(void) virtioWriteUsedFlags(PVIRTIOSTATE pVirtio, uint16_t qIdx, uint32_t fFlags)
 {
@@ -235 +241 @@
                           &fFlags, sizeof(fFlags));
 }
-
+#endif
+
+#if 0 /* unused */
 DECLINLINE(uint16_t) virtioReadUsedAvailEvent(PVIRTIOSTATE pVirtio, uint16_t qIdx)
 {
@@ -247 +255 @@
     return uAvailEventIdx;
 }
-
+#endif
+
+#if 0 /* unused */
 DECLINLINE(void) virtioWriteUsedAvailEvent(PVIRTIOSTATE pVirtio, uint16_t qIdx, uint32_t uAvailEventIdx)
 {
@@ -256 +266 @@
                           &uAvailEventIdx, sizeof(uAvailEventIdx));
 }
+#endif
 
 /** @} */
@@ -578 +589 @@
      * Place used buffer's descriptor in used ring but don't update used ring's slot index.
      * That will be done with a subsequent client call to virtioQueueSync() */
-    virtioWriteUsedElem(pVirtio, qIdx, pVirtq->uUsedIdx++, pDescChain->uHeadIdx,
-            (uint32_t)(cbCopy & 0xffffffff));
+    virtioWriteUsedElem(pVirtio, qIdx, pVirtq->uUsedIdx++, pDescChain->uHeadIdx, (uint32_t)(cbCopy & UINT32_C(0xffffffff)));
 
     Log2Func((".... Copied %lu bytes to %lu byte buffer, residual=%lu\n",