Changeset 32531 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 15, 2010 5:04:48 PM (15 years ago)

Author:

vboxsync

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

65913

Message:

Main/Medium+MediumFormat+GuestOSType+SystemPropertiesImpl+Console+Global: consistently use bytes as size units, forgotten const value in API, MaxVDISize method renamed to InfoVDSize, STDMETHOD macro usage fixes, whitespace cleanup

Frontends/VirtualBox+VBoxManage+VBoxShell: adapt to changed disk size units

Main/StorageControllerImpl: check the storage controller instance limit to avoid creating unusable VM configs, simplify unnecessarily complex code for querying the controller properties

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (28 diffs)
• VBoxManageDisk.cpp (modified) (5 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (1 diff)

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

@@ -555 +555 @@
     /* just try it */
     char *pszFormat = NULL;
-    int rc = VDGetFormat(NULL, argv[1], &pszFormat);
+    int rc = VDGetFormat(NULL /* pVDIfsDisk */, argv[1], &pszFormat);
     if (RT_FAILURE(rc))
     {
@@ -616 +616 @@
     /* just try it */
     char *pszFormat = NULL;
-    int rc = VDGetFormat(NULL, argv[0], &pszFormat);
+    int rc = VDGetFormat(NULL /* pVDIfsDisk */, argv[0], &pszFormat);
     if (RT_FAILURE(rc))
     {
@@ -848 +848 @@
         else
         {
-            return errorSyntax(USAGE_LISTPARTITIONS, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
+            return errorSyntax(USAGE_LISTPARTITIONS, "Invalid parameter '%s'", argv[i]);
         }
     }
@@ -910 +910 @@
 {
     HRESULT rc = S_OK;
-    Bstr filename;
+    Utf8Str filename;
     const char *pszMBRFilename = NULL;
     Utf8Str rawdisk;
@@ -972 +972 @@
 #endif /* RT_OS_LINUX */
         else
-            return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
+            return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", argv[i]);
     }
 
@@ -1444 +1444 @@
     LCHS.cHeads = 0;
     LCHS.cSectors = 0;
-    vrc = VDCreateBase(pDisk, "VMDK", Utf8Str(filename).c_str(), cbSize,
+    vrc = VDCreateBase(pDisk, "VMDK", filename.c_str(), cbSize,
                        VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_RAWDISK,
                        (char *)&RawDescriptor, &PCHS, &LCHS, NULL,
@@ -1453 +1453 @@
         goto out;
     }
-    RTPrintf("RAW host disk access VMDK file %s created successfully.\n", Utf8Str(filename).c_str());
+    RTPrintf("RAW host disk access VMDK file %s created successfully.\n", filename.c_str());
 
     VDCloseAll(pDisk);
@@ -1475 +1475 @@
     {
         ComPtr<IMedium> hardDisk;
-        CHECK_ERROR(aVirtualBox, OpenMedium(filename, DeviceType_HardDisk, AccessMode_ReadWrite, hardDisk.asOutParam()));
+        CHECK_ERROR(aVirtualBox, OpenMedium(Bstr(filename), DeviceType_HardDisk, AccessMode_ReadWrite, hardDisk.asOutParam()));
     }
 
@@ -1487 +1487 @@
 static int CmdRenameVMDK(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession)
 {
-    Bstr src;
-    Bstr dst;
+    Utf8Str src;
+    Utf8Str dst;
     /* Parse the arguments. */
     for (int i = 0; i < argc; i++)
@@ -1512 +1512 @@
         else
         {
-            return errorSyntax(USAGE_RENAMEVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
+            return errorSyntax(USAGE_RENAMEVMDK, "Invalid parameter '%s'", argv[i]);
         }
     }
@@ -1543 +1543 @@
     else
     {
-        vrc = VDOpen(pDisk, "VMDK", Utf8Str(src).c_str(), VD_OPEN_FLAGS_NORMAL, NULL);
+        vrc = VDOpen(pDisk, "VMDK", src.c_str(), VD_OPEN_FLAGS_NORMAL, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -1550 +1550 @@
         else
         {
-            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).c_str(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
+            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", dst.c_str(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
             if (RT_FAILURE(vrc))
             {
@@ -1563 +1563 @@
 static int CmdConvertToRaw(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession)
 {
-    Bstr srcformat;
-    Bstr src;
-    Bstr dst;
+    Utf8Str srcformat;
+    Utf8Str src;
+    Utf8Str dst;
     bool fWriteToStdOut = false;
 
@@ -1594 +1594 @@
         else
         {
-            return errorSyntax(USAGE_CONVERTTORAW, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
+            return errorSyntax(USAGE_CONVERTTORAW, "Invalid parameter '%s'", argv[i]);
         }
     }
@@ -1630 +1630 @@
         outFile = 1;
     else
-        vrc = RTFileOpen(&outFile, Utf8Str(dst).c_str(), RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
+        vrc = RTFileOpen(&outFile, dst.c_str(), RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
     if (RT_FAILURE(vrc))
     {
         VDCloseAll(pDisk);
-        RTPrintf("Error while creating destination file \"%s\": %Rrc\n", Utf8Str(dst).c_str(), vrc);
+        RTPrintf("Error while creating destination file \"%s\": %Rrc\n", dst.c_str(), vrc);
         return 1;
     }
@@ -1641 +1641 @@
     {
         char *pszFormat = NULL;
-        vrc = VDGetFormat(NULL, Utf8Str(src).c_str(), &pszFormat);
+        vrc = VDGetFormat(NULL /* pVDIfsDisk */, src.c_str(), &pszFormat);
         if (RT_FAILURE(vrc))
         {
@@ -1648 +1648 @@
             {
                 RTFileClose(outFile);
-                RTFileDelete(Utf8Str(dst).c_str());
+                RTFileDelete(dst.c_str());
             }
             RTPrintf("No file format specified and autodetect failed - please specify format: %Rrc\n", vrc);
@@ -1656 +1656 @@
         RTStrFree(pszFormat);
     }
-    vrc = VDOpen(pDisk, Utf8Str(srcformat).c_str(), Utf8Str(src).c_str(), VD_OPEN_FLAGS_READONLY, NULL);
+    vrc = VDOpen(pDisk, srcformat.c_str(), src.c_str(), VD_OPEN_FLAGS_READONLY, NULL);
     if (RT_FAILURE(vrc))
     {
@@ -1663 +1663 @@
         {
             RTFileClose(outFile);
-            RTFileDelete(Utf8Str(dst).c_str());
+            RTFileDelete(dst.c_str());
         }
         RTPrintf("Error while opening the source image: %Rrc\n", vrc);
@@ -1676 +1676 @@
     if (pvBuf)
     {
-        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB) to raw...\n", Utf8Str(src).c_str(), cbSize, (cbSize + _1M - 1) / _1M);
+        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB) to raw...\n", src.c_str(), cbSize, (cbSize + _1M - 1) / _1M);
         while (offFile < cbSize)
         {
@@ -1694 +1694 @@
             {
                 RTFileClose(outFile);
-                RTFileDelete(Utf8Str(dst).c_str());
+                RTFileDelete(dst.c_str());
             }
             RTPrintf("Error copying image data: %Rrc\n", vrc);
@@ -1707 +1707 @@
         {
             RTFileClose(outFile);
-            RTFileDelete(Utf8Str(dst).c_str());
+            RTFileDelete(dst.c_str());
         }
         RTPrintf("Error allocating read buffer: %Rrc\n", vrc);
@@ -1721 +1721 @@
 static int CmdConvertHardDisk(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession)
 {
-    Bstr srcformat;
-    Bstr dstformat;
-    Bstr src;
-    Bstr dst;
+    Utf8Str srcformat;
+    Utf8Str dstformat;
+    Utf8Str src;
+    Utf8Str dst;
     int vrc;
     PVBOXHDD pSrcDisk = NULL;
@@ -1760 +1760 @@
         else
         {
-            return errorSyntax(USAGE_CONVERTHD, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
+            return errorSyntax(USAGE_CONVERTHD, "Invalid parameter '%s'", argv[i]);
         }
     }
@@ -1788 +1788 @@
         {
             char *pszFormat = NULL;
-            vrc = VDGetFormat(NULL, Utf8Str(src).c_str(), &pszFormat);
+            vrc = VDGetFormat(NULL /* pVDIfsDisk */, src.c_str(), &pszFormat);
             if (RT_FAILURE(vrc))
             {
@@ -1806 +1806 @@
 
         /* Open the input image */
-        vrc = VDOpen(pSrcDisk, Utf8Str(srcformat).c_str(), Utf8Str(src).c_str(), VD_OPEN_FLAGS_READONLY, NULL);
+        vrc = VDOpen(pSrcDisk, srcformat.c_str(), src.c_str(), VD_OPEN_FLAGS_READONLY, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -1825 +1825 @@
 
         uint64_t cbSize = VDGetSize(pSrcDisk, VD_LAST_IMAGE);
-        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", Utf8Str(src).c_str(), cbSize, (cbSize + _1M - 1) / _1M);
+        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", src.c_str(), cbSize, (cbSize + _1M - 1) / _1M);
 
         /* Create the output image */
-        vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, Utf8Str(dstformat).c_str(),
-                     Utf8Str(dst).c_str(), false, 0, VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED, NULL, NULL, NULL, NULL);
+        vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, dstformat.c_str(),
+                     dst.c_str(), false, 0, VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED,
+                     NULL, NULL, NULL, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -2034 +2035 @@
 
     /* default: */
-    return errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(a->argv[0]).c_str());
-}
-
+    return errorSyntax(USAGE_ALL, "Invalid command '%s'", a->argv[0]);
+}
+

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

@@ -153 +153 @@
     { "--size",         's', RTGETOPT_REQ_UINT64 },
     { "-size",          's', RTGETOPT_REQ_UINT64 },     // deprecated
+    { "--sizebyte",     'S', RTGETOPT_REQ_UINT64 },
     { "--format",       'o', RTGETOPT_REQ_STRING },
     { "-format",        'o', RTGETOPT_REQ_STRING },     // deprecated
@@ -174 +175 @@
     int vrc;
     Bstr filename;
-    uint64_t sizeMB = 0;
+    uint64_t size = 0;
     Bstr format = "VDI";
     MediumVariant_T DiskVariant = MediumVariant_Standard;
@@ -196 +197 @@
 
             case 's':   // --size
-                sizeMB = ValueUnion.u64;
+                size = ValueUnion.u64 * _1M;
+                break;
+
+            case 'S':   // --sizebyte
+                size = ValueUnion.u64;
                 break;
 
@@ -256 +261 @@
     /* check the outcome */
     if (   !filename
-        || sizeMB == 0)
+        || size == 0)
         return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required");
 
@@ -287 +292 @@
 
         ComPtr<IProgress> progress;
-        CHECK_ERROR(hardDisk, CreateBaseStorage(sizeMB, DiskVariant, progress.asOutParam()));
+        CHECK_ERROR(hardDisk, CreateBaseStorage(size, DiskVariant, progress.asOutParam()));
         if (SUCCEEDED(rc) && progress)
         {

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

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

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

@@ -839 +839 @@
             systemProperties->COMGETTER(MaxGuestCPUCount)(&ulValue);
             RTPrintf("Maximum guest CPU count:         %u\n", ulValue);
-            systemProperties->COMGETTER(MaxVDISize)(&i64Value);
-            RTPrintf("Maximum VDI size:                %lld Megabytes\n", i64Value);
+            systemProperties->COMGETTER(InfoVDSize)(&i64Value);
+            RTPrintf("Virtual disk limit (info):       %lld Bytes\n", i64Value);
             systemProperties->COMGETTER(NetworkAdapterCount)(&ulValue);
             RTPrintf("Maximum Network Adapter count:   %u\n", ulValue);