Changeset 57410 in vbox

Timestamp:

Aug 18, 2015 9:58:29 AM (10 years ago)

Author:

vboxsync

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

102174

Message:

Device/Graphics: fix padding if VBOX_WITH_VMSVGA is unset, and make the sanity checks a little more paranoid to get better diagnostics in the future if some VMSVGA related alignment is touched

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.h (modified) (3 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -402 +402 @@
     /** Pointer to the GC vram mapping. */
     RCPTRTYPE(uint8_t *)        vram_ptrRC;
-    uint32_t                    PaddingMinus1;
+    uint32_t                    Padding1;
 
     /** Pointer to the device instance - R3 Ptr. */
@@ -443 +443 @@
     R0PTRTYPE(uint8_t *)        vram_ptrR0;
 
-#ifdef VBOX_WITH_VMSVGA
 # if HC_ARCH_BITS == 32
     uint32_t                    Padding3;
 # endif
+
+# ifdef VBOX_WITH_VMSVGA
     VMSVGAState                 svga;
-#endif
+# endif
 
     /** The number of monitors. */
@@ -469 +470 @@
     /** Whether to render the guest VRAM to the framebuffer memory. False only for some LFB modes. */
     bool                        fRenderVRAM;
-#ifdef VBOX_WITH_VMSVGA
+# ifdef VBOX_WITH_VMSVGA
     /* Whether the SVGA emulation is enabled or not. */
     bool                        fVMSVGAEnabled;
-    bool                        Padding1[1+4];
-#else
-    bool                        Padding1[2+4];
-#endif
+    bool                        Padding4[1+4];
+# else
+    bool                        Padding4[2+4];
+# endif
 
     /** Physical access type for the linear frame buffer dirty page tracking. */

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -344 +344 @@
     CHECK_MEMBER_ALIGNMENT(SerialState, CritSect, 8);
 #ifdef VBOX_WITH_VMSVGA
+    CHECK_SIZE(VMSVGAState, RT_ALIGN_Z(sizeof(VMSVGAState), 8));
+    CHECK_MEMBER_ALIGNMENT(VGASTATE, svga, 8);
     CHECK_MEMBER_ALIGNMENT(VGASTATE, svga.u64HostWindowId, 8);
 #endif
+    CHECK_MEMBER_ALIGNMENT(VGASTATE, cMonitors, 8);
     CHECK_MEMBER_ALIGNMENT(VGASTATE, GCPhysVRAM, 8);
     CHECK_MEMBER_ALIGNMENT(VGASTATE, Dev, 8);