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

Timestamp:

Jul 12, 2018 9:06:33 PM (7 years ago)

Author:

vboxsync

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio.cpp (modified) (9 diffs)
• Virtio.h (modified) (1 diff)

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

@@ -28 +28 @@
 
 #define INSTANCE(pState) pState->szInstance
-#define IFACE_TO_STATE(pIface, ifaceName) ((VPCISTATE *)((char*)pIface - RT_OFFSETOF(VPCISTATE, ifaceName)))
+#define IFACE_TO_STATE(pIface, ifaceName) ((VPCISTATE *)((char*)(pIface) - RT_UOFFSETOF(VPCISTATE, ifaceName)))
 
 #ifdef LOG_ENABLED
@@ -58 +58 @@
         + sizeof(VRINGDESC) * pQueue->VRing.uSize;
     pQueue->VRing.addrUsed        = RT_ALIGN(
-        pQueue->VRing.addrAvail + RT_OFFSETOF(VRINGAVAIL, auRing[pQueue->VRing.uSize]),
+        pQueue->VRing.addrAvail + RT_UOFFSETOF_DYN(VRINGAVAIL, auRing[pQueue->VRing.uSize]),
         PAGE_SIZE); /* The used ring must start from the next page. */
     pQueue->uNextAvailIndex       = 0;
@@ -81 +81 @@
 
     PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
-                      pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, auRing[uIndex % pVRing->uSize]),
+                      pVRing->addrAvail + RT_UOFFSETOF_DYN(VRINGAVAIL, auRing[uIndex % pVRing->uSize]),
                       &tmp, sizeof(tmp));
     return tmp;
@@ -91 +91 @@
 
     PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
-                      pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, uFlags),
+                      pVRing->addrAvail + RT_UOFFSETOF(VRINGAVAIL, uFlags),
                       &tmp, sizeof(tmp));
     return tmp;
@@ -101 +101 @@
 
     PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
-                      pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, uFlags),
+                      pVRing->addrUsed + RT_UOFFSETOF(VRINGUSED, uFlags),
                       &tmp, sizeof(tmp));
 
@@ -110 +110 @@
 
     PDMDevHlpPCIPhysWrite(pState->CTX_SUFF(pDevIns),
-                          pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, uFlags),
+                          pVRing->addrUsed + RT_UOFFSETOF(VRINGUSED, uFlags),
                           &tmp, sizeof(tmp));
 }
@@ -197 +197 @@
     uint16_t tmp;
     PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
-                      pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, uIndex),
+                      pVRing->addrUsed + RT_UOFFSETOF(VRINGUSED, uIndex),
                       &tmp, sizeof(tmp));
     return tmp;
@@ -205 +205 @@
 {
     PDMDevHlpPCIPhysWrite(pState->CTX_SUFF(pDevIns),
-                          pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, uIndex),
+                          pVRing->addrUsed + RT_UOFFSETOF(VRINGUSED, uIndex),
                           &u16Value, sizeof(u16Value));
 }
@@ -216 +216 @@
     elem.uLen = uLen;
     PDMDevHlpPCIPhysWrite(pState->CTX_SUFF(pDevIns),
-                          pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, aRing[uIndex % pVRing->uSize]),
+                          pVRing->addrUsed + RT_UOFFSETOF_DYN(VRINGUSED, aRing[uIndex % pVRing->uSize]),
                           &elem, sizeof(elem));
 }

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -299 +299 @@
 
     PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns),
-                      pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, uNextFreeIndex),
+                      pVRing->addrAvail + RT_UOFFSETOF(VRINGAVAIL, uNextFreeIndex),
                       &tmp, sizeof(tmp));
     return tmp;