← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtualbox/quantal

« back to all changes in this revision

Viewing changes to src/VBox/Main/include/VirtualBoxImpl.h

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-04-05 12:41:55 UTC
  • mfrom: (3.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120405124155-i7b39tv5ddwhubbe
Tags: 4.1.12-dfsg-2
http://bugs.debian.org/667460
* Upstream has replaced the 4.1.12 tarball with a new one that fixes a
  crash when creating host only interfaces. (Closes: #667460)
  - Add 36-tarball-respin.patch which contains the diff between the old
    and the new tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/include/VirtualBoxImpl.h
4
4
 */
5
5
 
6
6
/*
7
 
 * Copyright (C) 2006-2011 Oracle Corporation
 
7
 * Copyright (C) 2006-2012 Oracle Corporation
8
8
 *
9
9
 * This file is part of VirtualBox Open Source Edition (OSE), as
10
10
 * available from http://www.virtualbox.org. This file is free software;
259
259
    int calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult);
260
260
    void copyPathRelativeToConfig(const Utf8Str &strSource, Utf8Str &strTarget);
261
261
 
262
 
    HRESULT registerHardDisk(Medium *aHardDisk, GuidList *pllRegistriesThatNeedSaving);
263
 
    HRESULT unregisterHardDisk(Medium *aHardDisk, GuidList *pllRegistriesThatNeedSaving);
264
 
 
265
 
    HRESULT registerImage(Medium *aImage, DeviceType_T argType, GuidList *pllRegistriesThatNeedSaving);
266
 
    HRESULT unregisterImage(Medium *aImage, DeviceType_T argType, GuidList *pllRegistriesThatNeedSaving);
 
262
    HRESULT registerMedium(const ComObjPtr<Medium> &pMedium, ComObjPtr<Medium> *ppMedium, DeviceType_T argType, GuidList *pllRegistriesThatNeedSaving);
 
263
    HRESULT unregisterMedium(Medium *pMedium, GuidList *pllRegistriesThatNeedSaving);
267
264
 
268
265
    void pushMediumToListWithChildren(MediaList &llMedia, Medium *pMedium);
269
266
    HRESULT unregisterMachineMedia(const Guid &id);
279
276
    HRESULT saveSettings();
280
277
 
281
278
    static void addGuidToListUniquely(GuidList &llRegistriesThatNeedSaving, const Guid &uuid);
282
 
    HRESULT saveRegistries(const GuidList &llRegistriesThatNeedSaving);
 
279
    void saveRegistries(const GuidList &llRegistriesThatNeedSaving);
283
280
 
284
281
    static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate);
285
282
 
300
297
    HRESULT checkMediaForConflicts(const Guid &aId,
301
298
                                   const Utf8Str &aLocation,
302
299
                                   Utf8Str &aConflictType,
303
 
                                   bool &fIdentical);
 
300
                                   ComObjPtr<Medium> *pDupMedium);
304
301
 
305
302
    HRESULT registerMachine(Machine *aMachine);
306
303