Changeset 26932 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 2, 2010 10:10:59 AM (15 years ago)

Author:

vboxsync

Message:

virtio-net: alignment

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -183 +183 @@
     uint8_t                 aVlanFilter[VNET_MAX_VID / sizeof(uint8_t)];
 
-#if HC_ARCH_BITS != 64
-    uint32_t    padding3;
-#endif
-
     R3PTRTYPE(PVQUEUE)      pRxQueue;
     R3PTRTYPE(PVQUEUE)      pTxQueue;
@@ -193 +189 @@
 
     /** EMT: Gets signalled when more RX descriptors become available. */
-    RTSEMEVENT  hEventMoreRxDescAvail;
+    RTSEMEVENT              hEventMoreRxDescAvail;
 
     /* Statistic fields ******************************************************/

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -270 +270 @@
     CHECK_MEMBER_ALIGNMENT(DEVPIC, StatSetIrqGC, 8);
 #endif
+#ifdef VBOX_WITH_E1000
     CHECK_MEMBER_ALIGNMENT(E1KSTATE, cs, 8);
     CHECK_MEMBER_ALIGNMENT(E1KSTATE, csRx, 8);
+#endif
+#ifdef VBOX_WITH_VIRTIO
+    CHECK_MEMBER_ALIGNMENT(VNETSTATE, StatReceiveBytes, 8);
+#endif
     //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8);
 #ifdef VBOX_WITH_USB