Changeset 24884 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 23, 2009 6:48:14 PM (15 years ago)

Author:

vboxsync

Message:

Documentation+Frontends/VBoxManage: update documentation to reflect current terminology, and clean up image registration and unregistration. While at it, implement a delete option when unregistering an image.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDisk.cpp (modified) (14 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)

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

@@ -288 +288 @@
         if (SUCCEEDED(rc) && progress)
         {
-            showProgress(progress);
-            if (SUCCEEDED(rc))
+            rc = showProgress(progress);
+            if (FAILED(rc))
             {
-                LONG iRc;
-                progress->COMGETTER(ResultCode)(&iRc);
-                rc = iRc;
-                if (FAILED(rc))
+                com::ProgressErrorInfo info(progress);
+                if (info.isBasicAvailable())
+                    RTPrintf("Error: failed to create hard disk. Error message: %lS\n", info.getText().raw());
+                else
+                    RTPrintf("Error: failed to create hard disk. No error message available!\n");
+            }
+            else
+            {
+                doClose = !fRemember;
+
+                Bstr uuid;
+                CHECK_ERROR(hardDisk, COMGETTER(Id)(uuid.asOutParam()));
+
+                if (DiskType == MediumType_Writethrough)
                 {
-                    com::ProgressErrorInfo info(progress);
-                    if (info.isBasicAvailable())
-                        RTPrintf("Error: failed to create hard disk. Error message: %lS\n", info.getText().raw());
-                    else
-                        RTPrintf("Error: failed to create hard disk. No error message available!\n");
+                    CHECK_ERROR(hardDisk, COMSETTER(Type)(MediumType_Writethrough));
                 }
-                else
-                {
-                    doClose = !fRemember;
-
-                    Bstr uuid;
-                    CHECK_ERROR(hardDisk, COMGETTER(Id)(uuid.asOutParam()));
-
-                    if (DiskType == MediumType_Writethrough)
-                    {
-                        CHECK_ERROR(hardDisk, COMSETTER(Type)(MediumType_Writethrough));
-                    }
-
-                    RTPrintf("Disk image created. UUID: %s\n", Utf8Str(uuid).raw());
-                }
+
+                RTPrintf("Disk image created. UUID: %s\n", Utf8Str(uuid).raw());
             }
         }
@@ -482 +476 @@
             CHECK_ERROR(hardDisk, Compact(progress.asOutParam()));
             if (SUCCEEDED(rc))
-            {
-                showProgress(progress);
-                LONG iRc;
-                progress->COMGETTER(ResultCode)(&iRc);
-                rc = iRc;
-            }
+                rc = showProgress(progress);
             if (FAILED(rc))
             {
@@ -699 +688 @@
         CHECK_ERROR_BREAK(srcDisk, CloneTo(dstDisk, DiskVariant, NULL, progress.asOutParam()));
 
-        showProgress(progress);
-        LONG iRc;
-        progress->COMGETTER(ResultCode)(&iRc);
-        rc = iRc;
+        rc = showProgress(progress);
         if (FAILED(rc))
         {
@@ -1440 +1426 @@
     else if (cmd == CMD_DVD)
     {
-        if (fDiskType || fSetImageId || fSetParentId)
+        if (fDiskType || fSetParentId)
             return errorSyntax(USAGE_OPENMEDIUM, "Invalid option for DVD images");
+        Bstr ImageIdStr = BstrFmt("%RTuuid", &ImageId);
         ComPtr<IMedium> dvdImage;
-        rc = a->virtualBox->OpenDVDImage(Bstr(Filename), Bstr(), dvdImage.asOutParam());
+        rc = a->virtualBox->OpenDVDImage(Bstr(Filename), ImageIdStr, dvdImage.asOutParam());
         if (rc == VBOX_E_FILE_ERROR)
         {
@@ -1453 +1440 @@
                 return 1;
             }
-            CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(szFilenameAbs), Bstr(), dvdImage.asOutParam()));
+            CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(szFilenameAbs), ImageIdStr, dvdImage.asOutParam()));
         }
         else if (FAILED(rc))
-            CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(Filename), Bstr(), dvdImage.asOutParam()));
+            CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(Filename), ImageIdStr, dvdImage.asOutParam()));
     }
     else if (cmd == CMD_FLOPPY)
@@ -1462 +1449 @@
         if (fDiskType || fSetImageId || fSetParentId)
             return errorSyntax(USAGE_OPENMEDIUM, "Invalid option for floppy images");
+        Bstr ImageIdStr = BstrFmt("%RTuuid", &ImageId);
         ComPtr<IMedium> floppyImage;
-         rc = a->virtualBox->OpenFloppyImage(Bstr(Filename), Bstr(), floppyImage.asOutParam());
+        rc = a->virtualBox->OpenFloppyImage(Bstr(Filename), ImageIdStr, floppyImage.asOutParam());
         if (rc == VBOX_E_FILE_ERROR)
         {
@@ -1473 +1461 @@
                 return 1;
             }
