Changeset 46691 in vbox for trunk/include/VBox

Timestamp:

Jun 19, 2013 7:57:53 PM (12 years ago)

Author:

vboxsync

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

86588

Message:

VMMDev.h: Drop unnecessary pragmas, keeping the pack(4) on the whole header for what it's worth.

File:

• trunk/include/VBox/VMMDev.h (modified) (14 diffs)

trunk/include/VBox/VMMDev.h

@@ -35 +35 @@
 #include <iprt/assert.h>
 
-
+ 
+#pragma pack(4) /* force structure dword packing here. */
 RT_C_DECLS_BEGIN
+
 
 /** @defgroup grp_vmmdev    VMM Device
@@ -233 +235 @@
 #define VMMDEV_REQUEST_HEADER_VERSION (0x10001)
 
-#pragma pack(4) /* force structure dword packing here. */
 
 /**
@@ -960 +961 @@
  * Used by VMMDevReq_QueryCredentials.
  */
-#pragma pack(4)
 typedef struct
 {
@@ -975 +975 @@
 } VMMDevCredentials;
 AssertCompileSize(VMMDevCredentials, 24+4+3*128);
-#pragma pack()
 
 /** @name Credentials request flag (VMMDevCredentials::u32Flags)
@@ -1423 +1422 @@
 
 
-#pragma pack()
-
 
 #ifdef VBOX_WITH_HGCM
@@ -1435 +1432 @@
 # define VBOX_HGCM_REQ_CANCELLED (0x2)
 /** @} */
-
-# pragma pack(4)
 
 /**
@@ -1780 +1775 @@
 AssertCompileSize(HGCMPageListInfo, 4+2+2+8);
 
-# pragma pack()
 
 /** Get the pointer to the first parmater of a HGCM call request.  */
@@ -1981 +1975 @@
  * @todo Where does this fit in?
  */
-#pragma pack(1) /* unnecessary */
 typedef struct VBVACMDHDR
 {
@@ -1990 +1983 @@
    uint16_t h;
 } VBVACMDHDR;
-#pragma pack()
+AssertCompileSize(VBVACMDHDR, 8);
 
 /** @name VBVA ring defines.
@@ -2039 +2032 @@
  * This is a subsection of the VMMDevMemory structure.
  */
-#pragma pack(1) /* paranoia */
 typedef struct VBVAMEMORY
 {
@@ -2066 +2058 @@
 
 } VBVAMEMORY;
-#pragma pack()
 AssertCompileSize(VBVAMEMORY, 12 + (_4M-_1K) + 4*64 + 12);
 
@@ -2073 +2064 @@
  * The layout of VMMDEV RAM region that contains information for guest.
  */
-#pragma pack(1) /* paranoia */
 typedef struct VMMDevMemory
 {
@@ -2102 +2092 @@
 } VMMDevMemory;
 AssertCompileSize(VMMDevMemory, 8+8 + (12 + (_4M-_1K) + 4*64 + 12) );
-#pragma pack()
+AssertCompileMemberOffset(VMMDevMemory, vbvaMemory, 16);
 
 /** Version of VMMDevMemory structure (VMMDevMemory::u32Version). */
@@ -2108 +2098 @@
 
 /** @} */
+
 RT_C_DECLS_END
+#pragma pack()
 
 #endif