Changeset 32395 in vbox for trunk/src/VBox/Devices/Storage/testcase

Timestamp:

Sep 10, 2010 12:17:06 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65754

Message:

vbox-img: info/compact command and cleanup

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -47 +47 @@
                  "                [--srcformat VDI|VMDK|VHD|RAW|..]\n"
                  "                [--dstformat VDI|VMDK|VHD|RAW|..]\n"
-                 "                [--variant Standard,Fixed,Split2G,Stream,ESX]\n",
+                 "                [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
+                 "\n"
+                 "   info         --filename <filename>\n"
+                 "\n"
+                 "   compact      --filename <filename>\n",
                  g_pszProgName);
 }
@@ -73 +77 @@
     va_list args;
     va_start(args, pszFormat);
-    RTMsgWarningV(pszFormat, args);
+    RTPrintfV(pszFormat, args);
     va_end(args);
     return VINF_SUCCESS;
@@ -89 +93 @@
              "Syntax error: %N\n", pszFormat, &args);
     va_end(args);
+    showUsage();
     return 1;
 }
+int errorRuntime(const char *pszFormat, ...)
+{
+    va_list args;
+    
+    va_start(args, pszFormat);
+    RTPrintf("\n"
+             "Error: %N\n", pszFormat, &args);
+    va_end(args);
+    return 1;
+}
+
 
 
@@ -163 +179 @@
         rc = VDGetFormat(NULL, pszFilename, &pszFormat);
         if (RT_FAILURE(rc))
-            return errorSyntax("Format autodetect failed: %Rrc\n", rc);
+            return errorRuntime("Format autodetect failed: %Rrc\n", rc);
     }
     
@@ -169 +185 @@
     rc = VDCreate(pVDIfs, &pVD);
     if (RT_FAILURE(rc))
-        return errorSyntax("Cannot create the virtual disk container: %Rrc\n", rc);
+        return errorRuntime("Cannot create the virtual disk container: %Rrc\n", rc);
     
     
     rc = VDOpen(pVD, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
     if (RT_FAILURE(rc))
-        return errorSyntax("Cannot open the virtual disk image \"%s\": %Rrc\n",
-                           pszFilename, rc);
+        return errorRuntime("Cannot open the virtual disk image \"%s\": %Rrc\n",
+                            pszFilename, rc);
     
     RTUUID oldImageUuid;
     rc = VDGetUuid(pVD, VD_LAST_IMAGE, &oldImageUuid);
     if (RT_FAILURE(rc))
-        return errorSyntax("Cannot get UUID of virtual disk image \"%s\": %Rrc\n",
-                           pszFilename, rc);
+        return errorRuntime("Cannot get UUID of virtual disk image \"%s\": %Rrc\n",
+                            pszFilename, rc);
     
     RTPrintf("Old image UUID:  %RTuuid\n", &oldImageUuid);
@@ -188 +204 @@
     rc = VDGetParentUuid(pVD, VD_LAST_IMAGE, &oldParentUuid);
     if (RT_FAILURE(rc))
-        return errorSyntax("Cannot get parent UUID of virtual disk image \"%s\": %Rrc\n",
-                           pszFilename, rc);
+        return errorRuntime("Cannot get parent UUID of virtual disk image \"%s\": %Rrc\n",
+                            pszFilename, rc);
     
     RTPrintf("Old parent UUID: %RTuuid\n", &oldParentUuid);
@@ -198 +214 @@
         rc = VDSetUuid(pVD, VD_LAST_IMAGE, &imageUuid);
         if (RT_FAILURE(rc))
-            return errorSyntax("Cannot set UUID of virtual disk image \"%s\": %Rrc\n",
-                               pszFilename, rc);
+            return errorRuntime("Cannot set UUID of virtual disk image \"%s\": %Rrc\n",
+                                pszFilename, rc);
     }
     
@@ -207 +223 @@
         rc = VDSetParentUuid(pVD, VD_LAST_IMAGE, &parentUuid);
         if (RT_FAILURE(rc))
-            return errorSyntax("Cannot set parent UUID of virtual disk image \"%s\": %Rrc\n",
-                               pszFilename, rc);
+            return errorRuntime("Cannot set parent UUID of virtual disk image \"%s\": %Rrc\n",
+                                pszFilename, rc);
     }
     
     rc = VDCloseAll(pVD);
     if (RT_FAILURE(rc))
-        return errorSyntax("Closing image failed! rc=%Rrc\n", rc);
+        return errorRuntime("Closing image failed! rc=%Rrc\n", rc);
     
     if (pszFormat)
