Changeset 66126 in vbox

Timestamp:

Mar 16, 2017 2:06:27 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114027

Message:

Main/Machine+Snapshot+Appliance+StorageController: eliminate the one-member struct MediaData, as a preparation for later eliminating the Backupable<> template use in combination with anything containing a ComObjPtr (since these are not handled in a sensible way when creating a session or a snapshot anyway, needing more effort to fix than do right from the beginning). Additionally a lot of iterator loop cleanups, making proper use of scoping and const_iterator whenever possible. Also take the opportunity to improve the readability of some quite long lines. No behavior change intended.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (6 diffs)
• src-server/ApplianceImplExport.cpp (modified) (13 diffs)
• src-server/MachineImpl.cpp (modified) (142 diffs)
• src-server/SnapshotImpl.cpp (modified) (20 diffs)
• src-server/StorageControllerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/MachineImpl.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -235 +235 @@
      *
      *  SessionMachine instances can alter this data and discard changes.
+     *
+     *  @todo r=klaus move all "pointer" objects out of this struct, as they
+     *  need non-obvious handling when creating a new session or when taking
+     *  a snapshot. Better do this right straight away, not relying on the
+     *  template magic which doesn't work right in this case.
      */
     struct HWData
@@ -327 +332 @@
     };
 
-    /**
-     *  Hard disk and other media data.
-     *
-     *  The usage policy is the same as for HWData, but a separate structure
-     *  is necessary because hard disk data requires different procedures when
-     *  taking or deleting snapshots, etc.
-     *
-     *  The data variable is |mMediaData|.
-     */
-    struct MediaData
-    {
-        MediaData();
-        ~MediaData();
-
-        typedef std::list<ComObjPtr<MediumAttachment> > AttachmentList;
-        AttachmentList mAttachments;
-    };
+    typedef std::list<ComObjPtr<MediumAttachment> > MediumAttachmentList;
 
     DECLARE_EMPTY_CTOR_DTOR(Machine)
