Changeset 71246 in vbox for trunk

Timestamp:

Mar 6, 2018 5:12:38 PM (7 years ago)

Author:

vboxsync

Message:

gvm.h: Alignment fix

File:

• trunk/include/VBox/vmm/gvm.h (modified) (3 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -31 +31 @@
 #include <VBox/types.h>
 #include <iprt/thread.h>
+#include <iprt/assertcompile.h>
 
 
@@ -105 +106 @@
      * Same same as VM::cCpus. */
     uint32_t        cCpus;
-    uint32_t        padding;
+    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 16 : 4];
 
     /** The GVMM per vm data. */
@@ -148 +149 @@
     GVMCPU          aCpus[1];
 } GVM;
+AssertCompileMemberOffset(GVM, gvmm,   40);
+AssertCompileMemberOffset(GVM, gmm,    40 + 256);
+#ifdef VBOX_WITH_NEM_R0
+AssertCompileMemberOffset(GVM, nem,    40 + 256 + 512);
+AssertCompileMemberOffset(GVM, rawpci, 40 + 256 + 512 + 128);
+AssertCompileMemberOffset(GVM, aCpus,  40 + 256 + 512 + 128 + 64);
+#else
+AssertCompileMemberOffset(GVM, rawpci, 40 + 256 + 512);
+AssertCompileMemberOffset(GVM, aCpus,  40 + 256 + 512 + 64);
+#endif
 
 /** The GVM::u32Magic value (Wayne Shorter). */