-            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(szFilenameAbs), Bstr(), floppyImage.asOutParam()));
+            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(szFilenameAbs), ImageIdStr, floppyImage.asOutParam()));
         }
         else if (FAILED(rc))
-            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(Filename), Bstr(), floppyImage.asOutParam()));
+            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(Filename), ImageIdStr, floppyImage.asOutParam()));
     }
 
@@ -1487 +1475 @@
     { "dvd",            'D', RTGETOPT_REQ_NOTHING },
     { "floppy",         'f', RTGETOPT_REQ_NOTHING },
+    { "--delete",       'r', RTGETOPT_REQ_NOTHING },
 };
 
@@ -1499 +1488 @@
     } cmd = CMD_NONE;
     const char *FilenameOrUuid = NULL;
+    bool fDelete = false;
 
     int c;
@@ -1525 +1515 @@
                     return errorSyntax(USAGE_CLOSEMEDIUM, "Only one command can be specified: '%s'", ValueUnion.psz);
                 cmd = CMD_FLOPPY;
+                break;
+
+            case 'r':   // --delete
+                fDelete = true;
                 break;
 
@@ -1557 +1551 @@
         return errorSyntax(USAGE_CLOSEMEDIUM, "Disk name or UUID required");
 
+    ComPtr<IMedium> medium;
+
     /* first guess is that it's a UUID */
     Bstr uuid(FilenameOrUuid);
@@ -1562 +1558 @@
     if (cmd == CMD_DISK)
     {
-        ComPtr<IMedium> hardDisk;
-        rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
+        rc = a->virtualBox->GetHardDisk(uuid, medium.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */
-        if (!hardDisk)
-        {
-            CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(FilenameOrUuid), hardDisk.asOutParam()));
-        }
-        if (SUCCEEDED(rc) && hardDisk)
-        {
-            CHECK_ERROR(hardDisk, Close());
+        if (!medium)
+        {
+            CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(FilenameOrUuid), medium.asOutParam()));
         }
     }
@@ -1577 +1568 @@
     if (cmd == CMD_DVD)
     {
-        ComPtr<IMedium> dvdImage;
-        rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
+        rc = a->virtualBox->GetDVDImage(uuid, medium.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */
-        if (!dvdImage)
-        {
-            CHECK_ERROR(a->virtualBox, FindDVDImage(Bstr(FilenameOrUuid), dvdImage.asOutParam()));
-        }
-        if (SUCCEEDED(rc) && dvdImage)
-        {
-            CHECK_ERROR(dvdImage, Close());
+        if (!medium)
+        {
+            CHECK_ERROR(a->virtualBox, FindDVDImage(Bstr(FilenameOrUuid), medium.asOutParam()));
         }
     }
@@ -1592 +1578 @@
     if (cmd == CMD_FLOPPY)
     {
-        ComPtr<IMedium> floppyImage;
-        rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
+        rc = a->virtualBox->GetFloppyImage(uuid, medium.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */
-        if (!floppyImage)
-        {
-            CHECK_ERROR(a->virtualBox, FindFloppyImage(Bstr(FilenameOrUuid), floppyImage.asOutParam()));
-        }
-        if (SUCCEEDED(rc) && floppyImage)
-        {
-            CHECK_ERROR(floppyImage, Close());
-        }
+        if (!medium)
+        {
+            CHECK_ERROR(a->virtualBox, FindFloppyImage(Bstr(FilenameOrUuid), medium.asOutParam()));
+        }
+    }
+
+    if (SUCCEEDED(rc) && medium)
+    {
+        if (fDelete)
+        {
+            ComPtr<IProgress> progress;
+            CHECK_ERROR(medium, DeleteStorage(progress.asOutParam()));
+            if (SUCCEEDED(rc))
+            {
+                rc = showProgress(progress);
+                if (FAILED(rc))
+                {
+                    com::ProgressErrorInfo info(progress);
+                    if (info.isBasicAvailable())
+                        RTPrintf("Error: failed to delete medium. Error message: %lS\n", info.getText().raw());
+                    else
+                        RTPrintf("Error: failed to delete medium. No error message available!\n");
+                }
+            }
+            else
+                RTPrintf("Error: failed to delete medium. Error code %Rrc\n", rc);
+        }
+        CHECK_ERROR(medium, Close());
     }
 

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

@@ -343 +343 @@
         RTPrintf("VBoxManage openmedium       disk|dvd|floppy <filename>\n"
                  "                            [--type normal|immutable|writethrough] (disk only)\n"
+                 "                            [--uuid <uuid>]\n"
+                 "                            [--parentuuid <uuid>] (disk only)\n"
                  "\n");
     }
@@ -349 +351 @@
     {
         RTPrintf("VBoxManage closemedium      disk|dvd|floppy <uuid>|<filename>\n"
+                 "                            [--delete]\n"
                  "\n");
     }