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

Timestamp:

Jun 22, 2011 7:30:06 PM (14 years ago)

Author:

vboxsync

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

Location:

trunk/src/VBox/Devices

Files:

• Network/DrvNAT.cpp (modified) (9 diffs)
• Network/DrvNetSniffer.cpp (modified) (8 diffs)
• Network/DrvTAP.cpp (modified) (18 diffs)
• Network/DrvVDE.cpp (modified) (13 diffs)
• Parallel/DrvHostParallel.cpp (modified) (18 diffs)
• Serial/DrvHostSerial.cpp (modified) (22 diffs)
• Serial/DrvRawFile.cpp (modified) (6 diffs)
• Storage/DrvHostBase.cpp (modified) (24 diffs)
• Storage/DrvHostBase.h (modified) (1 diff)
• Storage/DrvHostDVD.cpp (modified) (14 diffs)
• Storage/DrvHostFloppy.cpp (modified) (4 diffs)
• Storage/DrvMediaISO.cpp (modified) (7 diffs)
• Storage/DrvRawImage.cpp (modified) (13 diffs)
• Storage/DrvSCSIHost.cpp (modified) (5 diffs)
• USB/USBProxyDevice.h (modified) (1 diff)
• USB/freebsd/USBProxyDevice-freebsd.cpp (modified) (8 diffs)
• USB/linux/USBProxyDevice-linux.cpp (modified) (13 diffs)
• USB/solaris/USBProxyDevice-solaris.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 #include <VBox/vmm/pdmnetifs.h>
 #include <VBox/vmm/pdmnetinline.h>
+
 #include <iprt/assert.h>
+#include <iprt/critsect.h>
+#include <iprt/cidr.h>
 #include <iprt/file.h>
 #include <iprt/mem.h>
+#include <iprt/pipe.h>
 #include <iprt/string.h>
-#include <iprt/critsect.h>
-#include <iprt/cidr.h>
 #include <iprt/stream.h>
 #include <iprt/uuid.h>
@@ -163 +165 @@
 #ifndef RT_OS_WINDOWS
     /** The write end of the control pipe. */
-    RTFILE                  PipeWrite;
+    RTPIPE                  hPipeWrite;
     /** The read end of the control pipe. */
-    RTFILE                  PipeRead;
+    RTPIPE                  hPipeRead;
 #else
     /** for external notification */
@@ -569 +571 @@
 #ifndef RT_OS_WINDOWS
     /* kick poll() */
-    rc = RTFileWrite(pThis->PipeWrite, "", 1, NULL);
+    size_t cbIgnored;
+    rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
 #else
     /* kick WSAWaitForMultipleEvents */
@@ -744 +747 @@
         slirp_select_fill(pThis->pNATState, &nFDs, &polls[1]);
 
-        polls[0].fd = pThis->PipeRead;
+        polls[0].fd = RTPipeToNative(pThis->hPipeRead);
         /* POLLRDBAND usually doesn't used on Linux but seems used on Solaris */
-        polls[0].events = POLLRDNORM|POLLPRI|POLLRDBAND;
+        polls[0].events = POLLRDNORM | POLLPRI | POLLRDBAND;
         polls[0].revents = 0;
 
@@ -770 +773 @@
             if (polls[0].revents & (POLLRDNORM|POLLPRI|POLLRDBAND))
             {
-                /* drain the pipe */
-                char ch[1];
-                size_t cbRead;
-                int counter = 0;
-                /*
-                 * drvNATSend decoupled so we don't know how many times
+                /* drain the pipe
+                 *
+                 * Note! drvNATSend decoupled so we don't know how many times
                  * device's thread sends before we've entered multiplex,
                  * so to avoid false alarm drain pipe here to the very end
@@ -782 +782 @@
                  * deep pipe has been filed before drain.
                  *
-                 * XXX:Make it reading exactly we need to drain the pipe.
                  */
-                /** @todo use RTPipeCreate + RTPipeRead(,biggerbuffer) here, it's
-                 *        non-blocking. */
-                RTFileRead(pThis->PipeRead, &ch, 1, &cbRead);
+                /** @todo XXX: Make it reading exactly we need to drain the
+                 * pipe.*/
+                char ch;
+                size_t cbRead;
+                RTPipeRead(pThis->hPipeRead, &ch, 1, &cbRead);
             }
         }
@@ -1345 +1346 @@
              * Create the control pipe.
              */
-            int fds[2];
-            if (pipe(&fds[0]) != 0) /** @todo RTPipeCreate() or something... */
-            {
-                rc = RTErrConvertFromErrno(errno);
-                AssertRC(rc);
-                return rc;
-            }
-            pThis->PipeRead = fds[0];
-            pThis->PipeWrite = fds[1];
+            rc = RTPipeCreate(&pThis->hPipeRead, &pThis->hPipeWrite, 0 /*fFlags*/);
+            AssertRCReturn(rc, rc);
 #else
             pThis->hWakeupEvent = CreateEvent(NULL, FALSE, FALSE, NULL); /* auto-reset event */
@@ -1362 +1356 @@
             rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pSlirpThread, pThis, drvNATAsyncIoThread,
                                        drvNATAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "NAT");
-            AssertRC(rc);
+            AssertRCReturn(rc, rc);
 
 #ifdef VBOX_WITH_SLIRP_MT
             rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pGuestThread, pThis, drvNATAsyncIoGuest,
                                        drvNATAsyncIoGuestWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATGUEST");
-            AssertRC(rc);
+            AssertRCReturn(rc, rc);
 #endif
 

trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

@@ -66 +66 @@
     char                    szFilename[RTPATH_MAX];
     /** The filehandle. */
-    RTFILE                  File;
+    RTFILE                  hFile;
     /** The lock serializing the file access. */
     RTCRITSECT              Lock;
@@ -134 +134 @@
     RTCritSectEnter(&pThis->Lock);
     if (!pSgBuf->pvUser)
-        PcapFileFrame(pThis->File, pThis->StartNanoTS,
+        PcapFileFrame(pThis->hFile, pThis->StartNanoTS,
                       pSgBuf->aSegs[0].pvSeg,
                       pSgBuf->cbUsed,
                       RT_MIN(pSgBuf->cbUsed, pSgBuf->aSegs[0].cbSeg));
     else
-        PcapFileGsoFrame(pThis->File, pThis->StartNanoTS, (PCPDMNETWORKGSO)pSgBuf->pvUser,
+        PcapFileGsoFrame(pThis->hFile, pThis->StartNanoTS, (PCPDMNETWORKGSO)pSgBuf->pvUser,
                          pSgBuf->aSegs[0].pvSeg,
                          pSgBuf->cbUsed,
@@ -206 +206 @@
     /* output to sniffer */
     RTCritSectEnter(&pThis->Lock);
-    PcapFileFrame(pThis->File, pThis->StartNanoTS, pvBuf, cb, cb);
+    PcapFileFrame(pThis->hFile, pThis->StartNanoTS, pvBuf, cb, cb);
     RTCritSectLeave(&pThis->Lock);
 
@@ -217 +217 @@
     Hdr.ts_usec = (uint32_t)((u64TS / 1000) % 1000000);
     Hdr.incl_len = 0;
-    RTFileWrite(pThis->File, &Hdr, sizeof(Hdr), NULL);
+    RTFileWrite(pThis->hFile, &Hdr, sizeof(Hdr), NULL);
     RTCritSectLeave(&pThis->Lock);
 #endif
@@ -358 +358 @@
         RTCritSectDelete(&pThis->XmitLock);
 
-    if (pThis->File != NIL_RTFILE)
-    {
-        RTFileClose(pThis->File);
-        pThis->File = NIL_RTFILE;
-    }
+    RTFileClose(pThis->hFile);
+    pThis->hFile = NIL_RTFILE;
 }
 
@@ -380 +377 @@
      */
     pThis->pDrvIns                                  = pDrvIns;
-    pThis->File                                     = NIL_RTFILE;
+    pThis->hFile                                    = NIL_RTFILE;
     /* The pcap file *must* start at time offset 0,0. */
     pThis->StartNanoTS                              = RTTimeNanoTS() - RTTimeProgramNanoTS();
@@ -483 +480 @@
      * Open output file / pipe.
      */
-    rc = RTFileOpen(&pThis->File, pThis->szFilename,
+    rc = RTFileOpen(&pThis->hFile, pThis->szFilename,
                     RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE);
     if (RT_FAILURE(rc))
@@ -494 +491 @@
      * current time again.
      */
-    PcapFileHdr(pThis->File, RTTimeNanoTS());
+    PcapFileHdr(pThis->hFile, RTTimeNanoTS());
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -31 +31 @@
 #include <iprt/mem.h>
 #include <iprt/path.h>
+#include <iprt/pipe.h>
 #include <iprt/semaphore.h>
 #include <iprt/string.h>
@@ -93 +94 @@
     PPDMDRVINS              pDrvIns;
     /** TAP device file handle. */
-    RTFILE                  FileDevice;
+    RTFILE                  hFileDevice;
     /** The configured TAP device name. */
     char                   *pszDeviceName;
@@ -104 +105 @@
 # else
     /** IP device file handle (/dev/udp). */
-    RTFILE                  IPFileDevice;
+    int                     iIPFileDes;
 # endif
     /** Whether device name is obtained from setup application. */
@@ -114 +115 @@
     char                   *pszTerminateApplication;
     /** The write end of the control pipe. */
-    RTFILE                  PipeWrite;
+    RTPIPE                  hPipeWrite;
     /** The read end of the control pipe. */
-    RTFILE                  PipeRead;
+    RTPIPE                  hPipeRead;
     /** Reader thread. */
     PPDMTHREAD              pThread;
@@ -275 +276 @@
               pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed, pSgBuf->cbUsed, pSgBuf->aSegs[0].pvSeg));
 
-        rc = RTFileWrite(pThis->FileDevice, pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed, NULL);
+        rc = RTFileWrite(pThis->hFileDevice, pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed, NULL);
     }
     else
@@ -289 +290 @@
             void *pvSegFrame = PDMNetGsoCarveSegmentQD(pGso, (uint8_t *)pbFrame, pSgBuf->cbUsed, abHdrScratch,
                                                        iSeg, cSegs, &cbSegFrame);
-            rc = RTFileWrite(pThis->FileDevice, pvSegFrame, cbSegFrame, NULL);
+            rc = RTFileWrite(pThis->hFileDevice, pvSegFrame, cbSegFrame, NULL);
             if (RT_FAILURE(rc))
                 break;
@@ -366 +367 @@
          */
         struct pollfd aFDs[2];
-        aFDs[0].fd      = pThis->FileDevice;
+        aFDs[0].fd      = RTFileToNative(pThis->hFileDevice);
         aFDs[0].events  = POLLIN | POLLPRI;
         aFDs[0].revents = 0;
-        aFDs[1].fd      = pThis->PipeRead;
+        aFDs[1].fd      = RTPipeToNative(pThis->hPipeRead);
         aFDs[1].events  = POLLIN | POLLPRI | POLLERR | POLLHUP;
         aFDs[1].revents = 0;
@@ -398 +399 @@
              *        after poll() returned successfully. I don't know why but a second
              *        RTFileRead() operation will return with VERR_TRY_AGAIN in any case. */
-            rc = RTFileRead(pThis->FileDevice, achBuf, sizeof(achBuf), &cbRead);
+            rc = RTFileRead(pThis->hFileDevice, achBuf, sizeof(achBuf), &cbRead);
 #endif
             if (RT_SUCCESS(rc))
@@ -459 +460 @@
             char ch;
             size_t cbRead;
-            RTFileRead(pThis->PipeRead, &ch, 1, &cbRead);
+            RTPipeRead(pThis->hPipeRead, &ch, 1, &cbRead);
         }
         else
@@ -495 +496 @@
     PDRVTAP pThis = PDMINS_2_DATA(pDrvIns, PDRVTAP);
 
-    int rc = RTFileWrite(pThis->PipeWrite, "", 1, NULL);
+    size_t cbIgnored;
+    int rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
     AssertRC(rc);
 
@@ -657 +659 @@
                         if (rc == DLPI_SUCCESS)
                         {
-                            pThis->FileDevice = g_pfnLibDlpiFd(pThis->pDeviceHandle);
+                            int fd = g_pfnLibDlpiFd(pThis->pDeviceHandle);
                             if (pThis->FileDevice >= 0)
                             {
-                                Log(("SolarisOpenVNIC: %s -> %d\n", pThis->pszDeviceName, pThis->FileDevice));
-                                return VINF_SUCCESS;
+                                rc = RTFileFromNative(&pThis->hFileDevice, fd);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    Log(("SolarisOpenVNIC: %s -> %RTfile\n", pThis->pszDeviceName, pThis->hFileDevice));
+                                    return VINF_SUCCESS;
+                                }
                             }
-
-                            rc = PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
-                                                     N_("Failed to obtain file descriptor for VNIC"));
+                            else
+                                rc = PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
+                                                         N_("Failed to obtain file descriptor for VNIC"));
                         }
                         else
@@ -879 +885 @@
     }
 
-    pThis->FileDevice = (RTFILE)TapFileDes;
-    pThis->IPFileDevice = (RTFILE)IPFileDes;
+    int rc = RTFileFromNative(&pThis->hFileDevice, TapFileDes);
+    AssertLogRelRC(rc);
+    if (RT_FAILURE(rc)))
+    {
+        close(IPFileDes);
+        close(TapFileDes);
+    }
+    pThis->iIPFileDes = IPFileDes;
 
     return VINF_SUCCESS;
@@ -922 +934 @@
      * Terminate the control pipe.
      */
-    if (pThis->PipeWrite != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->PipeWrite);
-        AssertRC(rc);
-        pThis->PipeWrite = NIL_RTFILE;
-    }
-    if (pThis->PipeRead != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->PipeRead);
-        AssertRC(rc);
-        pThis->PipeRead = NIL_RTFILE;
-    }
+    int rc;
+    rc = RTPipeClose(pThis->hPipeWrite); AssertRC(rc);
+    pThis->hPipeWrite = NIL_RTPIPE;
+    rc = RTPipeClose(pThis->hPipeRead); AssertRC(rc);
+    pThis->hPipeRead = NIL_RTPIPE;
 
 #ifdef RT_OS_SOLARIS
     /** @todo r=bird: This *does* need checking against ConsoleImpl2.cpp if used on non-solaris systems. */
-    if (pThis->FileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->FileDevice);
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
         AssertRC(rc);
-        pThis->FileDevice = NIL_RTFILE;
+        pThis->hFileDevice = NIL_RTFILE;
     }
 
 # ifndef VBOX_WITH_CROSSBOW
-    if (pThis->IPFileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->IPFileDevice);
-        AssertRC(rc);
-        pThis->IPFileDevice = NIL_RTFILE;
+    if (pThis->iIPFileDes != -1)
+    {
+        close(pThis->iIPFileDes);
+        pThis->iIPFileDes = -1;
     }
 # endif
@@ -1007 +1011 @@
      */
     pThis->pDrvIns                      = pDrvIns;
-    pThis->FileDevice                   = NIL_RTFILE;
+    pThis->hFileDevice                  = NIL_RTFILE;
     pThis->pszDeviceName                = NULL;
 #ifdef RT_OS_SOLARIS
@@ -1013 +1017 @@
     pThis->pDeviceHandle                = NULL;
 # else
-    pThis->IPFileDevice                 = NIL_RTFILE;
+    pThis->iIPFileDes                   = -1;
 # endif
     pThis->fStatic                      = true;
@@ -1126 +1130 @@
 #else /* !RT_OS_SOLARIS */
 
-    int32_t iFile;
-    rc = CFGMR3QueryS32(pCfg, "FileHandle", &iFile);
+    uint64_t u64File;
+    rc = CFGMR3QueryU64(pCfg, "FileHandle", &u64File);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                                 N_("Configuration error: Query for \"FileHandle\" 32-bit signed integer failed"));
-    pThis->FileDevice = (RTFILE)iFile;
-    if (!RTFileIsValid(pThis->FileDevice))
+    pThis->hFileDevice = (RTFILE)(uintptr_t)u64File;
+    if (!RTFileIsValid(pThis->hFileDevice))
         return PDMDrvHlpVMSetError(pDrvIns, VERR_INVALID_HANDLE, RT_SRC_POS,
-                                   N_("The TAP file handle %RTfile is not valid"), pThis->FileDevice);
+                                   N_("The TAP file handle %RTfile is not valid"), pThis->hFileDevice);
 #endif /* !RT_OS_SOLARIS */
 
@@ -1149 +1153 @@
      * found any way to do that.
      */
-    if (fcntl(pThis->FileDevice, F_SETFL, O_NONBLOCK) == -1)
+    if (fcntl(RTFileToNative(pThis->hFileDevice), F_SETFL, O_NONBLOCK) == -1)
         return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_IOCTL, RT_SRC_POS,
                                    N_("Configuration error: Failed to configure /dev/net/tun. errno=%d"), errno);
     /** @todo determine device name. This can be done by reading the link /proc/<pid>/fd/<fd> */
-    Log(("drvTAPContruct: %d (from fd)\n", pThis->FileDevice));
+    Log(("drvTAPContruct: %d (from fd)\n", pThis->hFileDevice));
     rc = VINF_SUCCESS;
 
@@ -1159 +1163 @@
      * Create the control pipe.
      */
-    int fds[2];
-#ifdef RT_OS_L4
-    /* XXX We need to tell the library which interface we are using */
-    fds[0] = vboxrtLinuxFd2VBoxFd(VBOXRT_FT_TAP, 0);
-#endif
-    if (pipe(&fds[0]) != 0) /** @todo RTPipeCreate() or something... */
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertRC(rc);
-        return rc;
-    }
-    pThis->PipeRead = fds[0];
-    pThis->PipeWrite = fds[1];
+    rc = RTPipeCreate(&pThis->hPipeRead, &pThis->hPipeWrite, 0 /*fFlags*/);
+    AssertRCReturn(rc, rc);
 
     /*

trunk/src/VBox/Devices/Network/DrvVDE.cpp

@@ -34 +34 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/pipe.h>
 #include <iprt/semaphore.h>
 #include <iprt/string.h>
@@ -64 +65 @@
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
-    /** VDE device file handle. */
-    RTFILE                  FileDevice;
     /** The configured VDE device name. */
     char                   *pszDeviceName;
     /** The write end of the control pipe. */
-    RTFILE                  PipeWrite;
+    RTPIPE                  hPipeWrite;
     /** The read end of the control pipe. */
-    RTFILE                  PipeRead;
+    RTPIPE                  hPipeRead;
     /** Reader thread. */
     PPDMTHREAD              pThread;
     /** The connection to the VDE switch */
-    VDECONN                *vdeconn;
+    VDECONN                *pVdeConn;
 
     /** @todo The transmit thread. */
@@ -225 +224 @@
 
         ssize_t cbSent;
-        cbSent = vde_send(pThis->vdeconn, pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed, 0);
+        cbSent = vde_send(pThis->pVdeConn, pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed, 0);
         rc = cbSent < 0 ? RTErrConvertFromErrno(-cbSent) : VINF_SUCCESS;
     }
@@ -241 +240 @@
                                                        iSeg, cSegs, &cbSegFrame);
             ssize_t cbSent;
-            cbSent = vde_send(pThis->vdeconn, pvSegFrame, cbSegFrame, 0);
+            cbSent = vde_send(pThis->pVdeConn, pvSegFrame, cbSegFrame, 0);
             rc = cbSent < 0 ? RTErrConvertFromErrno(-cbSent) : VINF_SUCCESS;
             if (RT_FAILURE(rc))
@@ -319 +318 @@
          */
         struct pollfd aFDs[2];
-        aFDs[0].fd      = vde_datafd(pThis->vdeconn);
+        aFDs[0].fd      = vde_datafd(pThis->pVdeConn);
         aFDs[0].events  = POLLIN | POLLPRI;
         aFDs[0].revents = 0;
-        aFDs[1].fd      = pThis->PipeRead;
+        aFDs[1].fd      = RTPipeToNative(pThis->hPipeRead);
         aFDs[1].events  = POLLIN | POLLPRI | POLLERR | POLLHUP;
         aFDs[1].revents = 0;
@@ -343 +342 @@
             char achBuf[16384];
             ssize_t cbRead = 0;
-            cbRead = vde_recv(pThis->vdeconn, achBuf, sizeof(achBuf), 0);
+            cbRead = vde_recv(pThis->pVdeConn, achBuf, sizeof(achBuf), 0);
             rc = cbRead < 0 ? RTErrConvertFromErrno(-cbRead) : VINF_SUCCESS;
             if (RT_SUCCESS(rc))
@@ -404 +403 @@
             char ch;
             size_t cbRead;
-            RTFileRead(pThis->PipeRead, &ch, 1, &cbRead);
+            RTPipeRead(pThis->hPipeRead, &ch, 1, &cbRead);
         }
         else
@@ -440 +439 @@
     PDRVVDE pThis = PDMINS_2_DATA(pDrvIns, PDRVVDE);
 
-    int rc = RTFileWrite(pThis->PipeWrite, "", 1, NULL);
+    size_t cbIgnored;
+    int rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
     AssertRC(rc);
 
@@ -481 +481 @@
      * Terminate the control pipe.
      */
