Changeset 49795 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Dec 5, 2013 6:53:18 PM (11 years ago)

Author:

vboxsync

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

91125

Message:

6813 - stage 3 rev 1

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (48 diffs)

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

@@ -1048 +1048 @@
         if (pMedium) // can be NULL for non-harddisk
         {
-            rc = pMedium->addBackReference(mData->mUuid, mSnapshotId);
+            rc = pMedium->i_addBackReference(mData->mUuid, mSnapshotId);
             AssertComRC(rc);
         }
@@ -1782 +1782 @@
             ++ulTotalWeight;         // assume one MB weight for each differencing hard disk to manage
             Assert(pAttach->getMedium());
-            LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, pAttach->getMedium()->getName().c_str()));
+            LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, pAttach->getMedium()->i_getName().c_str()));
         }
     }
@@ -1970 +1970 @@
             if (    !pMedium.isNull()
                  && pAttach->getType() == DeviceType_HardDisk
-                 && !pMedium->getParent().isNull()
-                 && pMedium->getChildren().size() == 0
+                 && !pMedium->i_getParent().isNull()
+                 && pMedium->i_getChildren().size() == 0
                )
             {
-                LogFlowThisFunc(("Picked differencing image '%s' for deletion\n", pMedium->getName().c_str()));
+                LogFlowThisFunc(("Picked differencing image '%s' for deletion\n", pMedium->i_getName().c_str()));
 
                 llDiffAttachmentsToDelete.push_back(pAttach);
@@ -2012 +2012 @@
             AutoWriteLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
 
-            LogFlowThisFunc(("Detaching old current state in differencing image '%s'\n", pMedium->getName().c_str()));
+            LogFlowThisFunc(("Detaching old current state in differencing image '%s'\n", pMedium->i_getName().c_str()));
 
             // Normally we "detach" the medium by removing the attachment object
@@ -2028 +2028 @@
                 mMediaData.backedUpData()->mAttachments.remove(pAttach);
             // then clean up backrefs
-            pMedium->removeBackReference(mData->mUuid);
+            pMedium->i_removeBackReference(mData->mUuid);
 
             llDiffsToDelete.push_back(pMedium);
@@ -2054 +2054 @@
         {
             ComObjPtr<Medium> &pMedium = *it;
-            LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->getName().c_str()));
-
-            HRESULT rc2 = pMedium->deleteStorage(NULL /* aProgress */,
-                                                 true /* aWait */);
+            LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->i_getName().c_str()));
+
+            HRESULT rc2 = pMedium->i_deleteStorage(NULL /* aProgress */,
+                                                   true /* aWait */);
             // ignore errors here because we cannot roll back after saveSettings() above
             if (SUCCEEDED(rc2))
@@ -2169 +2169 @@
                         mUserData->s.strName.c_str(),
                         childrenCount);
+
     if (pSnapshot == mData->mCurrentSnapshot && childrenCount >= 1)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
@@ -2175 +2176 @@
                         mUserData->s.strName.c_str());
 
