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

Timestamp:

Jul 27, 2008 7:57:55 PM (16 years ago)

Author:

vboxsync

Message:

Fix ioctl error on guest shutdown in the serial device

File:

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

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

@@ -780 +780 @@
     PDRVHOSTSERIAL pData = PDMINS2DATA(pDrvIns, PDRVHOSTSERIAL);
     int rc;
+    unsigned int uSerialLineFlags;
+    unsigned int uSerialLineStatus;
+    unsigned int uIoctl;
 
     /*
@@ -788 +791 @@
      * This should make the ioctl call return.
      */
-    rc = ioctl(pData->DeviceFile, TIOCMBIS, TIOCM_LOOP);
+
+    /* Get current status of control lines. */
+    rc = ioctl(pData->DeviceFile, TIOCMGET, &uSerialLineStatus);
     if (rc < 0)
         goto ioctl_error;
 
-    rc = ioctl(pData->DeviceFile, TIOCMBIS, TIOCM_RTS);
+    uSerialLineFlags = TIOCM_LOOP;
+    rc = ioctl(pData->DeviceFile, TIOCMBIS, &uSerialLineFlags);
+    if (rc < 0)
+        goto ioctl_error;
+
+    /* 
+     * Change current level on the RTS pin to make the ioctl call return in the
+     * monitor thread.
+     */
+    uIoctl = (uSerialLineStatus & TIOCM_CTS) ? TIOCMBIC : TIOCMBIS;
+    uSerialLineFlags = TIOCM_RTS;
+
+    rc = ioctl(pData->DeviceFile, uIoctl, &uSerialLineFlags);
+    if (rc < 0)
+        goto ioctl_error;
+
+    /* Change RTS back to the previous level. */
+    uIoctl = (uIoctl == TIOCMBIC) ? TIOCMBIS : TIOCMBIC;
+
+    rc = ioctl(pData->DeviceFile, uIoctl, &uSerialLineFlags);
     if (rc < 0)
         goto ioctl_error;
@@ -799 +823 @@
      * Set serial device into normal state.
      */
-    rc = ioctl(pData->DeviceFile, TIOCMBIC, TIOCM_LOOP);
+    uSerialLineFlags = TIOCM_LOOP;
+    rc = ioctl(pData->DeviceFile, TIOCMBIC, &uSerialLineFlags);
     if (rc >= 0)
         return VINF_SUCCESS;