VirtualBox

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


Ignore:
Timestamp:
Oct 22, 2009 12:34:22 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
53801
Message:

*,RTFileOpen: Fixing RTFileOpen flag misdesign: The deny, access and action flags are mandatory now.

Location:
trunk/src/VBox/Devices
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Network/slirp/slirp.c

    r23923 r23973  
    375375    {
    376376        RTStrmPrintf(buff, sizeof(buff), "%s/RESOLV2", etc);
    377         rc = RTFileOpen(&f, buff, RTFILE_O_READ);
     377        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    378378    }
    379379    if (RT_FAILURE(rc))
    380380    {
    381381        RTStrmPrintf(buff, sizeof(buff), "%s/RESOLV2", _PATH_ETC);
    382         rc = RTFileOpen(&f, buff, RTFILE_O_READ);
     382        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    383383    }
    384384    if (RT_FAILURE(rc))
    385385    {
    386386        RTStrmPrintf(buff, sizeof(buff), "%s/resolv.conf", _PATH_ETC);
    387         rc = RTFileOpen(&f, buff, RTFILE_O_READ);
     387        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    388388    }
    389389#else
    390390# ifndef DEBUG_vvl
    391     rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ);
     391    rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    392392# else
    393393    char *home = getenv("HOME");
    394394    RTStrPrintf(buff, sizeof(buff), "%s/resolv.conf", home);
    395     rc = RTFileOpen(&f, buff, RTFILE_O_READ);
     395    rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    396396    if (RT_SUCCESS(rc))
    397397    {
    … …  
    400400    else
    401401    {
    402         rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ);
     402        rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    403403        Log(("NAT: DNS we're using %s\n", buff));
    404404    }
    … …  
    771771    if (!link_up)
    772772        goto done;
    773    
     773
    774774    /*
    775775     * *_slowtimo needs calling if there are IP fragments
    … …  
    804804        if (pData->fmbuf_water_line == 1)
    805805        {
    806             if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
     806            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
    807807            {
    808808                pData->fmbuf_water_warn_sent = 0;
    … …  
    887887        if (pData->fmbuf_water_line == 1)
    888888        {
    889             if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
     889            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
    890890            {
    891891                pData->fmbuf_water_line = 0;
    … …  
    10271027        if (pData->fmbuf_water_line == 1)
    10281028        {
    1029             if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
     1029            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
    10301030            {
    10311031                pData->fmbuf_water_line = 0;
    … …  
    13241324        if (pData->fmbuf_water_line == 1)
    13251325        {
    1326             if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
     1326            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
    13271327            {
    13281328                pData->fmbuf_water_line = 0;
    … …  
    15491549        return;
    15501550    }
    1551     eh = mtod(m, struct ethhdr *); 
     1551    eh = mtod(m, struct ethhdr *);
    15521552    proto = ntohs(eh->h_proto);
    15531553#else
    … …  
    16211621#endif
    16221622#if 1
    1623             if (   pData->fmbuf_water_line 
     1623            if (   pData->fmbuf_water_line
    16241624                && pData->fmbuf_water_warn_sent == 0
    16251625                && (curtime - pData->tsmbuf_water_warn_sent) > 500)
    16261626            {
    1627                 icmp_error(pData, m, ICMP_SOURCEQUENCH, 0, 0, "Out of resources!!!"); 
     1627                icmp_error(pData, m, ICMP_SOURCEQUENCH, 0, 0, "Out of resources!!!");
    16281628                pData->fmbuf_water_warn_sent = 1;
    16291629                pData->tsmbuf_water_warn_sent = curtime;

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

    r22277 r23973  
    260260/**
    261261 * Construct a host parallel driver instance.
    262  * 
     262 *
    263263 * @copydoc FNPDMDRVCONSTRUCT
    264264 */
    … …  
    303303     * Open the device
    304304     */
    305     rc = RTFileOpen(&pThis->FileDevice, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
     305    rc = RTFileOpen(&pThis->FileDevice, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    306306    if (RT_FAILURE(rc))
    307307        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"),
    … …  
    433433    NULL,
    434434    /* pfnDetach */
    435     NULL, 
     435    NULL,
    436436    /* pfnPowerOff */
    437     NULL, 
     437    NULL,
    438438    /* pfnSoftReset */
    439439    NULL,

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

    r23160 r23973  
    12111211/**
    12121212 * Construct a char driver instance.
    1213  * 
     1213 *
    12141214 * @copydoc FNPDMDRVCONSTRUCT
    12151215 */
    … …  
    12881288#else
    12891289
    1290     rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
     1290    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    12911291# ifdef RT_OS_DARWIN
    12921292    if (RT_SUCCESS(rc))
    1293         rc = RTFileOpen(&pThis->DeviceFileR, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READ);
     1293        rc = RTFileOpen(&pThis->DeviceFileR, pThis->pszDevicePath, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    12941294# endif
    12951295
    … …  
    14951495    NULL,
    14961496    /* pfnDetach */
    1497     NULL, 
     1497    NULL,
    14981498    /* pfnPowerOff */
    1499     NULL, 
     1499    NULL,
    15001500    /* pfnSoftReset */
    15011501    NULL,

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

    r22653 r23973  
    150150     * Open the raw file.
    151151     */
    152     rc = RTFileOpen(&pThis->OutputFile, pThis->pszLocation, RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
     152    rc = RTFileOpen(&pThis->OutputFile, pThis->pszLocation, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
    153153    if (RT_FAILURE(rc))
    154154    {
    … …  
    180180
    181181    if (pThis->OutputFile != NIL_RTFILE)
    182     {   
     182    {
    183183        RTFileClose(pThis->OutputFile);
    184184        pThis->OutputFile = NIL_RTFILE;
    … …  
    200200
    201201    if (pThis->OutputFile != NIL_RTFILE)
    202     {   
     202    {
    203203        RTFileClose(pThis->OutputFile);
    204204        pThis->OutputFile = NIL_RTFILE;

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

    r23739 r23973  
    961961    RTFILE FileDevice;
    962962
    963     rc = RTFileOpen(&FileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE);
     963    rc = RTFileOpen(&FileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    964964    if (RT_FAILURE(rc))
    965965        return rc;
    … …  
    983983            RTFILE PassthroughDevice;
    984984
    985             rc = RTFileOpen(&PassthroughDevice, pszPassthroughDevice, RTFILE_O_READWRITE);
     985            rc = RTFileOpen(&PassthroughDevice, pszPassthroughDevice, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    986986
    987987            RTStrFree(pszPassthroughDevice);
    … …  
    10461046static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pFileBlockDevice, PRTFILE pFileRawDevice, bool fReadOnly)
    10471047{
    1048     unsigned fFlags = (fReadOnly ? RTFILE_O_READ : RTFILE_O_READWRITE) | RTFILE_O_NON_BLOCK;
     1048    unsigned fFlags = (fReadOnly ? RTFILE_O_READ : RTFILE_O_READWRITE)
     1049                    | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_NON_BLOCK;
    10491050    int rc = RTFileOpen(pFileBlockDevice, pThis->pszDeviceOpen, fFlags);
    10501051    if (RT_SUCCESS(rc))

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

    r23970 r23973  
    478478                                N_("Configuration error: Failed to get the \"DevicePath\" value"));
    479479
    480     rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
     480    rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    481481    if (RT_FAILURE(rc))
    482482        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,

  • trunk/src/VBox/Devices/Storage/ParallelsHDDCore.cpp

    r23223 r23973  
    143143
    144144#ifndef VBOX_WITH_NEW_IO_CODE
    145     unsigned uFileFlags = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
    146                                     : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
     145    uint32_t fOpen = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
     146                               : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
    147147
    148148    if (fCreate)
    149         uFileFlags |= RTFILE_O_CREATE;
    150     else
    151         uFileFlags |= RTFILE_O_OPEN;
    152 
    153     rc = RTFileOpen(&pImage->File, pImage->pszFilename, uFileFlags);
     149        fOpen |= RTFILE_O_CREATE;
     150    else
     151        fOpen |= RTFILE_O_OPEN;
     152
     153    rc = RTFileOpen(&pImage->File, pImage->pszFilename, fOpen);
    154154#else
    155155
    … …  
    415415    int rc;
    416416
    417     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
     417    rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    418418    if (RT_FAILURE(rc))
    419419        return VERR_VD_GEN_INVALID_HEADER;

  • trunk/src/VBox/Devices/Storage/RawHDDCore.cpp

    r23913 r23973  
    122122
    123123#ifndef VBOX_WITH_NEW_IO_CODE
    124     unsigned uFileFlags = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
    125                                     : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
     124    uint32_t fOpen = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
     125                               : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
    126126
    127127    if (fCreate)
    128         uFileFlags |= RTFILE_O_CREATE;
    129     else
    130         uFileFlags |= RTFILE_O_OPEN;
    131 
    132     rc = RTFileOpen(&pImage->File, pImage->pszFilename, uFileFlags);
     128        fOpen |= RTFILE_O_CREATE;
     129    else
     130        fOpen |= RTFILE_O_OPEN;
     131
     132    rc = RTFileOpen(&pImage->File, pImage->pszFilename, fOpen);
    133133#else
    134134

  • trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

    r23223 r23973  
    738738    pStorage->pfnCompleted = pfnCompleted;
    739739
    740     unsigned uFlags = 0;
     740    uint32_t fOpen = 0;
    741741
    742742    if (uOpenFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_READONLY)
    743         uFlags |= RTFILE_O_READ | RTFILE_O_DENY_NONE;
     743        fOpen |= RTFILE_O_READ      | RTFILE_O_DENY_NONE;
    744744    else
    745         uFlags |= RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
     745        fOpen |= RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
    746746
    747747    if (uOpenFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE)
    748         uFlags |= RTFILE_O_CREATE;
     748        fOpen |= RTFILE_O_CREATE;
    749749    else
    750         uFlags |= RTFILE_O_OPEN;
     750        fOpen |= RTFILE_O_OPEN;
    751751
    752752    /* Open the file. */
    753     int rc = RTFileOpen(&pStorage->File, pszLocation, uFlags);
     753    int rc = RTFileOpen(&pStorage->File, pszLocation, fOpen);
    754754    if (RT_SUCCESS(rc))
    755755    {

  • trunk/src/VBox/Devices/Storage/VBoxHDDFormats/AppleDiskImage/VBoxDMG.cpp

    r21405 r23973  
    10351035     */
    10361036    RTFILE hFile;
    1037     int rc = RTFileOpen(&hFile, pszFilename, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
     1037    int rc = RTFileOpen(&hFile, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
    10381038    if (RT_FAILURE(rc))
    10391039        return rc;

  • trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

    r23223 r23973  
    8989
    9090#ifndef VBOX_WITH_NEW_IO_CODE
    91     unsigned uFileFlags = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
    92                                     : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
     91    uint32_t fOpen = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
     92                               : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
    9393
    9494    if (fCreate)
    95         uFileFlags |= RTFILE_O_CREATE;
     95        fOpen |= RTFILE_O_CREATE;
    9696    else
    97         uFileFlags |= RTFILE_O_OPEN;
    98 
    99     rc = RTFileOpen(&pImage->File, pImage->pszFilename, uFileFlags);
     97        fOpen |= RTFILE_O_OPEN;
     98
     99    rc = RTFileOpen(&pImage->File, pImage->pszFilename, fOpen);
    100100#else
    101101

  • trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp

    r23223 r23973  
    226226
    227227#ifndef VBOX_WITH_NEW_IO_CODE
    228     unsigned uFileFlags = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
    229                                     : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
     228    uint32_t fOpen = fReadonly ? RTFILE_O_READ      | RTFILE_O_DENY_NONE
     229                               : RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
    230230
    231231    if (fCreate)
    232         uFileFlags |= RTFILE_O_CREATE;
    233     else
    234         uFileFlags |= RTFILE_O_OPEN;
    235 
    236     rc = RTFileOpen(&pImage->File, pImage->pszFilename, uFileFlags);
     232        fOpen |= RTFILE_O_CREATE;
     233    else
     234        fOpen |= RTFILE_O_OPEN;
     235
     236    rc = RTFileOpen(&pImage->File, pImage->pszFilename, fOpen);
    237237#else
    238238
    … …  
    774774    VHDFooter vhdFooter;
    775775
    776     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN);
     776    rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    777777    if (RT_FAILURE(rc))
    778778        return VERR_VD_VHD_INVALID_HEADER;
    … …  
    20152015        /* Interface doesn't provide such a feature. */
    20162016        RTFILE File;
    2017         rc = RTFileOpen(&File, pImage->pszFilename, RTFILE_O_OPEN | RTFILE_O_READ);
     2017        rc = RTFileOpen(&File, pImage->pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    20182018        if (RT_SUCCESS(rc))
    20192019        {

  • trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

    r22982 r23973  
    100100    {
    101101        RTFILE File;
    102         rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
     102        rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    103103        if (RT_SUCCESS(rc))
    104104        {
    … …  
    153153    VDClose(pVD, true);
    154154    RTFILE File;
    155     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
     155    rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    156156    if (RT_SUCCESS(rc))
    157157    {
    … …  
    535535
    536536    RTFILE File;
    537     rc = RTFileOpen(&File, pszBaseFilename, RTFILE_O_READ);
     537    rc = RTFileOpen(&File, pszBaseFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    538538    if (RT_SUCCESS(rc))
    539539    {
    … …  
    658658
    659659    RTFILE File;
    660     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
     660    rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    661661    if (RT_SUCCESS(rc))
    662662    {
    … …  
    827827
    828828    RTFILE File;
    829     rc = RTFileOpen(&File, DST_PATH, RTFILE_O_CREATE | RTFILE_O_WRITE);
     829    rc = RTFileOpen(&File, DST_PATH, RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE);
    830830    if (RT_SUCCESS(rc))
    831831        RTFileClose(File);
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