Changeset 49816 in vbox for trunk/src/VBox

Timestamp:

Dec 6, 2013 9:50:59 PM (11 years ago)

Author:

vboxsync

Message:

Try to fix solaris burn

File:

• trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp

@@ -317 +317 @@
                      * Create wakeup pipe.
                      */
-                    rc = RTPipeCreate(&pDevLnx->hPipeWakeupR, &pDevLnx->hPipeWakeupW, 0);
+                    rc = RTPipeCreate(&pDevSol->hPipeWakeupR, &pDevSol->hPipeWakeupW, 0);
                     if (RT_SUCCESS(rc))
                     {
@@ -382 +382 @@
                                 rc = VERR_OPEN_FAILED;
                         }
-                        RTPipeClose(pDevLnx->hPipeWakeupR);
-                        RTPipeClose(pDevLnx->hPipeWakeupW);
+                        RTPipeClose(pDevSol->hPipeWakeupR);
+                        RTPipeClose(pDevSol->hPipeWakeupW);
                     }
 
@@ -446 +446 @@
     }
 
-    RTPipeClose(pDevLnx->hPipeWakeupR);
-    RTPipeClose(pDevLnx->hPipeWakeupW);
+    RTPipeClose(pDevSol->hPipeWakeupR);
+    RTPipeClose(pDevSol->hPipeWakeupW);
 
     RTStrFree(pDevSol->pszDevicePath);
@@ -727 +727 @@
             pfd[0].revents = 0;
 
-            pfd[1].fd = RTPipeToNative(pDevSol->hWakeupPipeR);
+            pfd[1].fd = RTPipeToNative(pDevSol->hPipeWakeupR);
             pfd[1].events = POLLIN;
             pfd[1].revents = 0;
 
-            int rc = poll(&pfd, 2, cMilliesWait);
+            int rc = poll(&pfd[0], 2, cMilliesWait);
             if (rc > 0)
             {
@@ -746 +746 @@
                     uint8_t bRead;
                     size_t cbIgnored = 0;
-                    RTPipeRead(pDevLnx->hPipeWakeupR, &bRead, 1, &cbIgnored);
+                    RTPipeRead(pDevSol->hPipeWakeupR, &bRead, 1, &cbIgnored);
 
                     /*