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

Timestamp:

Apr 28, 2013 10:23:18 PM (12 years ago)

Author:

vboxsync

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

85364

Message:

More adj.

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevLsiLogicSCSI.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -286 +286 @@
     R3PTRTYPE(PMptConfigurationPagesSupported) pConfigurationPages;
 
-#if HC_ARCH_BITS == 64
-    uint32_t                       Alignment7;
-#endif
-
     /** Indicates that PDMDevHlpAsyncNotificationCompleted should be called when
      * a port is entering the idle state. */
@@ -295 +291 @@
     /** Flag whether we have tasks which need to be processed again- */
     bool volatile                  fRedo;
+    /** Alignment padding. */
+    bool                            afPAdding2[HC_ARCH_BITS == 32 ? 2 : 6];
     /** List of tasks which can be redone. */
     R3PTRTYPE(volatile PLSILOGICTASKSTATE) pTasksRedoHead;

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

@@ -296 +296 @@
     CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMMIOReadGC, 8);
 #endif
+    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, GCPhysMMIOBase, 8);
+    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, aMessage, 8);
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, ReplyPostQueueCritSect, 8);
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, ReplyFreeQueueCritSect, 8);
+    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, uReplyFreeQueueNextEntryFreeWrite, 8);
+    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, VBoxSCSI, 8);
 #ifdef VBOX_WITH_USB
     CHECK_MEMBER_ALIGNMENT(OHCI, RootHub, 8);