Changeset 37768 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 4, 2011 2:49:46 PM (14 years ago)

Author:

vboxsync

Message:

Main: add implicit parents which are not attached to other machines to the deletion list on unregister (code still disabled)

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (1 diff)

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

@@ -9652 +9652 @@
 
 /**
+ * Search for medias which are not attached to any machine, but in the chain to
+ * an attached disk. Mediums are only consided if they are:
+ * - have only one child
+ * - no refereneces to any machines
+ * - are of normal medium type
+ *
+ * This is done recursive and the recursing is stopped if a medium has more the
+ * one child or there is no parent anymore.
+ *
+ * Used in detachAllMedia.
+ *
+ * @param pMedium   Medium to investigate.
+ * @param llMedia   Caller's list to add a corrosponding media to.
+ * @return
+ */
+HRESULT Machine::searchAndAddImplicitParents(ComObjPtr<Medium> pMedium, MediaList &llMedia) const
+{
+    if (!pMedium.isNull())
+    {
+        AutoCaller mac(pMedium);
+        if (FAILED(mac.rc())) return mac.rc();
+        AutoReadLock lock(pMedium COMMA_LOCKVAL_SRC_POS);
+        MediaList childs = pMedium->getChildren();
+        if (childs.size() == 1)
+        {
+            if (   pMedium->getMachineBackRefCount() == 0
+                && pMedium->getType() == MediumType_Normal
+                && find(llMedia.begin(), llMedia.end(), pMedium) == llMedia.end())
+                llMedia.push_back(pMedium);
+            /* Recurse */
+            return searchAndAddImplicitParents(pMedium->getParent(), llMedia);
+        }
+    }
+    return S_OK;
+}
+
+/**
  * Goes thru all media of the given list and
  *
@@ -9702 +9739 @@
                  || (cleanupMode == CleanupMode_Full)
                )
+            {
                 llMedia.push_back(pMedium);
+                /* not enabled yet
+                rc = searchAndAddImplicitParents(pMedium->getParent(), llMedia);
+                if (FAILED(rc))
+                    return rc;
+                */
+            }
         }
 

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

@@ -3463 +3463 @@
 
     return &ref.llSnapshotIds.front();
+}
+
+size_t Medium::getMachineBackRefCount() const
+{
+    return m->backRefs.size();
 }