Changeset 21032 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2009 3:27:38 PM (16 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: client code for cloning to existing image, plus code for legacy --static option which was forgotten

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDisk.cpp (modified) (8 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -501 +501 @@
     { "--static",       'F', RTGETOPT_REQ_NOTHING },
     { "-static",        'F', RTGETOPT_REQ_NOTHING },
+    { "--existing",     'E', RTGETOPT_REQ_NOTHING },
     { "--variant",      'm', RTGETOPT_REQ_STRING },
     { "-variant",       'm', RTGETOPT_REQ_STRING },
@@ -518 +519 @@
     Bstr format;
     HardDiskVariant_T DiskVariant = HardDiskVariant_Standard;
+    bool fExisting = false;
     bool fRemember = false;
+    bool fSetDiskType = false;
     HardDiskType_T DiskType = HardDiskType_Normal;
 
@@ -534 +537 @@
                 break;
 
+            case 'F':   // --static
+                DiskVariant |= HardDiskVariant_Fixed;
+                break;
+
+            case 'E':   // --existing
+                fExisting = true;
+                break;
+
             case 'm':   // --variant
                 vrc = parseDiskVariant(ValueUnion.psz, &DiskVariant);
@@ -548 +559 @@
                 if (RT_FAILURE(vrc))
                     return errorArgument("Invalid hard disk type '%s'", ValueUnion.psz);
+                fSetDiskType = true;
                 break;
 
@@ -580 +592 @@
     if (dst.isEmpty())
         return errorSyntax(USAGE_CLONEHD, "Mandatory output file parameter missing");
+    if (fExisting && (!format.isEmpty() || DiskVariant != HardDiskType_Normal))
+        return errorSyntax(USAGE_CLONEHD, "Specified options which cannot be used with --existing");
 
     ComPtr<IHardDisk> srcDisk;
     ComPtr<IHardDisk> dstDisk;
-    bool unknown = false;
+    bool fSrcUnknown = false;
+    bool fDstUnknown = false;
 
     /* first guess is that it's a UUID */
@@ -589 +604 @@
     /* no? then it must be a filename */
     if (FAILED (rc))
-    {
         rc = a->virtualBox->FindHardDisk(src, srcDisk.asOutParam());
-        /* no? well, then it's an unknown image */
-        if (FAILED (rc))
-        {
-            rc = a->virtualBox->OpenHardDisk(src, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam());
-            if (rc == VBOX_E_FILE_ERROR)
+    /* no? well, then it's an unknown image */
+    if (FAILED (rc))
+    {
+        rc = a->virtualBox->OpenHardDisk(src, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam());
+        if (rc == VBOX_E_FILE_ERROR)
+        {
+            char szFilenameAbs[RTPATH_MAX] = "";
+            int vrc = RTPathAbs(Utf8Str(src), szFilenameAbs, sizeof(szFilenameAbs));
+            if (RT_FAILURE(vrc))
             {
-                char szFilenameAbs[RTPATH_MAX] = "";
-                int vrc = RTPathAbs(Utf8Str(src), szFilenameAbs, sizeof(szFilenameAbs));
-                if (RT_FAILURE(vrc))
-                {
-                    RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(src).raw());
-                    return 1;
-                }
-                CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(szFilenameAbs), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam()));
+                RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(src).raw());
+                return 1;
             }
-            else if (FAILED(rc))
-                CHECK_ERROR(a->virtualBox, OpenHardDisk(src, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam()));
-            if (SUCCEEDED (rc))
-            {
-                unknown = true;
-            }
-        }
+            CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(szFilenameAbs), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam()));
+        }
+        else if (FAILED(rc))
+            CHECK_ERROR(a->virtualBox, OpenHardDisk(src, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), srcDisk.asOutParam()));
+        if (SUCCEEDED (rc))
+            fSrcUnknown = true;
     }
 
@@ -620 +631 @@
             break;
 
-        if (format.isEmpty())
-        {
-            /* get the format of the source hard disk */
-            CHECK_ERROR_BREAK(srcDisk, COMGETTER(Format) (format.asOutParam()));
-        }
-
-        CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(format, dst, dstDisk.asOutParam()));
+        /* open/create destination hard disk */
+        if (fExisting)
+        {
+            /* first guess is that it's a UUID */
+            rc = a->virtualBox->GetHardDisk(dst, dstDisk.asOutParam());
+            /* no? then it must be a filename */
+            if (FAILED (rc))
+                rc = a->virtualBox->FindHardDisk(dst, dstDisk.asOutParam());
+            /* no? well, then it's an unknown image */
+            if (FAILED (rc))
+            {
+                rc = a->virtualBox->OpenHardDisk(dst, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), dstDisk.asOutParam());
+                if (rc == VBOX_E_FILE_ERROR)
+                {
+                    char szFilenameAbs[RTPATH_MAX] = "";
+                    int vrc = RTPathAbs(Utf8Str(dst), szFilenameAbs, sizeof(szFilenameAbs));
+                    if (RT_FAILURE(vrc))
+                    {
+                        RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(dst).raw());
+                        return 1;
+                    }
+                    CHECK_ERROR_BREAK(a->virtualBox, OpenHardDisk(Bstr(szFilenameAbs), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), dstDisk.asOutParam()));
+                }
+                else if (FAILED(rc))
+                    CHECK_ERROR_BREAK(a->virtualBox, OpenHardDisk(dst, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), dstDisk.asOutParam()));
+                if (SUCCEEDED (rc))
+                    fDstUnknown = true;
+            }
+            else
+                fRemember = true;
+            if (SUCCEEDED(rc))
+            {
+                /* Perform accessibility check now. */
+                MediaState_T state;
+                CHECK_ERROR_BREAK(dstDisk, COMGETTER(State)(&state));
+            }
+            CHECK_ERROR_BREAK(dstDisk, COMGETTER(Format) (format.asOutParam()));
+        }
+        else
+        {
+            /* use the format of the source hard disk if unspecified */
+            if (format.isEmpty())
+                CHECK_ERROR_BREAK(srcDisk, COMGETTER(Format) (format.asOutParam()));
+            CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(format, dst, dstDisk.asOutParam()));
+        }
 
         ComPtr<IProgress> progress;
@@ -658 +707 @@
         dstDisk->Close();
     }
-
-    if (unknown)
+    else if (fSetDiskType)
+    {
+        CHECK_ERROR(dstDisk, COMSETTER(Type)(DiskType));
+    }
+
+    if (fSrcUnknown)
     {
         /* close the unknown hard disk to forget it again */

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

@@ -380 +380 @@
                  "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                  "                            [--type normal|writethrough|immutable]\n"
-                 "                            [--remember]\n"
+                 "                            [--remember] [--existing]\n"
                  "\n");
     }