Changeset 106294 in vbox

Timestamp:

Oct 10, 2024 5:42:05 PM (7 months ago)

Author:

vboxsync

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

165101

Message:

VirtioNet/Core: debugger info fixes

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (2 diffs)
• VirtIO/VirtioCore.cpp (modified) (1 diff)
• VirtIO/VirtioCore.h (modified) (1 diff)

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

@@ -864 +864 @@
             }
             pHlp->pfnPrintf(pHlp, "\n");
-            virtioCoreR3VirtqInfo(pDevIns, pHlp, pszArgs, uVirtqNbr);
+            virtioCoreR3VirtqInfo(pDevIns, pHlp, &pThis->Virtio, pszArgs, uVirtqNbr);
             pHlp->pfnPrintf(pHlp, "    ---------------------------------------------------------------------\n");
             pHlp->pfnPrintf(pHlp, "\n");
@@ -3636 +3636 @@
      */
     char szTmp[128];
-    rc = PDMDevHlpDBGFInfoRegister(pDevIns, "virtionet", "Display virtionet info (help, net, features, state, pointers, queues, all)", virtioNetR3Info);
+    RTStrPrintf(szTmp, sizeof(szTmp), "virtionet%d", iInstance);
+    rc = PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "Display virtionet info (help, net, features, state, pointers, queues, all)", virtioNetR3Info);
     if (RT_FAILURE(rc))
         LogRel(("Failed to register DBGF info for device %s\n", szTmp));

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

@@ -634 +634 @@
 
 /** API Fuunction: See header file */
-DECLHIDDEN(void) virtioCoreR3VirtqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs, int uVirtq)
+DECLHIDDEN(void) virtioCoreR3VirtqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, PVIRTIOCORE pVirtio, const char *pszArgs, int uVirtq)
 {
     RT_NOREF(pszArgs);
-    PVIRTIOCORE pVirtio = PDMDEVINS_2_DATA(pDevIns, PVIRTIOCORE);
     PVIRTQUEUE pVirtq = &pVirtio->aVirtqueues[uVirtq];
 

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

@@ -769 +769 @@
  * @param   pDevIns     The device instance.
  * @param   pHlp        Pointer to the debug info hlp struct
+ * @param   pVirtio     Pointer to the virtio core embedded into the calling device
  * @param   pszArgs     Arguments to function
  */
-DECLHIDDEN(void) virtioCoreR3VirtqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs, int uVirtqNbr);
+DECLHIDDEN(void) virtioCoreR3VirtqInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, PVIRTIOCORE pVirtio, const char *pszArgs, int uVirtqNbr);
 
 /**