VirtualBox

Changeset 13878 in vbox


Ignore:
Timestamp:
Nov 5, 2008 3:56:44 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
38876
Message:

Main: typos

Location:
trunk/src/VBox/Main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r13877 r13878  
    113113 * 2. On successful initialization, the structure keeps the Console caller
    114114 *    until destruction (to ensure Console remains in the Ready state and won't
    115  *    be accidentially uninitialized). Forgetting to delete the created task
     115 *    be accidentally uninitialized). Forgetting to delete the created task
    116116 *    will lead to Console::uninit() stuck waiting for releasing all added
    117117 *    callers.
     
    240240};
    241241
    242 // constructor / desctructor
     242// constructor / destructor
    243243/////////////////////////////////////////////////////////////////////////////
    244244
     
    401401
    402402    /*
    403      * Uninit all children that ise addDependentChild()/removeDependentChild()
     403     * Uninit all children that use addDependentChild()/removeDependentChild()
    404404     * in their init()/uninit() methods.
    405405     */
     
    17671767         *  If we fail here it means a PowerDown() call happened on another
    17681768         *  thread while we were doing Pause() (which leaves the Console lock).
    1769          *  We assign PowerDown() a higher precendence than SaveState(),
     1769         *  We assign PowerDown() a higher precedence than SaveState(),
    17701770         *  therefore just return the error to the caller.
    17711771         */
     
    20122012    //
    20132013    /* bird: It is not permitted to attach or detach while the VM is saving,
    2014      * is restoring or has stopped - definintly not.
     2014     * is restoring or has stopped - definitely not.
    20152015     *
    20162016     * Attaching while starting, well, if you don't create any deadlock it
     
    23112311             *  If we fail here it means a PowerDown() call happened on another
    23122312             *  thread while we were doing Pause() (which leaves the Console lock).
    2313              *  We assign PowerDown() a higher precendence than TakeSnapshot(),
     2313             *  We assign PowerDown() a higher precedence than TakeSnapshot(),
    23142314             *  therefore just return the error to the caller.
    23152315             */
     
    23372337        /*
    23382338         *  state file is non-null only when the VM is paused
    2339          *  (i.e. createing a snapshot online)
     2339         *  (i.e. creating a snapshot online)
    23402340         */
    23412341        ComAssertBreak (
     
    27702770 *                          This will be both read and updated to eState or other appropriate state.
    27712771 * @param   pszPath         The path to the media / drive which is now being mounted / captured.
    2772  *                          If NULL no media or drive is attached and the lun will be configured with
     2772 *                          If NULL no media or drive is attached and the LUN will be configured with
    27732773 *                          the default block driver with no media. This will also be the state if
    27742774 *                          mounting / capturing the specified media / drive fails.
     
    28502850 *                          This will be both read and updated to eState or other appropriate state.
    28512851 * @param   pszPath         The path to the media / drive which is now being mounted / captured.
    2852  *                          If NULL no media or drive is attached and the lun will be configured with
     2852 *                          If NULL no media or drive is attached and the LUN will be configured with
    28532853 *                          the default block driver with no media. This will also be the state if
    28542854 *                          mounting / capturing the specified media / drive fails.
     
    31993199#ifdef VBOX_WITH_E1000
    32003200            /*
    3201              * Perharps it would be much wiser to wrap both 'pcnet' and 'e1000'
     3201             * Perhaps it would be much wiser to wrap both 'pcnet' and 'e1000'
    32023202             * into generic 'net' device.
    32033203             */
     
    40724072 *  Setting \a aQuiet to true is useful for methods that don't want to return
    40734073 *  the failed result code to the caller when this method fails (e.g. need to
    4074  *  silently check for the mpVM avaliability).
     4074 *  silently check for the mpVM availability).
    40754075 *
    40764076 *  When mpVM is NULL but \a aAllowNullVM is true, a corresponding error will be
     
    45404540 * Internal power off worker routine.
    45414541 *
    4542  * This method may be called only at certain places with the folliwing meaning
     4542 * This method may be called only at certain places with the following meaning
    45434543 * as shown below:
    45444544 *
     
    48434843             * powerDown() is called from EMT (i.e. from vmstateChangeCallback()
    48444844             * on receiving VM-initiated VMSTATE_OFF), VMSTATE_TERMINATE hasn't
    4845              * occured yet. This is okay, because mMachineState is already
     4845             * occurred yet. This is okay, because mMachineState is already
    48464846             * Stopping in this case, so any other attempt to call PowerDown()
    48474847             * will be rejected. */
     
    50545054                    else
    50555055                    {
    5056                         /* remove the old machhine folder (when changed)
     5056                        /* remove the old machine folder (when changed)
    50575057                         * or the global folder if any (when new) */
    50585058                        if (it != oldFolders.end() ||
     
    57195719  * standard output followed by a carriage return.  Anything further written to standard
    57205720  * output will be ignored.  If it returns a non-zero exit code, or does not write an
    5721   * intelligable interface name to standard output, it will be treated as having failed.
     5721  * intelligible interface name to standard output, it will be treated as having failed.
    57225722  * For now, this method only works on Linux.
    57235723  *
     
    61676167 * @param   rc          VBox status code.
    61686168 * @param   pszFormat   Printf-like error message.
    6169  * @param   args        Various number of argumens for the error message.
     6169 * @param   args        Various number of arguments for the error message.
    61706170 *
    61716171 * @thread EMT, VMPowerUp...
     
    71047104    }
    71057105
    7106     /* lock the console sonce we're going to access it */
     7106    /* lock the console once we're going to access it */
    71077107    AutoWriteLock thatLock (that);
    71087108
  • trunk/src/VBox/Main/include/ConsoleImpl.h

    r13837 r13878  
    6161 *  The translatable error message is defined in null context.
    6262 *
    63  *  Intended to used only within Console children (i,e. Keyboard, Mouse,
     63 *  Intended to used only within Console children (i.e. Keyboard, Mouse,
    6464 *  Display, etc.).
    6565 *
     
    365365    /**
    366366     *  A deviation of SaveVMPtr that doesn't set the error info on failure.
    367      *  Intenede for pieces of code that don't need to return the VM access
     367     *  Intended for pieces of code that don't need to return the VM access
    368368     *  failure to the caller. The usage pattern is:
    369369     *  <code>
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