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

Timestamp:

Mar 12, 2007 2:16:32 PM (18 years ago)

Author:

vboxsync

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

19442

Message:

added convertdd functionality from vditool to VBoxManage (but no progress indicator)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (3 diffs)
• VBoxManage.h (modified) (1 diff)

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

@@ -427 +427 @@
     {
         RTPrintf("VBoxManage clonevdi         <uuid>|<filename> <outputfile>\n"
+                 "\n");
+    }
+
+    if (enmCmd & USAGE_CONVERTDD)
+    {
+        RTPrintf("VBoxManage convertdd        <filename> <outputfile>\n"
                  "\n");
     }
@@ -2309 +2315 @@
     }
     return SUCCEEDED(rc) ? 0 : 1;
+}
+
+static int handleConvertDDImage(int argc, char *argv[],
+                                ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
+{
+    if (argc != 2)
+    {
+        return errorSyntax(USAGE_CONVERTDD, "Incorrect number of parameters");
+    }
+
+
+    RTPrintf("Converting VDI: from DD image file=\"%s\" to file=\"%s\"...\n",
+             argv[0], argv[1]);
+
+    /* open raw image file. */
+    RTFILE File;
+    int rc = RTFileOpen(&File, argv[0], RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+    if (VBOX_FAILURE(rc))
+    {
+        RTPrintf("File=\"%s\" open error: %Rrf\n", argv[0], rc);
+        return rc;
+    }
+
+    /* get image size. */
+    uint64_t cbFile;
+    rc = RTFileGetSize(File, &cbFile);
+    if (VBOX_SUCCESS(rc))
+    {
+        RTPrintf("Creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
+        rc = VDICreateBaseImage(argv[1],
+                                VDI_IMAGE_TYPE_FIXED,
+                                cbFile,
+                                "Converted from DD test image", NULL, NULL);
+        if (VBOX_SUCCESS(rc))
+        {
+            PVDIDISK pVdi = VDIDiskCreate();
+            rc = VDIDiskOpenImage(pVdi, argv[1], VDI_OPEN_FLAGS_NORMAL);
+            if (VBOX_SUCCESS(rc))
+            {
+                /* alloc work buffer. */
+                void *pvBuf = RTMemAlloc(VDIDiskGetBufferSize(pVdi));
+                if (pvBuf)
+                {
+                    uint64_t off = 0;
+                    while (off < cbFile)
+                    {
+                        unsigned cbRead = 0;
+                        rc = RTFileRead(File, pvBuf, VDIDiskGetBufferSize(pVdi), &cbRead);
+                        if (VBOX_FAILURE(rc) || !cbRead)
+                            break;
+                        rc = VDIDiskWrite(pVdi, off, pvBuf, cbRead);
+                        if (VBOX_FAILURE(rc))
+                            break;
+                        off += cbRead;
+                    }
+
+                    RTMemFree(pvBuf);
+                }
+                else
+                    rc = VERR_NO_MEMORY;
+
+                VDIDiskCloseImage(pVdi);
+            }
+
+            if (VBOX_FAILURE(rc))
+            {
+                /* delete image on error */
+                RTPrintf("Failed (%Vrc)!\n", rc);
+                VDIDeleteImage(argv[1]);
+            }
+        }
+    }
+    RTFileClose(File);
+
+    return rc;
 }
 
@@ -6048 +6129 @@
         { "modifyvm",         handleModifyVM },
         { "clonevdi",         handleCloneVDI },
+        { "convertdd",        handleConvertDDImage },
         { "startvm",          handleStartVM },
         { "controlvm",        handleControlVM },

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -27 +27 @@
 typedef enum {
     USAGE_DUMPOPTS              = 0,
-    USAGE_LIST                  = BIT(0),
-    USAGE_SHOWVMINFO            = BIT(1),
-    USAGE_REGISTERVM            = BIT(2),
-    USAGE_UNREGISTERVM          = BIT(3),
-    USAGE_CREATEVM              = BIT(4),
-    USAGE_MODIFYVM              = BIT(5),
-    USAGE_STARTVM               = BIT(6),
-    USAGE_CONTROLVM             = BIT(7),
-    USAGE_DISCARDSTATE          = BIT(8),
-    USAGE_SNAPSHOT              = BIT(9),
-    USAGE_REGISTERIMAGE         = BIT(10),
-    USAGE_UNREGISTERIMAGE       = BIT(11),
-    USAGE_SHOWVDIINFO           = BIT(12),
-    USAGE_CREATEVDI             = BIT(13),
-    USAGE_MODIFYVDI             = BIT(14),
-    USAGE_CLONEVDI              = BIT(15),
-    USAGE_ADDISCSIDISK          = BIT(16),
-    USAGE_CREATEHOSTIF          = BIT(17),
-    USAGE_REMOVEHOSTIF          = BIT(18),
-    USAGE_GETEXTRADATA          = BIT(19),
-    USAGE_SETEXTRADATA          = BIT(20),
-    USAGE_SETPROPERTY           = BIT(21),
-    USAGE_USBFILTER             = BIT(22) | BIT(23) | BIT(24),
-    USAGE_USBFILTER_ADD         = BIT(22),
-    USAGE_USBFILTER_MODIFY      = BIT(23),
-    USAGE_USBFILTER_REMOVE      = BIT(24),
-    USAGE_SHAREDFOLDER          = BIT(25) | BIT(26),
-    USAGE_SHAREDFOLDER_ADD      = BIT(25),
-    USAGE_SHAREDFOLDER_REMOVE   = BIT(26),
-    USAGE_UPDATESETTINGS        = BIT(27),
-    USAGE_LOADSYMS              = BIT(29),
-    USAGE_UNLOADSYMS            = BIT(30),
-    USAGE_SETVDIUUID            = BIT(31),
-    USAGE_ALL                   = ~0,
+    USAGE_LIST                  = BIT64(0),
+    USAGE_SHOWVMINFO            = BIT64(1),
+    USAGE_REGISTERVM            = BIT64(2),
+    USAGE_UNREGISTERVM          = BIT64(3),
+    USAGE_CREATEVM              = BIT64(4),
+    USAGE_MODIFYVM              = BIT64(5),
+    USAGE_STARTVM               = BIT64(6),
+    USAGE_CONTROLVM             = BIT64(7),
+    USAGE_DISCARDSTATE          = BIT64(8),
+    USAGE_SNAPSHOT              = BIT64(9),
+    USAGE_REGISTERIMAGE         = BIT64(10),
+    USAGE_UNREGISTERIMAGE       = BIT64(11),
+    USAGE_SHOWVDIINFO           = BIT64(12),
+    USAGE_CREATEVDI             = BIT64(13),
+    USAGE_MODIFYVDI             = BIT64(14),
+    USAGE_CLONEVDI              = BIT64(15),
+    USAGE_ADDISCSIDISK          = BIT64(16),
+    USAGE_CREATEHOSTIF          = BIT64(17),
+    USAGE_REMOVEHOSTIF          = BIT64(18),
+    USAGE_GETEXTRADATA          = BIT64(19),
+    USAGE_SETEXTRADATA          = BIT64(20),
+    USAGE_SETPROPERTY           = BIT64(21),
+    USAGE_USBFILTER             = BIT64(22) | BIT64(23) | BIT64(24),
+    USAGE_USBFILTER_ADD         = BIT64(22),
+    USAGE_USBFILTER_MODIFY      = BIT64(23),
+    USAGE_USBFILTER_REMOVE      = BIT64(24),
+    USAGE_SHAREDFOLDER          = BIT64(25) | BIT64(26),
+    USAGE_SHAREDFOLDER_ADD      = BIT64(25),
+    USAGE_SHAREDFOLDER_REMOVE   = BIT64(26),
+    USAGE_UPDATESETTINGS        = BIT64(27),
+    USAGE_LOADSYMS              = BIT64(29),
+    USAGE_UNLOADSYMS            = BIT64(30),
+    USAGE_SETVDIUUID            = BIT64(31),
+    USAGE_CONVERTDD             = BIT64(32),
+    USAGE_ALL                   = (uint64_t)~0,
 } USAGECATEGORY;