Changeset 38119 in vbox for trunk/src/VBox

Timestamp:

Jul 22, 2011 2:57:03 PM (14 years ago)

Author:

vboxsync

Message:

Main-CloneVM: keep the "public" interface clean

Location:

trunk/src/VBox/Main

Files:

• include/MachineImplCloneVM.h (modified) (1 diff)
• src-server/MachineImplCloneVM.cpp (modified) (6 diffs)

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

@@ -34 +34 @@
 protected:
     HRESULT run();
-    HRESULT createDiffHelper(const ComObjPtr<Medium> &pParent,
-                             const Utf8Str &strSnapshotFolder,
-                             RTCList<ComObjPtr<Medium> > *pNewMedia,
-                             ComObjPtr<Medium> *ppDiff);
     void destroy();
 

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

@@ -114 +114 @@
     void updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const;
     void updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const;
+    HRESULT createDifferencingMedium(const ComObjPtr<Medium> &pParent, const Utf8Str &strSnapshotFolder, RTCList<ComObjPtr<Medium> > &newMedia, ComObjPtr<Medium> *ppDiff) const;
     static int copyStateFileProgress(unsigned uPercentage, void *pvUser);
 
@@ -432 +433 @@
 #endif
             /* Check if there is a "step" in the histogram when going the chain
-             * upwards. If so, we need this image, cause there is another leave
+             * upwards. If so, we need this image, cause there is another branch
              * from here in the cloned VM. */
             if (hist > used)
@@ -611 +612 @@
             updateStateFile(it->llChildSnapshots, id, strFile);
     }
+}
+
+HRESULT MachineCloneVMPrivate::createDifferencingMedium(const ComObjPtr<Medium> &pParent, const Utf8Str &strSnapshotFolder, RTCList<ComObjPtr<Medium> > &newMedia, ComObjPtr<Medium> *ppDiff) const
+{
+    HRESULT rc = S_OK;
+    try
+    {
+        Bstr bstrSrcId;
+        rc = pParent->COMGETTER(Id)(bstrSrcId.asOutParam());
+        if (FAILED(rc)) throw rc;
+        ComObjPtr<Medium> diff;
+        diff.createObject();
+        rc = diff->init(p->getVirtualBox(),
+                        pParent->getPreferredDiffFormat(),
+                        Utf8StrFmt("%s%c", strSnapshotFolder.c_str(), RTPATH_DELIMITER),
+                        Guid::Empty, /* empty media registry */
+                        NULL);       /* pllRegistriesThatNeedSaving */
+        if (FAILED(rc)) throw rc;
+        MediumLockList *pMediumLockList(new MediumLockList());
+        rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
+                                        true /* fMediumLockWrite */,
+                                        pParent,
+                                        *pMediumLockList);
+        if (FAILED(rc)) throw rc;
+        rc = pMediumLockList->Lock();
+        if (FAILED(rc)) throw rc;
+        /* this already registers the new diff image */
+        rc = pParent->createDiffStorage(diff, MediumVariant_Standard,
+                                        pMediumLockList,
+                                        NULL /* aProgress */,
+                                        true /* aWait */,
+                                        NULL); // pllRegistriesThatNeedSaving
+        delete pMediumLockList;
+        if (FAILED(rc)) throw rc;
+        /* Remember created medium. */
+        newMedia.append(diff);
+        *ppDiff = diff;
+    }
+    catch (HRESULT rc2)
+    {
+        rc = rc2;
+    }
+    catch (...)
+    {
+        rc = VirtualBox::handleUnexpectedExceptions(RT_SRC_POS);
+    }
+
+    return rc;
 }
 
@@ -972 +1021 @@
                         ComObjPtr<Medium> pDiff;
                         /* create the diff under the snapshot medium */
-                        rc = createDiffHelper(pLMedium, strTrgSnapshotFolder,
-                                              &newMedia, &pDiff);
+                        rc = d->createDifferencingMedium(pLMedium, strTrgSnapshotFolder,
+                                                         newMedia, &pDiff);
                         if (FAILED(rc)) throw rc;
                         map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pDiff));
@@ -1142 +1191 @@
                 {
                     ComObjPtr<Medium> pDiff;
-                    rc = createDiffHelper(pNewParent, strTrgSnapshotFolder,
-                                          &newMedia, &pDiff);
+                    rc = d->createDifferencingMedium(pNewParent, strTrgSnapshotFolder,
+                                                     newMedia, &pDiff);
                     if (FAILED(rc)) throw rc;
                     /* diff image has to be used... */
@@ -1287 +1336 @@
 }
 
-HRESULT MachineCloneVM::createDiffHelper(const ComObjPtr<Medium> &pParent,
-                                         const Utf8Str &strSnapshotFolder,
-                                         RTCList< ComObjPtr<Medium> > *pNewMedia,
-                                         ComObjPtr<Medium> *ppDiff)
-{
-    DPTR(MachineCloneVM);
-    ComObjPtr<Machine> &p = d->p;
-    HRESULT rc = S_OK;
-
-    try
-    {
-        Bstr bstrSrcId;
-        rc = pParent->COMGETTER(Id)(bstrSrcId.asOutParam());
-        if (FAILED(rc)) throw rc;
-        ComObjPtr<Medium> diff;
-        diff.createObject();
-        rc = diff->init(p->mParent,
-                        pParent->getPreferredDiffFormat(),
-                        Utf8StrFmt("%s%c", strSnapshotFolder.c_str(), RTPATH_DELIMITER),
-                        Guid::Empty, /* empty media registry */
-                        NULL);       /* pllRegistriesThatNeedSaving */
-        if (FAILED(rc)) throw rc;
-        MediumLockList *pMediumLockList(new MediumLockList());
-        rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
-                                        true /* fMediumLockWrite */,
-                                        pParent,
-                                        *pMediumLockList);
-        if (FAILED(rc)) throw rc;
-        rc = pMediumLockList->Lock();
-        if (FAILED(rc)) throw rc;
-        /* this already registers the new diff image */
-        rc = pParent->createDiffStorage(diff, MediumVariant_Standard,
-                                        pMediumLockList,
-                                        NULL /* aProgress */,
-                                        true /* aWait */,
-                                        NULL); // pllRegistriesThatNeedSaving
-        delete pMediumLockList;
-        if (FAILED(rc)) throw rc;
-        /* Remember created medium. */
-        pNewMedia->append(diff);
-        *ppDiff = diff;
-    }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions(RT_SRC_POS);
-    }
-
-    return rc;
-}
-
 void MachineCloneVM::destroy()
 {