@@ -601 +590 @@
 
     HRESULT i_getMediumAttachmentsOfController(const Utf8Str &aName,
-                                               MediaData::AttachmentList &aAttachments);
+                                               MediumAttachmentList &aAttachments);
 
     HRESULT i_getUSBControllerByName(const Utf8Str &aName,
@@ -694 +683 @@
     HRESULT i_deleteImplicitDiffs(bool aOnline);
 
-    MediumAttachment* i_findAttachment(const MediaData::AttachmentList &ll,
+    MediumAttachment* i_findAttachment(const MediumAttachmentList &ll,
                                        const Utf8Str &aControllerName,
                                        LONG aControllerPort,
                                        LONG aDevice);
-    MediumAttachment* i_findAttachment(const MediaData::AttachmentList &ll,
+    MediumAttachment* i_findAttachment(const MediumAttachmentList &ll,
                                        ComObjPtr<Medium> pMedium);
-    MediumAttachment* i_findAttachment(const MediaData::AttachmentList &ll,
+    MediumAttachment* i_findAttachment(const MediumAttachmentList &ll,
                                        Guid &id);
 
@@ -762 +751 @@
     Backupable<UserData>    mUserData;
     Backupable<HWData>      mHWData;
-    Backupable<MediaData>   mMediaData;
+
+    /**
+     * Hard disk and other media data.
+     *
+     * The usage policy is the same as for mHWData, but a separate field
+     * is necessary because hard disk data requires different procedures when
+     * taking or deleting snapshots, etc.
+     *
+     * @todo r=klaus change this to a regular list and use the normal way to
+     * handle the settings when creating a session or taking a snapshot.
+     * Same thing applies to mStorageControllers and mUSBControllers.
+     */
+    Backupable<MediumAttachmentList> mMediumAttachments;
 
     // the following fields need special backup/rollback/commit handling,

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2016 Oracle Corporation
+ * Copyright (C) 2008-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -288 +288 @@
 //     <const name="CDROM" value="19" />
 
-        MediaData::AttachmentList::iterator itA;
-        for (itA = mMediaData->mAttachments.begin();
-             itA != mMediaData->mAttachments.end();
-             ++itA)
-        {
-            ComObjPtr<MediumAttachment> pHDA = *itA;
+        for (MediumAttachmentList::const_iterator
+             it = mMediumAttachments->begin();
+             it != mMediumAttachments->end();
+             ++it)
+        {
+            ComObjPtr<MediumAttachment> pHDA = *it;
 
             // the attachment's data
@@ -394 +394 @@
                     else
                     {
-                        std::map<com::Utf8Str, GUIDVEC>::iterator it = pAppliance->m->m_mapPwIdToMediumIds.find(strKeyId);
-                        if (it == pAppliance->m->m_mapPwIdToMediumIds.end())
+                        std::map<com::Utf8Str, GUIDVEC>::iterator itMap = pAppliance->m->m_mapPwIdToMediumIds.find(strKeyId);
+                        if (itMap == pAppliance->m->m_mapPwIdToMediumIds.end())
                             throw setError(E_FAIL, tr("Internal error adding a medium UUID to the map"));
-                        it->second.push_back(mediumUuid);
+                        itMap->second.push_back(mediumUuid);
                     }
                 }
@@ -649 +649 @@
     if (!m->fExportISOImages)/* remove all ISO images from VirtualSystemDescription */
     {
-        list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
-        for (it = m->virtualSystemDescriptions.begin();
+        for (list<ComObjPtr<VirtualSystemDescription> >::const_iterator
+             it = m->virtualSystemDescriptions.begin();
              it != m->virtualSystemDescriptions.end();
              ++it)
         {
-            ComObjPtr<VirtualSystemDescription> vsdescThis = (*it);
+            ComObjPtr<VirtualSystemDescription> vsdescThis = *it;
             std::list<VirtualSystemDescriptionEntry*> skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_CDROM);
-            std::list<VirtualSystemDescriptionEntry*>:: iterator pItSkipped = skipped.begin();
-            while (pItSkipped != skipped.end())
+            std::list<VirtualSystemDescriptionEntry*>::const_iterator itSkipped = skipped.begin();
+            while (itSkipped != skipped.end())
             {
-                (*pItSkipped)->skipIt = true;
-                ++pItSkipped;
+                (*itSkipped)->skipIt = true;
+                ++itSkipped;
             }
         }
@@ -906 +906 @@
     std::list<xml::ElementNode*> llElementsWithUuidAttributes;
     uint32_t ulFile = 1;
-    list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
     /* Iterate through all virtual systems of that appliance */
-    for (it = m->virtualSystemDescriptions.begin();
-         it != m->virtualSystemDescriptions.end();
-         ++it)
-    {
-        ComObjPtr<VirtualSystemDescription> vsdescThis = *it;
+    for (list<ComObjPtr<VirtualSystemDescription> >::const_iterator
+         itV = m->virtualSystemDescriptions.begin();
+         itV != m->virtualSystemDescriptions.end();
+         ++itV)
+    {
+        ComObjPtr<VirtualSystemDescription> vsdescThis = *itV;
         i_buildXMLForOneVirtualSystem(writeLock,
                                       *pelmToAddVirtualSystemsTo,
@@ -921 +921 @@
 
         list<Utf8Str> diskList;
-        list<Utf8Str>::const_iterator itS;
-
-        for (itS = stack.mapDiskSequenceForOneVM.begin();
-             itS != stack.mapDiskSequenceForOneVM.end();
-             ++itS)
-        {
-            const Utf8Str &strDiskID = *itS;
+
+        for (list<Utf8Str>::const_iterator
+             itDisk = stack.mapDiskSequenceForOneVM.begin();
+             itDisk != stack.mapDiskSequenceForOneVM.end();
+             ++itDisk)
+        {
+            const Utf8Str &strDiskID = *itDisk;
             const VirtualSystemDescriptionEntry *pDiskEntry = stack.mapDisks[strDiskID];
 
@@ -1043 +1043 @@
             // export image from); those UUIDs need to be fixed to the export image
             Utf8Str strGuidSourceCurly = guidSource.toStringCurly();
-            for (std::list<xml::ElementNode*>::iterator eit = llElementsWithUuidAttributes.begin();
-                 eit != llElementsWithUuidAttributes.end();
-                 ++eit)
+            for (std::list<xml::ElementNode*>::const_iterator
+                 it = llElementsWithUuidAttributes.begin();
+                 it != llElementsWithUuidAttributes.end();
+                 ++it)
             {
-                xml::ElementNode *pelmImage = *eit;
+                xml::ElementNode *pelmImage = *it;
                 Utf8Str strUUID;
                 pelmImage->getAttributeValue("uuid", strUUID);
@@ -1061 +1062 @@
     // now, fill in the network section we set up empty above according
     // to the networks we found with the hardware items
-    map<Utf8Str, bool>::const_iterator itN;
-    for (itN = stack.mapNetworks.begin();
-         itN != stack.mapNetworks.end();
-         ++itN)
-    {
-        const Utf8Str &strNetwork = itN->first;
+    for (map<Utf8Str, bool>::const_iterator
+         it = stack.mapNetworks.begin();
+         it != stack.mapNetworks.end();
+         ++it)
+    {
+        const Utf8Str &strNetwork = it->first;
         xml::ElementNode *pelmNetwork = pelmNetworkSection->createChild("Network");
         pelmNetwork->setAttribute("ovf:name", strNetwork.c_str());
@@ -1294 +1295 @@
     {
         int32_t lIndexThis = 0;
-        vector<VirtualSystemDescriptionEntry>::const_iterator itD;
-        for (itD = vsdescThis->m->maDescriptions.begin();
-            itD != vsdescThis->m->maDescriptions.end();
-            ++itD, ++lIndexThis)
-        {
-            const VirtualSystemDescriptionEntry &desc = *itD;
+        for (vector<VirtualSystemDescriptionEntry>::const_iterator
+             it = vsdescThis->m->maDescriptions.begin();
+             it != vsdescThis->m->maDescriptions.end();
+             ++it, ++lIndexThis)
+        {
+            const VirtualSystemDescriptionEntry &desc = *it;
 
             LogFlowFunc(("Loop %u: handling description entry ulIndex=%u, type=%s, strRef=%s, strOvf=%s, strVBox=%s, strExtraConfig=%s\n",
@@ -1915 +1916 @@
         if (fStripAllMACs || fStripAllNonNATMACs)
         {
-            for (settings::NetworkAdaptersList::iterator it = pConfig->hardwareMachine.llNetworkAdapters.begin();
+            for (settings::NetworkAdaptersList::iterator
+                 it = pConfig->hardwareMachine.llNetworkAdapters.begin();
                  it != pConfig->hardwareMachine.llNetworkAdapters.end();
                  ++it)
@@ -2166 +2168 @@
         //"VirtualSystem" and repeat the operation.
         //And here we go through the list and extract all disks in the same sequence
-        list<Utf8Str>::const_iterator itS;
-        for (itS = stack.mapDiskSequence.begin();
-              itS != stack.mapDiskSequence.end();
-              ++itS)
-        {
-            const Utf8Str &strDiskID = *itS;
+        for (list<Utf8Str>::const_iterator
+             it = stack.mapDiskSequence.begin();
+             it != stack.mapDiskSequence.end();
+             ++it)
+        {
+            const Utf8Str &strDiskID = *it;
             const VirtualSystemDescriptionEntry *pDiskEntry = stack.mapDisks[strDiskID];
 
@@ -2358 +2360 @@
             PRTMANIFESTTEST paManifestFiles = (PRTMANIFESTTEST)RTMemAlloc(sizeof(RTMANIFESTTEST) * fileList.size());
             size_t i = 0;
-            list<STRPAIR>::const_iterator it1;
-            for (it1 = fileList.begin();
-                 it1 != fileList.end();
-                 ++it1, ++i)
+            for (list<STRPAIR>::const_iterator
+                 it = fileList.begin();
+                 it != fileList.end();
+                 ++it, ++i)
             {
-                paManifestFiles[i].pszTestFile   = (*it1).first.c_str();
-                paManifestFiles[i].pszTestDigest = (*it1).second.c_str();
+                paManifestFiles[i].pszTestFile   = (*it).first.c_str();
+                paManifestFiles[i].pszTestDigest = (*it).second.c_str();
             }
             void *pvBuf;
@@ -2399 +2401 @@
     if (FAILED(rc))
     {
-        list<STRPAIR>::const_iterator it1;
-        for (it1 = fileList.begin();
-             it1 != fileList.end();
-             ++it1)
-             pIfIo->pfnDelete(pStorage, (*it1).first.c_str());
+        for (list<STRPAIR>::const_iterator
+             it = fileList.begin();
+             it != fileList.end();
+             ++it)
+             pIfIo->pfnDelete(pStorage, (*it).first.c_str());
     }
 

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2016 Oracle Corporation
+ * Copyright (C) 2004-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -225 +225 @@
 
 Machine::HWData::~HWData()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Machine::HDData structure
-/////////////////////////////////////////////////////////////////////////////
-
-Machine::MediaData::MediaData()
-{
-}
-
-Machine::MediaData::~MediaData()
 {
 }
@@ -1057 +1045 @@
     aGroups.resize(mUserData->s.llGroups.size());
     size_t i = 0;
-    for (StringsList::const_iterator it = mUserData->s.llGroups.begin();
-         it != mUserData->s.llGroups.end(); ++it, ++i)
+    for (StringsList::const_iterator
+         it = mUserData->s.llGroups.begin();
+         it != mUserData->s.llGroups.end();
+         ++it, ++i)
         aGroups[i] = (*it);
 
@@ -2650 +2640 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    aMediumAttachments.resize(mMediaData->mAttachments.size());
+    aMediumAttachments.resize(mMediumAttachments->size());
     size_t i = 0;
-    for (MediaData::AttachmentList::iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end(); ++it, ++i)
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
+         ++it, ++i)
         aMediumAttachments[i] = *it;
 
@@ -2692 +2684 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    USBControllerList data = *mUSBControllers.data();
-    aUSBControllers.resize(data.size());
+    aUSBControllers.resize(mUSBControllers->size());
     size_t i = 0;
-    for (USBControllerList::iterator it = data.begin(); it != data.end(); ++i, ++it)
+    for (USBControllerList::const_iterator
+         it = mUSBControllers->begin();
+         it != mUSBControllers->end();
+         ++it, ++i)
         aUSBControllers[i] = *it;
 
@@ -2868 +2862 @@
     aSharedFolders.resize(mHWData->mSharedFolders.size());
     size_t i = 0;
-    for (std::list<ComObjPtr<SharedFolder> >::iterator it = mHWData->mSharedFolders.begin();
-         it != mHWData->mSharedFolders.end(); ++i, ++it)
+    for (std::list<ComObjPtr<SharedFolder> >::const_iterator
+         it = mHWData->mSharedFolders.begin();
+         it != mHWData->mSharedFolders.end();
+         ++it, ++i)
         aSharedFolders[i] = *it;
 
@@ -2941 +2937 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    StorageControllerList data = *mStorageControllers.data();
+
+    aStorageControllers.resize(mStorageControllers->size());
     size_t i = 0;
-    aStorageControllers.resize(data.size());
-    for (StorageControllerList::iterator it = data.begin(); it != data.end(); ++it, ++i)
+    for (StorageControllerList::const_iterator
+         it = mStorageControllers->begin();
+         it != mStorageControllers->end();
+         ++it, ++i)
         aStorageControllers[i] = *it;
+
     return S_OK;
 }
@@ -3858 +3858 @@
     /* check if the device slot is already busy */
     MediumAttachment *pAttachTemp;
-    if ((pAttachTemp = i_findAttachment(mMediaData->mAttachments,
+    if ((pAttachTemp = i_findAttachment(*mMediumAttachments.data(),
                                         Bstr(aName).raw(),
                                         aControllerPort,
@@ -3889 +3889 @@
     AutoWriteLock mediumLock(medium COMMA_LOCKVAL_SRC_POS);
 
-    if (    (pAttachTemp = i_findAttachment(mMediaData->mAttachments, medium))
+    if (    (pAttachTemp = i_findAttachment(*mMediumAttachments.data(), medium))
          && !medium.isNull()
        )
@@ -3934 +3934 @@
     {
         if (    aType == DeviceType_HardDisk
-             && mMediaData.isBackedUp())
-        {
-            const MediaData::AttachmentList &oldAtts = mMediaData.backedUpData()->mAttachments;
+             && mMediumAttachments.isBackedUp())
+        {
+            const MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
 
             /* check if the medium was attached to the VM before we started
@@ -3950 +3950 @@
                     /* the simplest case: restore the whole attachment
                      * and return, nothing else to do */
-                    mMediaData->mAttachments.push_back(pAttachTemp);
+                    mMediumAttachments->push_back(pAttachTemp);
 
                     /* Reattach the medium to the VM. */
@@ -4015 +4015 @@
              * attachments to make it possible to re-attach existing diffs to
              * another device slot w/o losing their contents */
-            if (mMediaData.isBackedUp())
+            if (mMediumAttachments.isBackedUp())
             {
-                const MediaData::AttachmentList &oldAtts = mMediaData.backedUpData()->mAttachments;
-
-                MediaData::AttachmentList::const_iterator foundIt = oldAtts.end();
+                const MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
+
+                MediumAttachmentList::const_iterator foundIt = oldAtts.end();
                 uint32_t foundLevel = 0;
 
-                for (MediaData::AttachmentList::const_iterator it = oldAtts.begin(); it != oldAtts.end(); ++it)
+                for (MediumAttachmentList::const_iterator
+                     it = oldAtts.begin();
+                     it != oldAtts.end();
+                     ++it)
                 {
                     uint32_t level = 0;
@@ -4035 +4038 @@
                         /* skip the hard disk if its currently attached (we
                          * cannot attach the same hard disk twice) */
-                        if (i_findAttachment(mMediaData->mAttachments,
+                        if (i_findAttachment(*mMediumAttachments.data(),
                                              pMedium))
                             continue;
@@ -4048 +4051 @@
                             /* the simplest case: restore the whole attachment
                              * and return, nothing else to do */
-                            mMediaData->mAttachments.push_back(*it);
+                            mMediumAttachments->push_back(*it);
 
                             /* Reattach the medium to the VM. */
@@ -4131 +4134 @@
                 AutoReadLock snapLock(snap COMMA_LOCKVAL_SRC_POS);
 
-                const MediaData::AttachmentList &snapAtts = snap->i_getSnapshotMachine()->mMediaData->mAttachments;
+                const MediumAttachmentList &snapAtts = *snap->i_getSnapshotMachine()->mMediumAttachments.data();
 
                 MediumAttachment *pAttachFound = NULL;
                 uint32_t foundLevel = 0;
 
-                for (MediaData::AttachmentList::const_iterator it = snapAtts.begin(); it != snapAtts.end(); ++it)
+                for (MediumAttachmentList::const_iterator
+                     it = snapAtts.begin();
+                     it != snapAtts.end();
+                     ++it)
                 {
                     MediumAttachment *pAttach = *it;
@@ -4317 +4323 @@
     /* success: finally remember the attachment */
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
-    mMediaData->mAttachments.push_back(attachment);
+    mMediumAttachments.backup();
+    mMediumAttachments->push_back(attachment);
 
     mediumLock.release();
@@ -4414 +4420 @@
                         aName.c_str());
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4471 +4477 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4482 +4488 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4507 +4513 @@
     if (FAILED(rc)) return rc;
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4518 +4524 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4550 +4556 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4561 +4567 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4593 +4599 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4604 +4610 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4635 +4641 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4662 +4668 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4703 +4709 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    MediumAttachment *pAttach = i_findAttachment(mMediaData->mAttachments,
+    MediumAttachment *pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                  Bstr(aName).raw(),
                                                  aControllerPort,
@@ -4714 +4720 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     IBandwidthGroup *iB = aBandwidthGroup;
@@ -4790 +4796 @@
                                   &mParent->i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
 
-    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(mMediaData->mAttachments,
+    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                            Bstr(aName).raw(),
                                                            aControllerPort,
@@ -4832 +4838 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
+    mMediumAttachments.backup();
 
     {
         // The backup operation makes the pAttach reference point to the
         // old settings. Re-get the correct reference.
-        pAttach = i_findAttachment(mMediaData->mAttachments,
+        pAttach = i_findAttachment(*mMediumAttachments.data(),
                                    Bstr(aName).raw(),
                                    aControllerPort,
@@ -4871 +4877 @@
         if (!pMedium.isNull())
             pMedium->i_removeBackReference(mData->mUuid);
-        pAttach = i_findAttachment(mMediaData->mAttachments,
+        pAttach = i_findAttachment(*mMediumAttachments.data(),
                                    Bstr(aName).raw(),
                                    aControllerPort,
@@ -4906 +4912 @@
     aMedium = NULL;
 
-    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(mMediaData->mAttachments,
+    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                            Bstr(aName).raw(),
                                                            aControllerPort,
@@ -4961 +4967 @@
     aKeys.resize(mData->pMachineConfigFile->mapExtraDataItems.size());
     size_t i = 0;
-    for (settings::StringsMap::const_iterator it = mData->pMachineConfigFile->mapExtraDataItems.begin();
+    for (settings::StringsMap::const_iterator
+         it = mData->pMachineConfigFile->mapExtraDataItems.begin();
          it != mData->pMachineConfigFile->mapExtraDataItems.end();
          ++it, ++i)
@@ -5196 +5203 @@
     MediaList llMedia;
 
-    if (    !mMediaData.isNull()      // can be NULL if machine is inaccessible
-         && mMediaData->mAttachments.size()
+    if (    !mMediumAttachments.isNull()    // can be NULL if machine is inaccessible
+         && mMediumAttachments->size()
        )
     {
@@ -5206 +5213 @@
             return setError(VBOX_E_INVALID_OBJECT_STATE,
                             tr("Cannot unregister the machine '%s' because it has %d media attachments"),
-                            mUserData->s.strName.c_str(), mMediaData->mAttachments.size());
+                            mUserData->s.strName.c_str(), mMediumAttachments->size());
     }
 
@@ -5246 +5253 @@
 
     // return media to caller
+    aMedia.resize(llMedia.size());
     size_t i = 0;
-    aMedia.resize(llMedia.size());
-    for (MediaList::iterator it = llMedia.begin(); it != llMedia.end(); ++it, ++i)
+    for (MediaList::const_iterator
+         it = llMedia.begin();
+         it != llMedia.end();
+         ++it, ++i)
         (*it).queryInterfaceTo(aMedia[i].asOutParam());
 
@@ -5281 +5291 @@
             m_pMachine->i_deleteConfigHandler(*this);
         }
-        catch(...)
+        catch (...)
         {
             LogRel(("Some exception in the function Machine::i_deleteConfigHandler()\n"));
@@ -5383 +5393 @@
         // medium storage files from the IMedium list passed in, and the
         // machine XML file)
-        StringsList::const_iterator it = task.m_llFilesToDelete.begin();
-        while (it != task.m_llFilesToDelete.end())
+        for (StringsList::const_iterator
+             it = task.m_llFilesToDelete.begin();
+             it != task.m_llFilesToDelete.end();
+             ++it)
         {
             const Utf8Str &strFile = *it;
             LogFunc(("Deleting file %s\n", strFile.c_str()));
+            rc = task.m_pProgress->SetNextOperation(BstrFmt(tr("Deleting '%s'"), it->c_str()).raw(), 1);
+            if (FAILED(rc)) throw rc;
+
             int vrc = RTFileDelete(strFile.c_str());
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_IPRT_ERROR,
                                tr("Could not delete file '%s' (%Rrc)"), strFile.c_str(), vrc);
-
-            ++it;
-            if (it == task.m_llFilesToDelete.end())
-            {
-                rc = task.m_pProgress->SetNextOperation(Bstr(tr("Cleaning up machine directory")).raw(), 1);
-                if (FAILED(rc)) throw rc;
-                break;
-            }
-
-            rc = task.m_pProgress->SetNextOperation(BstrFmt(tr("Deleting '%s'"), it->c_str()).raw(), 1);
-            if (FAILED(rc)) throw rc;
-        }
+        }
+
+        rc = task.m_pProgress->SetNextOperation(Bstr(tr("Cleaning up machine directory")).raw(), 1);
+        if (FAILED(rc)) throw rc;
 
         /* delete the settings only when the file actually exists */
@@ -5937 +5944 @@
      * Look for matching patterns and build up a list.
      */
-    HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.begin();
-    while (it != mHWData->mGuestProperties.end())
+    for (HWData::GuestPropertyMap::const_iterator
+         it = mHWData->mGuestProperties.begin();
+         it != mHWData->mGuestProperties.end();
+         ++it)
     {
         if (   strPatterns.isEmpty()
@@ -5948 +5957 @@
            )
             propMap.insert(*it);
-        ++it;
     }
 
@@ -5964 +5972 @@
 
     char szFlags[MAX_FLAGS_LEN + 1];
-    size_t i= 0;
-    for (it = propMap.begin(); it != propMap.end(); ++i, ++it)
+    size_t i = 0;
+    for (HWData::GuestPropertyMap::const_iterator
+         it = propMap.begin();
+         it != propMap.end();
+         ++it, ++i)
     {
         aNames[i] = it->first;
@@ -6049 +6060 @@
                                                   std::vector<ComPtr<IMediumAttachment> > &aMediumAttachments)
 {
-    MediaData::AttachmentList atts;
+    MediumAttachmentList atts;
 
     HRESULT rc = i_getMediumAttachmentsOfController(aName, atts);
     if (FAILED(rc)) return rc;
 
+    aMediumAttachments.resize(atts.size());
     size_t i = 0;
-    aMediumAttachments.resize(atts.size());
-    for (MediaData::AttachmentList::iterator it = atts.begin(); it != atts.end(); ++it, ++i)
+    for (MediumAttachmentList::const_iterator
+         it = atts.begin();
+         it != atts.end();
+         ++it, ++i)
         (*it).queryInterfaceTo(aMediumAttachments[i].asOutParam());
 
@@ -6074 +6088 @@
     aAttachment = NULL;
 
-    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(mMediaData->mAttachments,
+    ComObjPtr<MediumAttachment> pAttach = i_findAttachment(*mMediumAttachments.data(),
                                                            Bstr(aName).raw(),
                                                            aControllerPort,
@@ -6118 +6132 @@
     ULONG ulInstance = 0;
     bool fBootable = true;
-    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = mStorageControllers->begin();
          it != mStorageControllers->end();
          ++it)
@@ -6171 +6186 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = mStorageControllers->begin();
          it != mStorageControllers->end();
          ++it)
@@ -6203 +6219 @@
         if (aBootable == TRUE)
         {
-            for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+            for (StorageControllerList::const_iterator
+                 it = mStorageControllers->begin();
                  it != mStorageControllers->end();
                  ++it)
@@ -6251 +6268 @@
         /* find all attached devices to the appropriate storage controller and detach them all */
         // make a temporary list because detachDevice invalidates iterators into
-        // mMediaData->mAttachments
-        MediaData::AttachmentList llAttachments2 = mMediaData->mAttachments;
-
-        for (MediaData::AttachmentList::iterator it = llAttachments2.begin();
+        // mMediumAttachments
+        MediumAttachmentList llAttachments2 = *mMediumAttachments.data();
+
+        for (MediumAttachmentList::const_iterator
+             it = llAttachments2.begin();
              it != llAttachments2.end();
              ++it)
@@ -6770 +6788 @@
 
         // check if device with this host PCI address already attached
-        for (HWData::PCIDeviceAssignmentList::iterator it =  mHWData->mPCIDeviceAssignments.begin();
-             it !=  mHWData->mPCIDeviceAssignments.end();
+        for (HWData::PCIDeviceAssignmentList::const_iterator
+             it = mHWData->mPCIDeviceAssignments.begin();
+             it != mHWData->mPCIDeviceAssignments.end();
              ++it)
         {
@@ -6816 +6835 @@
         if (FAILED(rc)) return rc;
 
-        for (HWData::PCIDeviceAssignmentList::iterator it =  mHWData->mPCIDeviceAssignments.begin();
-             it !=  mHWData->mPCIDeviceAssignments.end();
+        for (HWData::PCIDeviceAssignmentList::const_iterator
+             it = mHWData->mPCIDeviceAssignments.begin();
+             it != mHWData->mPCIDeviceAssignments.end();
              ++it)
         {
@@ -6859 +6879 @@
 
     aPCIDeviceAssignments.resize(mHWData->mPCIDeviceAssignments.size());
-
     size_t i = 0;
-    for (std::list<ComObjPtr<PCIDeviceAttachment> >::const_iterator it = mHWData->mPCIDeviceAssignments.begin();
+    for (std::list<ComObjPtr<PCIDeviceAttachment> >::const_iterator
+         it = mHWData->mPCIDeviceAssignments.begin();
          it != mHWData->mPCIDeviceAssignments.end();
-         ++i, ++it)
+         ++it, ++i)
         (*it).queryInterfaceTo(aPCIDeviceAssignments[i].asOutParam());
 
@@ -8357 +8377 @@
     mUserData.allocate();
     mHWData.allocate();
-    mMediaData.allocate();
+    mMediumAttachments.allocate();
     mStorageControllers.allocate();
     mUSBControllers.allocate();
@@ -8505 +8525 @@
      * attachments will already be uninitialized and deleted, so this
      * code will not affect them. */
-    if (    !!mMediaData
-         && (!i_isSessionMachine())
+    if (    !mMediumAttachments.isNull()
+         && !i_isSessionMachine()
        )
     {
-        for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-             it != mMediaData->mAttachments.end();
+        for (MediumAttachmentList::const_iterator
+             it = mMediumAttachments->begin();
+             it != mMediumAttachments->end();
              ++it)
         {
@@ -8539 +8560 @@
     /* free data structures (the essential mData structure is not freed here
      * since it may be still in use) */
-    mMediaData.free();
+    mMediumAttachments.free();
     mStorageControllers.free();
     mUSBControllers.free();
@@ -8555 +8576 @@
  *  (primary) machine pointer.
  */
-Machine* Machine::i_getMachine()
+Machine *Machine::i_getMachine()
 {
     if (i_isSessionMachine())
@@ -8664 +8685 @@
 {
     HRESULT rc = VBOX_E_OBJECT_NOT_FOUND;
-    for (HWData::SharedFolderList::const_iterator it = mHWData->mSharedFolders.begin();
-        it != mHWData->mSharedFolders.end();
-        ++it)
+    for (HWData::SharedFolderList::const_iterator
+         it = mHWData->mSharedFolders.begin();
+         it != mHWData->mSharedFolders.end();
+         ++it)
     {
         SharedFolder *pSF = *it;
@@ -8879 +8901 @@
 
     // now create the children
-    for (settings::SnapshotsList::const_iterator it = data.llChildSnapshots.begin();
+    for (settings::SnapshotsList::const_iterator
+         it = data.llChildSnapshots.begin();
          it != data.llChildSnapshots.end();
          ++it)
@@ -8939 +8962 @@
         if (mHWData->mCPUHotPlugEnabled)
         {
-            for (settings::CpuList::const_iterator it = data.llCpus.begin();
-                it != data.llCpus.end();
-                ++it)
+            for (settings::CpuList::const_iterator
+                 it = data.llCpus.begin();
+                 it != data.llCpus.end();
+                 ++it)
             {
                 const settings::Cpu &cpu = *it;
@@ -8950 +8974 @@
 
         // cpuid leafs
-        for (settings::CpuIdLeafsList::const_iterator it = data.llCpuIdLeafs.begin();
-            it != data.llCpuIdLeafs.end();
-            ++it)
+        for (settings::CpuIdLeafsList::const_iterator
+             it = data.llCpuIdLeafs.begin();
+             it != data.llCpuIdLeafs.end();
+             ++it)
         {
             const settings::CpuIdLeaf &leaf = *it;
@@ -9044 +9069 @@
 
         /* Shared folders */
-        for (settings::USBControllerList::const_iterator it = data.usbSettings.llUSBControllers.begin();
+        for (settings::USBControllerList::const_iterator
+             it = data.usbSettings.llUSBControllers.begin();
              it != data.usbSettings.llUSBControllers.end();
              ++it)
@@ -9074 +9100 @@
         else if (newCount < oldCount)
             mNetworkAdapters.resize(newCount);
-        for (settings::NetworkAdaptersList::const_iterator it = data.llNetworkAdapters.begin();
-            it != data.llNetworkAdapters.end();
-            ++it)
+        for (settings::NetworkAdaptersList::const_iterator
+             it = data.llNetworkAdapters.begin();
+             it != data.llNetworkAdapters.end();
+             ++it)
         {
             const settings::NetworkAdapter &nic = *it;
@@ -9087 +9114 @@
 
         // serial ports
-        for (settings::SerialPortsList::const_iterator it = data.llSerialPorts.begin();
-            it != data.llSerialPorts.end();
-            ++it)
+        for (settings::SerialPortsList::const_iterator
+             it = data.llSerialPorts.begin();
+             it != data.llSerialPorts.end();
+             ++it)
         {
             const settings::SerialPort &s = *it;
@@ -9099 +9127 @@
 
         // parallel ports (optional)
-        for (settings::ParallelPortsList::const_iterator it = data.llParallelPorts.begin();
-            it != data.llParallelPorts.end();
-            ++it)
+        for (settings::ParallelPortsList::const_iterator
+             it = data.llParallelPorts.begin();
+             it != data.llParallelPorts.end();
+             ++it)
         {
             const settings::ParallelPort &p = *it;
@@ -9121 +9150 @@
 
         /* Shared folders */
-        for (settings::SharedFoldersList::const_iterator it = data.llSharedFolders.begin();
+        for (settings::SharedFoldersList::const_iterator
+             it = data.llSharedFolders.begin();
              it != data.llSharedFolders.end();
              ++it)
@@ -9162 +9192 @@
 
         // Host PCI devices
-        for (settings::HostPCIDeviceAttachmentList::const_iterator it = data.pciAttachments.begin();
+        for (settings::HostPCIDeviceAttachmentList::const_iterator
+             it = data.pciAttachments.begin();
              it != data.pciAttachments.end();
              ++it)
@@ -9194 +9225 @@
          * as there are no config changes. */
         settings::GuestPropertiesList &llGuestProperties = unconst(data.llGuestProperties);
-        for (settings::GuestPropertiesList::iterator it = llGuestProperties.begin();
-            it != llGuestProperties.end();
-            /*nothing*/)
+        for (settings::GuestPropertiesList::iterator
+             it = llGuestProperties.begin();
+             it != llGuestProperties.end();
+             /*nothing*/)
         {
             const settings::GuestProperty &prop = *it;
@@ -9223 +9255 @@
         mHWData->mDefaultFrontend = data.strDefaultFrontend;
     }
-    catch(std::bad_alloc &)
+    catch (std::bad_alloc &)
     {
         return E_OUTOFMEMORY;
@@ -9262 +9294 @@
     HRESULT rc = S_OK;
 
-    for (settings::StorageControllersList::const_iterator it = data.llStorageControllers.begin();
+    for (settings::StorageControllersList::const_iterator
+         it = data.llStorageControllers.begin();
          it != data.llStorageControllers.end();
          ++it)
@@ -9324 +9357 @@
 
     /* paranoia: detect duplicate attachments */
-    for (settings::AttachedDevicesList::const_iterator it = data.llAttachedDevices.begin();
+    for (settings::AttachedDevicesList::const_iterator
+         it = data.llAttachedDevices.begin();
          it != data.llAttachedDevices.end();
          ++it)
@@ -9352 +9386 @@
     }
 
-    for (settings::AttachedDevicesList::const_iterator it = data.llAttachedDevices.begin();
+    for (settings::AttachedDevicesList::const_iterator
+         it = data.llAttachedDevices.begin();
          it != data.llAttachedDevices.end();
          ++it)
@@ -9452 +9487 @@
                                     medium->i_getChildren().size());
 
-                if (i_findAttachment(mMediaData->mAttachments,
+                if (i_findAttachment(*mMediumAttachments.data(),
                                      medium))
                     return setError(E_FAIL,
@@ -9531 +9566 @@
             break;
 
-        /* back up mMediaData to let registeredInit() properly rollback on failure
-         * (= limited accessibility) */
+        /* back up mMediumAttachments to let registeredInit() properly rollback
+         * on failure (= limited accessibility) */
         i_setModified(IsModified_Storage);
-        mMediaData.backup();
-        mMediaData->mAttachments.push_back(pAttachment);
+        mMediumAttachments.backup();
+        mMediumAttachments->push_back(pAttachment);
     }
 
@@ -9627 +9662 @@
     AssertReturn(!aName.isEmpty(), E_INVALIDARG);
 
-    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = mStorageControllers->begin();
          it != mStorageControllers->end();
          ++it)
@@ -9658 +9694 @@
     AssertReturn(!aName.isEmpty(), E_INVALIDARG);
 
-    for (USBControllerList::const_iterator it = mUSBControllers->begin();
+    for (USBControllerList::const_iterator
+         it = mUSBControllers->begin();
          it != mUSBControllers->end();
          ++it)
@@ -9685 +9722 @@
     ULONG cCtrls = 0;
 
-    for (USBControllerList::const_iterator it = mUSBControllers->begin();
+    for (USBControllerList::const_iterator
+         it = mUSBControllers->begin();
          it != mUSBControllers->end();
          ++it)
@@ -9697 +9735 @@
 
 HRESULT Machine::i_getMediumAttachmentsOfController(const Utf8Str &aName,
-                                                    MediaData::AttachmentList &atts)
+                                                    MediumAttachmentList &atts)
 {
     AutoCaller autoCaller(this);
@@ -9704 +9742 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    for (MediaData::AttachmentList::iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
@@ -10342 +10381 @@
         /* USB Controller (required) */
         data.usbSettings.llUSBControllers.clear();
-        for (USBControllerList::const_iterator it = mUSBControllers->begin(); it != mUSBControllers->end(); ++it)
+        for (USBControllerList::const_iterator
+             it = mUSBControllers->begin();
+             it != mUSBControllers->end();
+             ++it)
         {
             ComObjPtr<USBController> ctrl = *it;
@@ -10416 +10458 @@
         /* Shared folders */
         data.llSharedFolders.clear();
-        for (HWData::SharedFolderList::const_iterator it = mHWData->mSharedFolders.begin();
-            it != mHWData->mSharedFolders.end();
-            ++it)
+        for (HWData::SharedFolderList::const_iterator
+             it = mHWData->mSharedFolders.begin();
+             it != mHWData->mSharedFolders.end();
+             ++it)
         {
             SharedFolder *pSF = *it;
@@ -10451 +10494 @@
         /* Host PCI devices */
         data.pciAttachments.clear();
-        for (HWData::PCIDeviceAssignmentList::const_iterator it = mHWData->mPCIDeviceAssignments.begin();
+        for (HWData::PCIDeviceAssignmentList::const_iterator
+             it = mHWData->mPCIDeviceAssignments.begin();
              it != mHWData->mPCIDeviceAssignments.end();
              ++it)
@@ -10467 +10511 @@
         data.llGuestProperties.clear();
 #ifdef VBOX_WITH_GUEST_PROPS
-        for (HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.begin();
+        for (HWData::GuestPropertyMap::const_iterator
+             it = mHWData->mGuestProperties.begin();
              it != mHWData->mGuestProperties.end();
              ++it)
@@ -10503 +10548 @@
         data.strDefaultFrontend = mHWData->mDefaultFrontend;
     }
-    catch(std::bad_alloc &)
+    catch (std::bad_alloc &)
     {
         return E_OUTOFMEMORY;
@@ -10521 +10566 @@
     data.llStorageControllers.clear();
 
-    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = mStorageControllers->begin();
          it != mStorageControllers->end();
          ++it)
@@ -10563 +10609 @@
                                       settings::StorageController &data)
 {
-    MediaData::AttachmentList atts;
+    MediumAttachmentList atts;
 
     HRESULT rc = i_getMediumAttachmentsOfController(aStorageController->i_getName(), atts);
@@ -10569 +10615 @@
 
     data.llAttachedDevices.clear();
-    for (MediaData::AttachmentList::const_iterator it = atts.begin();
+    for (MediumAttachmentList::const_iterator
+         it = atts.begin();
          it != atts.end();
          ++it)
@@ -10718 +10765 @@
  * from SessionMachine::BeginTakingSnapshot() and SessionMachine::restoreSnapshotHandler().
  *
- * This method assumes that mMediaData contains the original hard disk attachments
- * it needs to create diffs for. On success, these attachments will be replaced
- * with the created diffs. On failure, #deleteImplicitDiffs() is implicitly
- * called to delete created diffs which will also rollback mMediaData and restore
- * whatever was backed up before calling this method.
+ * This method assumes that mMediumAttachments contains the original hard disk
+ * attachments it needs to create diffs for. On success, these attachments will
+ * be replaced with the created diffs. On failure, #deleteImplicitDiffs() is
+ * implicitly called to delete created diffs which will also rollback
+ * mMediumAttachments and restore whatever was backed up before calling this
+ * method.
  *
  * Attachments with non-normal hard disks are left as is.
@@ -10779 +10827 @@
             /* lock all attached hard disks early to detect "in use"
              * situations before creating actual diffs */
-            for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-                 it != mMediaData->mAttachments.end();
+            for (MediumAttachmentList::const_iterator
+                 it = mMediumAttachments->begin();
+                 it != mMediumAttachments->end();
                  ++it)
             {
-                MediumAttachment* pAtt = *it;
+                MediumAttachment *pAtt = *it;
                 if (pAtt->i_getType() == DeviceType_HardDisk)
                 {
-                    Medium* pMedium = pAtt->i_getMedium();
+                    Medium *pMedium = pAtt->i_getMedium();
                     Assert(pMedium);
 
@@ -10823 +10872 @@
 
         /* remember the current list (note that we don't use backup() since
-         * mMediaData may be already backed up) */
-        MediaData::AttachmentList atts = mMediaData->mAttachments;
+         * mMediumAttachments may be already backed up) */
+        MediumAttachmentList atts = *mMediumAttachments.data();
 
         /* start from scratch */
-        mMediaData->mAttachments.clear();
+        mMediumAttachments->clear();
 
         /* go through remembered attachments and create diffs for normal hard
          * disks and attach them */
-        for (MediaData::AttachmentList::const_iterator it = atts.begin();
+        for (MediumAttachmentList::const_iterator
+             it = atts.begin();
              it != atts.end();
              ++it)
         {
-            MediumAttachment* pAtt = *it;
+            MediumAttachment *pAtt = *it;
 
             DeviceType_T devType = pAtt->i_getType();
-            Medium* pMedium = pAtt->i_getMedium();
+            Medium *pMedium = pAtt->i_getMedium();
 
             if (   devType != DeviceType_HardDisk
@@ -10860 +10910 @@
                 }
 
-                mMediaData->mAttachments.push_back(pAtt);
+                mMediumAttachments->push_back(pAtt);
                 continue;
             }
@@ -10941 +10991 @@
             rc = lockedMediaMap->ReplaceKey(pAtt, attachment);
             AssertComRCThrowRC(rc);
-            mMediaData->mAttachments.push_back(attachment);
+            mMediumAttachments->push_back(attachment);
         }
     }
@@ -10960 +11010 @@
 /**
  * Deletes implicit differencing hard disks created either by
- * #i_createImplicitDiffs() or by #attachDevice() and rolls back mMediaData.
+ * #i_createImplicitDiffs() or by #attachDevice() and rolls back
+ * mMediumAttachments.
  *
  * Note that to delete hard disks created by #attachDevice() this method is
@@ -10978 +11029 @@
 
     /* We absolutely must have backed up state. */
-    AssertReturn(mMediaData.isBackedUp(), E_FAIL);
+    AssertReturn(mMediumAttachments.isBackedUp(), E_FAIL);
 
     /* Check if there are any implicitly created diff images. */
     bool fImplicitDiffs = false;
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
@@ -11033 +11085 @@
             /* lock all attached hard disks early to detect "in use"
              * situations before deleting actual diffs */
-            for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-               it != mMediaData->mAttachments.end();
-               ++it)
+            for (MediumAttachmentList::const_iterator
+                 it = mMediumAttachments->begin();
+                 it != mMediumAttachments->end();
+                 ++it)
             {
-                MediumAttachment* pAtt = *it;
+                MediumAttachment *pAtt = *it;
                 if (pAtt->i_getType() == DeviceType_HardDisk)
                 {
-                    Medium* pMedium = pAtt->i_getMedium();
+                    Medium *pMedium = pAtt->i_getMedium();
                     Assert(pMedium);
 
@@ -11072 +11125 @@
         /* Go through remembered attachments and delete all implicitly created
          * diffs and fix up the attachment information */
-        const MediaData::AttachmentList &oldAtts = mMediaData.backedUpData()->mAttachments;
-        MediaData::AttachmentList implicitAtts;
-        for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-             it != mMediaData->mAttachments.end();
+        const MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
+        MediumAttachmentList implicitAtts;
+        for (MediumAttachmentList::const_iterator
+             it = mMediumAttachments->begin();
+             it != mMediumAttachments->end();
              ++it)
         {
@@ -11123 +11177 @@
 
         /* rollback hard disk changes */
-        mMediaData.rollback();
+        mMediumAttachments.rollback();
 
         MultiResult mrc(S_OK);
@@ -11132 +11186 @@
             alock.release();
 
-            for (MediaData::AttachmentList::const_iterator it = implicitAtts.begin(); it != implicitAtts.end(); ++it)
+            for (MediumAttachmentList::const_iterator
+                 it = implicitAtts.begin();
+                 it != implicitAtts.end();
+                 ++it)
             {
                 // Remove medium associated with this attachment.
@@ -11200 +11257 @@
  * @return
  */
-MediumAttachment* Machine::i_findAttachment(const MediaData::AttachmentList &ll,
+MediumAttachment *Machine::i_findAttachment(const MediumAttachmentList &ll,
                                             const Utf8Str &aControllerName,
                                             LONG aControllerPort,
                                             LONG aDevice)
 {
-   for (MediaData::AttachmentList::const_iterator it = ll.begin(); it != ll.end(); ++it)
+    for (MediumAttachmentList::const_iterator
+         it = ll.begin();
+         it != ll.end();
+         ++it)
     {
         MediumAttachment *pAttach = *it;
@@ -11224 +11284 @@
  * @return
  */
-MediumAttachment* Machine::i_findAttachment(const MediaData::AttachmentList &ll,
+MediumAttachment *Machine::i_findAttachment(const MediumAttachmentList &ll,
                                             ComObjPtr<Medium> pMedium)
 {
-   for (MediaData::AttachmentList::const_iterator it = ll.begin(); it != ll.end(); ++it)
+    for (MediumAttachmentList::const_iterator
+         it = ll.begin();
+         it != ll.end();
+         ++it)
     {
         MediumAttachment *pAttach = *it;
@@ -11247 +11310 @@
  * @return
  */
-MediumAttachment* Machine::i_findAttachment(const MediaData::AttachmentList &ll,
+MediumAttachment *Machine::i_findAttachment(const MediumAttachmentList &ll,
                                             Guid &id)
 {
-   for (MediaData::AttachmentList::const_iterator it = ll.begin(); it != ll.end(); ++it)
+    for (MediumAttachmentList::const_iterator
+         it = ll.begin();
+         it != ll.end();
+         ++it)
     {
         MediumAttachment *pAttach = *it;
@@ -11290 +11356 @@
         /// a special media state for it to make it even more simple.
 
-        Assert(mMediaData.isBackedUp());
+        Assert(mMediumAttachments.isBackedUp());
 
         /* will release the lock before the potentially lengthy operation, so
@@ -11310 +11376 @@
 
     i_setModified(IsModified_Storage);
-    mMediaData.backup();
-    mMediaData->mAttachments.remove(pAttach);
+    mMediumAttachments.backup();
+    mMediumAttachments->remove(pAttach);
 
     if (!oldmedium.isNull())
@@ -11364 +11430 @@
 
     // make a temporary list because i_detachDevice invalidates iterators into
-    // mMediaData->mAttachments
-    MediaData::AttachmentList llAttachments2 = mMediaData->mAttachments;
-
-    for (MediaData::AttachmentList::iterator it = llAttachments2.begin(); it != llAttachments2.end(); ++it)
+    // mMediumAttachments
+    MediumAttachmentList llAttachments2 = *mMediumAttachments.data();
+
+    for (MediumAttachmentList::iterator
+         it = llAttachments2.begin();
+         it != llAttachments2.end();
+         ++it)
     {
         ComObjPtr<MediumAttachment> &pAttach = *it;
@@ -11428 +11497 @@
  * Perform deferred hard disk detachments.
  *
- * Does nothing if the hard disk attachment data (mMediaData) is not changed (not
- * backed up).
+ * Does nothing if the hard disk attachment data (mMediumAttachments) is not
+ * changed (not backed up).
  *
- * If @a aOnline is @c true then this method will also unlock the old hard disks
- * for which the new implicit diffs were created and will lock these new diffs for
- * writing.
+ * If @a aOnline is @c true then this method will also unlock the old hard
+ * disks for which the new implicit diffs were created and will lock these new
+ * diffs for writing.
  *
  * @param aOnline       Whether the VM was online prior to this operation.
@@ -11451 +11520 @@
 
     /* no attach/detach operations -- nothing to do */
-    if (!mMediaData.isBackedUp())
+    if (!mMediumAttachments.isBackedUp())
         return;
 
-    MediaData::AttachmentList &oldAtts = mMediaData.backedUpData()->mAttachments;
+    MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
     bool fMediaNeedsLocking = false;
 
     /* enumerate new attachments */
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
@@ -11466 +11536 @@
         pAttach->i_commit();
 
-        Medium* pMedium = pAttach->i_getMedium();
+        Medium *pMedium = pAttach->i_getMedium();
         bool fImplicit = pAttach->i_isImplicit();
 
@@ -11511 +11581 @@
         {
             /* was this medium attached before? */
-            for (MediaData::AttachmentList::iterator oldIt = oldAtts.begin(); oldIt != oldAtts.end(); ++oldIt)
+            for (MediumAttachmentList::iterator
+                 oldIt = oldAtts.begin();
+                 oldIt != oldAtts.end();
+                 ++oldIt)
             {
                 MediumAttachment *pOldAttach = *oldIt;
@@ -11528 +11601 @@
     /* enumerate remaining old attachments and de-associate from the
      * current machine state */
-    for (MediaData::AttachmentList::const_iterator it = oldAtts.begin(); it != oldAtts.end(); ++it)
+    for (MediumAttachmentList::const_iterator
+         it = oldAtts.begin();
+         it != oldAtts.end();
+         ++it)
     {
         MediumAttachment *pAttach = *it;
-        Medium* pMedium = pAttach->i_getMedium();
+        Medium *pMedium = pAttach->i_getMedium();
 
         /* Detach only hard disks, since DVD/floppy media is detached
@@ -11577 +11653 @@
 
     /* commit the hard disk changes */
-    mMediaData.commit();
+    mMediumAttachments.commit();
 
     if (i_isSessionMachine())
@@ -11592 +11668 @@
          *        machine.
          */
-        for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-             it != mMediaData->mAttachments.end();
+        for (MediumAttachmentList::const_iterator
+             it = mMediumAttachments->begin();
+             it != mMediumAttachments->end();
              ++it)
             (*it)->i_updateParentMachine(mPeer);
 
         /* attach new data to the primary machine and reshare it */
-        mPeer->mMediaData.attach(mMediaData);
+        mPeer->mMediumAttachments.attach(mMediumAttachments);
     }
 
@@ -11607 +11684 @@
  * Perform deferred deletion of implicitly created diffs.
  *
- * Does nothing if the hard disk attachment data (mMediaData) is not changed (not
- * backed up).
+ * Does nothing if the hard disk attachment data (mMediumAttachments) is not
+ * changed (not backed up).
  *
  * @note Locks this object for writing!
@@ -11623 +11700 @@
 
     /* no attach/detach operations -- nothing to do */
-    if (!mMediaData.isBackedUp())
+    if (!mMediumAttachments.isBackedUp())
         return;
 
     /* enumerate new attachments */
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
@@ -11635 +11713 @@
         if (pAttach->i_getType() != DeviceType_HardDisk)
         {
-            Medium* pMedium = pAttach->i_getMedium();
+            Medium *pMedium = pAttach->i_getMedium();
             if (pMedium)
             {
@@ -11649 +11727 @@
         if (pAttach->i_getType() != DeviceType_HardDisk)
         {
-            Medium* pMedium = pAttach->i_getMedium();
+            Medium *pMedium = pAttach->i_getMedium();
             if (pMedium)
             {
@@ -11715 +11793 @@
         {
             /* unitialize all new devices (absent in the backed up list). */
-            StorageControllerList::const_iterator it = mStorageControllers->begin();
             StorageControllerList *backedList = mStorageControllers.backedUpData();
-            while (it != mStorageControllers->end())
+            for (StorageControllerList::const_iterator
+                 it = mStorageControllers->begin();
+                 it != mStorageControllers->end();
+                 ++it)
             {
                 if (   std::find(backedList->begin(), backedList->end(), *it)
@@ -11725 +11805 @@
                     (*it)->uninit();
                 }
-                ++it;
             }
 
@@ -11735 +11814 @@
         if (mData->flModifications & IsModified_Storage)
         {
-            StorageControllerList::const_iterator it = mStorageControllers->begin();
-            while (it != mStorageControllers->end())
+            for (StorageControllerList::const_iterator
+                 it = mStorageControllers->begin();
+                 it != mStorageControllers->end();
+                 ++it)
             {
                 (*it)->i_rollback();
-                ++it;
             }
         }
@@ -11749 +11829 @@
         {
             /* unitialize all new devices (absent in the backed up list). */
-            USBControllerList::const_iterator it = mUSBControllers->begin();
             USBControllerList *backedList = mUSBControllers.backedUpData();
-            while (it != mUSBControllers->end())
+            for (USBControllerList::const_iterator
+                 it = mUSBControllers->begin();
+                 it != mUSBControllers->end();
+                 ++it)
             {
                 if (   std::find(backedList->begin(), backedList->end(), *it)
@@ -11759 +11841 @@
                     (*it)->uninit();
                 }
-                ++it;
             }
 
@@ -11769 +11850 @@
         if (mData->flModifications & IsModified_USB)
         {
-            USBControllerList::const_iterator it = mUSBControllers->begin();
-            while (it != mUSBControllers->end())
+            for (USBControllerList::const_iterator
+                 it = mUSBControllers->begin();
+                 it != mUSBControllers->end();
+                 ++it)
             {
                 (*it)->i_rollback();
-                ++it;
             }
         }
@@ -11894 +11976 @@
     mHWData.commit();
 
-    if (mMediaData.isBackedUp())
+    if (mMediumAttachments.isBackedUp())
         i_commitMedia(Global::IsOnline(mData->mMachineState));
 
@@ -11968 +12050 @@
              * peers for those who have peers) */
             StorageControllerList *newList = new StorageControllerList();
-            StorageControllerList::const_iterator it = mStorageControllers->begin();
-            while (it != mStorageControllers->end())
+            for (StorageControllerList::const_iterator
+                 it = mStorageControllers->begin();
+                 it != mStorageControllers->end();
+                 ++it)
             {
                 (*it)->i_commit();
@@ -11989 +12073 @@
                 /* and add it to the new list */
                 newList->push_back(peer);
-
-                ++it;
             }
 
             /* uninit old peer's controllers that are left */
-            it = mPeer->mStorageControllers->begin();
-            while (it != mPeer->mStorageControllers->end())
+            for (StorageControllerList::const_iterator
+                 it = mPeer->mStorageControllers->begin();
+                 it != mPeer->mStorageControllers->end();
+                 ++it)
             {
                 (*it)->uninit();
-                ++it;
             }
 
@@ -12020 +12103 @@
     if (commitStorageControllers)
     {
-        StorageControllerList::const_iterator it = mStorageControllers->begin();
-        while (it != mStorageControllers->end())
+        for (StorageControllerList::const_iterator
+             it = mStorageControllers->begin();
+             it != mStorageControllers->end();
+             ++it)
         {
             (*it)->i_commit();
-            ++it;
         }
     }
@@ -12039 +12123 @@
              * peers for those who have peers) */
             USBControllerList *newList = new USBControllerList();
-            USBControllerList::const_iterator it = mUSBControllers->begin();
-            while (it != mUSBControllers->end())
+            for (USBControllerList::const_iterator
+                 it = mUSBControllers->begin();
+                 it != mUSBControllers->end();
+                 ++it)
             {
                 (*it)->i_commit();
@@ -12060 +12146 @@
                 /* and add it to the new list */
                 newList->push_back(peer);
-
-                ++it;
             }
 
             /* uninit old peer's controllers that are left */
-            it = mPeer->mUSBControllers->begin();
-            while (it != mPeer->mUSBControllers->end())
+            for (USBControllerList::const_iterator
+                 it = mPeer->mUSBControllers->begin();
+                 it != mPeer->mUSBControllers->end();
+                 ++it)
             {
                 (*it)->uninit();
-                ++it;
             }
 
@@ -12091 +12176 @@
     if (commitUSBControllers)
     {
-        USBControllerList::const_iterator it = mUSBControllers->begin();
-        while (it != mUSBControllers->end())
+        for (USBControllerList::const_iterator
+             it = mUSBControllers->begin();
+             it != mUSBControllers->end();
+             ++it)
         {
             (*it)->i_commit();
-            ++it;
         }
     }
@@ -12104 +12190 @@
         mPeer->mUserData.attach(mUserData);
         mPeer->mHWData.attach(mHWData);
-        /* mMediaData is reshared by fixupMedia */
-        // mPeer->mMediaData.attach(mMediaData);
-        Assert(mPeer->mMediaData.data() == mMediaData.data());
+        /* mmMediumAttachments is reshared by fixupMedia */
+        // mPeer->mMediumAttachments.attach(mMediumAttachments);
+        Assert(mPeer->mMediumAttachments.data() == mMediumAttachments.data());
     }
 }
@@ -12133 +12219 @@
     // create copies of all shared folders (mHWData after attaching a copy
     // contains just references to original objects)
-    for (HWData::SharedFolderList::iterator it = mHWData->mSharedFolders.begin();
+    for (HWData::SharedFolderList::iterator
+         it = mHWData->mSharedFolders.begin();
          it != mHWData->mSharedFolders.end();
          ++it)
@@ -12153 +12240 @@
     mStorageControllers.backup();
     mStorageControllers->clear();
-    for (StorageControllerList::iterator it = aThat->mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = aThat->mStorageControllers->begin();
          it != aThat->mStorageControllers->end();
          ++it)
@@ -12166 +12254 @@
     mUSBControllers.backup();
     mUSBControllers->clear();
-    for (USBControllerList::iterator it = aThat->mUSBControllers->begin();
+    for (USBControllerList::const_iterator
+         it = aThat->mUSBControllers->begin();
          it != aThat->mUSBControllers->end();
          ++it)
@@ -12217 +12306 @@
 void Machine::i_getDiskList(MediaList &list)
 {
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
-        MediumAttachment* pAttach = *it;
+        MediumAttachment *pAttach = *it;
         /* just in case */
         AssertContinue(pAttach);
@@ -12487 +12577 @@
     mUserData.share(aMachine->mUserData);
     mHWData.share(aMachine->mHWData);
-    mMediaData.share(aMachine->mMediaData);
+    mMediumAttachments.share(aMachine->mMediumAttachments);
 
     mStorageControllers.allocate();
-    for (StorageControllerList::const_iterator it = aMachine->mStorageControllers->begin();
+    for (StorageControllerList::const_iterator
+         it = aMachine->mStorageControllers->begin();
          it != aMachine->mStorageControllers->end();
          ++it)
@@ -12501 +12592 @@
 
     mUSBControllers.allocate();
-    for (USBControllerList::const_iterator it = aMachine->mUSBControllers->begin();
+    for (USBControllerList::const_iterator
+         it = aMachine->mUSBControllers->begin();
          it != aMachine->mUSBControllers->end();
          ++it)
@@ -12704 +12796 @@
                           mData->mSession.mRemoteControls.size()));
 
-        Data::Session::RemoteControlList::iterator it =
-            mData->mSession.mRemoteControls.begin();
-        while (it != mData->mSession.mRemoteControls.end())
+        /* Always restart a the beginning, since the iterator is invalidated
+         * by using erase(). */
+        for (Data::Session::RemoteControlList::iterator
+             it = mData->mSession.mRemoteControls.begin();
+             it != mData->mSession.mRemoteControls.end();
+             it = mData->mSession.mRemoteControls.begin())
         {
             ComPtr<IInternalSessionControl> pControl = *it;
@@ -12717 +12812 @@
                 Log1WarningThisFunc(("Forgot to close the remote session?\n"));
             multilock.acquire();
-            it = mData->mSession.mRemoteControls.begin();
         }
         mData->mSession.mRemoteControls.clear();
@@ -13128 +13222 @@
 HRESULT SessionMachine::beginPowerUp(const ComPtr<IProgress> &aProgress)
 {
-    IProgress* pProgress(aProgress);
+    IProgress *pProgress(aProgress);
 
     LogFlowThisFunc(("aProgress=%p\n", pProgress));
@@ -13474 +13568 @@
     {
         /* the remote session is being normally closed */
-        Data::Session::RemoteControlList::iterator it =
-            mData->mSession.mRemoteControls.begin();
-        while (it != mData->mSession.mRemoteControls.end())
+        bool found = false;
+        for (Data::Session::RemoteControlList::iterator
+             it = mData->mSession.mRemoteControls.begin();
+             it != mData->mSession.mRemoteControls.end();
+             ++it)
         {
             if (control == *it)
+            {
+                found = true;
+                // This MUST be erase(it), not remove(*it) as the latter
+                // triggers a very nasty use after free due to the place where
+                // the value "lives".
+                mData->mSession.mRemoteControls.erase(it);
                 break;
-            ++it;
-        }
-        BOOL found = it != mData->mSession.mRemoteControls.end();
+            }
+        }
         ComAssertMsgRet(found, ("The session is not found in the session list!"),
                          E_INVALIDARG);
-        // This MUST be erase(it), not remove(*it) as the latter triggers a
-        // very nasty use after free due to the place where the value "lives".
-        mData->mSession.mRemoteControls.erase(it);
     }
 
@@ -13516 +13614 @@
 
     size_t  i = 0;
-    for (HWData::GuestPropertyMap::iterator it = mHWData->mGuestProperties.begin();
+    for (HWData::GuestPropertyMap::const_iterator
+         it = mHWData->mGuestProperties.begin();
          it != mHWData->mGuestProperties.end();
          ++it, ++i)
@@ -13676 +13775 @@
 
         i_setModified(IsModified_Storage);
-        mMediaData.backup();
+        mMediumAttachments.backup();
 
         // The backup operation makes the pAttach reference point to the
         // old settings. Re-get the correct reference.
-        pAttach = i_findAttachment(mMediaData->mAttachments,
+        pAttach = i_findAttachment(*mMediumAttachments.data(),
                                    ctrlName.raw(),
                                    lPort,
@@ -14459 +14558 @@
 
     /* Collect locking information for all medium objects attached to the VM. */
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::const_iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
-        MediumAttachment* pAtt = *it;
+        MediumAttachment *pAtt = *it;
         DeviceType_T devType = pAtt->i_getType();
         Medium *pMedium = pAtt->i_getMedium();
@@ -14730 +14830 @@
         /* remove it from the settings representation */
         settings::GuestPropertiesList &llGuestProperties = mData->pMachineConfigFile->hardwareMachine.llGuestProperties;
-        for (settings::GuestPropertiesList::iterator it = llGuestProperties.begin();
+        for (settings::GuestPropertiesList::iterator
+             it = llGuestProperties.begin();
              it != llGuestProperties.end();
              /*nothing*/)
@@ -14750 +14851 @@
          * keep everything in sync, as this is what the API keeps using. */
         HWData::GuestPropertyMap &llHWGuestProperties = mHWData->mGuestProperties;
-        for (HWData::GuestPropertyMap::iterator it = llHWGuestProperties.begin();
+        for (HWData::GuestPropertyMap::iterator
+             it = llHWGuestProperties.begin();
              it != llHWGuestProperties.end();
              /*nothing*/)

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1013 +1013 @@
      * media with the snapshot (Machine::uninitDataAndChildObjects() will
      * deassociate at destruction). */
-    mMediaData.allocate();
-    for (MediaData::AttachmentList::const_iterator
-         it = aSessionMachine->mMediaData->mAttachments.begin();
-         it != aSessionMachine->mMediaData->mAttachments.end();
+    mMediumAttachments.allocate();
+    for (MediumAttachmentList::const_iterator
+         it = aSessionMachine->mMediumAttachments->begin();
+         it != aSessionMachine->mMediumAttachments->end();
          ++it)
     {
@@ -1023 +1023 @@
         rc = pAtt->initCopy(this, *it);
         if (FAILED(rc)) return rc;
-        mMediaData->mAttachments.push_back(pAtt);
+        mMediumAttachments->push_back(pAtt);
 
         Medium *pMedium = pAtt->i_getMedium();
@@ -1191 +1191 @@
     /* allocate private copies of all other data (will be loaded from settings) */
     mHWData.allocate();
-    mMediaData.allocate();
+    mMediumAttachments.allocate();
     mStorageControllers.allocate();
     mUSBControllers.allocate();
@@ -1510 +1510 @@
     ULONG ulTotalOperationsWeight = 2;  // one each for setting up + finishing up
 
-    for (MediaData::AttachmentList::iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
+    for (MediumAttachmentList::iterator
+         it = mMediumAttachments->begin();
+         it != mMediumAttachments->end();
          ++it)
     {
@@ -1704 +1705 @@
         // The matching commit() is in fixupMedia() during SessionMachine::i_finishTakingSnapshot()
         i_setModified(IsModified_Storage);
-        mMediaData.backup();
+        mMediumAttachments.backup();
 
         alock.release();
@@ -2029 +2030 @@
     ULONG ulOpCount = 1;            // one for preparations
     ULONG ulTotalWeight = 1;        // one for preparations
-    for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
-         it != pSnapMachine->mMediaData->mAttachments.end();
+    for (MediumAttachmentList::iterator
+         it = pSnapMachine->mMediumAttachments->begin();
+         it != pSnapMachine->mMediumAttachments->end();
          ++it)
     {
@@ -2157 +2159 @@
             // restore the attachments from the snapshot
             i_setModified(IsModified_Storage);
-            mMediaData.backup();
-            mMediaData->mAttachments.clear();
-            for (MediaData::AttachmentList::const_iterator it = pSnapshotMachine->mMediaData->mAttachments.begin();
-                 it != pSnapshotMachine->mMediaData->mAttachments.end();
+            mMediumAttachments.backup();
+            mMediumAttachments->clear();
+            for (MediumAttachmentList::const_iterator
+                 it = pSnapshotMachine->mMediumAttachments->begin();
+                 it != pSnapshotMachine->mMediumAttachments->end();
                  ++it)
             {
@@ -2166 +2169 @@
                 pAttach.createObject();
                 pAttach->initCopy(this, *it);
-                mMediaData->mAttachments.push_back(pAttach);
+                mMediumAttachments->push_back(pAttach);
             }
 
@@ -2205 +2208 @@
         std::list< ComObjPtr<MediumAttachment> > llDiffAttachmentsToDelete;
 
-        for (MediaData::AttachmentList::const_iterator it = mMediaData.backedUpData()->mAttachments.begin();
-             it != mMediaData.backedUpData()->mAttachments.end();
+        for (MediumAttachmentList::const_iterator
+             it = mMediumAttachments.backedUpData()->begin();
+             it != mMediumAttachments.backedUpData()->end();
              ++it)
         {
@@ -2235 +2239 @@
         /* Paranoia: no one must have saved the settings in the mean time. If
          * it happens nevertheless we'll close our eyes and continue below. */
-        Assert(mMediaData.isBackedUp());
+        Assert(mMediumAttachments.isBackedUp());
 
         /* assign the timestamp from the snapshot */
@@ -2263 +2267 @@
             // the time in our case so instead we force a detachment here:
             // remove from machine data
-            mMediaData->mAttachments.remove(pAttach);
+            mMediumAttachments->remove(pAttach);
             // Remove it from the backup or else i_saveSettings will try to detach
             // it again and assert. The paranoia check avoids crashes (see
             // assert above) if this code is buggy and saves settings in the
             // wrong place.
-            if (mMediaData.isBackedUp())
-                mMediaData.backedUpData()->mAttachments.remove(pAttach);
+            if (mMediumAttachments.isBackedUp())
+                mMediumAttachments.backedUpData()->remove(pAttach);
             // then clean up backrefs
             pMedium->i_removeBackReference(mData->mUuid);
@@ -2489 +2493 @@
 
     // count normal hard disks and add their sizes to the weight
-    for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
-         it != pSnapMachine->mMediaData->mAttachments.end();
+    for (MediumAttachmentList::iterator
+         it = pSnapMachine->mMediumAttachments->begin();
+         it != pSnapMachine->mMediumAttachments->end();
          ++it)
     {
@@ -2707 +2712 @@
         // merge it with its one and only child (the diff image holding the
         // changes written after the snapshot was taken).
-        for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
-             it != pSnapMachine->mMediaData->mAttachments.end();
+        for (MediumAttachmentList::iterator
+             it = pSnapMachine->mMediumAttachments->begin();
+             it != pSnapMachine->mMediumAttachments->end();
              ++it)
         {
@@ -2754 +2760 @@
                 // prevent online merging in general.
                 pOnlineMediumAttachment =
-                    i_findAttachment(mMediaData->mAttachments,
+                    i_findAttachment(*mMediumAttachments.data(),
                                      pAttach->i_getControllerName(),
                                      pAttach->i_getPort(),
@@ -2863 +2869 @@
             std::map<uint32_t,const char*> serialMapToStoragePath;
 
-            MediumDeleteRecList::const_iterator it_md = toDelete.begin();
-
-            while (it_md != toDelete.end())
+            for (MediumDeleteRecList::const_iterator
+                 it = toDelete.begin();
+                 it != toDelete.end();
+                 ++it)
             {
                 uint64_t diskSize = 0;
                 uint32_t pu32Serial = 0;
-                ComObjPtr<Medium> pSource_local = it_md->mpSource;
-                ComObjPtr<Medium> pTarget_local = it_md->mpTarget;
+                ComObjPtr<Medium> pSource_local = it->mpSource;
+                ComObjPtr<Medium> pTarget_local = it->mpTarget;
                 ComPtr<IMediumFormat> pTargetFormat;
 
@@ -2876 +2883 @@
                     if (   pSource_local.isNull()
                         || pSource_local == pTarget_local)
-                    {
-                        ++it_md;
                         continue;
-                    }
                 }
 
@@ -2904 +2908 @@
                     serialMapToStoragePath.insert(std::make_pair(pu32Serial,pTarget_local->i_getLocationFull().c_str()));
                 }
-
-                ++it_md;
             }
 
@@ -3125 +3127 @@
             if (fReparentTarget)
             {
-                pAtt = i_findAttachment(pSnapMachine->mMediaData->mAttachments,
+                pAtt = i_findAttachment(*(pSnapMachine->mMediumAttachments.data()),
                                         it->mpTarget);
                 it->mpTarget->i_removeBackReference(machineId, snapshotId);
             }
             else
-                pAtt = i_findAttachment(pSnapMachine->mMediaData->mAttachments,
+                pAtt = i_findAttachment(*(pSnapMachine->mMediumAttachments.data()),
                                         it->mpSource);
-            pSnapMachine->mMediaData->mAttachments.remove(pAtt);
+            pSnapMachine->mMediumAttachments->remove(pAtt);
 
             if (fReparentTarget)
@@ -3146 +3148 @@
                     childSnapshotId = pChildSnapshot->i_getId();
                 }
-                pAtt = i_findAttachment(pMachine->mMediaData->mAttachments, it->mpSource);
+                pAtt = i_findAttachment(*(pMachine->mMediumAttachments).data(), it->mpSource);
                 if (pAtt)
                 {

trunk/src/VBox/Main/src-server/StorageControllerImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2016 Oracle Corporation
+ * Copyright (C) 2008-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -312 +312 @@
                             aName.c_str());
 
-        Machine::MediaData::AttachmentList atts;
+        Machine::MediumAttachmentList atts;
         rc = m->pParent->i_getMediumAttachmentsOfController(m->bd->strName, atts);
-        for (Machine::MediaData::AttachmentList::const_iterator it = atts.begin();
+        for (Machine::MediumAttachmentList::const_iterator
+             it = atts.begin();
              it != atts.end();
              ++it)