Changeset 71590 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

Timestamp:

Mar 31, 2018 6:34:28 PM (7 years ago)

Author:

vboxsync

Message:

DevVGA,HGSMI,++: Code cleanup in progress. bugref:9094

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (9 diffs)

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

@@ -2398 +2398 @@
  * @note    cbCmdDr is at least sizeof(VBOXVDMACBUF_DR).
  */
-static int vboxVDMACmdCheckCrCmd(struct VBOXVDMAHOST *pVdma, PVBOXVDMACBUF_DR pCmdDr, uint32_t cbCmdDr)
+static int vboxVDMACmdCheckCrCmd(struct VBOXVDMAHOST *pVdma, VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_GUEST *pCmdDr, uint32_t cbCmdDr)
 {
     uint32_t cbDmaCmd = 0;
@@ -2948 +2948 @@
  * @thread  VDMA
  */
-static void vboxVDMACommandProcess(PVBOXVDMAHOST pVdma, PVBOXVDMACBUF_DR pCmd, uint32_t cbCmd)
+static void vboxVDMACommandProcess(PVBOXVDMAHOST pVdma, VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd)
 {
     PHGSMIINSTANCE pHgsmi = pVdma->pHgsmi;
@@ -2958 +2958 @@
          * Get the command buffer (volatile).
          */
-        uint16_t const  cbCmdBuf = pCmd->cbBuf;
-        const uint8_t  *pbCmdBuf;
+        uint16_t const  cbCmdBuf  = pCmd->cbBuf;
+        uint32_t const  fCmdFlags = pCmd->fFlags;
+        const uint8_t  *pbCmdBuf; /** @todo fixme later */
         PGMPAGEMAPLOCK  Lock;
         bool            bReleaseLocked = false;
-        if (pCmd->fFlags & VBOXVDMACBUF_FLAG_BUF_FOLLOWS_DR)
+        if (fCmdFlags & VBOXVDMACBUF_FLAG_BUF_FOLLOWS_DR)
         {
             pbCmdBuf = VBOXVDMACBUF_DR_TAIL(pCmd, const uint8_t);
@@ -2969 +2970 @@
                             rc = VERR_INVALID_PARAMETER);
         }
-        else if (pCmd->fFlags & VBOXVDMACBUF_FLAG_BUF_VRAM_OFFSET)
+        else if (fCmdFlags & VBOXVDMACBUF_FLAG_BUF_VRAM_OFFSET)
         {
             uint64_t offVRam = pCmd->Location.offVramBuf;
@@ -3165 +3166 @@
  * @param   cbCmd   The size of the command.  At least sizeof(VBOXVDMA_CTL).
  */
-void vboxVDMAControl(struct VBOXVDMAHOST *pVdma, PVBOXVDMA_CTL pCmd, uint32_t cbCmd)
+void vboxVDMAControl(struct VBOXVDMAHOST *pVdma, VBOXVDMA_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd)
 {
     RT_NOREF(cbCmd);
@@ -3171 +3172 @@
 
     VBOXVDMA_CTL_TYPE enmCtl = pCmd->enmCtl;
+    ASMCompilerBarrier();
     switch (enmCtl)
     {
@@ -3204 +3206 @@
  * @param   cbCmd   The size of the command.  At least sizeof(VBOXVDMACBUF_DR).
  */
-void vboxVDMACommand(struct VBOXVDMAHOST *pVdma, PVBOXVDMACBUF_DR pCmd, uint32_t cbCmd)
+void vboxVDMACommand(struct VBOXVDMAHOST *pVdma, VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd)
 {
 #ifdef VBOX_WITH_CRHGSMI
@@ -3282 +3284 @@
  * Handler for vboxCmdVBVACmdCtl()/VBOXCMDVBVACTL_TYPE_3DCTL.
  */
-static int vdmaVBVACtlGenericGuestSubmit(PVBOXVDMAHOST pVdma, VBVAEXHOSTCTL_TYPE enmType, VBOXCMDVBVA_CTL *pCtl, uint32_t cbCtl)
+static int vdmaVBVACtlGenericGuestSubmit(PVBOXVDMAHOST pVdma, VBVAEXHOSTCTL_TYPE enmType,
+                                         VBOXCMDVBVA_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCtl, uint32_t cbCtl)
 {
     Assert(cbCtl >= sizeof(VBOXCMDVBVA_CTL)); /* Checked by callers caller, vbvaChannelHandler(). */
@@ -3791 +3794 @@
  *                              sizeof(VBOXCMDVBVA_CTL).
  */
-int vboxCmdVBVACmdCtl(PVGASTATE pVGAState, VBOXCMDVBVA_CTL *pCtl, uint32_t cbCtl)
+int vboxCmdVBVACmdCtl(PVGASTATE pVGAState, VBOXCMDVBVA_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCtl, uint32_t cbCtl)
 {
     struct VBOXVDMAHOST *pVdma = pVGAState->pVdma;