+
     /* If the snapshot being deleted is the current one, ensure current
      * settings are committed and saved.
@@ -2218 +2220 @@
             AutoReadLock mlock(pHD COMMA_LOCKVAL_SRC_POS);
 
-            MediumType_T type = pHD->getType();
+            MediumType_T type = pHD->i_getType();
             // writethrough and shareable images are unaffected by snapshots,
             // so do nothing for them
@@ -2227 +2229 @@
                 // normal or immutable media need attention
                 ++ulOpCount;
-                ulTotalWeight += (ULONG)(pHD->getSize() / _1M);
+                ulTotalWeight += (ULONG)(pHD->i_getSize() / _1M);
             }
-            LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, pHD->getName().c_str()));
+            LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, pHD->i_getName().c_str()));
         }
     }
@@ -2445 +2447 @@
                 // unaffected by snapshots, skip them
                 AutoReadLock medlock(pHD COMMA_LOCKVAL_SRC_POS);
-                MediumType_T type = pHD->getType();
+                MediumType_T type = pHD->i_getType();
                 if (   type == MediumType_Writethrough
                     || type == MediumType_Shareable
@@ -2453 +2455 @@
 
 #ifdef DEBUG
-            pHD->dumpBackRefs();
+            pHD->i_dumpBackRefs();
 #endif
 
@@ -2525 +2527 @@
                 // base disk. Here we need then to update the attachment that
                 // refers to the child and have it point to the parent instead
-                Assert(pHD->getChildren().size() == 1);
-
-                ComObjPtr<Medium> pReplaceHD = pHD->getChildren().front();
+                Assert(pHD->i_getChildren().size() == 1);
+
+                ComObjPtr<Medium> pReplaceHD = pHD->i_getChildren().front();
 
                 ComAssertThrow(pReplaceHD == pSource, E_FAIL);
@@ -2535 +2537 @@
             Guid replaceSnapshotId;
 
-            const Guid *pReplaceMachineId = pSource->getFirstMachineBackrefId();
+            const Guid *pReplaceMachineId = pSource->i_getFirstMachineBackrefId();
             // minimal sanity checking
             Assert(!pReplaceMachineId || *pReplaceMachineId == mData->mUuid);
@@ -2541 +2543 @@
                 replaceMachineId = *pReplaceMachineId;
 
-            const Guid *pSnapshotId = pSource->getFirstMachineBackrefSnapshotId();
+            const Guid *pSnapshotId = pSource->i_getFirstMachineBackrefSnapshotId();
             if (pSnapshotId)
                 replaceSnapshotId = *pSnapshotId;
@@ -2551 +2553 @@
                 // with the snapshot until the merge was successful.
                 HRESULT rc2 = S_OK;
-                rc2 = pSource->removeBackReference(replaceMachineId, replaceSnapshotId);
+                rc2 = pSource->i_removeBackReference(replaceMachineId, replaceSnapshotId);
                 AssertComRC(rc2);
 
@@ -2608 +2610 @@
                     throw rc;
 
-                if(pTarget_local->isMediumFormatFile())
+                if(pTarget_local->i_isMediumFormatFile())
                 {
-                    int vrc = RTFsQuerySerial(pTarget_local->getLocationFull().c_str(), &pu32Serial);
+                    int vrc = RTFsQuerySerial(pTarget_local->i_getLocationFull().c_str(), &pu32Serial);
                     if (RT_FAILURE(vrc))
                     {
                         rc = setError(E_FAIL,
                                       tr(" Unable to merge storage '%s'. Can't get storage UID "),
-                                      pTarget_local->getLocationFull().c_str());
+                                      pTarget_local->i_getLocationFull().c_str());
                         throw rc;
                     }
@@ -2624 +2626 @@
                     neededStorageFreeSpace.insert(std::make_pair(pu32Serial,diskSize));
                     /* linking storage UID with snapshot path, it is a helper container (just for easy finding needed path) */
-                    serialMapToStoragePath.insert(std::make_pair(pu32Serial,pTarget_local->getLocationFull().c_str()));
+                    serialMapToStoragePath.insert(std::make_pair(pu32Serial,pTarget_local->i_getLocationFull().c_str()));
                 }
 
@@ -2729 +2731 @@
             {
                 AutoReadLock alock(pMedium COMMA_LOCKVAL_SRC_POS);
-                ulWeight = (ULONG)(pMedium->getSize() / _1M);
+                ulWeight = (ULONG)(pMedium->i_getSize() / _1M);
             }
 
             aTask.pProgress->SetNextOperation(BstrFmt(tr("Merging differencing image '%s'"),
-                                              pMedium->getName().c_str()).raw(),
+                                              pMedium->i_getName().c_str()).raw(),
                                               ulWeight);
 
@@ -2745 +2747 @@
 
                 Assert(   !it->mfMergeForward
-                       || pMedium->getChildren().size() == 0);
+                       || pMedium->i_getChildren().size() == 0);
 
                 /* Delete the differencing hard disk (has no children). Two
@@ -2752 +2754 @@
                  * In both cases leave the image in place. If it's the first
                  * exception the user can delete it later if he wants. */
