Changeset 86407 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 2, 2020 6:26:15 AM (4 years ago)

Author:

vboxsync

Message:

Fix burn

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (3 diffs)
• VirtIO/VirtioCore.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

@@ -624 +624 @@
         if (cBufsAvailable)
         {
-            VIRTIOLOGLEVEL10("%s %u empty bufs added to %s by guest (notifying leaf device)\n",
-                       pThis->szInst, cBufsAvailable, pVirtq->szName);
+            Log10Func(("%s %u empty bufs added to %s by guest (notifying leaf device)\n",
+                       pThis->szInst, cBufsAvailable, pVirtq->szName));
             virtioNetWakeupRxBufWaiter(pDevIns);
         }
         else
-            VIRTIOLOGLEVEL10("%s \n\n***WARNING: %s notified but no empty bufs added by guest! (skip notifying of leaf device)\n\n",
-                    pThis->szInst, pVirtq->szName);
+            Log10Func(("%s \n\n***WARNING: %s notified but no empty bufs added by guest! (skip notifying of leaf device)\n\n",
+                    pThis->szInst, pVirtq->szName));
     }
     else if (IS_TX_VIRTQ(uVirtqNbr) || IS_CTRL_VIRTQ(uVirtqNbr))
@@ -639 +639 @@
             if (ASMAtomicReadBool(&pWorker->fSleeping))
             {
-                VIRTIOLOGLEVEL10("%s %s has available buffers - waking worker.\n", pThis->szInst, pVirtq->szName);
+                Log10Func(("%s %s has available buffers - waking worker.\n", pThis->szInst, pVirtq->szName));
 
                 int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pWorker->hEvtProcess);
@@ -646 +646 @@
             else
             {
-                VIRTIOLOGLEVEL10("%s %s has available buffers - worker already awake\n", pThis->szInst, pVirtq->szName);
+                Log10Func(("%s %s has available buffers - worker already awake\n", pThis->szInst, pVirtq->szName));
             }
         }
         else
         {
-            VIRTIOLOGLEVEL10("%s %s has available buffers - waking worker.\n", pThis->szInst, pVirtq->szName);
+            Log10Func(("%s %s has available buffers - waking worker.\n", pThis->szInst, pVirtq->szName));
         }
     }

trunk/src/VBox/Devices/VirtIO/VirtioCore.h

@@ -35 +35 @@
 # define VIRTIO_HEX_DUMP(logLevel, pv, cb, base, title) do { } while (0)
 #endif
-
-#ifdef IN_RING3
-#   define VIRTIOLOG(format...)    LogFunc((format))
-#   define VIRTIOLOGREL(format...) LogRelFunc((format))
-#else
-#   define VIRTIOLOG(format...)    SUPR0Printf(format)
-#   define VIRTIOLOGREL(format...) SUPR0Printf(format)
-#endif
-
-#define VIRTIOLOGLEVEL2(format...)  virtioLogLevel(2,  format)
-#define VIRTIOLOGLEVEL3(format...)  virtioLogLevel(3,  format)
-#define VIRTIOLOGLEVEL4(format...)  virtioLogLevel(4,  format)
-#define VIRTIOLOGLEVEL5(format...)  virtioLogLevel(5,  format)
-#define VIRTIOLOGLEVEL6(format...)  virtioLogLevel(6,  format)
-#define VIRTIOLOGLEVEL7(format...)  virtioLogLevel(7,  format)
-#define VIRTIOLOGLEVEL8(format...)  virtioLogLevel(8,  format)
-#define VIRTIOLOGLEVEL9(format...)  virtioLogLevel(9,  format)
-#define VIRTIOLOGLEVEL10(format...) virtioLogLevel(10, format)
-#define VIRTIOLOGLEVEL11(format...) virtioLogLevel(11, format)
-#define VIRTIOLOGLEVEL12(format...) virtioLogLevel(12, format)
-
-DECLINLINE(void) virtioLogLevel(int logLevel, const char *format...)
-{
-    va_list arglist;
-    va_start(arglist, format);
-    if (LogIsItEnabled(logLevel, LOG_GROUP))
-        VIRTIOLOG(format);
-    va_end(arglist);
-    RT_NOREF(logLevel);
-}
 
 /** Pointer to the shared VirtIO state. */