-    if (pThis->PipeWrite != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->PipeWrite);
-        AssertRC(rc);
-        pThis->PipeWrite = NIL_RTFILE;
-    }
-    if (pThis->PipeRead != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->PipeRead);
-        AssertRC(rc);
-        pThis->PipeRead = NIL_RTFILE;
-    }
+    RTPipeClose(pThis->hPipeWrite);
+    pThis->hPipeWrite = NIL_RTPIPE;
+    RTPipeClose(pThis->hPipeRead);
+    pThis->hPipeRead = NIL_RTPIPE;
 
     MMR3HeapFree(pThis->pszDeviceName);
@@ -502 +494 @@
         RTCritSectDelete(&pThis->XmitLock);
 
-    vde_close(pThis->vdeconn);
+    vde_close(pThis->pVdeConn);
+    pThis->pVdeConn = NULL;
+
 #ifdef VBOX_WITH_STATISTICS
     /*
@@ -530 +524 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                      = pDrvIns;
-    pThis->FileDevice                   = NIL_RTFILE;
-    pThis->pszDeviceName                = NULL;
-    pThis->PipeRead                     = NIL_RTFILE;
-    pThis->PipeWrite                    = NIL_RTFILE;
+    pThis->pDrvIns                              = pDrvIns;
+    pThis->pszDeviceName                        = NULL;
+    pThis->hPipeRead                            = NIL_RTPIPE;
+    pThis->hPipeWrite                           = NIL_RTPIPE;
 
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface    = drvVDEQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface            = drvVDEQueryInterface;
     /* INetwork */
     pThis->INetworkUp.pfnBeginXmit              = drvVDENetworkUp_BeginXmit;
@@ -592 +585 @@
         return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_HIF_OPEN_FAILED, RT_SRC_POS,
                                    N_("VDEplug library: not found"));
-    pThis->vdeconn = vde_open(szNetwork, "VirtualBOX", NULL);
-    if (pThis->vdeconn == NULL)
+    pThis->pVdeConn = vde_open(szNetwork, "VirtualBOX", NULL);
+    if (pThis->pVdeConn == NULL)
         return PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_PDM_HIF_OPEN_FAILED, RT_SRC_POS,
                                    N_("Failed to connect to the VDE SWITCH"));
@@ -606 +599 @@
      * Create the control pipe.
      */
-    int fds[2];
-    if (pipe(&fds[0]) != 0) /** @todo RTPipeCreate() or something... */
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertRC(rc);
-        return rc;
-    }
-    pThis->PipeRead = fds[0];
-    pThis->PipeWrite = fds[1];
+    rc = RTPipeCreate(&pThis->hPipeRead, &pThis->hPipeWrite, 0 /*fFlags*/);
+    AssertRCReturn(rc, rc);
 
     /*

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -27 +27 @@
 #include <iprt/assert.h>
 #include <iprt/file.h>
+#include <iprt/pipe.h>
 #include <iprt/semaphore.h>
 #include <iprt/stream.h>
@@ -64 +65 @@
     char                         *pszDevicePath;
     /** Device Handle */
-    RTFILE                        FileDevice;
+    RTFILE                        hFileDevice;
     /** Thread waiting for interrupts. */
     PPDMTHREAD                    pMonitorThread;
     /** Wakeup pipe read end. */
-    RTFILE                        WakeupPipeR;
+    RTPIPE                        hWakeupPipeR;
     /** Wakeup pipe write end. */
-    RTFILE                        WakeupPipeW;
+    RTPIPE                        hWakeupPipeW;
 } DRVHOSTPARALLEL, *PDRVHOSTPARALLEL;
 
@@ -102 +103 @@
     LogFlow(("%s: pvBuf=%#p cbWrite=%d\n", __FUNCTION__, pvBuf, *cbWrite));
 
-    ioctl(pThis->FileDevice, PPWDATA, pBuffer);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPWDATA, pBuffer);
     *cbWrite = 1;
 
@@ -115 +116 @@
     LogFlow(("%s: pvBuf=%#p cbRead=%d\n", __FUNCTION__, pvBuf, cbRead));
 
-    ioctl(pThis->FileDevice, PPRDATA, pBuffer);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRDATA, pBuffer);
     *cbRead = 1;
 
@@ -140 +141 @@
     }
 
-    ioctl(pThis->FileDevice, PPSETMODE, &ppdev_mode);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPSETMODE, &ppdev_mode);
 
     return VINF_SUCCESS;
@@ -150 +151 @@
 
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
-    ioctl(pThis->FileDevice, PPWCONTROL, &fReg);
+    ioctl(RTFileToNative(pThis->hFileDevice), PPWCONTROL, &fReg);
 
     return VINF_SUCCESS;
@@ -159 +159 @@
 {
     PDRVHOSTPARALLEL pThis = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t fReg;
-
-    ioctl(pThis->FileDevice, PPRCONTROL, &fReg);
-
+
+    uint8_t fReg = 0;
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRCONTROL, &fReg);
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
     *pfReg = fReg;
 
@@ -173 +171 @@
 {
     PDRVHOSTPARALLEL pThis = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t fReg;
-
-    ioctl(pThis->FileDevice, PPRSTATUS, &fReg);
-
+
+    uint8_t fReg = 0;
+    ioctl(RTFileToNative(pThis->hFileDevice), PPRSTATUS, &fReg);
     LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
-
     *pfReg = fReg;
 
@@ -196 +192 @@
         int rc;
 
-        aFDs[0].fd      = pThis->FileDevice;
+        aFDs[0].fd      = RTFileToNative(pThis->hFileDevice);
         aFDs[0].events  = POLLIN;
         aFDs[0].revents = 0;
-        aFDs[1].fd      = pThis->WakeupPipeR;
+        aFDs[1].fd      = RTPipeToNative(pThis->hWakeupPipeR);
         aFDs[1].events  = POLLIN | POLLERR | POLLHUP;
         aFDs[1].revents = 0;
@@ -218 +214 @@
             char ch;
             size_t cbRead;
-            RTFileRead(pThis->WakeupPipeR, &ch, 1, &cbRead);
+            RTPipeRead(pThis->hWakeupPipeR, &ch, 1, &cbRead);
             continue;
         }
@@ -240 +236 @@
 {
     PDRVHOSTPARALLEL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-
-    return RTFileWrite(pThis->WakeupPipeW, "", 1, NULL);
+    size_t cbIgnored;
+    return RTPipeWrite(pThis->hWakeupPipeW, "", 1, &cbIgnored);
 }
 
@@ -257 +253 @@
     LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-
-    ioctl(pThis->FileDevice, PPRELEASE);
-
-    if (pThis->WakeupPipeW != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeW);
-        AssertRC(rc);
-        pThis->WakeupPipeW = NIL_RTFILE;
-    }
-    if (pThis->WakeupPipeR != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeR);
-        AssertRC(rc);
-        pThis->WakeupPipeR = NIL_RTFILE;
-    }
-    if (pThis->FileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->FileDevice);
-        AssertRC(rc);
-        pThis->FileDevice = NIL_RTFILE;
-    }
+    int rc;
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+        ioctl(RTFileToNative(pThis->hFileDevice), PPRELEASE);
+
+    rc = RTPipeClose(pThis->hWakeupPipeW); AssertRC(rc);
+    pThis->hWakeupPipeW = NIL_RTPIPE;
+
+    rc = RTPipeClose(pThis->hWakeupPipeR); AssertRC(rc);
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+
+    rc = RTFileClose(pThis->hFileDevice); AssertRC(rc);
+    pThis->hFileDevice = NIL_RTFILE;
+
     if (pThis->pszDevicePath)
     {
@@ -297 +286 @@
 
     /*
-     * Validate the config.
-     */
-    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
-                                N_("Unknown host parallel configuration option, only supports DevicePath"));
-
-    /*
      * Init basic data members and interfaces.
-     */
+     *
+     * Must be done before returning any failure because we've got a destructor.
+     */
+    pThis->hFileDevice  = NIL_RTFILE;
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+    pThis->hWakeupPipeW = NIL_RTPIPE;
 
     /* IBase. */
@@ -318 +305 @@
 
     /*
+     * Validate the config.
+     */
+    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                N_("Unknown host parallel configuration option, only supports DevicePath"));
+
+    /*
      * Query configuration.
      */
@@ -331 +325 @@
      * Open the device
      */
-    rc = RTFileOpen(&pThis->FileDevice, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    rc = RTFileOpen(&pThis->hFileDevice, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"),
@@ -339 +333 @@
      * Try to get exclusive access to parallel port
      */
-    rc = ioctl(pThis->FileDevice, PPEXCL);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), PPEXCL);
     if (rc < 0)
         return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
@@ -349 +343 @@
      * Claim the parallel port
      */
-    rc = ioctl(pThis->FileDevice, PPCLAIM);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), PPCLAIM);
     if (rc < 0)
         return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS,
@@ -367 +361 @@
      * Create wakeup pipe.
      */
-    int aFDs[2];
-    if (pipe(aFDs) != 0)
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertRC(rc);
-        return rc;
-    }
-    pThis->WakeupPipeR = aFDs[0];
-    pThis->WakeupPipeW = aFDs[1];
+    rc = RTPipeCreate(&pThis->hWakeupPipeR, &pThis->hWakeupPipeR, 0 /*fFlags*/);
+    AssertRCReturn(rc, rc);
 
     /*

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

@@ -30 +30 @@
 #include <iprt/file.h>
 #include <iprt/mem.h>
+#include <iprt/pipe.h>
 #include <iprt/semaphore.h>
 #include <iprt/uuid.h>
@@ -103 +104 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     /** the device handle */
-    RTFILE                      DeviceFile;
+    RTFILE                      hDeviceFile;
 # ifdef RT_OS_DARWIN
     /** The device handle used for reading.
      * Used to prevent the read select from blocking the writes. */
-    RTFILE                      DeviceFileR;
+    RTFILE                      hDeviceFileR;
 # endif
     /** The read end of the control pipe */
-    RTFILE                      WakeupPipeR;
+    RTPIPE                      hWakeupPipeR;
     /** The write end of the control pipe */
