Changeset 31370 in vbox

Timestamp:

Aug 4, 2010 6:49:09 PM (14 years ago)

Author:

vboxsync

Message:

Main: cleanup machine renames, remove dead code

Location:

trunk/src/VBox

Files:

• Main/MediumImpl.cpp (modified) (3 diffs)
• Main/VirtualBoxImpl.cpp (modified) (1 diff)
• Main/include/MediumImpl.h (modified) (1 diff)
• Runtime/testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2858 +2858 @@
  * @note Locks this object for writing.
  */
-HRESULT Medium::updatePath(const char *aOldPath, const char *aNewPath)
-{
-    AssertReturn(aOldPath, E_FAIL);
-    AssertReturn(aNewPath, E_FAIL);
+HRESULT Medium::updatePath(const Utf8Str &strOldPath, const Utf8Str &strNewPath)
+{
+    AssertReturn(!strOldPath.isEmpty(), E_FAIL);
+    AssertReturn(!strNewPath.isEmpty(), E_FAIL);
 
     AutoCaller autoCaller(this);
@@ -2872 +2872 @@
     const char *pcszMediumPath = m->strLocationFull.c_str();
 
-    if (RTPathStartsWith(pcszMediumPath, aOldPath))
-    {
-        Utf8Str newPath = Utf8StrFmt("%s%s",
-                                     aNewPath,
-                                     pcszMediumPath + strlen(aOldPath));
+    if (RTPathStartsWith(pcszMediumPath, strOldPath.c_str()))
+    {
+        Utf8Str newPath(strNewPath);
+        newPath.append(pcszMediumPath + strOldPath.length());
         unconst(m->strLocationFull) = newPath;
 
@@ -2887 +2886 @@
 
     return S_OK;
-}
-
-/**
- * Checks if the given change of \a aOldPath to \a aNewPath affects the location
- * of this medium or any its child and updates the paths if necessary to
- * reflect the new location.
- *
- * @param aOldPath  Old path (full).
- * @param aNewPath  New path (full).
- *
- * @note Locks the medium tree for reading, this object and all children for writing.
- */
-void Medium::updatePaths(const char *aOldPath, const char *aNewPath)
-{
-    AssertReturnVoid(aOldPath);
-    AssertReturnVoid(aNewPath);
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturnVoid(autoCaller.rc());
-
-    /* we access children() */
-    AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    updatePath(aOldPath, aNewPath);
-
-    /* update paths of all children */
-    for (MediaList::const_iterator it = getChildren().begin();
-         it != getChildren().end();
-         ++it)
-    {
-        (*it)->updatePaths(aOldPath, aNewPath);
-    }
 }
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3226 +3226 @@
                 {
                     const Data::PendingMachineRename &pmr = *it2;
-                    const char *pcszOld = pmr.strConfigDirOld.c_str();
-                    const char *pcszNew = pmr.strConfigDirNew.c_str();
-                    pMedium->updatePath(pcszOld, pcszNew);
+                    pMedium->updatePath(pmr.strConfigDirOld,
+                                        pmr.strConfigDirNew);
                 }
             }

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

@@ -188 +188 @@
 #endif
 
-    HRESULT updatePath(const char *aOldPath, const char *aNewPath);
-    void updatePaths(const char *aOldPath, const char *aNewPath);
+    HRESULT updatePath(const Utf8Str &strOldPath, const Utf8Str &strNewPath);
 
     ComObjPtr<Medium> getBase(uint32_t *aLevel = NULL);

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -124 +124 @@
         tstRTProcIsRunningByName \
         tstRTBitOperationsPIC3 \
-        tstInlineAsmPIC \
         tstInlineAsmPIC3
+if1of ($(USERNAME), umoeller)
+else
+PROGRAMS.linux += \
+        tstInlineAsmPIC
+endif
 PROGRAMS.l4 += \
         tstIoCtl