Changeset 18313 in vbox for trunk/src

Timestamp:

Mar 26, 2009 1:59:14 PM (16 years ago)

Author:

vboxsync

Message:

Main: a different approach to opening images read-only for import which does not assert on empty UUIDs

Location:

trunk/src/VBox/Main

Files:

• HardDiskImpl.cpp (modified) (6 diffs)
• MediumImpl.cpp (modified) (4 diffs)
• include/HardDiskImpl.h (modified) (3 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -729 +729 @@
     m.state = MediaState_Created;
 
+    /* remember the open mode (defaults to ReadWrite) */
+    mm.hddOpenMode = enOpenMode;
+
     rc = setLocation (aLocation);
     CheckComRCReturnRC (rc);
 
     /* get all the information about the medium from the storage unit */
-    rc = queryInfo((enOpenMode == OpenReadWrite) /* fWrite */ );
-    if (SUCCEEDED (rc))
+    rc = queryInfo();
+
+    if (SUCCEEDED(rc))
     {
         /* if the storage unit is not accessible, it's not acceptable for the
@@ -745 +749 @@
         else
         {
-            /* storage format must be detected by queryInfo() if the medium is
-            * accessible */
-            AssertReturn (!m.id.isEmpty() && !mm.format.isNull(), E_FAIL);
+            AssertReturn(!m.id.isEmpty(), E_FAIL);
+
+            /* storage format must be detected by queryInfo() if the medium is accessible */
+            AssertReturn(!mm.format.isNull(), E_FAIL);
         }
     }
@@ -2996 +3001 @@
  *       writing.
  */
-HRESULT HardDisk::queryInfo(bool fWrite)
+HRESULT HardDisk::queryInfo()
 {
     AutoWriteLock alock (this);
@@ -3079 +3084 @@
              * time in VirtualBox (such as VMDK for which VDOpen() needs to
              * generate an UUID if it is missing) */
-            if (!fWrite || !isImport)
+            if (    (mm.hddOpenMode == OpenReadOnly)
+                 || !isImport
+               )
                 flags |= VD_OPEN_FLAGS_READONLY;
 
-            vrc = VDOpen (hdd, Utf8Str (mm.format), location, flags,
-                          mm.vdDiskIfaces);
+            vrc = VDOpen(hdd,
+                         Utf8Str(mm.format),
+                         location,
+                         flags,
+                         mm.vdDiskIfaces);
             if (RT_FAILURE (vrc))
             {
@@ -3096 +3106 @@
                 /* check the UUID */
                 RTUUID uuid;
-                vrc = VDGetUuid (hdd, 0, &uuid);
-                ComAssertRCThrow (vrc, E_FAIL);
+                vrc = VDGetUuid(hdd, 0, &uuid);
+                ComAssertRCThrow(vrc, E_FAIL);
 
                 if (isImport)
                 {
-                    unconst (m.id) = uuid;
+                    unconst(m.id) = uuid;
+
+                    if (m.id.isEmpty() && (mm.hddOpenMode == OpenReadOnly))
+                        // only when importing a VDMK that has no UUID, create one in memory
+                        unconst(m.id).create();
                 }
                 else
@@ -3126 +3140 @@
                 /* generate an UUID for an imported UUID-less hard disk */
                 if (isImport)
-                    unconst (m.id).create();
+                    unconst(m.id).create();
             }
 

trunk/src/VBox/Main/MediumImpl.cpp

@@ -115 +115 @@
         case MediaState_LockedWrite:
         {
-            rc = queryInfo(true /* fWrite */);
+            rc = queryInfo();
             break;
         }
@@ -715 +715 @@
  * size and description will be updated with the current information.
  *
- * The fWrite parameter is ignored in this variant, since this always opens
- * the medium read-only; it is however acknowledged by HardDisk::queryInfo(),
- * which overrides this implementation for hard disk media.
- *
  * @note This method may block during a system I/O call that checks image file
  *       accessibility.
@@ -724 +720 @@
  * @note Locks this object for writing.
  */
-HRESULT MediumBase::queryInfo(bool fWrite)
+HRESULT MediumBase::queryInfo()
 {
     AutoWriteLock alock (this);
@@ -966 +962 @@
 
     /* get all the information about the medium from the file */
-    rc = queryInfo(true);
-    if (SUCCEEDED (rc))
+    rc = queryInfo();
+
+    if (SUCCEEDED(rc))
     {
         /* if the image file is not accessible, it's not acceptable for the

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

@@ -256 +256 @@
     HRESULT setFormat (CBSTR aFormat);
 
-    virtual HRESULT queryInfo(bool fWrite);
+    virtual HRESULT queryInfo();
 
     HRESULT canClose();
@@ -289 +289 @@
     struct Data
     {
-        Data() : type (HardDiskType_Normal), logicalSize (0), autoReset (false)
-               , implicit (false), numCreateDiffTasks (0)
-               , vdProgress (NULL) , vdDiskIfaces (NULL) {}
+        Data()
+            : type(HardDiskType_Normal),
+              logicalSize(0),
+              hddOpenMode(OpenReadWrite),
+              autoReset(false),
+              implicit(false),
+              numCreateDiffTasks(0),
+              vdProgress(NULL),
+              vdDiskIfaces(NULL)
+        {}
 
         const Bstr format;
@@ -299 +306 @@
         uint64_t logicalSize;   /*< In MBytes. */
 
+        HDDOpenMode hddOpenMode;
+
         BOOL autoReset : 1;
 

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

@@ -143 +143 @@
 
     virtual HRESULT setLocation (CBSTR aLocation);
-    virtual HRESULT queryInfo(bool fWrite);
+    virtual HRESULT queryInfo();
 
     /**