Changeset 53801 in vbox

Timestamp:

Jan 14, 2015 1:31:53 PM (10 years ago)

Author:

vboxsync

Message:

Devices: use LogRelMax were appropriate

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (2 diffs)
• PC/DevAPIC.cpp (modified) (1 diff)
• PC/DevHPET.cpp (modified) (8 diffs)
• VMMDev/VMMDev.cpp (modified) (3 diffs)
• VMMDev/VMMDevHGCM.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -683 +683 @@
          * Too many variables.
          */
-        static unsigned s_cWarnings = 0;
-        if (s_cWarnings++ < 5)
-            LogRel(("EFI: Too many variables (%RTuuid::'%s' fAttrib=%#x cbValue=%#x)\n", &pThis->NVRAM.VarOpBuf.uuid,
-                    pThis->NVRAM.VarOpBuf.szName, pThis->NVRAM.VarOpBuf.fAttributes, pThis->NVRAM.VarOpBuf.cbValue));
+        LogRelMax(5, ("EFI: Too many variables (%RTuuid::'%s' fAttrib=%#x cbValue=%#x)\n", &pThis->NVRAM.VarOpBuf.uuid,
+                  pThis->NVRAM.VarOpBuf.szName, pThis->NVRAM.VarOpBuf.fAttributes, pThis->NVRAM.VarOpBuf.cbValue));
         pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_ERROR;
         Log(("nvramWriteVariableOpAdd: Too many variabled.\n"));
@@ -1529 +1527 @@
             {
                 /* For now, just log it. */
-                static uint64_t s_cDbgPointLogged = 0;
-                if (s_cDbgPointLogged < 1024)
-                {
-                    s_cDbgPointLogged++;
-                    LogRel(("EFI: debug point %s\n", efiDbgPointName((EFIDBGPOINT)u32)));
-                }
+                LogRelMax(1024, ("EFI: debug point %s\n", efiDbgPointName((EFIDBGPOINT)u32)));
                 rc = VINF_SUCCESS;
             }

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1162 +1162 @@
             {
                 /** @todo implement APIC_DM_FIXED! */
-                static unsigned s_c = 0;
-                if (s_c++ < 5)
-                    LogRel(("delivery type APIC_DM_FIXED not implemented. u8Pin=%d u8Level=%d\n", u8Pin, u8Level));
+                LogRelMax(5, ("delivery type APIC_DM_FIXED not implemented. u8Pin=%d u8Level=%d\n", u8Pin, u8Level));
                 return  VINF_SUCCESS;
             }

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -446 +446 @@
         || iTimerNo >= RT_ELEMENTS(pThis->aTimers) )                /* in practice, the number of configured timers */
     {                                                               /* will always be <= aTimers elements. */
-        static unsigned s_cOccurences = 0;
-        if (s_cOccurences++ < 10)
-            LogRel(("HPET: using timer above configured range: %d\n", iTimerNo));
+        LogRelMax(10, ("HPET: using timer above configured range: %d\n", iTimerNo));
         *pu32Value = 0;
         return VINF_SUCCESS;
@@ -484 +482 @@
         default:
         {
-            static unsigned s_cOccurences = 0;
-            if (s_cOccurences++ < 10)
-                LogRel(("invalid HPET register read %d on %d\n", iTimerReg, pHpetTimer->idxTimer));
+            LogRelMax(10, ("invalid HPET register read %d on %d\n", iTimerReg, pHpetTimer->idxTimer));
             u32Value = 0;
             break;
@@ -515 +511 @@
         || iTimerNo >= RT_ELEMENTS(pThis->aTimers) )    /* Parfait - see above. */
     {
-        static unsigned s_cOccurences = 0;
-        if (s_cOccurences++ < 10)
-            LogRel(("HPET: using timer above configured range: %d\n", iTimerNo));
+        LogRelMax(10, ("HPET: using timer above configured range: %d\n", iTimerNo));
         return VINF_SUCCESS;
     }
@@ -546 +540 @@
             if ((u32NewValue & HPET_TN_INT_TYPE) == HPET_TIMER_TYPE_LEVEL)
             {
-                static unsigned s_cOccurences = 0;
-                if (s_cOccurences++ < 10)
-                    LogRel(("level-triggered config not yet supported\n"));
+                LogRelMax(10, ("level-triggered config not yet supported\n"));
                 AssertFailed();
             }
@@ -559 +551 @@
 
         case HPET_TN_CFG + 4: /* Interrupt capabilities - read only. */
-        {
             Log(("write HPET_TN_CFG + 4, useless\n"));
             break;
-        }
 
         case HPET_TN_CMP: /* lower bits of comparator register */
@@ -603 +593 @@
 
         case HPET_TN_ROUTE:
-        {
             Log(("write HPET_TN_ROUTE\n"));
             break;
-        }
 
         case HPET_TN_ROUTE + 4:
-        {
             Log(("write HPET_TN_ROUTE + 4\n"));
             break;
-        }
 
         default:
-        {
-            static unsigned s_cOccurences = 0;
-            if (s_cOccurences++ < 10)
-                LogRel(("invalid timer register write: %d\n", iTimerReg));
-            break;
-        }
+            LogRelMax(10, ("invalid timer register write: %d\n", iTimerReg));
+            break;
     }
 
