diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:47:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:47:04 +0000 |
| commit | 8b152439beb81c8da1bdb00c7870e2d9e8d49612 (patch) | |
| tree | ea7e527f7531053d0bcc60ce1eea46e1c4b15757 /src/VBox/Devices/Network | |
| parent | Adding debian version 7.0.16-dfsg-8. (diff) | |
| download | virtualbox-8b152439beb81c8da1bdb00c7870e2d9e8d49612.tar.xz virtualbox-8b152439beb81c8da1bdb00c7870e2d9e8d49612.zip | |
Merging upstream version 7.0.18-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/VBox/Devices/Network')
| -rw-r--r-- | src/VBox/Devices/Network/DevVirtioNet.cpp | 10 | ||||
| -rw-r--r-- | src/VBox/Devices/Network/SrvIntNetR0.cpp | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/VBox/Devices/Network/DevVirtioNet.cpp b/src/VBox/Devices/Network/DevVirtioNet.cpp index 66d2cbf1..336b3000 100644 --- a/src/VBox/Devices/Network/DevVirtioNet.cpp +++ b/src/VBox/Devices/Network/DevVirtioNet.cpp @@ -791,7 +791,11 @@ void virtioNetDumpGcPhysRxBuf(PPDMDEVINS pDevIns, PVIRTIONETPKTHDR pRxPktHdr, /** * @callback_method_impl{FNDBGFHANDLERDEV, virtio-net debugger info callback.} */ +#ifdef VIRTIO_REL_INFO_DUMP +DECLCALLBACK(void) virtioNetR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs) +#else /* !VIRTIO_REL_INFO_DUMP */ static DECLCALLBACK(void) virtioNetR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs) +#endif /* !VIRTIO_REL_INFO_DUMP */ { PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET); PVIRTIONETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVIRTIONETCC); @@ -904,7 +908,7 @@ static DECLCALLBACK(void) virtioNetR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp pHlp->pfnPrintf(pHlp, " cVirtqPairs .,............. %d\n", pThis->cVirtqPairs); pHlp->pfnPrintf(pHlp, " cVirtqs .,................. %d\n", pThis->cVirtqs); pHlp->pfnPrintf(pHlp, " cWorkers .................. %d\n", pThis->cWorkers); - pHlp->pfnPrintf(pHlp, " MMIO mapping name ......... %d\n", pThisCC->Virtio.szMmioName); + pHlp->pfnPrintf(pHlp, " MMIO mapping name ......... %s\n", pThisCC->Virtio.szMmioName); pHlp->pfnPrintf(pHlp, "\n"); } @@ -923,7 +927,7 @@ static DECLCALLBACK(void) virtioNetR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp pHlp->pfnPrintf(pHlp, " Suppress multicast: ....... %s\n", pThis->fNoMulticast ? "true" : "false"); pHlp->pfnPrintf(pHlp, " Promiscuous: .............. %s\n", pThis->fPromiscuous ? "true" : "false"); pHlp->pfnPrintf(pHlp, "\n"); - pHlp->pfnPrintf(pHlp, " Default Rx MAC filter: .... %RTmac\n", pThis->rxFilterMacDefault); + pHlp->pfnPrintf(pHlp, " Default Rx MAC filter: .... %RTmac\n", &pThis->rxFilterMacDefault); pHlp->pfnPrintf(pHlp, "\n"); pHlp->pfnPrintf(pHlp, " Unicast filter MACs:\n"); @@ -3675,7 +3679,7 @@ static DECLCALLBACK(int) virtioNetR3Construct(PPDMDEVINS pDevIns, int iInstance, * Register the debugger info callback (ignore errors). */ char szTmp[128]; - rc = PDMDevHlpDBGFInfoRegister(pDevIns, "virtio-net", "Display virtio-net info (help, net, features, state, pointers, queues, all)", virtioNetR3Info); + rc = PDMDevHlpDBGFInfoRegister(pDevIns, "virtionet", "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)); return rc; diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp index 728cd25a..9e9d1757 100644 --- a/src/VBox/Devices/Network/SrvIntNetR0.cpp +++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp @@ -2935,7 +2935,7 @@ static int intnetR0TrunkIfSendGsoFallback(PINTNETTRUNKIF pThis, PINTNETIF pIfSen union { - uint8_t abBuf[sizeof(INTNETSG) + sizeof(INTNETSEG)]; + uint8_t abBuf[sizeof(INTNETSG) + 2 * sizeof(INTNETSEG)]; INTNETSG SG; } u; |