Changeset 53801 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97609

Message:

Devices: use LogRelMax were appropriate

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (3 diffs)
• VMMDevHGCM.cpp (modified) (2 diffs)

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;
     }