Changeset 62932 in vbox for trunk/src/VBox/Devices/Graphics/HGSMI

Timestamp:

Aug 3, 2016 4:50:15 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

File:

• trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (19 diffs)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -91 +91 @@
 #define VBOXHGSMI_STATE_FIFOSTOP_MAGIC 0x1fedcba9
 
-#define VBOXHGSMI_SAVE_START(_pSSM)     do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_START_MAGIC);      AssertRC(rc2);}while(0)
-#define VBOXHGSMI_SAVE_STOP(_pSSM)      do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_STOP_MAGIC);       AssertRC(rc2);}while(0)
-#define VBOXHGSMI_SAVE_FIFOSTART(_pSSM) do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTART_MAGIC);  AssertRC(rc2);}while(0)
-#define VBOXHGSMI_SAVE_FIFOSTOP(_pSSM)  do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTOP_MAGIC);   AssertRC(rc2);}while(0)
+#define VBOXHGSMI_SAVE_START(_pSSM)     do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_START_MAGIC);     AssertRC(rc2); }while(0)
+#define VBOXHGSMI_SAVE_STOP(_pSSM)      do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_STOP_MAGIC);      AssertRC(rc2); }while(0)
+#define VBOXHGSMI_SAVE_FIFOSTART(_pSSM) do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTART_MAGIC); AssertRC(rc2); }while(0)
+#define VBOXHGSMI_SAVE_FIFOSTOP(_pSSM)  do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTOP_MAGIC);  AssertRC(rc2); }while(0)
 
 #define VBOXHGSMI_LOAD_CHECK(_pSSM, _v) \
@@ -304 +304 @@
         if (RTListIsEmpty(&pIns->guestCmdCompleted))
         {
-            if(pIns->pHGFlags)
-            {
+            if (pIns->pHGFlags)
                 ASMAtomicAndU32(&pIns->pHGFlags->u32HostFlags, ~HGSMIHOSTFLAGS_GCOMMAND_COMPLETED);
-            }
         }
 
@@ -355 +353 @@
 
     int rc = hgsmiFIFOLock(pIns);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Search the Read list for the given buffer offset. */
@@ -392 +390 @@
 
         hgsmiFIFOUnlock(pIns);
-        if(!bCompleteFirst)
+        if (!bCompleteFirst)
             LogRel(("HGSMI[%s]: ignored invalid write to the host FIFO: 0x%08X!!!\n", pIns->pszName, offBuffer));
     }
@@ -420 +418 @@
     VM_ASSERT_EMT(pIns->pVM);
 
-    AssertPtrReturn(pIns->pHGFlags, VERR_WRONG_ORDER);
+    AssertPtrReturn(pIns->pHGFlags, HGSMIOFFSET_VOID);
     int rc = hgsmiFIFOLock(pIns);
     AssertRC(rc);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Get the host FIFO head entry. */
@@ -454 +452 @@
             return pEntry->offBuffer;
         }
+
         hgsmiFIFOUnlock(pIns);
     }
@@ -723 +722 @@
     HGSMIINSTANCE *pIns = pEntry->pIns;
     int rc = hgsmiFIFOLock (pIns);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTListNodeRemove(&pEntry->nodeEntry);
@@ -731 +730 @@
 
         rc = hgsmiHostHeapLock (pIns);