-                if (!pMedium->getParent().isNull())
+                if (!pMedium->i_getParent().isNull())
                 {
-                    Assert(pMedium->getState() == MediumState_Deleting);
+                    Assert(pMedium->i_getState() == MediumState_Deleting);
                     /* No need to hold the lock any longer. */
                     mLock.release();
-                    rc = pMedium->deleteStorage(&aTask.pProgress,
-                                                true /* aWait */);
+                    rc = pMedium->i_deleteStorage(&aTask.pProgress,
+                                                  true /* aWait */);
                     if (FAILED(rc))
                         throw rc;
@@ -2791 +2793 @@
                 {
                     // normal medium merge, in the direction decided earlier
-                    rc = it->mpSource->mergeTo(it->mpTarget,
-                                               it->mfMergeForward,
-                                               it->mpParentForTarget,
-                                               it->mpChildrenToReparent,
-                                               it->mpMediumLockList,
-                                               &aTask.pProgress,
-                                               true /* aWait */);
+                    rc = it->mpSource->i_mergeTo(it->mpTarget,
+                                                 it->mfMergeForward,
+                                                 it->mpParentForTarget,
+                                                 it->mpChildrenToReparent,
+                                                 it->mpMediumLockList,
+                                                 &aTask.pProgress,
+                                                 true /* aWait */);
                 }
 
@@ -2809 +2811 @@
                 {
                     AutoReadLock mlock(it->mpSource COMMA_LOCKVAL_SRC_POS);
-                    if (!it->mpSource->isMediumFormatFile())
+                    if (!it->mpSource->i_isMediumFormatFile())
                         // Diff medium not backed by a file - cannot get status so
                         // be pessimistic.
                         throw rc;
-                    const Utf8Str &loc = it->mpSource->getLocationFull();
+                    const Utf8Str &loc = it->mpSource->i_getLocationFull();
                     // Source medium is still there, so merge failed early.
                     if (RTFileExists(loc.c_str()))
@@ -2848 +2850 @@
                 pAtt = findAttachment(pSnapMachine->mMediaData->mAttachments,
                                       it->mpTarget);
-                it->mpTarget->removeBackReference(machineId, snapshotId);
+                it->mpTarget->i_removeBackReference(machineId, snapshotId);
             }
             else
@@ -2872 +2874 @@
                     AutoWriteLock attLock(pAtt COMMA_LOCKVAL_SRC_POS);
                     pAtt->updateMedium(it->mpTarget);
-                    it->mpTarget->addBackReference(pMachine->mData->mUuid, childSnapshotId);
+                    it->mpTarget->i_addBackReference(pMachine->mData->mUuid, childSnapshotId);
                 }
                 else
@@ -2882 +2884 @@
                     // Needs a bit of special treatment due to this difference.
                     if (it->mfNeedsOnlineMerge)
-                        it->mpTarget->addBackReference(pMachine->mData->mUuid, childSnapshotId);
+                        it->mpTarget->i_addBackReference(pMachine->mData->mUuid, childSnapshotId);
                 }
             }
@@ -3021 +3023 @@
 
     // Medium must not be writethrough/shareable/readonly at this point
