Changeset 28082 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2010 10:18:45 AM (15 years ago)

Author:

vboxsync

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

59793

Message:

Network: allow to start the VM even if a network device is not attached to a driver (regression fix)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (2 diffs)
• DevPCNet.cpp (modified) (3 diffs)
• DevVirtioNet.cpp (modified) (2 diffs)
• DrvNetSniffer.cpp (modified) (2 diffs)

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

@@ -5224 +5224 @@
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
+        /* This should never happen because this function is not called
+         * if there is no driver to attach! */
         Log(("%s No attached driver!\n", INSTANCE(pState)));
-
+    }
 
     /*
@@ -5682 +5686 @@
                         VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-    {
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
+        /* No error! */
         E1kLog(("%s This adapter is not attached to any network!\n", INSTANCE(pState)));
     }

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

@@ -4932 +4932 @@
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
+        /* This should never happen because this function is not called
+         * if there is no driver to attach! */
         Log(("#%d No attached driver!\n", PCNET_INST_NR));
-
+    }
 
     /*
@@ -5283 +5287 @@
     if (RT_SUCCESS(rc))
         pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
-    else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc != VERR_PDM_NO_ATTACHED_DRIVER
+             && rc != VERR_PDM_CFG_MISSING_DRIVER_NAME)
     {
         AssertMsgFailed(("Failed to attach to status driver. rc=%Rrc\n", rc));
@@ -5309 +5314 @@
                         VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
+        /* No error! */
         Log(("No attached driver!\n"));
+    }
     else
         return rc;

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

@@ -1517 +1517 @@
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
+        /* This should never happen because this function is not called
+         * if there is no driver to attach! */
         Log(("%s No attached driver!\n", INSTANCE(pState)));
-
+    }
 
     /*
@@ -1738 +1742 @@
                         VERR_PDM_MISSING_INTERFACE_BELOW);
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-    {
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME )
+    {
+         /* No error! */
         Log(("%s This adapter is not attached to any network!\n", INSTANCE(pState)));
     }

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

@@ -327 +327 @@
     PPDMIBASE   pBaseDown;
     int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pBaseDown);
-    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+        || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
         pThis->pIBelowNet = NULL;
     else if (RT_SUCCESS(rc))
@@ -460 +461 @@
     PPDMIBASE   pBaseDown;
     rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pBaseDown);
-    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+        || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
         pThis->pIBelowNet = NULL;
     else if (RT_SUCCESS(rc))