Changeset 54379 in vbox

Timestamp:

Feb 23, 2015 11:04:07 AM (10 years ago)

Author:

vboxsync

Message:

SUPDrvGip.cpp: Fixed warnings and build break.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (10 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -884 +884 @@
         int64_t  iStartTscDelta = iStartGipCpu < pGip->cCpus ? pGip->aCPUs[iStartGipCpu].i64TSCDelta : INT64_MAX;
         int64_t  iStopTscDelta  = iStopGipCpu  < pGip->cCpus ? pGip->aCPUs[iStopGipCpu].i64TSCDelta  : INT64_MAX;
-        if (RT_LIKELY(iStartTscDelta != INT64_MAX && iStopGipCpu != INT64_MAX))
+        if (RT_LIKELY(iStartTscDelta != INT64_MAX && iStopTscDelta != INT64_MAX))
         {
             if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO)
@@ -1172 +1172 @@
                     int64_t  iStartTscDelta = iStartGipCpu < pGip->cCpus ? pGip->aCPUs[iStartGipCpu].i64TSCDelta : INT64_MAX;
                     int64_t  iStopTscDelta  = iStopGipCpu  < pGip->cCpus ? pGip->aCPUs[iStopGipCpu].i64TSCDelta  : INT64_MAX;
-                    if (RT_LIKELY(iStartTscDelta != INT64_MAX && iStopGipCpu != INT64_MAX))
+                    if (RT_LIKELY(iStartTscDelta != INT64_MAX && iStopTscDelta != INT64_MAX))
                     {
                         if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO)
@@ -2653 +2653 @@
      */
     if (fIsMaster)
+    {
         if (RT_LIKELY(ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_STEADY, GIP_TSC_DELTA_SYNC2_READY)))
         { /* likely*/ }
         else
             return false;
+    }
 
     /*
@@ -2710 +2712 @@
      */
     if (!fIsMaster)
+    {
         if (RT_LIKELY(ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_STEADY, GIP_TSC_DELTA_SYNC2_READY)))
         { /* likely */ }
@@ -2717 +2720 @@
             return false;
         }
+    }
 
     /*
@@ -2722 +2726 @@
      */
     if (fIsMaster)
+    {
         if (RT_LIKELY(ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_GO, GIP_TSC_DELTA_SYNC2_STEADY)))
         { /* likely */ }
@@ -2729 +2734 @@
             return false;
         }
+    }
 
     /*
@@ -2755 +2761 @@
      */
     if (!fIsMaster)
+    {
         if (RT_LIKELY(ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_GO, GIP_TSC_DELTA_SYNC2_STEADY)))
         { /* likely */ }
@@ -2762 +2769 @@
             return false;
         }
+    }
 
     /*
@@ -3535 +3543 @@
     rc = RTSemMutexRequest(pDevExt->mtxTscDelta, RT_INDEFINITE_WAIT);
 #else
-    rc = RTSemFastMutexRequest(pDevExt->mtxTscDelta, RT_INDEFINITE_WAIT);
+    rc = RTSemFastMutexRequest(pDevExt->mtxTscDelta);
 #endif
     if (RT_FAILURE(rc))