← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/src-server/MachineImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/src-server/MachineImpl.cpp
7757
7757
                rc = medium->addBackReference(mData->mUuid, *puuidSnapshot);
7758
7758
            else
7759
7759
                rc = medium->addBackReference(mData->mUuid);
 
7760
            /* If the medium->addBackReference fails it sets an appropriate
 
7761
             * error message, so no need to do any guesswork here. */
7760
7762
 
7761
7763
            if (puuidRegistry)
7762
7764
                // caller wants registry ID to be set on all attached media (OVF import case)
9013
9015
    {
9014
9016
        ErrorInfoKeeper eik;
9015
9017
 
9016
 
        rc = lockedMediaMap->Clear();
9017
 
        AssertComRC(rc);
 
9018
        HRESULT rc1 = lockedMediaMap->Clear();
 
9019
        AssertComRC(rc1);
9018
9020
    }
9019
9021
 
9020
9022
    if (FAILED(rc))