@@ -333 +349 @@
         if (RT_FAILURE(rc))
         {
-            errorSyntax("Error while creating source disk container: %Rrc\n", rc);
+            errorRuntime("Error while creating source disk container: %Rrc\n", rc);
             break;
         }
@@ -340 +356 @@
         if (RT_FAILURE(rc))
         {
-            errorSyntax("Error while opening source image: %Rrc\n", rc);
+            errorRuntime("Error while opening source image: %Rrc\n", rc);
             break;
         }
@@ -351 +367 @@
         if (RT_FAILURE(rc))
         {
-            errorSyntax("Error while creating the destination disk container: %Rrc\n", rc);
+            errorRuntime("Error while creating the destination disk container: %Rrc\n", rc);
             break;
         }
@@ -363 +379 @@
         if (RT_FAILURE(rc))
         {
-            errorSyntax("Error while copying the image: %Rrc\n", rc);
+            errorRuntime("Error while copying the image: %Rrc\n", rc);
             break;
         }
@@ -376 +392 @@
     
     return RT_SUCCESS(rc) ? 0 : 1;
+}
+
+
+int handleInfo(HandlerArg *a)
+{
+    int rc = VINF_SUCCESS;
+    PVBOXHDD pDisk = NULL;
+    const char *pszFilename = NULL;
+
+    /* Parse the command line. */
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        { "--filename", 'f', RTGETOPT_REQ_STRING }
+    };
+    int ch;
+    RTGETOPTUNION ValueUnion;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /* fFlags */);
+    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
+    {
+        switch (ch)
+        {
+            case 'f':   // --filename
+                pszFilename = ValueUnion.psz;
+                break;
+                
+            default:
+                ch = RTGetOptPrintError(ch, &ValueUnion);
+                showUsage();
+                return ch;
+        }
+    }
+    
+    /* Check for mandatory parameters. */
+    if (!pszFilename)
+        return errorSyntax("Mandatory --filename option missing\n");
+    
+    /* just try it */
+    char *pszFormat = NULL;
+    rc = VDGetFormat(NULL, pszFilename, &pszFormat);
+    if (RT_FAILURE(rc))
+        return errorSyntax("Format autodetect failed: %Rrc\n", rc);
+
+    rc = VDCreate(pVDIfs, &pDisk);
+    if (RT_FAILURE(rc))
+        return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
+    
+    /* Open the image */
+    rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_INFO, NULL);
+    if (RT_FAILURE(rc))
+        return errorRuntime("Error while opening the image: %Rrc\n", rc);
+    
+    VDDumpImages(pDisk);
+    
+    VDCloseAll(pDisk);
+    
+    return rc;
+}
+
+int handleCompact(HandlerArg *a)
+{
+    int rc = VINF_SUCCESS;
+    PVBOXHDD pDisk = NULL;
+    const char *pszFilename = NULL;
+    
+    /* Parse the command line. */
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        { "--filename", 'f', RTGETOPT_REQ_STRING }
+    };
+    int ch;
+    RTGETOPTUNION ValueUnion;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /* fFlags */);
+    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
+    {
+        switch (ch)
+        {
+            case 'f':   // --filename
+                pszFilename = ValueUnion.psz;
+                break;
+                
+            default:
+                ch = RTGetOptPrintError(ch, &ValueUnion);
+                showUsage();
+                return ch;
+        }
+    }
+    
+    /* Check for mandatory parameters. */
+    if (!pszFilename)
+        return errorSyntax("Mandatory --filename option missing\n");
+    
+    /* just try it */
+    char *pszFormat = NULL;
+    rc = VDGetFormat(NULL, pszFilename, &pszFormat);
+    if (RT_FAILURE(rc))
+        return errorSyntax("Format autodetect failed: %Rrc\n", rc);
+    
+    rc = VDCreate(pVDIfs, &pDisk);
+    if (RT_FAILURE(rc))
+        return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
+    
+    /* Open the image */
+    rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
+    if (RT_FAILURE(rc))
+        return errorRuntime("Error while opening the image: %Rrc\n", rc);
+    
+    rc = VDCompact(pDisk, 0, NULL);
+    if (RT_FAILURE(rc))
+        errorRuntime("Error while compacting image: %Rrc\n", rc);
+    
+    VDCloseAll(pDisk);
+    
+    return rc;
 }
 
@@ -470 +601 @@
         { "setuuid", handleSetUUID },
         { "convert", handleConvert },
+        { "info",    handleInfo    },
+        { "compact", handleCompact },
         { NULL,               NULL }
     };