Changeset 75590 in vbox for trunk/src/VBox/Devices/VMMDev/VMMDevState.h

Timestamp:

Nov 19, 2018 6:26:59 PM (6 years ago)

Author:

vboxsync

Message:

VMMDev: Alignment fixes. bugref:9172

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevState.h (modified) (6 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -113 +113 @@
 
 
-/** device structure containing all state information */
+/**
+ * State structure for the VMM device.
+ */
 typedef struct VMMDevState
 {
@@ -199 +201 @@
     /** R0 pointer to VMMDev RAM area - first page only, could be NULL! */
     RCPTRTYPE(VMMDevMemory *)   pVMMDevRAMRC;
-    RTGCPTR                     RCPtrAlignment3b;
+    RTRCPTR                     RCPtrAlignment3b;
 
     /** R3 pointer to VMMDev Heap RAM area. */
@@ -241 +243 @@
     R3PTRTYPE(VMMDEVCREDS *) pCredentials;
 
-    bool afAlignment4[HC_ARCH_BITS == 32 ? 3 : 7];
+#if HC_ARCH_BITS == 32
+    uint32_t uAlignment4;
+#endif
 
     /* memory balloon change request */
@@ -267 +271 @@
     uint64_t hostTime;
     bool fTimesyncBackdoorLo;
-    bool afAlignment6[3];
+    bool afAlignment6[2];
+#else
+    bool afAlignment6[1+2];
 #endif
     /** Set if GetHostTime should fail.
@@ -290 +296 @@
     /** Number of additional cores to keep around. */
     uint32_t cGuestCoreDumps;
-
-    bool afAlignment7[1];
 
 #ifdef VBOX_WITH_HGCM
@@ -412 +416 @@
 typedef VMMDEV *PVMMDEV;
 AssertCompileMemberAlignment(VMMDEV, CritSect, 8);
+AssertCompileMemberAlignment(VMMDEV, StatSlowIrqAck, 8);
 AssertCompileMemberAlignment(VMMDEV, cbGuestRAM, 8);
 AssertCompileMemberAlignment(VMMDEV, enmCpuHotPlugEvent, 4);