Changeset 28827 in vbox for trunk/src

Timestamp:

Apr 27, 2010 1:55:04 PM (15 years ago)

Author:

vboxsync

Message:

Storage/iSCSI: Error handling fix when connecting to a target. Crashing isn't nice, even if the VM would fail to start anyway.

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -535 +535 @@
 
     rc = pImage->pInterfaceNetCallbacks->pfnClientConnect(pImage->pszHostname, pImage->uPort, &pImage->Socket);
-    if (RT_UNLIKELY(   RT_FAILURE(rc)
-                    && (   rc == VERR_NET_CONNECTION_REFUSED
-                        || rc == VERR_NET_CONNECTION_RESET
-                        || rc == VERR_NET_UNREACHABLE
-                        || rc == VERR_NET_HOST_UNREACHABLE
-                        || rc == VERR_NET_CONNECTION_TIMED_OUT)))
-    {
-        /* Standardize return value for no connection. */
-        return VERR_NET_CONNECTION_REFUSED;
+    if (RT_FAILURE(rc))
+    {
+        if (   rc == VERR_NET_CONNECTION_REFUSED
+            || rc == VERR_NET_CONNECTION_RESET
+            || rc == VERR_NET_UNREACHABLE
+            || rc == VERR_NET_HOST_UNREACHABLE
+            || rc == VERR_NET_CONNECTION_TIMED_OUT)
+        {
+            /* Standardize return value for no connection. */
+            rc = VERR_NET_CONNECTION_REFUSED;
+        }
+        return rc;
     }