Add Ring Index to ring-related Info messages

This patch adds the Ring Index to all calls to Info() issued in ring-
related functions so that the specific Ring is identified in the log.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/xenvif/transmitter.c b/src/xenvif/transmitter.c
index e4e3c31084999ebc6b222fae83f9306c1c17537b..a31bcd12ff2a1d42acddb13000cb9adacd871a08 100644 (file)
--- a/src/xenvif/transmitter.c
+++ b/src/xenvif/transmitter.c
@@ -2435,8 +2435,10 @@ __TransmitterRingFakeResponses(
         Transmitter = Ring->Transmitter;
         Frontend = Transmitter->Frontend;
 
-        Info("%s: faked %lu responses\n",
-             FrontendGetPath(Frontend), Count);
+        Info("%s[%u]: faked %lu responses\n",
+             FrontendGetPath(Frontend),
+             Ring->Index,
+             Count);
     }
 }
 
@@ -4242,8 +4244,9 @@ __TransmitterRingAbortPackets(
         Count++;
     }
 
-    Info("%s: aborted %u packets\n",
+    Info("%s[%u]: aborted %u packets\n",
          FrontendGetPath(Frontend),
+         Ring->Index,
          Count);
 
     ASSERT3U(Ring->PacketsSent, ==, Ring->PacketsPrepared - Ring->PacketsUnprepared);
@@ -4287,8 +4290,9 @@ __TransmitterRingQueueArp(
 
     __TransmitterRingReleaseLock(Ring);
 
-    Info("%s: %u.%u.%u.%u\n",
+    Info("%s[%u]: %u.%u.%u.%u\n",
          FrontendGetPath(Frontend),
+         Ring->Index,
          Address->Byte[0],
          Address->Byte[1],
          Address->Byte[2],
@@ -4336,8 +4340,9 @@ __TransmitterRingQueueNeighbourAdvertisement(
 
     __TransmitterRingReleaseLock(Ring);
 
-    Info("%s: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+    Info("%s[%u]: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
          FrontendGetPath(Frontend),
+         Ring->Index,
          HTONS(Address->Word[0]),
          HTONS(Address->Word[1]),
          HTONS(Address->Word[2]),
@@ -4412,8 +4417,9 @@ __TransmitterRingQueueMulticastControl(
 
     __TransmitterRingReleaseLock(Ring);
 
-    Info("%s: %s %02X:%02X:%02X:%02X:%02X:%02X\n",
+    Info("%s[%u]: %s %02X:%02X:%02X:%02X:%02X:%02X\n",
          FrontendGetPath(Frontend),
+         Ring->Index,
          (Add) ? "ADD" : "REMOVE",
          Address->Byte[0],
          Address->Byte[1],