Changeset 44316 in vbox for trunk

Timestamp:

Jan 21, 2013 9:16:41 AM (12 years ago)

Author:

vboxsync

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

83244

Message:

Main: Check for already used UUIDs when registering a new non file based Medium and recreate if there are conflicts

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxImpl.h (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -246 +246 @@
                                  ComObjPtr<Medium> &pMedium);
 
+    HRESULT checkMediaForConflicts(const Guid &aId,
+                                   const Utf8Str &aLocation,
+                                   Utf8Str &aConflictType,
+                                   ComObjPtr<Medium> *pDupMedium);
+
     HRESULT findGuestOSType(const Bstr &bstrOSType,
                             GuestOSType*& pGuestOSType);
@@ -309 +314 @@
         return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
     }
-
-    HRESULT checkMediaForConflicts(const Guid &aId,
-                                   const Utf8Str &aLocation,
-                                   Utf8Str &aConflictType,
-                                   ComObjPtr<Medium> *pDupMedium);
 
     HRESULT registerMachine(Machine *aMachine);

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

@@ -974 +974 @@
         AutoWriteLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         ComObjPtr<Medium> pMedium;
+
+        /*
+         * Check whether the UUID is taken already and create a new one
+         * if required.
+         */
+        do
+        {
+            Utf8Str strConflict;
+            ComObjPtr<Medium> pMediumDup;
+
+            rc = m->pVirtualBox->checkMediaForConflicts(m->id, Utf8Str(""),
+                                                        strConflict, &pMediumDup);
+            if (   SUCCEEDED(rc)
+                && strConflict.length()
+                && pMediumDup.isNull())
+            {
+                // create new UUID
+                unconst(m->id).create();
+            }
+            else
+                break;
+        } while (true);
+
         rc = m->pVirtualBox->registerMedium(this, &pMedium, DeviceType_HardDisk);
-        Assert(this == pMedium);
+        Assert(this == pMedium || FAILED(rc));
     }
 

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

@@ -3844 +3844 @@
                                            ComObjPtr<Medium> *ppMedium)
 {
-    AssertReturn(!aId.isZero() && !aLocation.isEmpty(), E_FAIL);
+    AssertReturn(!aId.isZero(), E_FAIL);
     AssertReturn(ppMedium, E_INVALIDARG);