Index: /trunk/src/VBox/Devices/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 22834)
+++ /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 22835)
@@ -73,4 +73,10 @@
 tstDeviceStructSizeGC_DEFS     += VBOX_WITH_HPET
 endif
+ifdef VBOX_WITH_HGSMI
+tstDeviceStructSizeGC_DEFS     += VBOX_WITH_HGSMI
+endif
+ifdef VBOX_WITH_VIDEOHWACCEL
+tstDeviceStructSizeGC_DEFS     += VBOX_WITH_VIDEOHWACCEL
+endif
 tstDeviceStructSizeGC_SOURCES   = tstDeviceStructSizeGC.cpp
 tstDeviceStructSizeGC_INCS      = \
@@ -109,4 +115,10 @@
 tstDeviceStructSize_DEFS     += VBOX_WITH_LPC
 endif
+ifdef VBOX_WITH_HGSMI
+tstDeviceStructSize_DEFS     += VBOX_WITH_HGSMI
+endif
+ifdef VBOX_WITH_VIDEOHWACCEL
+tstDeviceStructSize_DEFS     += VBOX_WITH_VIDEOHWACCEL
+endif
 tstDeviceStructSize_INCS     = \
 	$(VBOX_PATH_DEVICES_SRC) \
Index: /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp
===================================================================
--- /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp	(revision 22834)
+++ /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp	(revision 22835)
@@ -257,17 +257,25 @@
     GEN_CHECK_OFF(VGASTATE, fRemappedVGA);
     GEN_CHECK_OFF(VGASTATE, fRenderVRAM);
-    GEN_CHECK_OFF(VGASTATE, RCPtrLFBHandler);
+    GEN_CHECK_OFF(VGASTATE, cMonitors);
+#ifdef VBOX_WITH_HGSMI
+    GEN_CHECK_OFF(VGASTATE, pHGSMI);
+#endif
+    GEN_CHECK_OFF(VGASTATE, cMilliesRefreshInterval);
+    GEN_CHECK_OFF(VGASTATE, RefreshTimer);
     GEN_CHECK_OFF(VGASTATE, au32DirtyBitmap);
     GEN_CHECK_OFF(VGASTATE, au32DirtyBitmap[1]);
     GEN_CHECK_OFF(VGASTATE, au32DirtyBitmap[(VGA_VRAM_MAX / PAGE_SIZE / 32) - 1]);
+    GEN_CHECK_OFF(VGASTATE, RCPtrLFBHandler);
+    GEN_CHECK_OFF(VGASTATE, pDevInsRC);
     GEN_CHECK_OFF(VGASTATE, pDevInsR3);
     GEN_CHECK_OFF(VGASTATE, pDevInsR0);
-    GEN_CHECK_OFF(VGASTATE, pDevInsRC);
+    GEN_CHECK_OFF(VGASTATE, lock);
     GEN_CHECK_OFF(VGASTATE, Base);
     GEN_CHECK_OFF(VGASTATE, Port);
+#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
+    GEN_CHECK_OFF(VGASTATE, VBVACallbacks);
+#endif
     GEN_CHECK_OFF(VGASTATE, pDrvBase);
     GEN_CHECK_OFF(VGASTATE, pDrv);
-    GEN_CHECK_OFF(VGASTATE, RefreshTimer);
-    GEN_CHECK_OFF(VGASTATE, cMilliesRefreshInterval);
     GEN_CHECK_OFF(VGASTATE, Dev);
     GEN_CHECK_OFF(VGASTATE, StatRZMemoryRead);
@@ -282,7 +290,7 @@
     GEN_CHECK_OFF(VGASTATE, cbWriteVBEData);
     GEN_CHECK_OFF(VGASTATE, cbWriteVBEIndex);
-#ifdef VBE_NEW_DYN_LIST
+# ifdef VBE_NEW_DYN_LIST
     GEN_CHECK_OFF(VGASTATE, cbWriteVBEExtraAddress);
-#endif
+# endif
 #endif
 #ifdef VBE_NEW_DYN_LIST
@@ -290,4 +298,7 @@
     GEN_CHECK_OFF(VGASTATE, pu8VBEExtraData);
     GEN_CHECK_OFF(VGASTATE, u16VBEExtraAddress);
+#endif
+#ifdef VBOX_WITH_HGSMI
+    GEN_CHECK_OFF(VGASTATE, IOPortBase);
 #endif