@@ -814 +796 @@
             Log(("write HPET_STATUS + 4: %x\n", u32NewValue));
             if (u32NewValue != 0)
-            {
-                static unsigned s_cOccurrences = 0;
-                if (s_cOccurrences++ < 10)
-                    LogRel(("Writing HPET_STATUS + 4 with non-zero, ignored\n"));
-            }
+                LogRelMax(10, ("Writing HPET_STATUS + 4 with non-zero, ignored\n"));
             break;
         }
@@ -841 +819 @@
 
         default:
-        {
-            static unsigned s_cOccurences = 0;
-            if (s_cOccurences++ < 10)
-                LogRel(("invalid HPET config write: %x\n", idxReg));
-            break;
-        }
+            LogRelMax(10, ("invalid HPET config write: %x\n", idxReg));
+            break;
     }
 

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -744 +744 @@
         if (!pEntry)
         {
-            static int g_cLogEntries = 0;
-            if (g_cLogEntries++ < 10)
-                LogRel(("VMM: Facility table is full - facility=%u status=%u.\n", pStatus->facility, pStatus->status));
+            LogRelMax(10, ("VMM: Facility table is full - facility=%u status=%u.\n", pStatus->facility, pStatus->status));
             return VERR_OUT_OF_RESOURCES;
         }
@@ -2726 +2724 @@
         else
         {
-            static int s_cRelWarn;
-            if (s_cRelWarn < 10)
-            {
-                s_cRelWarn++;
-                LogRel(("VMMDev: the guest has not yet reported to us -- refusing operation of request #%d\n",
+            LogRelMax(10, ("VMMDev: the guest has not yet reported to us -- refusing operation of request #%d\n",
                         requestHeader.requestType));
-            }
             requestHeader.rc = VERR_NOT_SUPPORTED;
         }
@@ -2738 +2731 @@
     else
     {
-        static int s_cRelWarn;
-        if (s_cRelWarn < 50)
-        {
-            s_cRelWarn++;
-            LogRel(("VMMDev: request packet too big (%x). Refusing operation.\n", requestHeader.size));
-        }
+        LogRelMax(50, ("VMMDev: request packet too big (%x). Refusing operation.\n", requestHeader.size));
         requestHeader.rc = VERR_NOT_SUPPORTED;
     }

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -652 +652 @@
     if (cParms > VMMDEV_MAX_HGCM_PARMS)
     {
-        static int s_cRelWarn;
-        if (s_cRelWarn < 50)
-        {
-            s_cRelWarn++;
-            LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-        }
+        LogRelMax(50, ("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
         return VERR_INVALID_PARAMETER;
     }
@@ -1201 +1196 @@
     if (cParms > VMMDEV_MAX_HGCM_PARMS)
     {
-        static int s_cRelWarn;
-        if (s_cRelWarn < 50)
-        {
-            s_cRelWarn++;
-            LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-        }
+        LogRelMax(50, ("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
         return VERR_INVALID_PARAMETER;
     }