-    MediumType_T type = aHD->getType();
+    MediumType_T type = aHD->i_getType();
     AssertReturn(   type != MediumType_Writethrough
                  && type != MediumType_Shareable
@@ -3030 +3032 @@
     fNeedsOnlineMerge = false;
 
-    if (aHD->getChildren().size() == 0)
+    if (aHD->i_getChildren().size() == 0)
     {
         /* This technically is no merge, set those values nevertheless.
@@ -3038 +3040 @@
 
         /* special treatment of the last hard disk in the chain: */
-        if (aHD->getParent().isNull())
+        if (aHD->i_getParent().isNull())
         {
             /* lock only, to prevent any usage until the snapshot deletion
@@ -3048 +3050 @@
         /* the differencing hard disk w/o children will be deleted, protect it
          * from attaching to other VMs (this is why Deleting) */
-        return aHD->markForDeletion();
+        return aHD->i_markForDeletion();
    }
 
     /* not going multi-merge as it's too expensive */
-    if (aHD->getChildren().size() > 1)
+    if (aHD->i_getChildren().size() > 1)
         return setError(E_FAIL,
                         tr("Hard disk '%s' has more than one child hard disk (%d)"),
-                        aHD->getLocationFull().c_str(),
-                        aHD->getChildren().size());
-
-    ComObjPtr<Medium> pChild = aHD->getChildren().front();
+                        aHD->i_getLocationFull().c_str(),
+                        aHD->i_getChildren().size());
+
+    ComObjPtr<Medium> pChild = aHD->i_getChildren().front();
 
     AutoWriteLock childLock(pChild COMMA_LOCKVAL_SRC_POS);
 
     /* the rest is a normal merge setup */
-    if (aHD->getParent().isNull())
+    if (aHD->i_getParent().isNull())
     {
         /* base hard disk, backward merge */
-        const Guid *pMachineId1 = pChild->getFirstMachineBackrefId();
-        const Guid *pMachineId2 = aHD->getFirstMachineBackrefId();
+        const Guid *pMachineId1 = pChild->i_getFirstMachineBackrefId();
+        const Guid *pMachineId2 = aHD->i_getFirstMachineBackrefId();
         if (pMachineId1 && pMachineId2 && *pMachineId1 != *pMachineId2)
         {
@@ -3087 +3089 @@
         childLock.release();
         alock.release();
-        HRESULT rc = aHD->queryPreferredMergeDirection(pChild, fMergeForward);
+        HRESULT rc = aHD->i_queryPreferredMergeDirection(pChild, fMergeForward);
         alock.acquire();
         childLock.acquire();
@@ -3111 +3113 @@
     childLock.release();
     alock.release();
-    rc = aSource->prepareMergeTo(aTarget, &aMachineId, &aSnapshotId,
+    rc = aSource->i_prepareMergeTo(aTarget, &aMachineId, &aSnapshotId,
                                  !fOnlineMergePossible /* fLockMedia */,
                                  aMergeForward, aParentForTarget,
@@ -3221 +3223 @@
                 if (FAILED(rc))
                 {
-                    aSource->cancelMergeTo(aChildrenToReparent, aMediumLockList);
+                    aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
                     rc = setError(rc,
                                   tr("Cannot lock hard disk '%s' for a live merge"),
-                                  aHD->getLocationFull().c_str());
+                                  aHD->i_getLocationFull().c_str());
                 }
                 else
@@ -3235 +3237 @@
             else
             {
-                aSource->cancelMergeTo(aChildrenToReparent, aMediumLockList);
+                aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
                 rc = setError(rc,
                               tr("Failed to construct lock list for a live merge of hard disk '%s'"),
-                              aHD->getLocationFull().c_str());
+                              aHD->i_getLocationFull().c_str());
             }
 
@@ -3261 +3263 @@
                     // blindly apply this, only needed for medium objects which
                     // would be deleted as part of the merge
-                    pMedium->unmarkLockedForDeletion();
+                    pMedium->i_unmarkLockedForDeletion();
                 }
             }
@@ -3268 +3270 @@
         else
         {
-            aSource->cancelMergeTo(aChildrenToReparent, aMediumLockList);
+            aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
             rc = setError(rc,
                           tr("Cannot lock hard disk '%s' for an offline merge"),
-                          aHD->getLocationFull().c_str());
+                          aHD->i_getLocationFull().c_str());
         }
     }
