Changeset 34335 in vbox for trunk

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

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvIntNet.cpp (modified) (4 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (6 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)

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);
+        }
     }
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3874 +3874 @@
     AssertRelease(pInst);
 
-    rcRet = pThis->configNetwork(pszDevice, uInstance, uLun, aNetworkAdapter, pCfg, pLunL0, pInst, true);
+    rcRet = pThis->configNetwork(pszDevice, uInstance, uLun, aNetworkAdapter, pCfg, pLunL0, pInst,
+                                 true /*fAttachDetach*/, false /*fIgnoreConnectFailure*/);
 
     /*

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1674 +1674 @@
              * Configure the network card now
              */
+            bool fIgnoreConnectFailure = pConsole->mMachineState == MachineState_Restoring;
             rc = pConsole->configNetwork(pszAdapterName,
                                          ulInstance,
@@ -1681 +1682 @@
                                          pLunL0,
                                          pInst,
-                                         false /*fAttachDetach*/);
+                                         false /*fAttachDetach*/,
+                                         fIgnoreConnectFailure);
             if (RT_FAILURE(rc))
                 return rc;
@@ -3203 +3205 @@
  *                               be attached/detached after/before
  *                               configuration.
+ *  @param   fIgnoreConnectFailure
+ *                               True if connection failures should be ignored
+ *                               (makes only sense for bridged/host-only networks).
  *
  *  @note Locks this object for writing.
@@ -3213 +3218 @@
                            PCFGMNODE pLunL0,
                            PCFGMNODE pInst,
-                           bool fAttachDetach)
+                           bool fAttachDetach,
+                           bool fIgnoreConnectFailure)
 {
     AutoCaller autoCaller(this);
@@ -3734 +3740 @@
                 InsertConfigString(pCfg, "Trunk", pszTrunk);
                 InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt);
+                InsertConfigInteger(pCfg, "IgnoreConnectFailure", (uint64_t)fIgnoreConnectFailure);
                 char szNetwork[INTNET_MAX_NETWORK_NAME];
                 RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
@@ -4051 +4058 @@
                 InsertConfigString(pCfg, "Trunk", pszTrunk);
                 InsertConfigString(pCfg, "Network", szNetwork);
+                InsertConfigInteger(pCfg, "IgnoreConnectFailure", (uint64_t)fIgnoreConnectFailure);
                 networkName = Bstr(szNetwork);
                 trunkName   = Bstr(pszTrunk);

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -508 +508 @@
     int configNetwork(const char *pszDevice, unsigned uInstance, unsigned uLun,
                       INetworkAdapter *aNetworkAdapter, PCFGMNODE pCfg,
-                      PCFGMNODE pLunL0, PCFGMNODE pInst, bool fAttachDetach);
+                      PCFGMNODE pLunL0, PCFGMNODE pInst,
+                      bool fAttachDetach, bool fIgnoreConnectFailure);
 
     static DECLCALLBACK(int) configGuestProperties(void *pvConsole);