Changeset 80313 in vbox

Timestamp:

Aug 15, 2019 11:11:50 PM (6 years ago)

Author:

vboxsync

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

132771

Message:

vm.h,gvm.h: Fix 32-bit header syntax checking.

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (1 diff)
• vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -244 +244 @@
 #  pragma GCC diagnostic ignored "-Winvalid-offsetof"
 # endif
+AssertCompileMemberAlignment(GVM, u32Magic, 64);
 AssertCompileMemberAlignment(GVM, gvmm,     64);
 AssertCompileMemberAlignment(GVM, gmm,      64);

trunk/include/VBox/vmm/vm.h

@@ -1247 +1247 @@
 
     /** Padding - the unions must be aligned on a 64 bytes boundary. */
-    uint8_t                     abAlignment3[24];
+    uint8_t                     abAlignment3[HC_ARCH_BITS == 64 ? 24 : 52];
 
     /** CPUM part. */
@@ -1463 +1463 @@
     /** Padding for aligning the structure size on a page boundrary. */
 #ifdef VBOX_WITH_REM
-    uint8_t         abAlignment2[2520       - sizeof(PVMCPUR0) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abAlignment2[2520 + 256 - sizeof(PVMCPUR0) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[3032       - (sizeof(PVMCPUR3) + sizeof(PVMCPUR0)) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abAlignment2[3032 + 256 - (sizeof(PVMCPUR3) + sizeof(PVMCPUR0)) * VMM_MAX_CPU_COUNT];
 #endif