Changeset 33728 in vbox

Timestamp:

Nov 3, 2010 2:05:37 PM (14 years ago)

Author:

vboxsync

Message:

Serial/DrvHostSerial: on Linux, try to open the serial device in non-blocking mode, fixes public ticket 5756

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -1360 +1360 @@
     }
 
-#else
-
-    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+#else /* !RT_OS_WINDOWS */
+
+    uint32_t fOpen = RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE;
+# ifdef RT_OS_LINUX
+    /* This seems to be necessary on some Linux hosts, otherwise we hang here forever.
+     * Surprisingly, I've never seen VERR_TRY_AGAIN as result even if RTFileOpen()
+     * would block without that flag. */
+    fOpen |= RTFILE_O_NON_BLOCK;
+# endif
+    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, fOpen);
+# ifdef RT_OS_LINUX
+    if (rc == VERR_INVALID_PARAMETER)
+        rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, fOpen & ~RTFILE_O_NON_BLOCK);
+# endif
 # ifdef RT_OS_DARWIN
     if (RT_SUCCESS(rc))
@@ -1369 +1380 @@
 
 
-#endif
+#endif /* !RT_OS_WINDOWS */
 
     if (RT_FAILURE(rc))