Changeset 28196 in vbox for trunk/src/VBox

Timestamp:

Apr 12, 2010 11:13:10 AM (15 years ago)

Author:

vboxsync

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

59933

Message:

DevE1000: Alignment fix.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevE1000.cpp (modified) (1 diff)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -1051 +1051 @@
     PHY         phy;
 
+#if 0
     /** Alignment padding. */
     uint8_t                             Alignment[HC_ARCH_BITS == 64 ? 8 : 4];
+#endif
 
     STAMCOUNTER                         StatReceiveBytes;

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

@@ -284 +284 @@
 # endif
 #endif
+    CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8);
 #ifdef VBOX_WITH_STATISTICS
     CHECK_MEMBER_ALIGNMENT(IOAPICState, StatMMIOReadGC, 8);

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

@@ -1340 +1340 @@
     GEN_CHECK_OFF(E1KSTATE, eeprom);
     GEN_CHECK_OFF(E1KSTATE, phy);
+    GEN_CHECK_OFF(E1KSTATE, StatReceiveBytes);
 #endif /* VBOX_WITH_E1000 */