@@ -3307 +3309 @@
         AutoMultiWriteLock2 mLock(&mParent->getMediaTreeLockHandle(), aHD->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
-        Assert(aHD->getChildren().size() == 0);
-
-        if (aHD->getParent().isNull())
+        Assert(aHD->i_getChildren().size() == 0);
+
+        if (aHD->i_getParent().isNull())
         {
             Assert(!aHDLockToken.isNull());
@@ -3320 +3322 @@
         else
         {
-            HRESULT rc = aHD->unmarkForDeletion();
+            HRESULT rc = aHD->i_unmarkForDeletion();
             AssertComRC(rc);
         }
@@ -3330 +3332 @@
             // Online merge uses the medium lock list of the VM, so give
             // an empty list to cancelMergeTo so that it works as designed.
-            aSource->cancelMergeTo(aChildrenToReparent, new MediumLockList());
+            aSource->i_cancelMergeTo(aChildrenToReparent, new MediumLockList());
 
             // clean up the VM medium lock list ourselves
@@ -3345 +3347 @@
                 ComObjPtr<Medium> pMedium = it->GetMedium();
                 AutoWriteLock mediumLock(pMedium COMMA_LOCKVAL_SRC_POS);
-                if (pMedium->getState() == MediumState_Deleting)
-                    pMedium->unmarkForDeletion();
+                if (pMedium->i_getState() == MediumState_Deleting)
+                    pMedium->i_unmarkForDeletion();
                 else
                 {
                     // blindly apply this, only needed for medium objects which
                     // would be deleted as part of the merge
-                    pMedium->unmarkLockedForDeletion();
+                    pMedium->i_unmarkLockedForDeletion();
                 }
                 mediumLock.release();
@@ -3360 +3362 @@
         else
         {
-            aSource->cancelMergeTo(aChildrenToReparent, aMediumLockList);
+            aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
         }
     }
@@ -3367 +3369 @@
     {
         // reattach the source media to the snapshot
-        HRESULT rc = aSource->addBackReference(aMachineId, aSnapshotId);
+        HRESULT rc = aSource->i_addBackReference(aMachineId, aSnapshotId);
         AssertComRC(rc);
     }
@@ -3512 +3514 @@
         // then, reparent it and disconnect the deleted branch at
         // both ends (chain->parent() is source's parent)
-        pDeleteRec->mpTarget->deparent();
-        pDeleteRec->mpTarget->setParent(pDeleteRec->mpParentForTarget);
+        pDeleteRec->mpTarget->i_deparent();
+        pDeleteRec->mpTarget->i_setParent(pDeleteRec->mpParentForTarget);
         if (pDeleteRec->mpParentForTarget)
-            pDeleteRec->mpSource->deparent();
+            pDeleteRec->mpSource->i_deparent();
 
         // then, register again
@@ -3523 +3525 @@
     else
     {
-        Assert(pDeleteRec->mpTarget->getChildren().size() == 1);
-        targetChild = pDeleteRec->mpTarget->getChildren().front();
+        Assert(pDeleteRec->mpTarget->i_getChildren().size() == 1);
+        targetChild = pDeleteRec->mpTarget->i_getChildren().front();
 
         // disconnect the deleted branch at the elder end
-        targetChild->deparent();
+        targetChild->i_deparent();
 
         // Update parent UUIDs of the source's children, reparent them and
@@ -3540 +3542 @@
             // need manual fixing via VBoxManage to adjust the parent UUID.
             treeLock.release();
-            pDeleteRec->mpTarget->fixParentUuidOfChildren(pDeleteRec->mpChildrenToReparent);
+            pDeleteRec->mpTarget->i_fixParentUuidOfChildren(pDeleteRec->mpChildrenToReparent);
             // The childen are still write locked, unlock them now and don't
             // rely on the destructor doing it very late.
@@ -3558 +3560 @@
                 AutoWriteLock childLock(pMedium COMMA_LOCKVAL_SRC_POS);
 
-                pMedium->deparent();  // removes pMedium from source
-                pMedium->setParent(pDeleteRec->mpTarget);
+                pMedium->i_deparent();  // removes pMedium from source
+                pMedium->i_setParent(pDeleteRec->mpTarget);
             }
         }
@@ -3584 +3586 @@
         /* The target and all images not merged (readonly) are skipped */
         if (   pMedium == pDeleteRec->mpTarget
-            || pMedium->getState() == MediumState_LockedRead)
+            || pMedium->i_getState() == MediumState_LockedRead)
         {
             ++it;
@@ -3607 +3609 @@
             if (pMedium == pDeleteRec->mpSource)
             {
-                Assert(pDeleteRec->mpSource->getChildren().size() == 0);
-                Assert(pDeleteRec->mpSource->getFirstMachineBackrefId() == NULL);
+                Assert(pDeleteRec->mpSource->i_getChildren().size() == 0);
+                Assert(pDeleteRec->mpSource->i_getFirstMachineBackrefId() == NULL);
             }