-    RTFILE                      WakeupPipeW;
+    RTPIPE                      hWakeupPipeW;
 # ifndef RT_OS_LINUX
     /** The current line status.
@@ -265 +266 @@
 #ifdef RT_OS_LINUX
             struct serial_struct serialStruct;
-            if (ioctl(pThis->DeviceFile, TIOCGSERIAL, &serialStruct) != -1)
+            if (ioctl(RTFileToNative(pThis->hDeviceFile), TIOCGSERIAL, &serialStruct) != -1)
             {
                 serialStruct.custom_divisor = serialStruct.baud_base / Bps;
@@ -272 +273 @@
                 serialStruct.flags &= ~ASYNC_SPD_MASK;
                 serialStruct.flags |= ASYNC_SPD_CUST;
-                ioctl(pThis->DeviceFile, TIOCSSERIAL, &serialStruct);
+                ioctl(RTFileToNative(pThis->hDeviceFile), TIOCSSERIAL, &serialStruct);
                 baud_rate = B38400;
             }
@@ -328 +329 @@
     termiosSetup->c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL | ECHOK | ISIG | IEXTEN);
 
-    tcsetattr(pThis->DeviceFile, TCSANOW, termiosSetup);
+    tcsetattr(RTFileToNative(pThis->hDeviceFile), TCSANOW, termiosSetup);
     RTMemTmpFree(termiosSetup);
 
@@ -486 +487 @@
 
             size_t cbWritten;
-            rc = RTFileWrite(pThis->DeviceFile, &ch, 1, &cbWritten);
+            rc = RTFileWrite(pThis->hDeviceFile, &ch, 1, &cbWritten);
             if (rc == VERR_TRY_AGAIN)
                 cbWritten = 0;
@@ -498 +499 @@
                     fd_set WrSet;
                     FD_ZERO(&WrSet);
-                    FD_SET(pThis->DeviceFile, &WrSet);
+                    FD_SET(RTFileToNative(pThis->hDeviceFile), &WrSet);
                     fd_set XcptSet;
                     FD_ZERO(&XcptSet);
-                    FD_SET(pThis->DeviceFile, &XcptSet);
+                    FD_SET(RTFileToNative(pThis->hDeviceFile), &XcptSet);
 # ifdef DEBUG
                     uint64_t u64Now = RTTimeMilliTS();
 # endif
-                    rc = select(pThis->DeviceFile + 1, NULL, &WrSet, &XcptSet, NULL);
+                    rc = select(RTFileToNative(pThis->hDeviceFile) + 1, NULL, &WrSet, &XcptSet, NULL);
                     /** @todo check rc? */
 
@@ -512 +513 @@
 # endif
                     /* try write more */
-                    rc = RTFileWrite(pThis->DeviceFile, &ch, 1, &cbWritten);
+                    rc = RTFileWrite(pThis->hDeviceFile, &ch, 1, &cbWritten);
                     if (rc == VERR_TRY_AGAIN)
                         cbWritten = 0;
@@ -627 +628 @@
             fd_set RdSet;
             FD_ZERO(&RdSet);
-            FD_SET(pThis->DeviceFileR, &RdSet);
-            FD_SET(pThis->WakeupPipeR, &RdSet);
+            FD_SET(RTFileToNative(pThis->hDeviceFileR), &RdSet);
+            FD_SET(RTPipeToNative(pThis->hWakeupPipeR), &RdSet);
             fd_set XcptSet;
             FD_ZERO(&XcptSet);
-            FD_SET(pThis->DeviceFileR, &XcptSet);
-            FD_SET(pThis->WakeupPipeR, &XcptSet);
+            FD_SET(RTFileToNative(pThis->hDeviceFile), &XcptSet);
+            FD_SET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet);
 # if 1 /* it seems like this select is blocking the write... */
-            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFileR) + 1, &RdSet, NULL, &XcptSet, NULL);
+            rc = select(RT_MAX(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1,
+                        &RdSet, NULL, &XcptSet, NULL);
 # else
             struct timeval tv = { 0, 1000 };
-            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFileR) + 1, &RdSet, NULL, &XcptSet, &tv);
+            rc = select(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1,
+                        &RdSet, NULL, &XcptSet, &tv);
 # endif
             if (rc == -1)
@@ -655 +658 @@
             /* drain the wakeup pipe */
             size_t cbRead;
-            if (   FD_ISSET(pThis->WakeupPipeR, &RdSet)
-                || FD_ISSET(pThis->WakeupPipeR, &XcptSet))
-            {
-                rc = RTFileRead(pThis->WakeupPipeR, abBuffer, 1, &cbRead);
+            if (   FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &RdSet)
+                || FD_ISSET(pThis->hWakeupPipeR, &XcptSet))
+            {
+                rc = RTPipeRead(pThis->hWakeupPipeR, abBuffer, 1, &cbRead);
                 if (RT_FAILURE(rc))
                 {
@@ -669 +672 @@
 
             /* read data from the serial port. */
-            rc = RTFileRead(pThis->DeviceFileR, abBuffer, sizeof(abBuffer), &cbRead);
+            rc = RTFileRead(pThis->hDeviceFileR, abBuffer, sizeof(abBuffer), &cbRead);
             if (RT_FAILURE(rc))
             {
@@ -682 +685 @@
             size_t cbRead;
             struct pollfd aFDs[2];
-            aFDs[0].fd      = pThis->DeviceFile;
+            aFDs[0].fd      = RTFileToNative(pThis->hDeviceFile);
             aFDs[0].events  = POLLIN;
             aFDs[0].revents = 0;
-            aFDs[1].fd      = pThis->WakeupPipeR;
+            aFDs[1].fd      = RTPipeToNative(pThis->hWakeupPipeR);
             aFDs[1].events  = POLLIN | POLLERR | POLLHUP;
             aFDs[1].revents = 0;
@@ -704 +707 @@
                     break;
                 /* notification to terminate -- drain the pipe */
-                RTFileRead(pThis->WakeupPipeR, &abBuffer, 1, &cbRead);
+                RTPipeRead(pThis->hWakeupPipeR, &abBuffer, 1, &cbRead);
                 continue;
             }
-            rc = RTFileRead(pThis->DeviceFile, abBuffer, sizeof(abBuffer), &cbRead);
+            rc = RTFileRead(pThis->hDeviceFile, abBuffer, sizeof(abBuffer), &cbRead);
             if (RT_FAILURE(rc))
             {
@@ -844 +847 @@
     PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
-    return RTFileWrite(pThis->WakeupPipeW, "", 1, NULL);
+    size_t cbIgnored;
+    return RTPipeWrite(pThis->hWakeupPipeW, "", 1, &cbIgnored);
+
 #elif defined(RT_OS_WINDOWS)
     if (!SetEvent(pThis->hHaltEventSem))
@@ -883 +888 @@
          * Get the status line state.
          */
-        rc = ioctl(pThis->DeviceFile, TIOCMGET, &statusLines);
+        rc = ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMGET, &statusLines);
         if (rc < 0)
         {
@@ -916 +921 @@
          * is to send a signal after each tcsetattr.
          */
-        ioctl(pThis->DeviceFile, TIOCMIWAIT, uStatusLinesToCheck);
+        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMIWAIT, uStatusLinesToCheck);
 # else
         /* Poll for status line change. */
@@ -989 +994 @@
 
     if (modemStateSet)
-        ioctl(pThis->DeviceFile, TIOCMBIS, &modemStateSet);
+        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMBIS, &modemStateSet);
 
     if (modemStateClear)
-        ioctl(pThis->DeviceFile, TIOCMBIC, &modemStateClear);
+        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMBIC, &modemStateClear);
 
 #elif defined(RT_OS_WINDOWS)
@@ -1024 +1029 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     if (fBreak)
-        ioctl(pThis->DeviceFile, TIOCSBRK);
+        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCSBRK);
     else
-        ioctl(pThis->DeviceFile, TIOCCBRK);
+        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCCBRK);
 
 #elif defined(RT_OS_WINDOWS)
@@ -1058 +1063 @@
     pThis->SendSem = NIL_RTSEMEVENT;
 
+    int rc;
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
 
-    if (pThis->WakeupPipeW != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeW);
-        AssertRC(rc);
-        pThis->WakeupPipeW = NIL_RTFILE;
-    }
-    if (pThis->WakeupPipeR != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->WakeupPipeR);
-        AssertRC(rc);
-        pThis->WakeupPipeR = NIL_RTFILE;
-    }
+    rc = RTPipeClose(pThis->hWakeupPipeW); AssertRC(rc);
+    pThis->hWakeupPipeW = NIL_RTPIPE;
+    rc = RTPipeClose(pThis->hWakeupPipeR); AssertRC(rc);
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+
 # if defined(RT_OS_DARWIN)
-    if (pThis->DeviceFileR != NIL_RTFILE)
-    {
-        if (pThis->DeviceFileR != pThis->DeviceFile)
+    if (pThis->hDeviceFileR != NIL_RTFILE)
+    {
+        if (pThis->hDeviceFileR != pThis->hDeviceFile)
         {
-            int rc = RTFileClose(pThis->DeviceFileR);
+            rc = RTFileClose(pThis->hDeviceFileR);
             AssertRC(rc);
         }
-        pThis->DeviceFileR = NIL_RTFILE;
-    }
-# endif
-    if (pThis->DeviceFile != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->DeviceFile);
-        AssertRC(rc);
-        pThis->DeviceFile = NIL_RTFILE;
-    }
+        pThis->hDeviceFileR = NIL_RTFILE;
+    }
+# endif
+    rc = RTFileClose(pThis->hDeviceFile); AssertRC(rc);
+    pThis->hDeviceFile = NIL_RTFILE;
 
 #elif defined(RT_OS_WINDOWS)
-
     CloseHandle(pThis->hEventRecv);
     CloseHandle(pThis->hEventSend);
@@ -1121 +1115 @@
      */
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
-    pThis->DeviceFile  = NIL_RTFILE;
+    pThis->hDeviceFile  = NIL_RTFILE;
 # ifdef RT_OS_DARWIN
-    pThis->DeviceFileR = NIL_RTFILE;
-# endif
-    pThis->WakeupPipeR = NIL_RTFILE;
-    pThis->WakeupPipeW = NIL_RTFILE;
+    pThis->hDeviceFileR = NIL_RTFILE;
+# endif
+    pThis->hWakeupPipeR = NIL_RTPIPE;
+    pThis->hWakeupPipeW = NIL_RTPIPE;
+#elif defined(RT_OS_WINDOWS)
+    pThis->hEventRecv  = INVALID_HANDLE_VALUE;
+    pThis->hEventSend  = INVALID_HANDLE_VALUE;
+    pThis->hDeviceFile = INVALID_HANDLE_VALUE;
 #endif
     /* IBase. */
@@ -1191 +1189 @@
     fOpen |= RTFILE_O_NON_BLOCK;
 # endif
-    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, fOpen);
+    rc = RTFileOpen(&pThis->hDeviceFile, pThis->pszDevicePath, fOpen);
 # ifdef RT_OS_LINUX
     /* RTFILE_O_NON_BLOCK not supported? */
     if (rc == VERR_INVALID_PARAMETER)
-        rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, fOpen & ~RTFILE_O_NON_BLOCK);
+        rc = RTFileOpen(&pThis->hDeviceFile, pThis->pszDevicePath, fOpen & ~RTFILE_O_NON_BLOCK);
 # endif
 # ifdef RT_OS_DARWIN
     if (RT_SUCCESS(rc))
