Changeset 38726 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2011 9:10:21 AM (13 years ago)

Author:

vboxsync

Message:

VBoxManage convertfromraw: allow to specify the UUID of the output file

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -690 +690 @@
     { "--variant",      'm', RTGETOPT_REQ_STRING },
     { "-variant",       'm', RTGETOPT_REQ_STRING },
+    { "--uuid",         'u', RTGETOPT_REQ_STRING },
 };
 
@@ -702 +703 @@
     unsigned uImageFlags = VD_IMAGE_FLAGS_NONE;
     void *pvBuf = NULL;
+    RTUUID uuid;
+    PCRTUUID pUuid = NULL;
 
     int c;
@@ -713 +716 @@
         switch (c)
         {
+            case 'u':   // --uuid
+                if (RT_FAILURE(RTUuidFromStr(&uuid, ValueUnion.psz)))
+                    return errorSyntax(USAGE_CONVERTFROMRAW, "Invalid UUID '%s'", ValueUnion.psz);
+                pUuid = &uuid;
+                break;
             case 'o':   // --format
                 format = ValueUnion.psz;
@@ -809 +817 @@
     LCHS.cSectors = 0;
     rc = VDCreateBase(pDisk, format, dstfilename, cbFile,
-                      uImageFlags, pszComment, &PCHS, &LCHS, NULL,
+                      uImageFlags, pszComment, &PCHS, &LCHS, pUuid,
                       VD_OPEN_FLAGS_NORMAL, NULL, NULL);
     if (RT_FAILURE(rc))

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

@@ -543 +543 @@
                      "                            [--format VDI|VMDK|VHD]\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
+                     "                            [--uuid <uuid>\n>"
 #ifndef RT_OS_WINDOWS
                      "VBoxManage convertfromraw   stdin <outputfile> <bytes>\n"
                      "                            [--format VDI|VMDK|VHD]\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
+                     "                            [--uuid <uuid>\n>"
 #endif
                      "\n");