Changeset 2920 in vbox for trunk/src/VBox

Timestamp:

May 29, 2007 2:45:52 PM (18 years ago)

Author:

vboxsync

Message:

VBoxManage: 'modifyvm' and 'showvdiinfo' now understand images of any supproted type (currently, VDI and VMDK).

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (7 diffs)

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

@@ -2259 +2259 @@
         {
             virtualBox->OpenVirtualDiskImage(Bstr(argv[0]), vdi.asOutParam());
-            if (!hardDisk)
+            if (!vdi)
             {
                 return errorArgument("Hard disk image not found");
@@ -3373 +3373 @@
                 if (!hardDisk)
                 {
-                    ComPtr<IVirtualDiskImage> vdi;
-                    CHECK_ERROR(virtualBox, OpenVirtualDiskImage(Bstr(hdds[0]), vdi.asOutParam()));
-                    if (SUCCEEDED(rc) && vdi)
+                    CHECK_ERROR(virtualBox, OpenHardDisk(Bstr(hdds[0]), hardDisk.asOutParam()));
+                    if (SUCCEEDED(rc) && hardDisk)
                     {
-                        hardDisk = vdi;
                         /* first check if it's already registered */
                         Guid hddUUID;
@@ -3420 +3418 @@
                 if (!hardDisk)
                 {
-                    ComPtr<IVirtualDiskImage> vdi;
-                    CHECK_ERROR(virtualBox, OpenVirtualDiskImage(Bstr(hdds[1]), vdi.asOutParam()));
-                    if (SUCCEEDED(rc) && vdi)
+                    CHECK_ERROR(virtualBox, OpenHardDisk(Bstr(hdds[1]), hardDisk.asOutParam()));
+                    if (SUCCEEDED(rc) && hardDisk)
                     {
-                        hardDisk = vdi;
                         /* first check if it's already registered */
                         Guid hddUUID;
@@ -3467 +3463 @@
                 if (!hardDisk)
                 {
-                    ComPtr<IVirtualDiskImage> vdi;
-                    CHECK_ERROR(virtualBox, OpenVirtualDiskImage(Bstr(hdds[2]), vdi.asOutParam()));
-                    if (SUCCEEDED(rc) && vdi)
+                    CHECK_ERROR(virtualBox, OpenHardDisk(Bstr(hdds[2]), hardDisk.asOutParam()));
+                    if (SUCCEEDED(rc) && hardDisk)
                     {
-                        hardDisk = vdi;
                         /* first check if it's already registered */
                         Guid hddUUID;
@@ -4747 +4741 @@
 
     ComPtr<IHardDisk> hardDisk;
-    ComPtr<IVirtualDiskImage> vdi;
     Bstr filepath;
 
@@ -4759 +4752 @@
     {
         filepath = argv[0];
-        rc = virtualBox->FindVirtualDiskImage(filepath, vdi.asOutParam());
+        rc = virtualBox->FindHardDisk(filepath, hardDisk.asOutParam());
         /* no? well, then it's an unregistered image */
         if (FAILED (rc))
         {
             registered = false;
-            CHECK_ERROR(virtualBox, OpenVirtualDiskImage(filepath, vdi.asOutParam()));
-        }
-        if (SUCCEEDED (rc))
-            hardDisk = vdi;
-    }
-    else
-    {
-        vdi = hardDisk;
+            CHECK_ERROR(virtualBox, OpenHardDisk(filepath, hardDisk.asOutParam()));
+        }
     }
     if (SUCCEEDED(rc) && hardDisk)
     {
+        /* query a VDI object (will remain null if it's not VDI) */
+        ComPtr<IVirtualDiskImage> vdi = hardDisk;
+
         hardDisk->COMGETTER(Id)(uuid.asOutParam());
         RTPrintf("UUID:                 %s\n", uuid.toString().raw());
@@ -4832 +4822 @@
             case HardDiskStorageType_VirtualDiskImage:
                 storageTypeStr = "Virtual Disk Image (VDI)";
+                break;
+            case HardDiskStorageType_VMDKImage:
+                storageTypeStr = "VMDK Image";
                 break;
             case HardDiskStorageType_ISCSIHardDisk: