Changeset 2918 in vbox for trunk/src/VBox

Timestamp:

May 29, 2007 2:26:58 PM (18 years ago)

Author:

vboxsync

Message:

VBoxManage: 'registerimage' can now register images of any supproted type (currently, VDI and VMDK).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (2 diffs)
• Main/HardDiskImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -4877 +4877 @@
     if (strcmp(argv[0], "disk") == 0)
     {
-        const char *type = "normal";
+        const char *type = NULL;
         /* there can be a type parameter */
         if ((argc > 2) && (argc != 4))
@@ -4898 +4898 @@
         }
 
-        ComPtr<IVirtualDiskImage> vdi;
-
-        CHECK_ERROR(virtualBox, OpenVirtualDiskImage(filepath, vdi.asOutParam()));
-        if (SUCCEEDED(rc) && vdi)
-        {
-            ComPtr<IHardDisk> hardDisk = vdi;
+        ComPtr<IHardDisk> hardDisk;
+        CHECK_ERROR(virtualBox, OpenHardDisk(filepath, hardDisk.asOutParam()));
+        if (SUCCEEDED(rc) && hardDisk)
+        {
             /* change the type if requested */
-            if (strcmp(type, "normal") == 0)
-                CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_NormalHardDisk));
-            else if (strcmp(type, "immutable") == 0)
-                CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_ImmutableHardDisk));
-            else if (strcmp(type, "writethrough") == 0)
-                CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_WritethroughHardDisk));
-            CHECK_ERROR(virtualBox, RegisterHardDisk(hardDisk));
+            if (type)
+            {
+                if (strcmp(type, "normal") == 0)
+                    CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_NormalHardDisk));
+                else if (strcmp(type, "immutable") == 0)
+                    CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_ImmutableHardDisk));
+                else if (strcmp(type, "writethrough") == 0)
+                    CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_WritethroughHardDisk));
+            }
+            if (SUCCEEDED(rc))
+                CHECK_ERROR(virtualBox, RegisterHardDisk(hardDisk));
         }
     }

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -251 +251 @@
             tr ("You cannot change the type of the registered hard disk '%ls'"),
             toString().raw());
+
+    /* return silently if nothing to do */
+    if (mType == aType)
+        return S_OK;
+
+    if (mStorageType == HardDiskStorageType_VMDKImage)
+        return setError (E_FAIL,
+            tr ("Currently, changing the type of VMDK hard disks is not allowed"));
 
     if (mStorageType == HardDiskStorageType_ISCSIHardDisk)