-        if(RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             /* Deallocate the host heap memory. */
@@ -1292 +1291 @@
               hgsmiHostHeapHandleLocationOffset(&pIns->hostHeap);
     rc = SSMR3PutU32 (pSSM, off);
-    if(off != HGSMIOFFSET_VOID)
+    if (off != HGSMIOFFSET_VOID)
     {
         SSMR3PutU32 (pSSM, hgsmiHostHeapOffset(&pIns->hostHeap));
@@ -1299 +1298 @@
         SSMR3PutU64 (pSSM, (uint64_t)(uintptr_t)pIns->area.pu8Base);
         rc = hgsmiFIFOLock (pIns);
-        if(RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFO, pSSM); AssertRC(rc);
@@ -1327 +1326 @@
 int HGSMIHostLoadStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM, uint32_t u32Version)
 {
-    if(u32Version < VGA_SAVEDSTATE_VERSION_HGSMI)
+    if (u32Version < VGA_SAVEDSTATE_VERSION_HGSMI)
         return VINF_SUCCESS;
 
@@ -1346 +1345 @@
     pIns->pHGFlags = (off != HGSMIOFFSET_VOID) ? (HGSMIHOSTFLAGS*)HGSMIOffsetToPointer (&pIns->area, off) : NULL;
 
-    HGSMIHOSTHEAP hHeap = pIns->hostHeap;
     rc = SSMR3GetU32(pSSM, &off);
     AssertLogRelRCReturn(rc, rc);
-    if(off != HGSMIOFFSET_VOID)
+    if (off != HGSMIOFFSET_VOID)
     {
         /* There is a saved heap. */
@@ -1370 +1368 @@
         {
             rc = hgsmiFIFOLock (pIns);
-            if(RT_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFO, pSSM);
@@ -1440 +1438 @@
  */
 
-static int hgsmiChannelMapCreate (PHGSMIINSTANCE pIns,
-                                  const char *pszChannel,
-                                  uint8_t *pu8Channel)
-{
-    /* @todo later */
+static int hgsmiChannelMapCreate(PHGSMIINSTANCE pIns, const char *pszChannel, uint8_t *pu8Channel)
+{
+    RT_NOREF(pIns, pszChannel, pu8Channel);
+    /** @todo later */
     return VERR_NOT_SUPPORTED;
 }
@@ -1478 +1475 @@
 /* Register a new HGSMI channel by name.
  */
-int HGSMIChannelRegisterName (PHGSMIINSTANCE pIns,
-                              const char *pszChannel,
-                              PFNHGSMICHANNELHANDLER pfnChannelHandler,
-                              void *pvChannelHandler,
-                              uint8_t *pu8Channel)
+int HGSMIChannelRegisterName(PHGSMIINSTANCE pIns,
+                             const char *pszChannel,
+                             PFNHGSMICHANNELHANDLER pfnChannelHandler,
+                             void *pvChannelHandler,
+                             uint8_t *pu8Channel)
 {
     LogFlowFunc(("pIns %p, pszChannel %s, pfnChannelHandler %p, pvChannelHandler %p, pu8Channel %p\n",
@@ -1591 +1588 @@
 
             HGSMIBUFFERLOCATION *pLoc = (HGSMIBUFFERLOCATION *)pvBuffer;
-            if(pLoc->cbLocation != sizeof(HGSMIHOSTFLAGS))
+            if (pLoc->cbLocation != sizeof(HGSMIHOSTFLAGS))
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -1705 +1702 @@
 {
     uint32_t flags = 0;
-    if(pIns->pHGFlags)
+    if (pIns->pHGFlags)
     {
         /* treat the abandoned commands as read.. */
-        while(HGSMIHostRead (pIns) != HGSMIOFFSET_VOID)  {}
+        while (HGSMIHostRead(pIns) != HGSMIOFFSET_VOID)
+        {}
         flags = pIns->pHGFlags->u32HostFlags;
         pIns->pHGFlags->u32HostFlags = 0;
@@ -1714 +1712 @@
 
     /* .. and complete them */
-    while(hgsmiProcessHostCmdCompletion (pIns, 0, true)) {}
+    while (hgsmiProcessHostCmdCompletion(pIns, 0, true))
+    {}
 
 #ifdef VBOX_WITH_WDDM
-    while(hgsmiProcessGuestCmdCompletion(pIns) != HGSMIOFFSET_VOID) {}
+    while(hgsmiProcessGuestCmdCompletion(pIns) != HGSMIOFFSET_VOID)
+    {}
 #endif
 
@@ -1794 +1794 @@
     if (RT_SUCCESS (rc))
     {
-        if(bDoIrq)
+        if (bDoIrq)
         {
             /* Now guest can read the FIFO, the notification is informational. */