Changeset 62032 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 5, 2016 4:39:31 PM (9 years ago)

Author:

vboxsync

Message:

Devices/VGA: fixed alignment of CritSectIRQ (important for 32-bit debug builds)

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (4 diffs)
• DevVGA.h (modified) (3 diffs)
• DevVGA_VBVA.cpp (modified) (3 diffs)

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

@@ -3053 +3053 @@
                 if (u32 == HGSMIOFFSET_VOID)
                 {
-                    PDMCritSectEnter(&pThis->critSectIRQ, VERR_SEM_BUSY);
+                    PDMCritSectEnter(&pThis->CritSectIRQ, VERR_SEM_BUSY);
 
                     if (pThis->fu32PendingGuestFlags == 0)
@@ -3075 +3075 @@
                     }
 
-                    PDMCritSectLeave(&pThis->critSectIRQ);
+                    PDMCritSectLeave(&pThis->CritSectIRQ);
                 }
                 else
@@ -5954 +5954 @@
     }
 
-    PDMR3CritSectDelete(&pThis->critSectIRQ);
+    PDMR3CritSectDelete(&pThis->CritSectIRQ);
     PDMR3CritSectDelete(&pThis->CritSect);
     return VINF_SUCCESS;
@@ -6186 +6186 @@
     AssertRCReturn(rc, rc);
 
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->critSectIRQ, RT_SRC_POS, "VGA#%u_IRQ", iInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSectIRQ, RT_SRC_POS, "VGA#%u_IRQ", iInstance);
     AssertRCReturn(rc, rc);
 

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

@@ -588 +588 @@
     /** The name of the VGA BIOS ROM file. */
     R3PTRTYPE(char *)           pszVgaBiosFile;
+# if HC_ARCH_BITS == 32
+    uint32_t                    Padding9;
+# endif
 
 # ifdef VBOX_WITH_HGSMI
@@ -593 +596 @@
     RTIOPORT                    IOPortBase;
 #  ifdef VBOX_WITH_WDDM
-    uint8_t                     Padding9[2];
+    uint8_t                     Padding10[2];
     /** Specifies guest driver caps, i.e. whether it can handle IRQs from the
      * adapter, the way it can handle async HGSMI command completion, etc. */
@@ -600 +603 @@
     uint32_t                    fHostCursorCapabilities;
 #  else
-    uint8_t                     Padding10[14];
+    uint8_t                     Padding11[14];
 #  endif
 
     /** The critical section serializes the HGSMI IRQ setting/clearing. */
-    PDMCRITSECT                 critSectIRQ;
+    PDMCRITSECT                 CritSectIRQ;
     /** VBVARaiseIRQ flags which were set when the guest was still processing previous IRQ. */
     uint32_t                    fu32PendingGuestFlags;
-    uint32_t                    Padding11;
+    uint32_t                    Padding12;
 # endif /* VBOX_WITH_HGSMI */
 

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2082 +2082 @@
     PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
 
-    PDMCritSectEnter(&pVGAState->critSectIRQ, VERR_SEM_BUSY);
+    PDMCritSectEnter(&pVGAState->CritSectIRQ, VERR_SEM_BUSY);
 
     const uint32_t fu32CurrentGuestFlags = HGSMIGetHostGuestFlags(pVGAState->pHGSMI);
@@ -2104 +2104 @@
     }
 
-    PDMCritSectLeave(&pVGAState->critSectIRQ);
+    PDMCritSectLeave(&pVGAState->CritSectIRQ);
 }
 
@@ -2111 +2111 @@
     PPDMDEVINS pDevIns = pThis->pDevInsR3;
 
-    PDMCritSectEnter(&pThis->critSectIRQ, VERR_SEM_BUSY);
+    PDMCritSectEnter(&pThis->CritSectIRQ, VERR_SEM_BUSY);
 
     if (HGSMIGetHostGuestFlags(pThis->pHGSMI) & HGSMIHOSTFLAGS_IRQ)
         PDMDevHlpPCISetIrqNoWait(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
 
-    PDMCritSectLeave(&pThis->critSectIRQ);
+    PDMCritSectLeave(&pThis->CritSectIRQ);
 }