VirtualBox

Changeset 37597 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jun 22, 2011 8:54:05 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
72443
Message:

darwin build fix

Location:
trunk/src/VBox
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r37596 r37597  
    635635            FD_SET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet);
    636636# if 1 /* it seems like this select is blocking the write... */
    637             rc = select(RT_MAX(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1,
     637            rc = select(RT_MAX(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1,
    638638                        &RdSet, NULL, &XcptSet, NULL);
    639639# else
    640640            struct timeval tv = { 0, 1000 };
    641             rc = select(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1,
     641            rc = select(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1,
    642642                        &RdSet, NULL, &XcptSet, &tv);
    643643# endif
    … …  
    659659            size_t cbRead;
    660660            if (   FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &RdSet)
    661                 || FD_ISSET(pThis->hWakeupPipeR, &XcptSet))
     661                || FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet))
    662662            {
    663663                rc = RTPipeRead(pThis->hWakeupPipeR, abBuffer, 1, &cbRead);
    … …  
    12761276    /* Linux & darwin needs a separate thread which monitors the status lines. */
    12771277# ifndef RT_OS_LINUX
    1278     ioctl(pThis->DeviceFile, TIOCMGET, &pThis->fStatusLines);
     1278    ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMGET, &pThis->fStatusLines);
    12791279# endif
    12801280    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon");

  • trunk/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp

    r37578 r37597  
    2626
    2727
    28 #define RTMEM_WRAP_TO_EF_APIS
    2928/*******************************************************************************
    3029*   Header Files                                                               *
    … …  
    5049#include "internal/iprt.h"
    5150#include <iprt/darwin/machkernel.h>
    52 
    53 #ifdef IN_RING0  /* till RTFILE is changed in types.h */
    54 # include <iprt/types.h>
    55 typedef struct RTFILENEWINT *RTFILENEW;
    56 typedef RTFILENEW *PRTFILENEW;
    57 # undef NIL_RTFILE
    58 # define RTFILE         RTFILENEW
    59 # define PRTFILE        PRTFILENEW
    60 # define NIL_RTFILE     ((RTFILENEW)-1)
    61 #endif
    6251
    6352#include <iprt/asm.h>
    … …  
    197186 * Darwin kernel file handle data.
    198187 */
    199 typedef struct RTFILENEWINT
     188typedef struct RTFILEINT
    200189{
    201190    /** Magic value (RTFILE_MAGIC). */
    … …  
    209198    /** The vnode returned by vnode_open. */
    210199    vnode_t         hVnode;
    211 } RTFILENEWINT;
    212 /** Magic number for RTFILENEWINT::u32Magic (To Be Determined). */
     200} RTFILEINT;
     201/** Magic number for RTFILEINT::u32Magic (To Be Determined). */
    213202#define RTFILE_MAGIC                    UINT32_C(0x01020304)
    214203
    215204
    216 RTDECL(int) RTFileOpen(PRTFILE phFile, const char *pszFilename, uint32_t fOpen)
    217 {
    218     RTFILENEWINT *pThis = (RTFILENEWINT *)RTMemAllocZ(sizeof(*pThis));
     205RTDECL(int) RTFileOpen(PRTFILE phFile, const char *pszFilename, uint64_t fOpen)
     206{
     207    RTFILEINT *pThis = (RTFILEINT *)RTMemAllocZ(sizeof(*pThis));
    219208    if (!pThis)
    220209        return VERR_NO_MEMORY;
    … …  
    286275        return VINF_SUCCESS;
    287276
    288     RTFILENEWINT *pThis = hFile;
     277    RTFILEINT *pThis = hFile;
    289278    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
    290279    AssertReturn(pThis->u32Magic == RTFILE_MAGIC, VERR_INVALID_HANDLE);
    … …  
    300289RTDECL(int) RTFileReadAt(RTFILE hFile, RTFOFF off, void *pvBuf, size_t cbToRead, size_t *pcbRead)
    301290{
    302     RTFILENEWINT *pThis = hFile;
     291    RTFILEINT *pThis = hFile;
    303292    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
    304293    AssertReturn(pThis->u32Magic == RTFILE_MAGIC, VERR_INVALID_HANDLE);

  • trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp

    r28800 r37597  
    55
    66/*
    7  * Copyright (C) 2006-2007 Oracle Corporation
     7 * Copyright (C) 2006-2011 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    5050
    5151
    52 RTR3DECL(int)  RTFileLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
     52RTR3DECL(int)  RTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
    5353{
    5454    Assert(offLock >= 0);
    … …  
    8383
    8484    Assert(RTFILE_LOCK_WAIT);
    85     if (fcntl(File, (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
     85    if (fcntl(RTFileToNative(hFile), (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
    8686        return VINF_SUCCESS;
    8787    int iErr = errno;
    … …  
    102102        else
    103103            f |= LOCK_SH;
    104         if (!flock(File, f))
     104        if (!flock(RTFileToNative(hFile), f))
    105105            return VINF_SUCCESS;
    106106        iErr = errno;
    … …  
    117117
    118118
    119 RTR3DECL(int)  RTFileChangeLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
     119RTR3DECL(int)  RTFileChangeLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
    120120{
    121121    /** @todo We never returns VERR_FILE_NOT_LOCKED for now. */
    122     return RTFileLock(File, fLock, offLock, cbLock);
     122    return RTFileLock(hFile, fLock, offLock, cbLock);
    123123}
    124124
    125125
    126 RTR3DECL(int)  RTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
     126RTR3DECL(int)  RTFileUnlock(RTFILE hFile, int64_t offLock, uint64_t cbLock)
    127127{
    128128    Assert(offLock >= 0);
    … …  
    148148    fl.l_pid    = 0;
    149149
    150     if (fcntl(File, F_SETLK, &fl) >= 0)
     150    if (fcntl(RTFileToNative(hFile), F_SETLK, &fl) >= 0)
    151151        return VINF_SUCCESS;
    152152
    … …  
    155155    {
    156156        /* A SMB hack, see RTFileLock. */
    157         if (!flock(File, LOCK_UN))
     157        if (!flock(RTFileToNative(hFile), LOCK_UN))
    158158            return VINF_SUCCESS;
    159159    }

  • trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

    r37596 r37597  
    638638        DISK_GEOMETRY DriveGeo;
    639639        DWORD cbDriveGeo;
    640         if (DeviceIoControl((HANDLE)hFile,
     640        if (DeviceIoControl((HANDLE)RTFileToNative(hFile),
    641641                            IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0,
    642642                            &DriveGeo, sizeof(DriveGeo), &cbDriveGeo, NULL))
    … …  
    652652                GET_LENGTH_INFORMATION DiskLenInfo;
    653653                DWORD junk;
    654                 if (DeviceIoControl((HANDLE)hFile,
     654                if (DeviceIoControl((HANDLE)RTFileToNative(hFile),
    655655                                    IOCTL_DISK_GET_LENGTH_INFO, NULL, 0,
    656656                                    &DiskLenInfo, sizeof(DiskLenInfo), &junk, (LPOVERLAPPED)NULL))
    … …  
    668668        }
    669669        else
    670         {
    671670            rc = RTErrConvertFromWin32(GetLastError());
    672         }
     671
    673672#elif defined(RT_OS_DARWIN)
    674673        struct stat DevStat;
    675         if (!fstat(hFile, &DevStat) && S_ISBLK(DevStat.st_mode))
     674        if (!fstat(RTFileToNative(hFile), &DevStat) && S_ISBLK(DevStat.st_mode))
    676675        {
    677676            uint64_t cBlocks;
    678677            uint32_t cbBlock;
    679             if (!ioctl(hFile, DKIOCGETBLOCKCOUNT, &cBlocks))
     678            if (!ioctl(RTFileToNative(hFile), DKIOCGETBLOCKCOUNT, &cBlocks))
    680679            {
    681                 if (!ioctl(hFile, DKIOCGETBLOCKSIZE, &cbBlock))
     680                if (!ioctl(RTFileToNative(hFile), DKIOCGETBLOCKSIZE, &cbBlock))
    682681                    cbSize = cBlocks * cbBlock;
    683682                else
    … …  
    689688        else
    690689            rc = VERR_INVALID_PARAMETER;
     690
    691691#elif defined(RT_OS_SOLARIS)
    692692        struct stat DevStat;
    693         if (!fstat(hFile, &DevStat) && (   S_ISBLK(DevStat.st_mode)
    694                                         || S_ISCHR(DevStat.st_mode)))
     693        if (   !fstat(RTFileToNative(hFile), &DevStat)
     694            && (   S_ISBLK(DevStat.st_mode)
     695                || S_ISCHR(DevStat.st_mode)))
    695696        {
    696697            struct dk_minfo mediainfo;
    697             if (!ioctl(hFile, DKIOCGMEDIAINFO, &mediainfo))
     698            if (!ioctl(RTFileToNative(hFile), DKIOCGMEDIAINFO, &mediainfo))
    698699                cbSize = mediainfo.dki_capacity * mediainfo.dki_lbsize;
    699700            else
    … …  
    702703        else
    703704            rc = VERR_INVALID_PARAMETER;
     705
    704706#elif defined(RT_OS_FREEBSD)
    705707        struct stat DevStat;
    706         if (!fstat(hFile, &DevStat) && S_ISCHR(DevStat.st_mode))
     708        if (!fstat(RTFileToNative(hFile), &DevStat) && S_ISCHR(DevStat.st_mode))
    707709        {
    708710            off_t cbMedia = 0;
    709             if (!ioctl(hFile, DIOCGMEDIASIZE, &cbMedia))
     711            if (!ioctl(RTFileToNative(hFile), DIOCGMEDIASIZE, &cbMedia))
    710712            {
    711713                cbSize = cbMedia;
    … …  
    10121014         * contain dirty buffers.
    10131015         */
    1014         RTFILE hFile = NIL_RTFILE;
    1015 
     1016        RTFILE hFile;
    10161017        rc = RTFileOpen(&hFile, pszUri, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    10171018        if (RT_SUCCESS(rc))
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette