Changeset 50125 in vbox for trunk

Timestamp:

Jan 20, 2014 4:52:31 PM (11 years ago)

Author:

vboxsync

Message:

Devices/Graphics: added missing tstDeviceStructSizeRC tests

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.h (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -355 +355 @@
         uint32_t                    u32RegCaps;
         /** Physical address of command mmio range. */
+        uint32_t                    Padding2;
         RTIOPORT                    BasePort;
         /** Port io index register. */
@@ -376 +377 @@
         /** VRAM page monitoring enabled or not. */
         bool                        fVRAMTracking;
-        bool                        Padding6[HC_ARCH_BITS == 64 ? 6 : 2];
+        bool                        Padding6[2];
     } svga;
 #endif

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -42 +42 @@
         $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
         $(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \
-        $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,)
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,) \
+        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA,)
 
 

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

@@ -304 +304 @@
     GEN_CHECK_OFF(VGASTATE, RefreshTimer);
     GEN_CHECK_OFF(VGASTATE, pDevInsR0);
+#ifdef VBOX_WITH_VMSVGA
+    GEN_CHECK_OFF(VGASTATE, svga.u64HostWindowId);
+    GEN_CHECK_OFF(VGASTATE, svga.pFIFOR3);
+    GEN_CHECK_OFF(VGASTATE, svga.pFIFOR0);
+    GEN_CHECK_OFF(VGASTATE, svga.pSVGAState);
+    GEN_CHECK_OFF(VGASTATE, svga.p3dState);
+    GEN_CHECK_OFF(VGASTATE, svga.pFrameBufferBackup);
+    GEN_CHECK_OFF(VGASTATE, svga.GCPhysFIFO);
+    GEN_CHECK_OFF(VGASTATE, svga.cbFIFO);
+    GEN_CHECK_OFF(VGASTATE, svga.BasePort);
+    GEN_CHECK_OFF(VGASTATE, svga.pFIFOIOThread);
+    GEN_CHECK_OFF(VGASTATE, svga.iWidth);
+    GEN_CHECK_OFF(VGASTATE, svga.u32ActionFlags);
+    GEN_CHECK_OFF(VGASTATE, svga.f3DEnabled);
+    GEN_CHECK_OFF(VGASTATE, svga.fVRAMTracking);
+#endif
     GEN_CHECK_OFF(VGASTATE, cMonitors);
     GEN_CHECK_OFF(VGASTATE, cMilliesRefreshInterval);