-        rc = RTFileOpen(&pThis->DeviceFileR, pThis->pszDevicePath, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+        rc = RTFileOpen(&pThis->hDeviceFileR, pThis->pszDevicePath, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
 # endif
 
@@ -1232 +1230 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
 
-    fcntl(pThis->DeviceFile, F_SETFL, O_NONBLOCK);
+    fcntl(RTFileToNative(pThis->hDeviceFile), F_SETFL, O_NONBLOCK);
 # ifdef RT_OS_DARWIN
-    fcntl(pThis->DeviceFileR, F_SETFL, O_NONBLOCK);
-# endif
-    int aFDs[2];
-    if (pipe(aFDs) != 0)
-    {
-        rc = RTErrConvertFromErrno(errno);
-        AssertRC(rc);
-        return rc;
-    }
-    pThis->WakeupPipeR = aFDs[0];
-    pThis->WakeupPipeW = aFDs[1];
+    fcntl(RTFileToNative(pThis->hDeviceFileR), F_SETFL, O_NONBLOCK);
+# endif
+    rc = RTPipeCreate(&pThis->hWakeupPipeR, &pThis->hWakeupPipeW, 0 /*fFlags*/);
+    AssertRCReturn(rc, rc);
 
 #elif defined(RT_OS_WINDOWS)

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

@@ -60 +60 @@
     char               *pszLocation;
     /** Flag whether VirtualBox represents the server or client side. */
-    RTFILE              OutputFile;
+    RTFILE              hOutputFile;
 } DRVRAWFILE, *PDRVRAWFILE;
 
@@ -75 +75 @@
 
     Assert(pvBuf);
-    if (pThis->OutputFile != NIL_RTFILE)
+    if (pThis->hOutputFile != NIL_RTFILE)
     {
         size_t cbWritten;
-        rc = RTFileWrite(pThis->OutputFile, pvBuf, *pcbWrite, &cbWritten);
+        rc = RTFileWrite(pThis->hOutputFile, pvBuf, *pcbWrite, &cbWritten);
 #if 0
         /* don't flush here, takes too long and we will loose characters */
         if (RT_SUCCESS(rc))
-            RTFileFlush(pThis->OutputFile);
+            RTFileFlush(pThis->hOutputFile);
 #endif
         *pcbWrite = cbWritten;
@@ -121 +121 @@
     LogFlow(("%s: %s\n", __FUNCTION__, pThis->pszLocation));
 
-    if (pThis->OutputFile != NIL_RTFILE)
-    {
-        RTFileClose(pThis->OutputFile);
-        pThis->OutputFile = NIL_RTFILE;
-    }
+    RTFileClose(pThis->hOutputFile);
+    pThis->hOutputFile = NIL_RTFILE;
 }
 
@@ -146 +143 @@
         MMR3HeapFree(pThis->pszLocation);
 
-    if (pThis->OutputFile != NIL_RTFILE)
-    {
-        RTFileClose(pThis->OutputFile);
-        pThis->OutputFile = NIL_RTFILE;
-    }
+    RTFileClose(pThis->hOutputFile);
+    pThis->hOutputFile = NIL_RTFILE;
 }
 
@@ -169 +163 @@
     pThis->pDrvIns                      = pDrvIns;
     pThis->pszLocation                  = NULL;
-    pThis->OutputFile                   = NIL_RTFILE;
+    pThis->hOutputFile                  = NIL_RTFILE;
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvRawFileQueryInterface;
@@ -188 +182 @@
      * Open the raw file.
      */
-    rc = RTFileOpen(&pThis->OutputFile, pThis->pszLocation, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
+    rc = RTFileOpen(&pThis->hOutputFile, pThis->pszLocation, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
     {

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

@@ -185 +185 @@
          * Seek and read.
          */
-        rc = RTFileSeek(pThis->FileDevice, off, RTFILE_SEEK_BEGIN, NULL);
+        rc = RTFileReadAt(pThis->hFileDevice, off, pvBuf, cbRead, NULL);
         if (RT_SUCCESS(rc))
         {
-            rc = RTFileRead(pThis->FileDevice, pvBuf, cbRead, NULL);
-            if (RT_SUCCESS(rc))
-            {
-                Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n"
-                      "%16.*Rhxd\n",
-                      pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
-            }
-            else
-                Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
-                     pvBuf, cbRead, rc, off, pThis->pszDevice));
+            Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n"
+                  "%16.*Rhxd\n",
+                  pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
         }
         else
-            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szName,
-                 pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
+            Log(("%s-%d: drvHostBaseRead: RTFileReadAt(%RTfile, %#llx, %p, %#x) -> %Rrc ('%s')\n",
+                 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->hFileDevice,
+                 off, pvBuf, cbRead, rc, pThis->pszDevice));
 #endif
     }
@@ -241 +234 @@
              * Seek and write.
              */
-            rc = RTFileSeek(pThis->FileDevice, off, RTFILE_SEEK_BEGIN, NULL);
-            if (RT_SUCCESS(rc))
-            {
-                rc = RTFileWrite(pThis->FileDevice, pvBuf, cbWrite, NULL);
-                if (RT_FAILURE(rc))
-                    Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                         pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
-                         pvBuf, cbWrite, rc, off, pThis->pszDevice));
-            }
-            else
-                Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Rrc\n",
-                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
+            rc = RTFileWriteAt(pThis->hFileDevice, off, pvBuf, cbWrite, NULL);
+            if (RT_FAILURE(rc))
+                Log(("%s-%d: drvHostBaseWrite: RTFileWriteAt(%RTfile, %#llx, %p, %#x) -> %Rrc ('%s')\n",
+                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->hFileDevice,
+                     off, pvBuf, cbWrite, rc, pThis->pszDevice));
 #endif
         }
@@ -282 +268 @@
         /** @todo scsi device buffer flush... */
 #else
-        rc = RTFileFlush(pThis->FileDevice);
+        rc = RTFileFlush(pThis->hFileDevice);
 #endif
     }
@@ -762 +748 @@
 static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pFileDevice, bool fReadOnly)
 {
-#ifdef RT_OS_DARWIN
+# ifdef RT_OS_DARWIN
     /* Darwin is kind of special... */
     Assert(!pFileDevice); NOREF(pFileDevice);
@@ -940 +926 @@
     return rc;
 
-#elif defined(RT_OS_LINUX)
-    /** @todo we've got RTFILE_O_NON_BLOCK now. Change the code to use RTFileOpen. */
-    int FileDevice = open(pThis->pszDeviceOpen, (pThis->fReadOnlyConfig ? O_RDONLY : O_RDWR) | O_NONBLOCK);
-    if (FileDevice < 0)
-        return RTErrConvertFromErrno(errno);
-    *pFileDevice = FileDevice;
-    return VINF_SUCCESS;
-
 #elif defined(RT_OS_FREEBSD)
-    int rc = VINF_SUCCESS;
-    RTFILE FileDevice;
-
-    rc = RTFileOpen(&FileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    RTFILE hFileDevice;
+    int rc = RTFileOpen(&hFileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
         return rc;
@@ -964 +940 @@
 
     DeviceCCB.ccb_h.func_code = XPT_GDEVLIST;
-    int rcBSD = ioctl(FileDevice, CAMGETPASSTHRU, &DeviceCCB);
+    int rcBSD = ioctl(RTFileToNative(hFileDevice), CAMGETPASSTHRU, &DeviceCCB);
     if (!rcBSD)
     {
@@ -972 +948 @@
         if (rc >= 0)
         {
-            RTFILE PassthroughDevice;
-
-            rc = RTFileOpen(&PassthroughDevice, pszPassthroughDevice, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-
+            RTFILE hPassthroughDevice;
+            rc = RTFileOpen(&hPassthroughDevice, pszPassthroughDevice, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
             RTStrFree(pszPassthroughDevice);
-
             if (RT_SUCCESS(rc))
             {
@@ -989 +962 @@
                 DeviceCCB.ccb_h.func_code = XPT_GDEVLIST;
 
-                rcBSD = ioctl(PassthroughDevice, CAMGETPASSTHRU, &DeviceCCB);
+                rcBSD = ioctl(RTFileToNative(hPassthroughDevice), CAMGETPASSTHRU, &DeviceCCB);
                 if (!rcBSD)
                 {
@@ -997 +970 @@
                         pThis->ScsiTargetID = DeviceCCB.ccb_h.target_id;
                         pThis->ScsiLunID    = DeviceCCB.ccb_h.target_lun;
-                        *pFileDevice = PassthroughDevice;
+                        *pFileDevice = hPassthroughDevice;
                     }
                     else
@@ -1009 +982 @@
 
                 if (RT_FAILURE(rc))
-                    RTFileClose(PassthroughDevice);
+                    RTFileClose(hPassthroughDevice);
             }
         }
@@ -1018 +991 @@
         rc = RTErrConvertFromErrno(errno);
 
-    RTFileClose(FileDevice);
+    RTFileClose(hFileDevice);
     return rc;
+
 #else
-    return RTFileOpen(pFileDevice, pThis->pszDeviceOpen,
-                      (fReadOnly ? RTFILE_O_READ : RTFILE_O_READWRITE) | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    uint32_t fFlags = (fReadOnly ? RTFILE_O_READ : RTFILE_O_READWRITE) | RTFILE_O_OPEN | RTFILE_O_DENY_NONE;
+# ifdef RT_OS_LINUX
+    fFlags |= RTFILE_O_NON_BLOCK;
+# endif
+    return RTFileOpen(pFileDevice, pThis->pszDeviceOpen, fFlags);
 #endif
 }
@@ -1072 +1049 @@
     LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
 
-    RTFILE FileDevice;
+    RTFILE hFileDevice;
 #ifdef RT_OS_SOLARIS
-    if (pThis->FileRawDevice != NIL_RTFILE)
-    {
-        RTFileClose(pThis->FileRawDevice);
-        pThis->FileRawDevice = NIL_RTFILE;
-    }
-    if (pThis->FileDevice != NIL_RTFILE)
-    {
-        RTFileClose(pThis->FileDevice);
-        pThis->FileDevice = NIL_RTFILE;
-    }
-    RTFILE FileRawDevice;
-    int rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, pThis->fReadOnlyConfig);
+    if (pThis->hFileRawDevice != NIL_RTFILE)
+    {
+        RTFileClose(pThis->hFileRawDevice);
+        pThis->hFileRawDevice = NIL_RTFILE;
+    }
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        RTFileClose(pThis->hFileDevice);
+        pThis->hFileDevice = NIL_RTFILE;
+    }
+    RTFILE hFileRawDevice;
+    int rc = drvHostBaseOpen(pThis, &hFileDevice, &hFileRawDevice, pThis->fReadOnlyConfig);
 #else
-    int rc = drvHostBaseOpen(pThis, &FileDevice, pThis->fReadOnlyConfig);
+    int rc = drvHostBaseOpen(pThis, &hFileDevice, pThis->fReadOnlyConfig);
 #endif
     if (RT_FAILURE(rc))
@@ -1095 +1072 @@
             LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
 #ifdef RT_OS_SOLARIS
-            rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false);
+            rc = drvHostBaseOpen(pThis, &hFileDevice, &hFileRawDevice, false);
 #else
-            rc = drvHostBaseOpen(pThis, &FileDevice, false);
+            rc = drvHostBaseOpen(pThis, &hFileDevice, false);
 #endif
         }
@@ -1112 +1089 @@
 
 #ifdef RT_OS_SOLARIS
-    if (pThis->FileRawDevice != NIL_RTFILE)
-        RTFileClose(pThis->FileRawDevice);
-    pThis->FileRawDevice = FileRawDevice;
-#endif
-
-    if (pThis->FileDevice != NIL_RTFILE)
-        RTFileClose(pThis->FileDevice);
-    pThis->FileDevice = FileDevice;
+    if (pThis->hFileRawDevice != NIL_RTFILE)
+        RTFileClose(pThis->hFileRawDevice);
+    pThis->hFileRawDevice = hFileRawDevice;
+#endif
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+        RTFileClose(pThis->hFileDevice);
+    pThis->hFileDevice = hFileDevice;
 #endif /* !RT_OS_DARWIN */
     return VINF_SUCCESS;
@@ -1170 +1147 @@
      */
     struct dk_minfo MediaInfo;
-    if (ioctl(pThis->FileRawDevice, DKIOCGMEDIAINFO, &MediaInfo) == 0)
+    if (ioctl(RTFileToNative(pThis->hFileRawDevice), DKIOCGMEDIAINFO, &MediaInfo) == 0)
     {
         *pcb = MediaInfo.dki_capacity * (uint64_t)MediaInfo.dki_lbsize;
         return VINF_SUCCESS;
     }
-    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
+    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
 
 #elif defined(RT_OS_WINDOWS)
@@ -1181 +1158 @@
     IO_STATUS_BLOCK             IoStatusBlock = {0};
     FILE_FS_SIZE_INFORMATION    FsSize= {0};
-    NTSTATUS rcNt = NtQueryVolumeInformationFile((HANDLE)pThis->FileDevice,  &IoStatusBlock,
+    NTSTATUS rcNt = NtQueryVolumeInformationFile(RTFileToNative(pThis->hFileDevice),  &IoStatusBlock,
                                                  &FsSize, sizeof(FsSize), FileFsSizeInformation);
     int cRetries = 5;
@@ -1187 +1164 @@
     {
         RTThreadSleep(10);
-        rcNt = NtQueryVolumeInformationFile((HANDLE)pThis->FileDevice,  &IoStatusBlock,
+        rcNt = NtQueryVolumeInformationFile(RTFileToNative(pThis->hFileDevice),  &IoStatusBlock,
                                             &FsSize, sizeof(FsSize), FileFsSizeInformation);
     }
@@ -1207 +1184 @@
     return rc;
 #else
-    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
+    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
 #endif
 }
@@ -1340 +1317 @@
         pDeviceCCB->ccb_h.func_code = XPT_GDEV_TYPE;
 
-        rcBSD = ioctl(pThis->FileDevice, CAMIOCOMMAND, pDeviceCCB);
+        rcBSD = ioctl(RTFileToNative(pThis->hFileDevice), CAMIOCOMMAND, pDeviceCCB);
         if (!rcBSD)
         {
@@ -1375 +1352 @@
 
         /* Send command */
-        rcBSD = ioctl(pThis->FileDevice, CAMIOCOMMAND, pDeviceCCB);
+        rcBSD = ioctl(RTFileToNative(pThis->hFileDevice), CAMIOCOMMAND, pDeviceCCB);
         if (!rcBSD)
         {
@@ -1715 +1692 @@
        * (We're currently not unlocking the device after use. See todo in DevATA.cpp.) */
     if (    pThis->fLocked
-        &&  pThis->FileDevice != NIL_RTFILE
+        &&  pThis->hFileDevice != NIL_RTFILE
 #endif
         &&  pThis->pfnDoLock)
@@ -1785 +1762 @@
     }
 #else
-    if (pThis->FileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->FileDevice);
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
         AssertRC(rc);
-        pThis->FileDevice = NIL_RTFILE;
+        pThis->hFileDevice = NIL_RTFILE;
     }
 #endif
 
 #ifdef RT_OS_SOLARIS
-    if (pThis->FileRawDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->FileRawDevice);
+    if (pThis->hFileRawDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileRawDevice);
         AssertRC(rc);
-        pThis->FileRawDevice = NIL_RTFILE;
+        pThis->hFileRawDevice = NIL_RTFILE;
     }
 
@@ -1863 +1840 @@
     pThis->pDASession                       = NULL;
 #else
-    pThis->FileDevice                       = NIL_RTFILE;
+    pThis->hFileDevice                      = NIL_RTFILE;
 #endif
 #ifdef RT_OS_SOLARIS
-    pThis->FileRawDevice                    = NIL_RTFILE;
+    pThis->hFileRawDevice                   = NIL_RTFILE;
 #endif
     pThis->enmType                          = enmType;
@@ -2110 +2087 @@
             && RT_SUCCESS(RTPathReal(pszDevice, szPathReal, sizeof(szPathReal))))
             pszDevice = szPathReal;
-        pThis->FileDevice = NIL_RTFILE;
+        pThis->hFileDevice = NIL_RTFILE;
 #endif
 #ifdef RT_OS_SOLARIS
-        pThis->FileRawDevice = NIL_RTFILE;
+        pThis->hFileRawDevice = NIL_RTFILE;
 #endif
 

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ -83 +83 @@
 #if !defined(RT_OS_DARWIN)
     /** The filehandle of the device. */
-    RTFILE                  FileDevice;
+    RTFILE                  hFileDevice;
 #endif
 #ifdef RT_OS_SOLARIS
     /** The raw filehandle of the device. */
-    RTFILE                  FileRawDevice;
+    RTFILE                  hFileRawDevice;
 #endif
 

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

@@ -156 +156 @@
 
 #elif defined(RT_OS_LINUX)
-            rc = ioctl(pThis->FileDevice, CDROMEJECT, 0);
+            rc = ioctl(RTFileToNative(pThis->hFileDevice), CDROMEJECT, 0);
             if (rc < 0)
             {
@@ -168 +168 @@
 
 #elif defined(RT_OS_SOLARIS)
-            rc = ioctl(pThis->FileRawDevice, DKIOCEJECT, 0);
+            rc = ioctl(RTFileToNative(pThis->hFileRawDevice), DKIOCEJECT, 0);
             if (rc < 0)
             {
@@ -182 +182 @@
 
 #elif defined(RT_OS_WINDOWS)
-            RTFILE FileDevice = pThis->FileDevice;
-            if (FileDevice == NIL_RTFILE) /* obsolete crap */
-                rc = RTFileOpen(&FileDevice, pThis->pszDeviceOpen, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+            RTFILE hFileDevice = pThis->hFileDevice;
+            if (hFileDevice == NIL_RTFILE) /* obsolete crap */
+                rc = RTFileOpen(&hFileDevice, pThis->pszDeviceOpen, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
             if (RT_SUCCESS(rc))
             {
                 /* do ioctl */
                 DWORD cbReturned;
-                if (DeviceIoControl((HANDLE)FileDevice, IOCTL_STORAGE_EJECT_MEDIA,
+                if (DeviceIoControl(RTFileToNative(hFileDevice), IOCTL_STORAGE_EJECT_MEDIA,
                                     NULL, 0,
                                     NULL, 0, &cbReturned,
@@ -198 +198 @@
 
                 /* clean up handle */
-                if (FileDevice != pThis->FileDevice)
-                    RTFileClose(FileDevice);
+                if (hFileDevice != pThis->hFileDevice)
+                    RTFileClose(hFileDevice);
             }
             else
@@ -246 +246 @@
 
 #elif defined(RT_OS_LINUX)
-    int rc = ioctl(pThis->FileDevice, CDROM_LOCKDOOR, (int)fLock);
+    int rc = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_LOCKDOOR, (int)fLock);
     if (rc < 0)
     {
@@ -258 +258 @@
 
 #elif defined(RT_OS_SOLARIS)
-    int rc = ioctl(pThis->FileRawDevice, fLock ? DKIOCLOCK : DKIOCUNLOCK, 0);
+    int rc = ioctl(RTFileToNative(pThis->hFileRawDevice), fLock ? DKIOCLOCK : DKIOCUNLOCK, 0);
     if (rc < 0)
     {
@@ -274 +274 @@
     DWORD cbReturned;
     int rc;
-    if (DeviceIoControl((HANDLE)pThis->FileDevice, IOCTL_STORAGE_MEDIA_REMOVAL,
+    if (DeviceIoControl(RTFileToNative(pThis->hFileDevice), IOCTL_STORAGE_MEDIA_REMOVAL,
                         &PreventMediaRemoval, sizeof(PreventMediaRemoval),
                         NULL, 0, &cbReturned,
@@ -309 +309 @@
      */
     /* Clear the media-changed-since-last-call-thingy just to be on the safe side. */
-    ioctl(pThis->FileDevice, CDROM_MEDIA_CHANGED, CDSL_CURRENT);
-    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
+    ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT);
+    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
 
 }
@@ -357 +357 @@
 
 #elif defined(RT_OS_LINUX)
-    bool fMediaPresent = ioctl(pThis->FileDevice, CDROM_DRIVE_STATUS, CDSL_CURRENT) == CDS_DISC_OK;
+    bool fMediaPresent = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_DRIVE_STATUS, CDSL_CURRENT) == CDS_DISC_OK;
 
 #elif defined(RT_OS_SOLARIS)
@@ -366 +366 @@
     static dkio_state s_DeviceState = DKIO_NONE;
     dkio_state PreviousState = s_DeviceState;
-    int rc2 = ioctl(pThis->FileRawDevice, DKIOCSTATE, &s_DeviceState);
+    int rc2 = ioctl(RTFileToNative(pThis->hFileRawDevice), DKIOCSTATE, &s_DeviceState);
     if (rc2 == 0)
     {
@@ -398 +398 @@
         /* taken care of above. */
 #elif defined(RT_OS_LINUX)
-        bool fMediaChanged = ioctl(pThis->FileDevice, CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
+        bool fMediaChanged = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
 #else
 # error "Unsupported platform."
@@ -484 +484 @@
     cgc.quiet = false;
     cgc.timeout = cTimeoutMillies;
-    rc = ioctl(pThis->FileDevice, CDROM_SEND_PACKET, &cgc);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_SEND_PACKET, &cgc);
     if (rc < 0)
     {
@@ -560 +560 @@
     solarisEnterRootMode(&effUserID); /** @todo check return code when this really works. */
 #endif
-    rc = ioctl(pThis->FileRawDevice, USCSICMD, &usc);
+    rc = ioctl(RTFileToNative(pThis->hFileRawDevice), USCSICMD, &usc);
 #ifdef VBOX_WITH_SUID_WRAPPER
     solarisExitRootMode(&effUserID);
@@ -620 +620 @@
     Req.spt.SenseInfoLength = (UCHAR)RT_MIN(sizeof(Req.aSense), cbSense);
     Req.spt.SenseInfoOffset = RT_OFFSETOF(struct _REQ, aSense);
-    if (DeviceIoControl((HANDLE)pThis->FileDevice, IOCTL_SCSI_PASS_THROUGH_DIRECT,
+    if (DeviceIoControl(RTFileToNative(pThis->hFileDevice), IOCTL_SCSI_PASS_THROUGH_DIRECT,
                         &Req, sizeof(Req), &Req, sizeof(Req), &cbReturned, NULL))
     {

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

@@ -73 +73 @@
 static DECLCALLBACK(int) drvHostFloppyGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
 {
-    int rc = ioctl(pThis->FileDevice, FDFLUSH);
+    int rc = ioctl(RTFileToNative(pThis->hFileDevice), FDFLUSH);
     if (rc)
     {
@@ -82 +82 @@
 
     floppy_drive_struct DrvStat;
-    rc = ioctl(pThis->FileDevice, FDGETDRVSTAT, &DrvStat);
+    rc = ioctl(RTFileToNative(pThis->hFileDevice), FDGETDRVSTAT, &DrvStat);
     if (rc)
     {
@@ -91 +91 @@
     pThis->fReadOnly = !(DrvStat.flags & FD_DISK_WRITABLE);
 
-    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
+    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
 }
 #endif /* RT_OS_LINUX */
@@ -108 +108 @@
     PDRVHOSTFLOPPY          pThisFloppy = (PDRVHOSTFLOPPY)pThis;
     floppy_drive_struct     DrvStat;
-    int rc = ioctl(pThis->FileDevice, FDPOLLDRVSTAT, &DrvStat);
+    int rc = ioctl(RTFileToNative(pThis->hFileDevice), FDPOLLDRVSTAT, &DrvStat);
     if (rc)
         return RTErrConvertFromErrno(errno);

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

@@ -60 +60 @@
     char           *pszFilename;
     /** File handle of the ISO file. */
-    RTFILE          File;
+    RTFILE          hFile;
 } DRVMEDIAISO, *PDRVMEDIAISO;
 
@@ -74 +74 @@
 
     uint64_t cbFile;
-    int rc = RTFileGetSize(pThis->File, &cbFile);
+    int rc = RTFileGetSize(pThis->hFile, &cbFile);
     if (RT_SUCCESS(rc))
     {
@@ -124 +124 @@
     LogFlow(("drvMediaISORead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n", off, pvBuf, cbRead, pThis->pszFilename));
 
-    Assert(pThis->File);
+    Assert(pThis->hFile != NIL_RTFILE);
     Assert(pvBuf);
 
@@ -130 +130 @@
      * Seek to the position and read.
      */
-    int rc = RTFileSeek(pThis->File, off, RTFILE_SEEK_BEGIN, NULL);
+    int rc = RTFileReadAt(pThis->hFile, off, pvBuf, cbRead, NULL);
     if (RT_SUCCESS(rc))
-    {
-        rc = RTFileRead(pThis->File, pvBuf, cbRead, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            Log2(("drvMediaISORead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n"
-                  "%16.*Rhxd\n",
-                  off, pvBuf, cbRead, pThis->pszFilename,
-                  cbRead, pvBuf));
-        }
-        else
-            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                             pThis->File, pvBuf, cbRead, rc, off, pThis->pszFilename));
-    }
+        Log2(("drvMediaISORead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n"
+              "%16.*Rhxd\n",
+              off, pvBuf, cbRead, pThis->pszFilename,
+              cbRead, pvBuf));
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+        AssertMsgFailed(("RTFileReadAt(%RTfile, %#llx, %p, %#x) -> %Rrc ('%s')\n",
+                         pThis->hFile, off, pvBuf, cbRead, rc, pThis->pszFilename));
     LogFlow(("drvMediaISORead: returns %Rrc\n", rc));
     return rc;
@@ -212 +204 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
-    if (pThis->File != NIL_RTFILE)
+    RTFileClose(pThis->hFile);
+    pThis->hFile = NIL_RTFILE;
+
+    if (pThis->pszFilename)
     {
-        RTFileClose(pThis->File);
-        pThis->File = NIL_RTFILE;
+        MMR3HeapFree(pThis->pszFilename);
+        pThis->pszFilename = NULL;
     }
-    if (pThis->pszFilename)
-        MMR3HeapFree(pThis->pszFilename);
 }
 
@@ -236 +229 @@
      */
     pThis->pDrvIns                      = pDrvIns;
-    pThis->File                         = NIL_RTFILE;
+    pThis->hFile                        = NIL_RTFILE;
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvMediaISOQueryInterface;
@@ -265 +258 @@
      * Open the image.
      */
-    rc = RTFileOpen(&pThis->File, pszName,
-                    RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    rc = RTFileOpen(&pThis->hFile, pszName, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_SUCCESS(rc))
     {

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

@@ -61 +61 @@
     char           *pszFilename;
     /** File handle of the raw image file. */
-    RTFILE          File;
+    RTFILE          hFile;
     /** True if the image is operating in readonly mode. */
     bool            fReadOnly;
@@ -77 +77 @@
 
     uint64_t cbFile;
-    int rc = RTFileGetSize(pThis->File, &cbFile);
+    int rc = RTFileGetSize(pThis->hFile, &cbFile);
     if (RT_SUCCESS(rc))
     {
@@ -127 +127 @@
     LogFlow(("drvRawImageRead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n", off, pvBuf, cbRead, pThis->pszFilename));
 
-    Assert(pThis->File);
+    Assert(pThis->hFile != NIL_RTFILE);
     Assert(pvBuf);
 
@@ -133 +133 @@
      * Seek to the position and read.
      */
-    int rc = RTFileSeek(pThis->File, off, RTFILE_SEEK_BEGIN, NULL);
+    int rc = RTFileSeek(pThis->hFile, off, RTFILE_SEEK_BEGIN, NULL);
     if (RT_SUCCESS(rc))
     {
-        rc = RTFileRead(pThis->File, pvBuf, cbRead, NULL);
+        rc = RTFileRead(pThis->hFile, pvBuf, cbRead, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -145 +145 @@
         }
         else
-            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                             pThis->File, pvBuf, cbRead, rc, off, pThis->pszFilename));
+            AssertMsgFailed(("RTFileRead(%RTfile, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
+                             pThis->hFile, pvBuf, cbRead, rc, off, pThis->pszFilename));
     }
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+        AssertMsgFailed(("RTFileSeek(%RTfile,%#llx,) -> %Rrc\n", pThis->hFile, off, rc));
     LogFlow(("drvRawImageRead: returns %Rrc\n", rc));
     return rc;
@@ -161 +161 @@
     LogFlow(("drvRawImageWrite: off=%#llx pvBuf=%p cbWrite=%#x (%s)\n", off, pvBuf, cbWrite, pThis->pszFilename));
 
-    Assert(pThis->File);
+    Assert(pThis->hFile != NIL_RTFILE);
     Assert(pvBuf);
 
@@ -167 +167 @@
      * Seek to the position and write.
      */
-    int rc = RTFileSeek(pThis->File, off, RTFILE_SEEK_BEGIN, NULL);
+    int rc = RTFileSeek(pThis->hFile, off, RTFILE_SEEK_BEGIN, NULL);
     if (RT_SUCCESS(rc))
     {
-        rc = RTFileWrite(pThis->File, pvBuf, cbWrite, NULL);
+        rc = RTFileWrite(pThis->hFile, pvBuf, cbWrite, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -179 +179 @@
         }
         else
-            AssertMsgFailed(("RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                             pThis->File, pvBuf, cbWrite, rc, off, pThis->pszFilename));
+            AssertMsgFailed(("RTFileWrite(%RTfile, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
+                             pThis->hFile, pvBuf, cbWrite, rc, off, pThis->pszFilename));
     }
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+        AssertMsgFailed(("RTFileSeek(%RTfile,%#llx,) -> %Rrc\n", pThis->hFile, off, rc));
     LogFlow(("drvRawImageWrite: returns %Rrc\n", rc));
     return rc;
@@ -195 +195 @@
     LogFlow(("drvRawImageFlush: (%s)\n", pThis->pszFilename));
 
-    Assert(pThis->File != NIL_RTFILE);
-    int rc = RTFileFlush(pThis->File);
+    Assert(pThis->hFile != NIL_RTFILE);
+    int rc = RTFileFlush(pThis->hFile);
     LogFlow(("drvRawImageFlush: returns %Rrc\n", rc));
     return rc;
@@ -249 +249 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
-    if (pThis->File != NIL_RTFILE)
-    {
-        RTFileClose(pThis->File);
-        pThis->File = NIL_RTFILE;
-    }
+    RTFileClose(pThis->hFile);
+    pThis->hFile = NIL_RTFILE;
+
     if (pThis->pszFilename)
+    {
         MMR3HeapFree(pThis->pszFilename);
+        pThis->pszFilename = NULL;
+    }
 }
 
@@ -273 +274 @@
      */
     pThis->pDrvIns                      = pDrvIns;
-    pThis->File                         = NIL_RTFILE;
+    pThis->hFile                        = NIL_RTFILE;
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvRawImageQueryInterface;
@@ -305 +306 @@
      * Open the image.
      */
-    rc = RTFileOpen(&pThis->File, pszName,
-                    RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    rc = RTFileOpen(&pThis->hFile, pszName, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(rc))
     {
@@ -315 +315 @@
     else
     {
-        rc = RTFileOpen(&pThis->File, pszName,
-                        RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+        rc = RTFileOpen(&pThis->hFile, pszName, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
         if (RT_SUCCESS(rc))
         {

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

@@ -58 +58 @@
     char                   *pszDevicePath;
     /** Handle to the device. */
-    RTFILE                  DeviceFile;
+    RTFILE                  hDeviceFile;
 
     /** The dedicated I/O thread. */
@@ -302 +302 @@
         ScsiIoReq.flags  |= SG_FLAG_DIRECT_IO;
 
-        /** Issue command. */
-        rc = ioctl(pThis->DeviceFile, SG_IO, &ScsiIoReq);
+        /* Issue command. */
+        rc = ioctl(RTFileToNative(pThis->hDeviceFile), SG_IO, &ScsiIoReq);
         if (rc < 0)
         {
@@ -420 +420 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
-    if (pThis->DeviceFile != NIL_RTFILE)
-        RTFileClose(pThis->DeviceFile);
+    RTFileClose(pThis->hDeviceFile);
+    pThis->hDeviceFile = NIL_RTFILE;
 
     if (pThis->pszDevicePath)
+    {
         MMR3HeapFree(pThis->pszDevicePath);
+        pThis->pszDevicePath = NULL;
+    }
 
     if (pThis->pQueueRequests)
@@ -457 +460 @@
     pDrvIns->IBase.pfnQueryInterface                    = drvscsihostQueryInterface;
     pThis->ISCSIConnector.pfnSCSIRequestSend            = drvscsihostRequestSend;
-    pThis->pDrvIns    = pDrvIns;
-    pThis->DeviceFile = NIL_RTFILE;
+    pThis->pDrvIns     = pDrvIns;
+    pThis->hDeviceFile = NIL_RTFILE;
 
     /* Query the SCSI port interface above. */
@@ -474 +477 @@
                                 N_("Configuration error: Failed to get the \"DevicePath\" value"));
 
-    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    rc = RTFileOpen(&pThis->hDeviceFile, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,

trunk/src/VBox/Devices/USB/USBProxyDevice.h

@@ -207 +207 @@
          * The Linux and Darwin backends are making use of this. */
         void *pv;
-        RTFILE File;
+        RTFILE hFile;
         int fd;
         struct vrdp_priv

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

@@ -94 +94 @@
 {
     /** The open file. */
-    RTFILE                 File;
+    RTFILE                 hFile;
     /** Software endpoint structures */
     USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
@@ -133 +133 @@
     do
     {
-        rc = ioctl(pDevFBSD->File, iCmd, pvArg);
+        rc = ioctl(RTFileToNative(pDevFBSD->hFile), iCmd, pvArg);
         if (rc >= 0)
             return VINF_SUCCESS;
@@ -369 +369 @@
      * Try open the device node.
      */
-    RTFILE File;
-
-    rc = RTFileOpen(&File, pszAddress, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    RTFILE hFile;
+    rc = RTFileOpen(&hFile, pszAddress, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(rc))
     {
         /*
-             * Allocate and initialize the linux backend data.
-             */
-        PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD)
-        RTMemAllocZ(sizeof(USBPROXYDEVFBSD));
-
+         * Allocate and initialize the linux backend data.
+         */
+        PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD)RTMemAllocZ(sizeof(USBPROXYDEVFBSD));
         if (pDevFBSD)
         {
-            pDevFBSD->File = File;
+            pDevFBSD->hFile = hFile;
             pProxyDev->Backend.pv = pDevFBSD;
 
@@ -388 +385 @@
             if (RT_SUCCESS(rc))
             {
-                LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns "
-                         "successfully File=%d iActiveCfg=%d\n",
-                         pProxyDev, pszAddress,
-                         pDevFBSD->File, pProxyDev->iActiveCfg));
+                LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
+                         pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
 
                 return VINF_SUCCESS;
@@ -401 +396 @@
             rc = VERR_NO_MEMORY;
 
-        RTFileClose(File);
+        RTFileClose(hFile);
     }
     else if (rc == VERR_ACCESS_DENIED)
@@ -455 +450 @@
 static void usbProxyFreeBSDClose(PUSBPROXYDEV pProxyDev)
 {
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD)pProxyDev->Backend.pv;
 
     LogFlow(("usbProxyFreeBSDClose: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
@@ -464 +459 @@
     usbProxyFreeBSDFsUnInit(pProxyDev);
 
-    RTFileClose(pDevFBSD->File);
-
-    pDevFBSD->File = NIL_RTFILE;
+    RTFileClose(pDevFBSD->hFile);
+    pDevFBSD->hFile = NIL_RTFILE;
 
     RTMemFree(pDevFBSD);
-
     pProxyDev->Backend.pv = NULL;
 
@@ -991 +984 @@
     {
         /* Poll for finished transfers */
-        PollFd.fd = (int)pDevFBSD->File;
+        PollFd.fd = RTFileToNative(pDevFBSD->hFile);
         PollFd.events = POLLIN | POLLRDNORM;
         PollFd.revents = 0;

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

@@ -137 +137 @@
 {
     /** The open file. */
-    RTFILE              File;
+    RTFILE              hFile;
     /** Critical section protecting the two lists. */
     RTCRITSECT          CritSect;
@@ -194 +194 @@
         do
         {
-            rc = ioctl(pDevLnx->File, iCmd, pvArg);
+            rc = ioctl(RTFileToNative(pDevLnx->hFile), iCmd, pvArg);
             if (rc >= 0)
                 return rc;
@@ -236 +236 @@
         pUrbLnx = pUrbLnx->pNext;
 
-        ioctl(pDevLnx->File, USBDEVFS_DISCARDURB, &pCur->KUrb); /* not sure if this is required.. */
+        ioctl(RTFileToNative(pDevLnx->hFile), USBDEVFS_DISCARDURB, &pCur->KUrb); /* not sure if this is required.. */
         if (!pCur->KUrb.status)
             pCur->KUrb.status = -ENODEV;
@@ -596 +596 @@
 {
     PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
-    AssertReturn(pDevLnx->File != NIL_RTFILE, -1);
-    return pDevLnx->File;
+    AssertReturn(pDevLnx->hFile != NIL_RTFILE, -1);
+    return RTFileToNative(pDevLnx->hFile);
 }
 
@@ -653 +653 @@
      * Try open the device node.
      */
-    RTFILE File;
-    int rc = RTFileOpen(&File, pszDevNode, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    RTFILE hFile;
+    int rc = RTFileOpen(&hFile, pszDevNode, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(rc))
     {
@@ -666 +666 @@
             memcpy(&pDevLnx->szPath[0], pszPath, cchPath);
             pDevLnx->szPath[cchPath] = '\0';
-            pDevLnx->File = File;
+            pDevLnx->hFile = hFile;
             rc = RTCritSectInit(&pDevLnx->CritSect);
             if (RT_SUCCESS(rc))
@@ -672 +672 @@
                 pProxyDev->Backend.pv = pDevLnx;
 
-                LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%d iActiveCfg=%d\n",
-                         pProxyDev, pszAddress, pDevLnx->File, pProxyDev->iActiveCfg));
+                LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%RTfile iActiveCfg=%d\n",
+                         pProxyDev, pszAddress, pDevLnx->hFile, pProxyDev->iActiveCfg));
 
                 return VINF_SUCCESS;
@@ -682 +682 @@
         else
             rc = VERR_NO_MEMORY;
-        RTFileClose(File);
+        RTFileClose(hFile);
     }
     else if (rc == VERR_ACCESS_DENIED)
@@ -812 +812 @@
     }
 
-    RTFileClose(pDevLnx->File);
-    pDevLnx->File = NIL_RTFILE;
+    RTFileClose(pDevLnx->hFile);
+    pDevLnx->hFile = NIL_RTFILE;
 
     RTMemFree(pDevLnx);
@@ -1278 +1278 @@
     unsigned        cTries = 0;
 
-    while (ioctl(pDevLnx->File, USBDEVFS_SUBMITURB, &pCur->KUrb))
+    while (ioctl(RTFileToNative(pDevLnx->hFile), USBDEVFS_SUBMITURB, &pCur->KUrb))
     {
         if (errno == EINTR)
@@ -1516 +1516 @@
      */
     cTries = 0;
-    while (ioctl(pDevLnx->File, USBDEVFS_SUBMITURB, &pUrbLnx->KUrb))
+    while (ioctl(RTFileToNative(pDevLnx->hFile), USBDEVFS_SUBMITURB, &pUrbLnx->KUrb))
     {
         if (errno == EINTR)
@@ -1760 +1760 @@
             {
                 struct pollfd pfd;
-                int rc;
-
-                pfd.fd = pDevLnx->File;
+                pfd.fd = RTFileToNative(pDevLnx->hFile);
                 pfd.events = POLLOUT | POLLWRNORM /* completed async */
                            | POLLERR | POLLHUP    /* disconnected */;
                 pfd.revents = 0;
-                rc = poll(&pfd, 1, cMillies);
+                int rc = poll(&pfd, 1, cMillies);
                 Log(("usbProxyLinuxUrbReap: poll rc = %d\n", rc));
                 if (rc >= 1)
@@ -1790 +1788 @@
         {
             struct usbdevfs_urb *pKUrb;
-            while (ioctl(pDevLnx->File, USBDEVFS_REAPURBNDELAY, &pKUrb))
+            while (ioctl(RTFileToNative(pDevLnx->hFile), USBDEVFS_REAPURBNDELAY, &pKUrb))
                 if (errno != EINTR)
                 {

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

@@ -80 +80 @@
     char                          *pszDevicePath;
     /** The connection to the client driver. */
-    RTFILE                         File;
+    RTFILE                         hFile;
     /** Pointer to the proxy device instance. */
     PUSBPROXYDEV                   pProxyDev;
@@ -196 +196 @@
 static void usbProxySolarisCloseFile(PUSBPROXYDEVSOL pDevSol)
 {
-    if (pDevSol->File != NIL_RTFILE)
-    {
-        RTFileClose(pDevSol->File);
-        pDevSol->File = NIL_RTFILE;
-    }
+    RTFileClose(pDevSol->hFile);
+    pDevSol->hFile = NIL_RTFILE;
 }
 
@@ -215 +212 @@
 static int usbProxySolarisIOCtl(PUSBPROXYDEVSOL pDevSol, unsigned Function, void *pvData, size_t cbData)
 {
-    if (RT_UNLIKELY(pDevSol->File == NIL_RTFILE))
+    if (RT_UNLIKELY(pDevSol->hFile == NIL_RTFILE))
     {
         LogFlow((USBPROXY ":usbProxySolarisIOCtl connection to driver gone!\n"));
@@ -228 +225 @@
 
     int Ret = -1;
-    int rc = RTFileIoCtl(pDevSol->File, Function, &Req, sizeof(Req), &Ret);
+    int rc = RTFileIoCtl(pDevSol->hFile, Function, &Req, sizeof(Req), &Ret);
     if (RT_SUCCESS(rc))
     {
@@ -327 +324 @@
                          * Open the client driver.
                          */
-                        RTFILE File;
-                        rc = RTFileOpen(&File, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+                        RTFILE hFile;
+                        rc = RTFileOpen(&hFile, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
                         if (RT_SUCCESS(rc))
                         {
-                            pDevSol->File = File;
+                            pDevSol->hFile = hFile;
                             pDevSol->pProxyDev = pProxyDev;
 
@@ -363 +360 @@
                             }
 
-                            RTFileClose(pDevSol->File);
-                            pDevSol->File = NIL_RTFILE;
+                            RTFileClose(pDevSol->hFile);
+                            pDevSol->hFile = NIL_RTFILE;
                             pDevSol->pProxyDev = NULL;
                         }
@@ -721 +718 @@
         {
             struct pollfd pfd;
-            int rc;
-
-            pfd.fd = pDevSol->File;
+            pfd.fd = RTFileToNative(pDevSol->hFile);
             pfd.events = POLLIN;
             pfd.revents = 0;
-            rc = poll(&pfd, 1, cMillies);
-
+            int rc = poll(&pfd, 1, cMillies);
             if (rc > 0)
             {