VirtualBox

Changeset 32431 in vbox


Ignore:
Timestamp:
Sep 11, 2010 6:02:17 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
65796
Message:

scm cleanup

Location:
trunk
Files:
57 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/VBoxHDD.h

    r32370 r32431  
    20802080 * Resizes the given disk image to the given size.
    20812081 *
    2082  * @return  VBox status 
     2082 * @return  VBox status
    20832083 * @return  VERR_VD_IMAGE_READ_ONLY if image is not writable.
    20842084 * @return  VERR_NOT_SUPPORTED if this kind of image can be compacted, but

  • trunk/include/VBox/pci.h

    r32263 r32431  
    470470{
    471471    pPciDev->config[VBOX_PCI_CAPABILITY_LIST] = u8Offset;
    472 } 
     472}
    473473
    474474/**

  • trunk/include/VBox/pdmifs.h

    r31251 r32431  
    21192119     * @param   pInterface          Pointer to this interface.
    21202120     * @param   guestInfo           Pointer to Guest Additions information structure.
    2121         * @thread  The emulation thread.
    2122          */
     2121    * @thread  The emulation thread.
     2122     */
    21232123    DECLR3CALLBACKMEMBER(void, pfnUpdateGuestInfo2,(PPDMIVMMDEVCONNECTOR pInterface, const struct VBoxGuestInfo2 *pGuestInfo));
    21242124

  • trunk/include/VBox/settings.h

    r32120 r32431  
    705705    bool                fAccelerate3D,
    706706                        fAccelerate2DVideo;     // requires settings version 1.8 (VirtualBox 3.1)
    707     FirmwareType_T      firmwareType;           // requires settings version 1.9 (VirtualBox 3.1)   
     707    FirmwareType_T      firmwareType;           // requires settings version 1.9 (VirtualBox 3.1)
    708708
    709709    PointingHidType_T   pointingHidType;        // requires settings version 1.10 (VirtualBox 3.2)

  • trunk/include/iprt/condvar.h

    r31154 r32431  
    282282#endif
    283283
    284 

  • trunk/include/iprt/memtracker.h

    r32125 r32431  
    200200#endif
    201201
    202 

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

    r32175 r32431  
    7979# VBoxDispD3D_DEFS    += VBOXDISPMP_TEST
    8080ifdef VBOXWDDM_WITH_VBVA
    81 VBoxDispD3D_DEFS    += VBOXWDDM_WITH_VBVA 
     81VBoxDispD3D_DEFS    += VBOXWDDM_WITH_VBVA
    8282endif
    8383
    … …  
    118118PROGRAMS += tstMvWnd
    119119tstMvWnd_TEMPLATE = VBOXR3EXE
    120 tstMvWnd_DEFS = UNICODE _UNICODE 
     120tstMvWnd_DEFS = UNICODE _UNICODE
    121121tstMvWnd_SOURCES  = \
    122122        wddm/dbg/tstMvWnd.cpp

  • trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProv.cpp

    r30252 r32431  
    6969
    7070
    71 /* 
     71/*
    7272 * SetUsageScenario is the provider's cue that it's going to be asked for tiles
    7373 * in a subsequent call. This call happens after the user pressed CTRL+ALT+DEL
    74  * and we need to handle the CPUS_LOGON event. 
     74 * and we need to handle the CPUS_LOGON event.
    7575 */
    7676HRESULT VBoxCredProv::SetUsageScenario(CREDENTIAL_PROVIDER_USAGE_SCENARIO cpUsageScenario,
    … …  
    105105                {
    106106                    hr = m_pCred->Initialize(m_cpUsageScenario,
    107                                              s_rgCredProvFieldDescriptors, 
     107                                             s_rgCredProvFieldDescriptors,
    108108                                             s_rgFieldStatePairs);
    109109                }
    … …  
    134134        case CPUS_CREDUI:
    135135        case CPUS_PLAP:
    136        
     136
    137137            hr = E_NOTIMPL;
    138138            break;
    … …  
    149149
    150150
    151 /* 
     151/*
    152152 * SetSerialization takes the kind of buffer that you would normally return to LogonUI for
    153153 * an authentication attempt.  It's the opposite of ICredentialProviderCredential::GetSerialization.
    … …  
    168168
    169169
    170 /* 
     170/*
    171171 * Called by LogonUI to give you a callback.  Providers often use the callback if they
    172172 * some event would cause them to need to change the set of tiles (visible UI elements)
    173  * that they enumerated. 
     173 * that they enumerated.
    174174 */
    175175HRESULT VBoxCredProv::Advise(ICredentialProviderEvents *pcpEvents,
    … …  
    187187    /*
    188188     * Save advice context for later use when binding to
    189      * certain ICredentialProviderEvents events. 
     189     * certain ICredentialProviderEvents events.
    190190     */
    191191    m_upAdviseContext = upAdviseContext;
    … …  
    199199    Log(("VBoxCredProv::UnAdvise\n"));
    200200    if (m_pCredProvEvents != NULL)
    201     {     
     201    {
    202202        m_pCredProvEvents->Release();
    203203        m_pCredProvEvents = NULL;
    … …  
    208208
    209209
    210 /* 
     210/*
    211211 * Called by LogonUI to determine the number of fields in your tiles. This
    212212 * does mean that all your tiles must have the same number of fields.
    … …  
    248248
    249249
    250 /* 
     250/*
    251251 * Sets pdwCount to the number of tiles that we wish to show at this time.
    252252 * Sets pdwDefault to the index of the tile which should be used as the default.
    … …  
    317317       && ppCredProvCredential)
    318318    {
    319         hr = m_pCred->QueryInterface(IID_ICredentialProviderCredential, 
     319        hr = m_pCred->QueryInterface(IID_ICredentialProviderCredential,
    320320                                     reinterpret_cast<void**>(ppCredProvCredential));
    321321    }

  • trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProv.h

    r30252 r32431  
    9191
    9292        /** Interface reference count. */
    93         LONG                                     m_cRef;                             
     93        LONG                                     m_cRef;
    9494        /** Our one and only credential. */
    95         VBoxCredential                          *m_pCred; 
    96         /** Poller thread for credential lookup. */                           
     95        VBoxCredential                          *m_pCred;
     96        /** Poller thread for credential lookup. */
    9797        VBoxCredPoller                          *m_pPoller;
    9898        /** Used to tell our owner to re-enumerate credentials. */
    9999        ICredentialProviderEvents               *m_pCredProvEvents;
    100         /** Used to tell our owner who we are when asking to re-enumerate credentials. */           
     100        /** Used to tell our owner who we are when asking to re-enumerate credentials. */
    101101        UINT_PTR                                 m_upAdviseContext;
    102102        /** Saved usage scenario. */

  • trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredential.cpp

    r30367 r32431  
    105105    PWSTR *ppwszStored;
    106106
    107     /* 
     107    /*
    108108     * Update domain name (can be NULL) and will
    109109     * be later replaced by the local computer name in the
    … …  
    138138        else
    139139        {
    140             /* 
    141              * Oky, no display name, but mabye it's a 
     140            /*
     141             * Oky, no display name, but mabye it's a
    142142             * principal name from which we have to extract the
    143143             * domain from? ([email protected] -> jdoe in
    … …  
    175175
    176176
    177 /* 
     177/*
    178178 * Initializes one credential with the field information passed in.
    179179 * Set the value of the SFI_USERNAME field to pwzUsername.
    … …  
    190190    m_cpUS = cpus;
    191191
    192     /* 
     192    /*
    193193     * Copy the field descriptors for each field. This is useful if you want to vary the
    194      * field descriptors based on what Usage scenario the credential was created for. 
     194     * field descriptors based on what Usage scenario the credential was created for.
    195195     */
    196196    for (DWORD i = 0; SUCCEEDED(hr) && i < ARRAYSIZE(m_rgCredProvFieldDescriptors); i++)
    … …  
    207207
    208208
    209 /* 
     209/*
    210210 * LogonUI calls this in order to give us a callback in case we need to notify it of anything.
    211  * Store this callback pointer for later use. 
     211 * Store this callback pointer for later use.
    212212 */
    213213HRESULT VBoxCredential::Advise(ICredentialProviderCredentialEvents* pcpce)
    … …  
    230230    /*
    231231     * We're done with the current iteration, trigger a refresh of ourselves
    232      * to reset credentials and to keep the logon UI clean (no stale entries anymore). 
     232     * to reset credentials and to keep the logon UI clean (no stale entries anymore).
    233233     */
    234234    Reset();
    235235
    236     /* 
     236    /*
    237237     * Force a re-iteration of the provider (which will give zero credentials
    238      * to try out because we just resetted our one and only a line above. 
     238     * to try out because we just resetted our one and only a line above.
    239239     */
    240240    if (m_pProvider)
    … …  
    260260    Log(("VBoxCredential::SetSelected\n"));
    261261
    262     /* 
     262    /*
    263263     * Don't do auto logon here because it would retry too often with
    264264     * every credential field (user name, password, domain, ...) which makes
    … …  
    363363                              &dwTotalEntries,
    364364                              &dwResumeHandle);
    365         if (   (nStatus == NERR_Success) 
     365        if (   (nStatus == NERR_Success)
    366366            || (nStatus == ERROR_MORE_DATA))
    367367        {
    … …  
    370370                for (DWORD i = 0; i < dwEntriesRead; i++)
    371371                {
    372                     /* 
    373                      * Search for the "display name" - that might be 
     372                    /*
     373                     * Search for the "display name" - that might be
    374374                     * "John Doe" or something similar the user recognizes easier
    375375                     * and may not the same as the "account" name (e.g. "jdoe").
    376376                     */
    377                     if (   pCurBuf 
     377                    if (   pCurBuf
    378378                        && pCurBuf->usri2_full_name
    379379                        && StrCmpI(pwszDisplayName, pCurBuf->usri2_full_name) == 0)
    380380                    {
    381                         /* 
    382                          * Copy the real user name (e.g. "jdoe") to our 
     381                        /*
     382                         * Copy the real user name (e.g. "jdoe") to our
    383383                         * output buffer.
    384384                         */
    … …  
    411411    }
    412412
    413     Log(("VBoxCredential::TranslateAccountName: Returned nStatus=%ld, fFound=%s\n", 
     413    Log(("VBoxCredential::TranslateAccountName: Returned nStatus=%ld, fFound=%s\n",
    414414         nStatus, fFound ? "Yes" : "No"));
    415415    return fFound;
    … …  
    427427        if (TranslateNameW(pwszName, NameUnknown, NameUserPrincipal, ppwszAccoutName, &cbLen))
    428428        {
    429             Log(("VBoxCredential::GetAccountName: Real ADS account name of '%ls' is '%ls'\n", 
     429            Log(("VBoxCredential::GetAccountName: Real ADS account name of '%ls' is '%ls'\n",
    430430                 pwszName, ppwszAccoutName));
    431431        }
    … …  
    442442    {
    443443        dwErr = NO_ERROR;
    444        
     444
    445445    }
    446446#endif
    … …  
    514514    /* Check to make sure dwFieldID is a legitimate index. */
    515515    HRESULT hr;
    516     if (   dwFieldID < ARRAYSIZE(m_rgCredProvFieldDescriptors) 
     516    if (   dwFieldID < ARRAYSIZE(m_rgCredProvFieldDescriptors)
    517517        && ppwszString)
    518518    {
    … …  
    524524
    525525                /*
    526                  * Make a copy of the string and return that, the caller is responsible for freeing it. 
     526                 * Make a copy of the string and return that, the caller is responsible for freeing it.
    527527                 * Note that there can be empty fields (like a missing domain name); handle them
    528528                 * by writing an empty string.
    … …  
    570570
    571571
    572 /* 
     572/*
    573573 * Sets the value of a field which can accept a string as a value.
    574574 * This is called on each keystroke when a user types into an edit field.
    … …  
    577577                                       PCWSTR pcwzString)
    578578{
    579     Log(("VBoxCredential::SetStringValue: dwFieldID=%ld, pcwzString=%ls\n", 
     579    Log(("VBoxCredential::SetStringValue: dwFieldID=%ld, pcwzString=%ls\n",
    580580         dwFieldID, pcwzString));
    581581
    … …  
    589589    /* Validate parameters. */
    590590    if (   dwFieldID < ARRAYSIZE(m_rgCredProvFieldDescriptors)
    591         && (   CPFT_EDIT_TEXT     == m_rgCredProvFieldDescriptors[dwFieldID].cpft 
     591        && (   CPFT_EDIT_TEXT     == m_rgCredProvFieldDescriptors[dwFieldID].cpft
    592592            || CPFT_PASSWORD_TEXT == m_rgCredProvFieldDescriptors[dwFieldID].cpft))
    593593    {
    … …  
    709709            hr = UnicodeStringInitWithString(wszComputerName, &kil.LogonDomainName);
    710710        else
    711             hr = UnicodeStringInitWithString(m_rgFieldStrings [SFI_DOMAINNAME], 
     711            hr = UnicodeStringInitWithString(m_rgFieldStrings [SFI_DOMAINNAME],
    712712                                             &kil.LogonDomainName);
    713713
    … …  
    723723                    /* Allocate copies of, and package, the strings in a binary blob. */
    724724                    kil.MessageType = KerbInteractiveLogon;
    725                     hr = KerbInteractiveLogonPack(kil, 
    726                                                   &pcpCredentialSerialization->rgbSerialization, 
     725                    hr = KerbInteractiveLogonPack(kil,
     726                                                  &pcpCredentialSerialization->rgbSerialization,
    727727                                                  &pcpCredentialSerialization->cbSerialization);
    728728                    if (SUCCEEDED(hr))
    … …  
    739739                             * By setting this to CPGSR_RETURN_CREDENTIAL_FINISHED we are letting logonUI know
    740740                             * that we have all the information we need and it should attempt to submit the
    741                              * serialized credential. 
     741                             * serialized credential.
    742742                             */
    743743                            *pcpGetSerializationResponse = CPGSR_RETURN_CREDENTIAL_FINISHED;
    … …  
    759759
    760760
    761 /* 
     761/*
    762762 * ReportResult is completely optional.  Its purpose is to allow a credential to customize the string
    763763 * and the icon displayed in the case of a logon failure.  For example, we have chosen to

  • trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredential.h

    r30367 r32431  
    124124        LONG                                  m_cRef;
    125125        /** The usage scenario for which we were enumerated. */
    126         CREDENTIAL_PROVIDER_USAGE_SCENARIO    m_cpUS;     
     126        CREDENTIAL_PROVIDER_USAGE_SCENARIO    m_cpUS;
    127127        /** Holding type and name of each field in the tile. */
    128128        CREDENTIAL_PROVIDER_FIELD_DESCRIPTOR  m_rgCredProvFieldDescriptors[SFI_NUM_FIELDS];
    129129        /** Holding state of each field in the tile. */
    130         FIELD_STATE_PAIR                      m_rgFieldStatePairs[SFI_NUM_FIELDS];         
     130        FIELD_STATE_PAIR                      m_rgFieldStatePairs[SFI_NUM_FIELDS];
    131131        /** Holding string value of each field. This is different from the name of
    132132            the field held in m_rgCredProvFieldDescriptors. */
    133         PWSTR                                 m_rgFieldStrings[SFI_NUM_FIELDS];           
     133        PWSTR                                 m_rgFieldStrings[SFI_NUM_FIELDS];
    134134        ICredentialProviderCredentialEvents  *m_pCredProvCredentialEvents;
    135135

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

    r32249 r32431  
    197197                SendMessageCallback(hViewer, WM_CHANGECBCHAIN, (WPARAM)pCtx->hwndNextInChain, (LPARAM)pCtx->hwndNextInChain, CBChainPingProc, (ULONG_PTR) pCtx);
    198198        } break;
    199        
     199
    200200        case WM_CLOSE:
    201201        {

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

    r32182 r32431  
    120120
    121121#if 0 /* for valgrind */
    122     RT_ZERO(szCmd); 
    123     RT_ZERO(szArgs); 
    124     RT_ZERO(szEnv); 
    125     RT_ZERO(szUser); 
     122    RT_ZERO(szCmd);
     123    RT_ZERO(szArgs);
     124    RT_ZERO(szEnv);
     125    RT_ZERO(szUser);
    126126    RT_ZERO(szPassword);
    127127#endif

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

    r31982 r32431  
    338338    {
    339339        ULONG ulError = LsaNtStatusToWinError(rcNt);
    340         /* Skip session data which is not valid anymore because it may have been                 
     340        /* Skip session data which is not valid anymore because it may have been
    341341         * already terminated. */
    342342        if (ulError != ERROR_NO_SUCH_LOGON_SESSION)

  • trunk/src/VBox/Additions/common/testcase/Makefile.kmk

    • Property svn:eol-style set to native

  • trunk/src/VBox/Additions/common/testcase/tstPageFusion.cpp

    • Property svn:eol-style set to native

  • trunk/src/VBox/Additions/linux/sharedfolders/utils.c

    r31719 r32431  
    435435 * [dentry] contains string encoded in coding system that corresponds
    436436 * to [sf_g]->nls, we must convert it to UTF8 here and pass down to
    437  * [sf_make_path] which will allocate SHFLSTRING and fill it in 
     437 * [sf_make_path] which will allocate SHFLSTRING and fill it in
    438438 */
    439439int sf_path_from_dentry(const char *caller, struct sf_glob_info *sf_g,

  • trunk/src/VBox/Devices/Audio/DevCodec.cpp

    r32412 r32431  
    216216{
    217217    AMPLIFIER *pAmplifier = NULL;
    218     bool fIsLeft = false; 
    219     bool fIsRight = false; 
     218    bool fIsLeft = false;
     219    bool fIsRight = false;
    220220    bool fIsOut = false;
    221221    bool fIsIn = false;
    … …  
    240240    if (pAmplifier)
    241241    {
    242         fIsOut = CODEC_SET_AMP_IS_OUT_DIRECTION(cmd); 
    243         fIsIn = CODEC_SET_AMP_IS_IN_DIRECTION(cmd); 
    244         fIsRight = CODEC_SET_AMP_IS_RIGHT_SIDE(cmd); 
    245         fIsLeft = CODEC_SET_AMP_IS_LEFT_SIDE(cmd); 
     242        fIsOut = CODEC_SET_AMP_IS_OUT_DIRECTION(cmd);
     243        fIsIn = CODEC_SET_AMP_IS_IN_DIRECTION(cmd);
     244        fIsRight = CODEC_SET_AMP_IS_RIGHT_SIDE(cmd);
     245        fIsLeft = CODEC_SET_AMP_IS_LEFT_SIDE(cmd);
    246246        u8Index = CODEC_SET_AMP_INDEX(cmd);
    247247        if (   (!fIsLeft && !fIsRight)
    … …  
    254254            if (fIsRight)
    255255                codecSetRegisterU8(&AMPLIFIER_REGISTER(*pAmplifier, AMPLIFIER_IN, AMPLIFIER_RIGHT, u8Index), cmd, 0);
    256         } 
     256        }
    257257        if (fIsOut)
    258258        {

  • trunk/src/VBox/Devices/Audio/DevCodec.h

    r31990 r32431  
    5353typedef uint32_t AMPLIFIER[AMPLIFIER_SIZE];
    5454#define AMPLIFIER_IN    0
    55 #define AMPLIFIER_OUT   1 
     55#define AMPLIFIER_OUT   1
    5656#define AMPLIFIER_LEFT  1
    5757#define AMPLIFIER_RIGHT 0
    … …  
    6868    uint32_t    u32A_param;
    6969    AMPLIFIER B_params;
    70    
     70
    7171} DACNODE, *PDACNODE;
    7272

  • trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

    r32335 r32431  
    351351    uint32_t    u32BdleCviLen;
    352352    uint32_t    u32BdleCviPos;
    353     bool        fBdleCviIoc; 
     353    bool        fBdleCviIoc;
    354354} HDABDLEDESC, *PHDABDLEDESC;
    355355
    … …  
    587587#define IS_INTERRUPT_OCCURED_AND_ENABLED(pState, num)                       \
    588588        (   INTCTL_SX((pState), num)                                        \
    589          && (SDSTS(pState, num) & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS))) 
     589         && (SDSTS(pState, num) & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS)))
    590590    bool fIrq = false;
    591591    if(   INTCTL_CIE(pState)
    … …  
    887887        || RIRBSTS_RINTFL(pState)
    888888        || HDA_REG_FLAG_VALUE(pState, CORBSTS, CMEI)
    889         || STATESTS(pState)) 
     889        || STATESTS(pState))
    890890        v |= RT_BIT(30);
    891891#define HDA_IS_STREAM_EVENT(pState, stream)             \
    … …  
    893893        || (SDSTS((pState),stream) & HDA_REG_FIELD_FLAG_MASK(SDSTS, FE))  \
    894894        || (SDSTS((pState),stream) & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS)))
    895 #define MARK_STREAM(pState, stream, v) do {(v) |= HDA_IS_STREAM_EVENT((pState),stream) ? RT_BIT((stream)) : 0;}while(0) 
     895#define MARK_STREAM(pState, stream, v) do {(v) |= HDA_IS_STREAM_EVENT((pState),stream) ? RT_BIT((stream)) : 0;}while(0)
    896896    MARK_STREAM(pState, 0, v);
    897897    MARK_STREAM(pState, 1, v);
    … …  
    13321332        /* Optionally write back the current DMA position. */
    13331333        if (pState->u64DPBase & DPBASE_ENABLED)
    1334             PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), 
     1334            PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState),
    13351335                               (pState->u64DPBase & DPBASE_ADDR_MASK) + u8Strm*8, pu32Lpib, sizeof(*pu32Lpib));
    13361336

  • trunk/src/VBox/Devices/Network/slirp/bsd/kern/kern_mbuf.c

    r30351 r32431  
    129129        nmbjumbo16 = nmbjumbo9 / 2;
    130130#else
    131     /* drvNATNetowrkUp_AllocBuf always requests mbuf from this 
     131    /* drvNATNetowrkUp_AllocBuf always requests mbuf from this
    132132     * zones, that require more buffers allocated on jumbo16 zone,
    133      * in case of intensive communication like p2p and UDP benches. 
     133     * in case of intensive communication like p2p and UDP benches.
    134134     */
    135135    nmbjumbo16 = nmbclusters;

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

    r30921 r32431  
    210210    QStr2CStr(qw_qname, cname, sizeof(cname));
    211211    cname_len = RTStrNLen(cname, sizeof(cname));
    212     /* Some guests like win-xp adds _dot_ after host name 
     212    /* Some guests like win-xp adds _dot_ after host name
    213213     * and after domain name (not passed with host resolver)
    214214     * that confuses host resolver.
    215215     */
    216     if (   cname_len > 2 
     216    if (   cname_len > 2
    217217        && cname[cname_len - 1] == '.'
    218218        && cname[cname_len - 2] == '.')

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

    r30421 r32431  
    420420void slirp_ext_m_free(PNATState pData, struct mbuf *m, uint8_t *pu8Buf)
    421421{
    422    
    423     if (   !pu8Buf 
     422
     423    if (   !pu8Buf
    424424        && pu8Buf != mtod(m, uint8_t *))
    425425        RTMemFree(pu8Buf); /* This buffer was allocated on heap */

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

    r30426 r32431  
    279279}
    280280#else /* VBOX_WITH_SLIRP_BSD_SBUF */
    281 void 
     281void
    282282sbappend (PNATState pData, struct socket *so, struct mbuf *m)
    283283{

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

    r30421 r32431  
    13811381
    13821382/**
    1383  * @note This function will free m! 
     1383 * @note This function will free m!
    13841384 */
    13851385static void arp_input(PNATState pData, struct mbuf *m)

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

    r30402 r32431  
    334334
    335335    if (len > mss)
    336         len -= len % mss; 
     336        len -= len % mss;
    337337    buf = RTMemAlloc(len);
    338338    if (buf == NULL)
    … …  
    341341        return -1;
    342342    }
    343    
     343
    344344    n = recv(so->s, buf, len, (so->so_tcpcb->t_force? MSG_OOB:0));
    345345    if (n <= 0)
    … …  
    650650
    651651    len = sbuf_len(sb);
    652    
     652
    653653    n = send(so->s, sbuf_data(sb), len, (fUrg ? MSG_OOB : 0));
    654654    if (n < 0)

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

    r32429 r32431  
    52595259
    52605260    LogFlowFunc(("pBackendData=%p uOffset=%#llx pIoCtx=%#p cbToRead=%u pcbActuallyRead=%p\n",
    5261                      pvBackendData, uOffset, pIoCtx, cbToRead, pcbActuallyRead));
     5261                     pvBackendData, uOffset, pIoCtx, cbToRead, pcbActuallyRead));
    52625262
    52635263    if (uOffset + cbToRead > pImage->cbSize)

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

    r32386 r32431  
    57205720 * Resizes the the given disk image to the given size.
    57215721 *
    5722  * @return  VBox status 
     5722 * @return  VBox status
    57235723 * @return  VERR_VD_IMAGE_READ_ONLY if image is not writable.
    57245724 * @return  VERR_NOT_SUPPORTED if this kind of image can be compacted, but

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

    r31920 r32431  
    25432543
    25442544    /*
    2545      * Making the image smaller is not supported at the moment. 
     2545     * Making the image smaller is not supported at the moment.
    25462546     * Resizing is also not supported for fixed size images and
    25472547     * very old images.

  • trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

    r32395 r32431  
    8888{
    8989    va_list args;
    90    
     90
    9191    va_start(args, pszFormat);
    9292    RTPrintf("\n"
    … …  
    9999{
    100100    va_list args;
    101    
     101
    102102    va_start(args, pszFormat);
    103103    RTPrintf("\n"
    … …  
    120120    RTUuidClear(&parentUuid);
    121121    int rc;
    122    
     122
    123123    /* Parse the command line. */
    124124    static const RTGETOPTDEF s_aOptions[] =
    … …  
    163163        }
    164164    }
    165    
     165
    166166    /* Check for mandatory parameters. */
    167167    if (!pszFilename)
    168168        return errorSyntax("Mandatory --filename option missing\n");
    169    
     169
    170170    /* Check for consistency of optional parameters. */
    171171    if (fSetImageUuid && RTUuidIsNull(&imageUuid))
    172172        return errorSyntax("Invalid parameter to --uuid option\n");
    173    
     173
    174174    /* Autodetect image format. */
    175175    if (!pszFormat)
    … …  
    181181            return errorRuntime("Format autodetect failed: %Rrc\n", rc);
    182182    }
    183    
     183
    184184    PVBOXHDD pVD = NULL;
    185185    rc = VDCreate(pVDIfs, &pVD);
    186186    if (RT_FAILURE(rc))
    187187        return errorRuntime("Cannot create the virtual disk container: %Rrc\n", rc);
    188    
    189    
     188
     189
    190190    rc = VDOpen(pVD, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
    191191    if (RT_FAILURE(rc))
    192192        return errorRuntime("Cannot open the virtual disk image \"%s\": %Rrc\n",
    193193                            pszFilename, rc);
    194    
     194
    195195    RTUUID oldImageUuid;
    196196    rc = VDGetUuid(pVD, VD_LAST_IMAGE, &oldImageUuid);
    … …  
    198198        return errorRuntime("Cannot get UUID of virtual disk image \"%s\": %Rrc\n",
    199199                            pszFilename, rc);
    200    
     200
    201201    RTPrintf("Old image UUID:  %RTuuid\n", &oldImageUuid);
    202    
     202
    203203    RTUUID oldParentUuid;
    204204    rc = VDGetParentUuid(pVD, VD_LAST_IMAGE, &oldParentUuid);
    … …  
    206206        return errorRuntime("Cannot get parent UUID of virtual disk image \"%s\": %Rrc\n",
    207207                            pszFilename, rc);
    208    
     208
    209209    RTPrintf("Old parent UUID: %RTuuid\n", &oldParentUuid);
    210    
     210
    211211    if (fSetImageUuid)
    212212    {
    … …  
    217217                                pszFilename, rc);
    218218    }
    219    
     219
    220220    if (fSetParentUuid)
    221221    {
    … …  
    226226                                pszFilename, rc);
    227227    }
    228    
     228
    229229    rc = VDCloseAll(pVD);
    230230    if (RT_FAILURE(rc))
    231231        return errorRuntime("Closing image failed! rc=%Rrc\n", rc);
    232    
     232
    233233    if (pszFormat)
    234234    {
    … …  
    236236        pszFormat = NULL;
    237237    }
    238    
    239     return 0;   
     238
     239    return 0;
    240240}
    241241
    … …  
    252252    unsigned uImageFlags = VD_IMAGE_FLAGS_NONE;
    253253    int rc = VINF_SUCCESS;
    254    
     254
    255255    /* Parse the command line. */
    256256    static const RTGETOPTDEF s_aOptions[] =
    … …  
    292292        }
    293293    }
    294    
     294
    295295    /* Check for mandatory parameters. */
    296296    if (!pszSrcFilename)
    … …  
    298298    if (!pszDstFilename)
    299299        return errorSyntax("Mandatory --dstfilename option missing\n");
    300    
     300
    301301    /* check the variant parameter */
    302302    if (pszVariant)
    … …  
    332332        }
    333333    }
    334    
     334
    335335    do
    336336    {
    … …  
    363363        if (!pszDstFormat)
    364364            pszDstFormat = "VDI";
    365        
     365
    366366        rc = VDCreate(pVDIfs, &pDstDisk);
    367367        if (RT_FAILURE(rc))
    … …  
    370370            break;
    371371        }
    372        
     372
    373373        uint64_t cbSize = VDGetSize(pSrcDisk, VD_LAST_IMAGE);
    374374        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", pszSrcFilename, cbSize, (cbSize + _1M - 1) / _1M);
    375        
     375
    376376        /* Create the output image */
    377377        rc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, pszDstFormat,
    … …  
    382382            break;
    383383        }
    384            
     384
    385385    }
    386386    while (0);
    387        
     387
    388388    if (pDstDisk)
    389389        VDCloseAll(pDstDisk);
    390390    if (pSrcDisk)
    391391        VDCloseAll(pSrcDisk);
    392    
     392
    393393    return RT_SUCCESS(rc) ? 0 : 1;
    394394}
    … …  
    417417                pszFilename = ValueUnion.psz;
    418418                break;
    419                
     419
    420420            default:
    421421                ch = RTGetOptPrintError(ch, &ValueUnion);
    … …  
    424424        }
    425425    }
    426    
     426
    427427    /* Check for mandatory parameters. */
    428428    if (!pszFilename)
    429429        return errorSyntax("Mandatory --filename option missing\n");
    430    
     430
    431431    /* just try it */
    432432    char *pszFormat = NULL;
    … …  
    438438    if (RT_FAILURE(rc))
    439439        return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
    440    
     440
    441441    /* Open the image */
    442442    rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_INFO, NULL);
    443443    if (RT_FAILURE(rc))
    444444        return errorRuntime("Error while opening the image: %Rrc\n", rc);
    445    
     445
    446446    VDDumpImages(pDisk);
    447    
     447
    448448    VDCloseAll(pDisk);
    449    
     449
    450450    return rc;
    451451}
    … …  
    456456    PVBOXHDD pDisk = NULL;
    457457    const char *pszFilename = NULL;
    458    
     458
    459459    /* Parse the command line. */
    460460    static const RTGETOPTDEF s_aOptions[] =
    … …  
    473473                pszFilename = ValueUnion.psz;
    474474                break;
    475                
     475
    476476            default:
    477477                ch = RTGetOptPrintError(ch, &ValueUnion);
    … …  
    480480        }
    481481    }
    482    
     482
    483483    /* Check for mandatory parameters. */
    484484    if (!pszFilename)
    485485        return errorSyntax("Mandatory --filename option missing\n");
    486    
     486
    487487    /* just try it */
    488488    char *pszFormat = NULL;
    … …  
    490490    if (RT_FAILURE(rc))
    491491        return errorSyntax("Format autodetect failed: %Rrc\n", rc);
    492    
     492
    493493    rc = VDCreate(pVDIfs, &pDisk);
    494494    if (RT_FAILURE(rc))
    495495        return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
    496    
     496
    497497    /* Open the image */
    498498    rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
    499499    if (RT_FAILURE(rc))
    500500        return errorRuntime("Error while opening the image: %Rrc\n", rc);
    501    
     501
    502502    rc = VDCompact(pDisk, 0, NULL);
    503503    if (RT_FAILURE(rc))
    504504        errorRuntime("Error while compacting image: %Rrc\n", rc);
    505    
     505
    506506    VDCloseAll(pDisk);
    507    
     507
    508508    return rc;
    509509}
    … …  
    516516             "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
    517517             "All rights reserved.\n"
    518              "\n");   
     518             "\n");
    519519}
    520520
    … …  
    530530    int  iCmd      = 1;
    531531    int  iCmdArg;
    532    
     532
    533533    /* global options */
    534534    for (int i = 1; i < argc || argc <= iCmd; i++)
    … …  
    545545            return 0;
    546546        }
    547        
     547
    548548        if (   !strcmp(argv[i], "-v")
    549549            || !strcmp(argv[i], "-version")
    … …  
    569569        }
    570570    }
    571    
     571
    572572    iCmdArg = iCmd + 1;
    573    
     573
    574574    if (fShowLogo)
    575575        showLogo();
    … …  
    582582    vdInterfaceErrorCallbacks.pfnError     = handleVDError;
    583583    vdInterfaceErrorCallbacks.pfnMessage   = handleVDMessage;
    584    
     584
    585585    rc = VDInterfaceAdd(&vdInterfaceError, "VBoxManage_IError", VDINTERFACETYPE_ERROR,
    586586                        &vdInterfaceErrorCallbacks, NULL, &pVDIfs);
    587    
     587
    588588    rc = VDInit();
    589589    if (RT_FAILURE(rc))
    590590        return errorSyntax("Initalizing backends failed! rc=%Rrc\n");
    591    
     591
    592592    /*
    593593     * All registered command handlers
    … …  
    614614            handlerArg.argc = argc - iCmdArg;
    615615            handlerArg.argv = &argv[iCmdArg];
    616            
     616
    617617            rc = s_commandHandlers[commandIndex].handler(&handlerArg);
    618618            break;
    … …  
    620620    }
    621621    if (!s_commandHandlers[commandIndex].command)
    622         return errorSyntax("Invalid command '%s'", argv[iCmd]);       
     622        return errorSyntax("Invalid command '%s'", argv[iCmd]);
    623623
    624624    rc = VDShutdown();
    625625    if (RT_FAILURE(rc))
    626626        return errorSyntax("Unloading backends failed! rc=%Rrc\n", rc);
    627    
     627
    628628    return rc;
    629629}

  • trunk/src/VBox/Devices/USB/VUSBUrb.cpp

    r32010 r32431  
    20112011 * state and in the async list until its reaped. When it's finally reaped
    20122012 * it will be unlinked and freed without doing any completion.
    2013  * 
     2013 *
    20142014 * There are different modes of canceling an URB. When devices are being
    20152015 * disconnected etc., they will be completed with an error (CRC). However,

  • trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

    r32192 r32431  
    762762    if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_ABORT_ENDPOINT, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
    763763        return;
    764    
     764
    765765    rc = GetLastError();
    766766    if (    rc == ERROR_INVALID_HANDLE_STATE

  • trunk/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h

    r31798 r32431  
    2222    NullFB()
    2323    :
    24     mScreen(NULL), mBuffer(NULL), 
     24    mScreen(NULL), mBuffer(NULL),
    2525    mUsesGuestVRAM(false),
    2626    mWidth(0), mHeight(0)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r32296 r32431  
    446446    if (vboxProblem().isAnyWarningShown())
    447447    {
    448         vboxProblem().closeAllWarnings();
     448        vboxProblem().closeAllWarnings();
    449449        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
    450450        return;

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp

    r32409 r32431  
    163163        /* Paint the name in the center of the monitor */
    164164        painter.fillRect(m_vRect, Qt::black);
    165                 QFont font = painter.font();
     165                QFont font = painter.font();
    166166        font.setBold(true);
    167167        int fFlags = Qt::AlignCenter | Qt::TextWordWrap;

  • trunk/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp

    r30489 r32431  
    228228    RTTESTI_CHECK_RC(SUPSemEventMultiCreate(pSession, &hEvent), VINF_SUCCESS);
    229229    RTTESTI_CHECK_RC(RTThreadCreate(&hThread, tstSupSemInterruptibleMRE, (void *)hEvent, 0, RTTHREADTYPE_TIMER, RTTHREADFLAGS_WAITABLE, "IntSRE"), VINF_SUCCESS);
    230    
     230
    231231    RTTHREAD hThread2 = NIL_RTTHREAD;
    232232    RTTESTI_CHECK_RC(RTThreadCreate(&hThread2, tstSupSemInterruptibleMRE, (void *)hEvent, 0, RTTHREADTYPE_TIMER, RTTHREADFLAGS_WAITABLE, "IntSRE"), VINF_SUCCESS);

  • trunk/src/VBox/HostDrivers/VBoxUSB/win/Device/vboxdev.cpp

    r31896 r32431  
    19511951        || devdescr->iProduct || devdescr->iManufacturer
    19521952#endif
    1953        ) 
     1953       )
    19541954    {
    19551955        status = VBoxUSBGetLangID(pDevice, &langId);
    … …  
    19711971        }
    19721972        memset(pstrdescr, 0, uLength);
    1973    
     1973
    19741974        pstrdescr->bLength         = uLength;
    19751975        pstrdescr->bDescriptorType = USB_STRING_DESCRIPTOR_TYPE;
    1976    
     1976
    19771977        status = VBoxUSBGetDescriptor(pDevice, pstrdescr, uLength,  USB_STRING_DESCRIPTOR_TYPE, devdescr->iSerialNumber, langId);
    19781978        if (!NT_SUCCESS(status))

  • trunk/src/VBox/Installer/solaris/vboxconfig.sh

    r32388 r32431  
    130130        exit 1
    131131    fi
    132    
     132
    133133    binfilename=`basename $1`
    134134    binfilepath=`which $binfilename 2> /dev/null`

  • trunk/src/VBox/Main/ConsoleVRDPServer.cpp

    r31957 r32431  
    777777
    778778            /* features are mapped to "VRDP/Feature/NAME" extra data. */
    779             com::Utf8Str extraData("VRDP/Feature/"); 
     779            com::Utf8Str extraData("VRDP/Feature/");
    780780            extraData += pFeature->achInfo;
    781781

  • trunk/src/VBox/Main/ProgressProxyImpl.cpp

    r30976 r32431  
    313313    HRESULT hrc;
    314314    LogFlowThisFunc(("\n"));
    315    
     315
    316316    NOREF(fEarly);
    317317

  • trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

    r32324 r32431  
    10261026 *
    10271027 * @returns zero on success or (positive) posix error value.
    1028  * @param   pcszPath      the path to dump. 
     1028 * @param   pcszPath      the path to dump.
    10291029 * @param   pvecpchDevs   an empty vector of char pointers - must be cleaned up
    10301030 *                        by the caller even on failure.

  • trunk/src/VBox/Main/linux/USBGetDevices.cpp

    r32324 r32431  
    878878    if (cchDevPath < 0)
    879879        return VINF_SUCCESS;
    880    
     880
    881881    USBDeviceInfo info;
    882882    if (USBDevInfoInit(&info, szDevPath, pcszNode))
    … …  
    985985 *
    986986 * @returns zero on success or (positive) posix error value.
    987  * @param   pcszPath      the path to dump. 
     987 * @param   pcszPath      the path to dump.
    988988 * @param   pvecpchDevs   an empty vector of char pointers - must be cleaned up
    989989 *                        by the caller even on failure.

  • trunk/src/VBox/Main/linux/USBProxyServiceLinux.cpp

    r32324 r32431  
    206206                RTFileClose(mFile);
    207207            }
    208            
     208
    209209        }
    210210        RTStrFree(pszDevices);

  • trunk/src/VBox/Runtime/common/alloc/memtracker.cpp

    r32125 r32431  
    3838#include "internal/magics.h"
    3939
    40 

  • trunk/src/VBox/Runtime/r3/win/fs-win.cpp

    r30371 r32431  
    339339 *
    340340 * @returns @c true if equal, @c false if not.
    341  * @param   pwsz1               The first string. 
     341 * @param   pwsz1               The first string.
    342342 * @param   cb1                 The length of the first string, in bytes.
    343  * @param   psz2                The second string. 
    344  * @param   cch2                The length of the second string. 
     343 * @param   psz2                The second string.
     344 * @param   cch2                The length of the second string.
    345345 */
    346346static bool rtFsWinAreEqual(WCHAR const *pwsz1, size_t cch1, const char *psz2, size_t cch2)

  • trunk/src/VBox/Runtime/r3/win/poll-win.cpp

    r32131 r32431  
    585585}
    586586
    587 

  • trunk/src/VBox/Runtime/testcase/tstTimer.cpp

    r32332 r32431  
    6161        if (u64Delta > gu64Max)
    6262            gu64Max = u64Delta;
    63         int i = (int)(  RT_ELEMENTS(cFrequency) 
     63        int i = (int)(  RT_ELEMENTS(cFrequency)
    6464                      - (u64Delta * (RT_ELEMENTS(cFrequency) / 2) / gu64Norm));
    6565        if (i >= 0 && i < (int)RT_ELEMENTS(cFrequency))

  • trunk/src/VBox/VMM/FTM.cpp

    r32319 r32431  
    135135    STAM_REL_REG(pVM, &pVM->ftm.s.StatDeltaMem,                  STAMTYPE_COUNTER, "/FT/Sync/DeltaMem",                 STAMUNIT_OCCURENCES, "Number of delta mem syncs.");
    136136    STAM_REL_REG(pVM, &pVM->ftm.s.StatCheckpointStorage,         STAMTYPE_COUNTER, "/FT/Checkpoint/Storage",            STAMUNIT_OCCURENCES, "Number of storage checkpoints.");
    137     STAM_REL_REG(pVM, &pVM->ftm.s.StatCheckpointNetwork,         STAMTYPE_COUNTER, "/FT/Checkpoint/Network",            STAMUNIT_OCCURENCES, "Number of network checkpoints.");   
     137    STAM_REL_REG(pVM, &pVM->ftm.s.StatCheckpointNetwork,         STAMTYPE_COUNTER, "/FT/Checkpoint/Network",            STAMUNIT_OCCURENCES, "Number of network checkpoints.");
    138138#ifdef VBOX_WITH_STATISTICS
    139139    STAM_REG(pVM,     &pVM->ftm.s.StatCheckpoint,                STAMTYPE_PROFILE, "/FT/Checkpoint",                    STAMUNIT_TICKS_PER_CALL, "Profiling of FTMR3SetCheckpoint.");
    … …  
    701701        break;
    702702
    703     case PGMPAGETYPE_MMIO2: 
     703    case PGMPAGETYPE_MMIO2:
    704704        pVM->ftm.s.StatSentMemMMIO2.c  += Hdr.cb + sizeof(Hdr);
    705705        break;
    … …  
    777777        rc = RTSemEventWait(pVM->ftm.s.hShutdownEvent, 1000 /* 1 second */);
    778778        if (rc != VERR_TIMEOUT)
    779             return VINF_SUCCESS;    /* told to quit */           
     779            return VINF_SUCCESS;    /* told to quit */
    780780    }
    781781
    … …  
    784784     */
    785785
    786     /* First sync all memory and write protect everything so 
     786    /* First sync all memory and write protect everything so
    787787     * we can send changed pages later on.
    788788     */
    … …  
    12331233    bool fSuspended = false;
    12341234
    1235     /** We don't call VMR3Suspend here to avoid the overhead of state changes and notifications. This 
     1235    /** We don't call VMR3Suspend here to avoid the overhead of state changes and notifications. This
    12361236     *  is only a short suspend.
    12371237     */
    … …  
    12711271    AssertRC(rc);
    12721272
    1273     /** We don't call VMR3Resume here to avoid the overhead of state changes and notifications. This 
     1273    /** We don't call VMR3Resume here to avoid the overhead of state changes and notifications. This
    12741274     *  is only a short suspend.
    12751275     */

  • trunk/src/VBox/VMM/FTMInternal.h

    r32319 r32431  
    8989    } standby;
    9090
    91     /* 
     91    /*
    9292    struct
    9393    {

  • trunk/src/VBox/VMM/PATM/CSAM.cpp

    r30572 r32431  
    686686
    687687    pHCPtr = PATMR3GCPtrToHCPtr(pVM, pGCPtr);
    688     if (pHCPtr) 
     688    if (pHCPtr)
    689689        return pHCPtr;
    690690
    … …  
    22892289    PCSAMPAGE pPage = NULL;
    22902290
    2291     if (    EMIsRawRing0Enabled(pVM) == false 
     2291    if (    EMIsRawRing0Enabled(pVM) == false
    22922292        ||  PATMIsPatchGCAddr(pVM, pInstrGC) == true)
    22932293    {

  • trunk/src/VBox/VMM/PGMGstDefs.h

    r32036 r32431  
    230230#endif
    231231
    232 

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r32410 r32431  
    12721272# ifdef PGMPOOL_WITH_OPTIMIZED_DIRTY_PT
    12731273            /* Reset the modification counter (OpenSolaris trashes tlb entries very often) */
    1274             if (    !pShwPage->fDirty 
     1274            if (    !pShwPage->fDirty
    12751275                &&  pShwPage->cModifications)
    12761276                pShwPage->cModifications = 1;

  • trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

    r32401 r32431  
    12471247    if (    pPage->cModifications >= cMaxModifications
    12481248        &&  !fForcedFlush
    1249 # if 1 
     1249# if 1
    12501250        &&  (pPage->enmKind == PGMPOOLKIND_PAE_PT_FOR_PAE_PT)
    12511251# else /* test code */

  • trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

    r31361 r32431  
    6464     * and then by native thread id (page fusion case).
    6565     */
    66     /* RTMpCpuId had better be cheap. */ 
    67     RTCPUID idHostCpu = RTMpCpuId(); 
     66    /* RTMpCpuId had better be cheap. */
     67    RTCPUID idHostCpu = RTMpCpuId();
    6868
    6969    /** @todo optimize for large number of VCPUs when that becomes more common. */
    … …  
    119119     */
    120120
    121     /* RTMpCpuId had better be cheap. */ 
    122     RTCPUID idHostCpu = RTMpCpuId(); 
     121    /* RTMpCpuId had better be cheap. */
     122    RTCPUID idHostCpu = RTMpCpuId();
    123123
    124124    /** @todo optimize for large number of VCPUs when that becomes more common. */

  • trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

    r31383 r32431  
    37653765                                RTMemFree(pRec->aRegions[i].paHCPhysPageID);
    37663766
    3767                         Assert(pRec->Core.Key == GCBaseAddr || pRec->enmGuestOS == VBOXOSFAMILY_Windows64);                       
     3767                        Assert(pRec->Core.Key == GCBaseAddr || pRec->enmGuestOS == VBOXOSFAMILY_Windows64);
    37683768                        Assert(pRec->cRegions == pRecVM->cRegions);
    37693769#ifdef VBOX_STRICT

  • trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

    r32087 r32431  
    408408}
    409409
    410 

  • trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

    r32418 r32431  
    7979#if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
    8080/* Increase the size of the image to work around the refusal of Win64 to
    81  * load images in the 0x80000 range. 
     81 * load images in the 0x80000 range.
    8282 */
    8383static uint64_t u64BloatImage[8192] = {0};
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