Changeset 98121 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 18, 2023 8:22:00 PM (2 years ago)

Author:

vboxsync

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

155289

Message:

Devices/DevVirtioNet: Fix logic for attaching driver at device construct time which caused VM start errors before when no driver was attached. Add a missing safety check if pDrv is NULL. Also fix some indentation issues and a duplicate message.

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (9 diffs)

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

@@ -883 +883 @@
         pHlp->pfnPrintf(pHlp, "    pDrvBase .................. %p\n",   pThisCC->pDrvBase);
         pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",   pThisCC->pDrv);
-        pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",   pThisCC->pDrv);
         pHlp->pfnPrintf(pHlp, "\n");
     }
@@ -1156 +1155 @@
  */
 static DECLCALLBACK(int) virtioNetR3LegacyDeviceLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass,
-                                                    RTMAC uMacLoaded)
+                                                         RTMAC uMacLoaded)
 {
     PVIRTIONET     pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
@@ -1972 +1971 @@
  */
 static int virtioNetR3RxPktMultibufXfer(PPDMDEVINS pDevIns, PVIRTIONET pThis, uint8_t *pvPktBuf, size_t cb,
-                                       PVIRTIONETPKTHDR pRxPktHdr, PVIRTIONETVIRTQ pRxVirtq, PVIRTQBUF pVirtqBuf)
+                                        PVIRTIONETPKTHDR pRxPktHdr, PVIRTIONETVIRTQ pRxVirtq, PVIRTQBUF pVirtqBuf)
 {
 
@@ -2119 +2118 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnReceiveGso}
  */
-static DECLCALLBACK(int) virtioNetR3NetworkDown_ReceiveGso(
-                                 PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb, PCPDMNETWORKGSO pGso)
+static DECLCALLBACK(int) virtioNetR3NetworkDown_ReceiveGso(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb,
+                                                           PCPDMNETWORKGSO pGso)
 {
     PVIRTIONETCC    pThisCC  = RT_FROM_MEMBER(pInterface, VIRTIONETCC, INetworkDown);
@@ -2654 +2653 @@
  */
 static int virtioNetR3TransmitFrame(PVIRTIONET pThis, PVIRTIONETCC pThisCC, PPDMSCATTERGATHER pSgBuf,
-                               PPDMNETWORKGSO pGso, PVIRTIONETPKTHDR pPktHdr)
+                                    PPDMNETWORKGSO pGso, PVIRTIONETPKTHDR pPktHdr)
 {
 
@@ -2717 +2716 @@
  */
 static int virtioNetR3TransmitPkts(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETCC pThisCC,
-                                         PVIRTIONETVIRTQ pTxVirtq, bool fOnWorkerThread)
+                                   PVIRTIONETVIRTQ pTxVirtq, bool fOnWorkerThread)
 {
     PVIRTIOCORE pVirtio = &pThis->Virtio;
@@ -3278 +3277 @@
         memset(pThis->aVlanFilter,          0, sizeof(pThis->aVlanFilter));
 
-        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, true);
+        if (pThisCC->pDrv)
+            pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, true);
 
         for (uint16_t uVirtqNbr = 0; uVirtqNbr < pThis->cVirtqs; uVirtqNbr++)
@@ -3349 +3349 @@
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
              || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
-                    Log(("[%s] No attached driver!\n", pThis->szInst));
+    {
+        /* This should never happen because this function is not called
+         * if there is no driver to attach! */
+        Log(("[%s] No attached driver!\n", pThis->szInst));
+    }
 
     RT_NOREF2(pThis, fFlags);
@@ -3616 +3620 @@
              || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
     {
-                    Log(("[%s] No attached driver!\n", pThis->szInst));
-                    AssertRCReturn(rc, rc);
-    }
+        /* No error! */
+        Log(("[%s] No attached driver!\n", pThis->szInst));
+    }
+    else
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to attach the network LUN"));
     /*
      * Status driver