Changeset 34335 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 24, 2010 5:49:09 PM (14 years ago)

Author:

vboxsync

Message:

Main/DrvIntNet: pass IgnoreConnectFailure to the driver to make it ignore connection errors only if the VM is restoring from a saved state

File:

• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (4 diffs)

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

@@ -1226 +1226 @@
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
     bool f;
+    bool fIgnoreConnectFailure;
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
@@ -1275 +1276 @@
                               "QuietlyIgnoreTrunkWirePromisc\0"
                               "IgnoreTrunkHostPromisc\0"
+                              "IgnoreConnectFailure\0"
                               "QuietlyIgnoreTrunkHostPromisc\0"
                               "IsService\0"))
@@ -1436 +1438 @@
     /** @todo flags for not sending to the host and for setting the trunk-wire
      *        connection in promiscuous mode. */
+
+
+    /** @cfgm{IgnoreConnectFailure, boolean, false}
+     * When set only raise a runtime error if we cannot connect to the internal
+     * network. */
+    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreConnectFailure", &fIgnoreConnectFailure, false);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("Configuration error: Failed to get the \"IgnoreConnectFailure\" value"));
+    if (f)
+        OpenReq.fFlags |= INTNET_OPEN_FLAGS_IGNORE_PROMISC;
 
 
@@ -1539 +1552 @@
     if (RT_FAILURE(rc))
     {
-         PDMDrvHlpVMSetRuntimeError (pDrvIns, 0 /*fFlags*/, "HostIfNotConnecting",
-                                     N_ ("Cannot connect to the network interface '%s'. The virtual "
-                                         "network card will appear to work but the guest will not "
-                                         "be able to connect. Please choose a different network in the "
-                                         "network settings"), OpenReq.szTrunk);
-
-        return VERR_PDM_NO_ATTACHED_DRIVER;
+        if (fIgnoreConnectFailure)
+        {
+            /*
+             * During VM restore it is fatal if the network is not available because the
+             * VM settings are locked and the user has no chance to fix network settings.
+             * Therefore don't abort but just raise a runtime warning.
+             */
+            PDMDrvHlpVMSetRuntimeError (pDrvIns, 0 /*fFlags*/, "HostIfNotConnecting",
+                                        N_ ("Cannot connect to the network interface '%s'. The virtual "
+                                            "network card will appear to work but the guest will not "
+                                            "be able to connect. Please choose a different network in the "
+                                            "network settings"), OpenReq.szTrunk);
+
+            return VERR_PDM_NO_ATTACHED_DRIVER;
+        }
+        else
+        {
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Failed to open/create the internal network '%s'"), pThis->szNetwork);
+        }
     }