Changeset 38787 in vbox

Timestamp:

Sep 19, 2011 10:08:15 AM (13 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: add support for explicitly creating diff images (feature for expert users only)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -245 +245 @@
     { "--filename",     'f', RTGETOPT_REQ_STRING },
     { "-filename",      'f', RTGETOPT_REQ_STRING },     // deprecated
+    { "--diffparent",   'd', RTGETOPT_REQ_STRING },
     { "--size",         's', RTGETOPT_REQ_UINT64 },
     { "-size",          's', RTGETOPT_REQ_UINT64 },     // deprecated
@@ -261 +262 @@
     int vrc;
     const char *filename = NULL;
+    const char *diffparent = NULL;
     uint64_t size = 0;
-    const char *format = "VDI";
+    const char *format = NULL;
+    bool fBase = true;
     MediumVariant_T DiskVariant = MediumVariant_Standard;
 
@@ -277 +280 @@
             case 'f':   // --filename
                 filename = ValueUnion.psz;
+                break;
+
+            case 'd':   // --diffparent
+                diffparent = ValueUnion.psz;
+                fBase = false;
                 break;
 
@@ -326 +334 @@
 
     /* check the outcome */
-    if (   !filename
-        || !*filename
-        || size == 0)
-        return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required");
-
+    bool fUnknownParent = false;
+    ComPtr<IMedium> parentHardDisk;
+    if (fBase)
+    {
+        if (   !filename
+            || !*filename
+            || size == 0)
+            return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required");
+        if (!format || !*format)
+            format = "VDI";
+    }
+    else
+    {
+        if (   !filename
+            || !*filename)
+            return errorSyntax(USAGE_CREATEHD, "Parameters --filename is required");
+        size = 0;
+        DiskVariant = MediumVariant_Diff;
+        if (!format || !*format)
+        {
+            const char *pszExt = RTPathExt(filename);
+            /* Skip over . if there is an extension. */
+            if (pszExt)
+                pszExt++;
+            if (!pszExt || !*pszExt)
+                format = "VDI";
+            else
+                format = pszExt;
+        }
+        rc = findOrOpenMedium(a, diffparent, DeviceType_HardDisk,
+                              parentHardDisk, false /* fForceNewUuidOnOpen */,
+                              &fUnknownParent);
+        if (FAILED(rc))
+            return 1;
+        if (parentHardDisk.isNull())
+        {
+            RTMsgError("Invalid parent hard disk reference, avoiding crash");
+            return 1;
+        }
+        MediumState_T state;
+        CHECK_ERROR(parentHardDisk, COMGETTER(State)(&state));
+        if (FAILED(rc))
+            return 1;
+        if (state == MediumState_Inaccessible)
+        {
+            CHECK_ERROR(parentHardDisk, RefreshState(&state));
+            if (FAILED(rc))
+                return 1;
+        }
+    }
     /* check for filename extension */
     /** @todo use IMediumFormat to cover all extensions generically */
@@ -351 +404 @@
     {
         ComPtr<IProgress> progress;
-        CHECK_ERROR(hardDisk, CreateBaseStorage(size, DiskVariant, progress.asOutParam()));
+        if (fBase)
+            CHECK_ERROR(hardDisk, CreateBaseStorage(size, DiskVariant, progress.asOutParam()));
+        else
+            CHECK_ERROR(parentHardDisk, CreateDiffStorage(hardDisk, DiskVariant, progress.asOutParam()));
         if (SUCCEEDED(rc) && progress)
         {
@@ -363 +419 @@
             }
         }
+
         CHECK_ERROR(hardDisk, Close());
+        if (!fBase && fUnknownParent)
+            CHECK_ERROR(parentHardDisk, Close());
     }
     return SUCCEEDED(rc) ? 0 : 1;

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

@@ -515 +515 @@
         RTStrmPrintf(pStrm,
                      "VBoxManage createhd         --filename <filename>\n"
-                     "                            --size <megabytes>|--sizebyte <bytes>\n"
+                     "                            --diffparent <uuid>|<filename>\n"
+                     "                            [--size <megabytes>|--sizebyte <bytes>]\n"
                      "                            [--format VDI|VMDK|VHD] (default: VDI)\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"