Changeset 62646 in vbox for trunk/src/VBox/VMM/include/TRPMInternal.h

Timestamp:

Jul 28, 2016 9:57:29 PM (8 years ago)

Author:

vboxsync

Message:

TRPM: drop the pragma pack on struct TRPM too, and make sure GuestIdtr is naturally aligned.

File:

• trunk/src/VBox/VMM/include/TRPMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/include/TRPMInternal.h

@@ -95 +95 @@
  * IMPORTANT! Keep the nasm version of this struct up-to-date.
  */
-#pragma pack(4)
 typedef struct TRPM
 {
@@ -133 +132 @@
     /** RC Pointer to the IDT shadow area (aIdt) in HMA. */
     RCPTRTYPE(void *)       pvMonShwIdtRC;
+    /** padding. */
+    uint8_t                 au8Padding[2];
     /** Current (last) Guest's IDTR. */
     VBOXIDTR                GuestIdtr;
-    /** padding. */
-    uint8_t                 au8Padding[2];
     /** Shadow IDT virtual write access handler type. */
     PGMVIRTHANDLERTYPE      hShadowIdtWriteHandlerType;
@@ -177 +176 @@
 #endif
 } TRPM;
-#pragma pack()
+AssertCompileMemberAlignment(TRPM, GuestIdtr.pIdt, 8);
 
 /** Pointer to TRPM Data. */