Changeset 44433 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 28, 2013 4:12:29 PM (12 years ago)

Author:

vboxsync

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

83414

Message:

Main/Medium: improve the error handling for medium UUID change failures, e.g. when the medium is readonly.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1546 +1546 @@
     {
         ULONG temp = m->variant;
-        temp &= 1<<i; 
+        temp &= 1<<i;
         variants [i] = (MediumVariant_T)temp;
     }
@@ -5694 +5694 @@
                     vrc = VDSetUuid(hdd, 0, m->uuidImage.raw());
                     alock.release();
-                    ComAssertRCThrow(vrc, E_FAIL);
+                    if (RT_FAILURE(vrc))
+                    {
+                        lastAccessError = Utf8StrFmt(tr("Could not update the UUID of medium '%s'%s"),
+                                         location.c_str(), vdError(vrc).c_str());
+                        throw S_OK;
+                    }
                     mediumId = m->uuidImage;
                 }
@@ -5702 +5707 @@
                     vrc = VDSetParentUuid(hdd, 0, m->uuidParentImage.raw());
                     alock.release();
-                    ComAssertRCThrow(vrc, E_FAIL);
+                    if (RT_FAILURE(vrc))
+                    {
+                        lastAccessError = Utf8StrFmt(tr("Could not update the parent UUID of medium '%s'%s"),
+                                         location.c_str(), vdError(vrc).c_str());
+                        throw S_OK;
+                    }
                 }
                 /* zap the information, these are no long-term members */