Changeset 81661 in vbox

Timestamp:

Nov 4, 2019 9:50:26 PM (5 years ago)

Author:

vboxsync

Message:

Virtio_1_0,DevVirtioScsi: More common virtio code cleanups. bugref:9218 bugref:9440

File:

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

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

@@ -973 +973 @@
         uint32_t offIntra = offCfg - RT_OFFSETOF(VIRTIO_PCI_COMMON_CFG_T, member); \
         if (fWrite) \
-            memcpy(((char *)(pVirtio->member + idx)) + offIntra, (const char *)pv, cb); \
+            memcpy((char *)&pVirtio->member[idx] + offIntra, pv, cb); \
         else \
-            memcpy((char *)pv, (const char *)(((char *)(pVirtio->member + idx)) + offIntra), cb); \
+            memcpy(pv, (const char *)&pVirtio->member[idx] + offIntra, cb); \
         LOG_COMMON_CFG_ACCESS_INDEXED(member, idx, offIntra); \
     } while(0)
@@ -987 +987 @@
         else \
         { \
-            memcpy((char *)pv, (const char *)(((char *)&pVirtio->member) + offIntra), cb); \
+            memcpy(pv, (const char *)&pVirtio->member + offIntra, cb); \
             LOG_COMMON_CFG_ACCESS(member, offIntra); \
         } \
@@ -1000 +1000 @@
         else \
         { \
-            memcpy((char *)pv, ((char *)(pVirtio->member + idx)) + offIntra, cb); \
+            memcpy(pv, (char const *)&pVirtio->member[idx] + offIntra, cb); \
             LOG_COMMON_CFG_ACCESS_INDEXED(member, idx, offIntra); \
         } \