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

Timestamp:

Mar 4, 2008 2:12:17 PM (17 years ago)

Author:

vboxsync

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

28615

Message:

Make the backend type a per-image property and get away from the per container property. Required e.g. for snapshotting iSCSI disks (whenever we get there).

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• HardDiskImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -760 +760 @@
             rc = CFGMR3InsertString(pCfg,   "Path",             psz);                   RC_CHECK();
             STR_FREE();
+            rc = CFGMR3InsertString(pCfg,   "Format",           "VMDK");                RC_CHECK();
         }
         else if (hddType == HardDiskStorageType_CustomHardDisk)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -3381 +3381 @@
 
     /* initialize the container */
-    int vrc = VDCreate ("VMDK", VDError, this, &mContainer);
+    int vrc = VDCreate (VDError, this, &mContainer);
     ComAssertRCRet (vrc, E_FAIL);
 
@@ -4049 +4049 @@
         /// obviously. This of course changes locking behavior, but for now
         /// this is acceptable. A better solution needs to be found later.
-        vrc = VDOpen (mContainer, filePath, VD_OPEN_FLAGS_NORMAL);
+        vrc = VDOpen (mContainer, "VMDK", filePath, VD_OPEN_FLAGS_NORMAL);
         if (VBOX_FAILURE (vrc))
             break;
@@ -4316 +4316 @@
 
         /* initialize the container */
-        vrc = VDCreate (Utf8Str (mFormat), VDError, this, &mContainer);
+        vrc = VDCreate (VDError, this, &mContainer);
         if (VBOX_FAILURE (vrc))
         {
@@ -4417 +4417 @@
                 break;
             }
+            mFormat = Bstr (pszFormat);
+            RTStrFree (pszFormat);
 
             /* Create the corresponding container. */
-            vrc = VDCreate (pszFormat, VDError, this, &mContainer);
-
-            if (VBOX_SUCCESS(vrc))
-                mFormat = Bstr (pszFormat);
-
-            RTStrFree (pszFormat);
+            vrc = VDCreate (VDError, this, &mContainer);
 
             /* the format has been already checked for presence at this point */
@@ -4885 +4882 @@
         Guid id, parentId;
 
-        vrc = VDOpen (mContainer, location, VD_OPEN_FLAGS_INFO);
+        vrc = VDOpen (mContainer, Utf8Str (mFormat), location, VD_OPEN_FLAGS_INFO);
         if (VBOX_FAILURE (vrc))
             break;
@@ -5083 +5080 @@
 
     /* initialize the container */
-    int vrc = VDCreate ("VHD", VDError, this, &mContainer);
+    int vrc = VDCreate (VDError, this, &mContainer);
     ComAssertRCRet (vrc, E_FAIL);
 
@@ -5749 +5746 @@
         /// obviously. This of course changes locking behavior, but for now
         /// this is acceptable. A better solution needs to be found later.
-        vrc = VDOpen (mContainer, filePath, VD_OPEN_FLAGS_NORMAL);
+        vrc = VDOpen (mContainer, "VHD", filePath, VD_OPEN_FLAGS_NORMAL);
         if (VBOX_FAILURE (vrc))
             break;