Changeset 32531 in vbox for trunk/src

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

Files:

• Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (28 diffs)
• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (5 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Frontends/VBoxShell/vboxshell.py (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxMedium.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp (modified) (5 diffs)
• Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/Global.cpp (modified) (1 diff)
• Main/GuestOSTypeImpl.cpp (modified) (25 diffs)
• Main/MediumFormatImpl.cpp (modified) (7 diffs)
• Main/MediumImpl.cpp (modified) (7 diffs)
• Main/StorageControllerImpl.cpp (modified) (7 diffs)
• Main/SystemPropertiesImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (12 diffs)
• Main/include/Global.h (modified) (1 diff)
• Main/include/GuestOSTypeImpl.h (modified) (4 diffs)
• Main/include/MediumFormatImpl.h (modified) (4 diffs)
• Main/include/SystemPropertiesImpl.h (modified) (4 diffs)

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);

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -1829 +1829 @@
        if hdd.state != ctx['global'].constants.MediumState_Created:
            hdd.refreshState()
-       print "   %s (%s)%s %s [logical %s]" %(colPath(ctx,hdd.location), hdd.format, optId(verbose,hdd.id),colSizeM(ctx,asSize(hdd.size, True)), colSizeM(ctx,asSize(hdd.logicalSize, False)))
+       print "   %s (%s)%s %s [logical %s]" %(colPath(ctx,hdd.location), hdd.format, optId(verbose,hdd.id),colSizeM(ctx,asSize(hdd.size, True)), colSizeM(ctx,asSize(hdd.logicalSize, True)))
 
    dvds = ctx['global'].getArray(ctx['vb'], 'DVDImages')

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp

@@ -168 +168 @@
         mSize = vboxGlobal().formatSize (mMedium.GetSize());
         if (mType == VBoxDefs::MediumType_HardDisk)
-            mLogicalSize = vboxGlobal().formatSize (mMedium.GetLogicalSize() * _1M);
+            mLogicalSize = vboxGlobal().formatSize(mMedium.GetLogicalSize());
         else
             mLogicalSize = mSize;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -193 +193 @@
     , m_uInitialSize(2 * _1K)
     , m_uCurrentSize(0)
-    , m_uMinVDISize(4)
-    , m_uMaxVDISize(vboxGlobal().virtualBox().GetSystemProperties().GetMaxVDISize())
+    , m_uMinVDISize(_4M)
+    , m_uMaxVDISize(vboxGlobal().virtualBox().GetSystemProperties().GetInfoVDSize())
     , m_iSliderScale(0)
 {
@@ -231 +231 @@
     m_pSizeSlider->setTickInterval(0);
     m_pSizeSlider->setMinimum(sizeMBToSlider(m_uMinVDISize, m_iSliderScale));
-    m_pSizeSlider->setMaximum(sizeMBToSlider (m_uMaxVDISize, m_iSliderScale));
-    m_pSizeMin->setText(vboxGlobal().formatSize(m_uMinVDISize * _1M));
-    m_pSizeMax->setText(vboxGlobal().formatSize(m_uMaxVDISize * _1M));
+    m_pSizeSlider->setMaximum(sizeMBToSlider(m_uMaxVDISize, m_iSliderScale));
+    m_pSizeMin->setText(vboxGlobal().formatSize(m_uMinVDISize));
+    m_pSizeMax->setText(vboxGlobal().formatSize(m_uMaxVDISize));
 
     /* Attach button icon */
@@ -344 +344 @@
     m_uCurrentSize = sliderToSizeMB(iValue, m_iSliderScale);
     /* Update tooltip: */
-    updateSizeToolTip(m_uCurrentSize * _1M);
+    updateSizeToolTip(m_uCurrentSize);
     /* Notify size-editor about size is changed: */
-    emit sigToUpdateSizeEditor(vboxGlobal().formatSize(m_uCurrentSize * _1M));
+    emit sigToUpdateSizeEditor(vboxGlobal().formatSize(m_uCurrentSize));
     /* Notify wizard sub-system about complete status changed: */
     emit completeChanged();
@@ -354 +354 @@
 {
     /* Update currently stored size: */
-    m_uCurrentSize = vboxGlobal().parseSize(strValue) / _1M;
+    m_uCurrentSize = vboxGlobal().parseSize(strValue);
     /* Update tooltip: */
-    updateSizeToolTip(m_uCurrentSize * _1M);
+    updateSizeToolTip(m_uCurrentSize);
     /* Notify size-slider about size is changed but prevent callback: */
     blockSignals(true);
@@ -446 +446 @@
     QString type = field("type").toString();
     QString location = UINewHDWzd::composeFullFileName(field("location").toString());
-    QString sizeFormatted = VBoxGlobal::formatSize(field("currentSize").toULongLong() * _1M);
-    QString sizeUnformatted = tr("%1 B").arg(field("currentSize").toULongLong() * _1M);
+    QString sizeFormatted = VBoxGlobal::formatSize(field("currentSize").toULongLong());
+    QString sizeUnformatted = tr("%1 B").arg(field("currentSize").toULongLong());
 
     summary += QString

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -373 +373 @@
     /* Translate recommended 'hdd' field value */
     QString strRecommendedHDD = field("type").value<CGuestOSType>().isNull() ? QString() :
-                                QString::number(field("type").value<CGuestOSType>().GetRecommendedHDD());
-    m_pPage4Text2->setText (tr ("The recommended size of the boot hard disk is <b>%1</b> MB.").arg (strRecommendedHDD));
+                                VBoxGlobal::formatSize(field("type").value<CGuestOSType>().GetRecommendedHDD());
+    m_pPage4Text2->setText (tr ("The recommended size of the boot hard disk is <b>%1</b>.").arg (strRecommendedHDD));
 }
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2630 +2630 @@
                 LONG64 i64Size;
                 hrc = pMedium->COMGETTER(LogicalSize)(&i64Size);                            H();
-                i64Size *= _1M;
 #ifdef RT_OS_WINDOWS
                 if (   enmFsTypeFile == RTFSTYPE_FAT

trunk/src/VBox/Main/Global.cpp

@@ -34 +34 @@
     { "Other",   "Other",             SchemaDefs_OSTypeId_Other,           "Other/Unknown",
       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3 },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31,       "Windows 3.1",
       VBOXOSTYPE_Win31,           VBOXOSHINT_NONE,
-        32,   4,  1 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95,       "Windows 95",
       VBOXOSTYPE_Win95,           VBOXOSHINT_NONE,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98,       "Windows 98",
       VBOXOSTYPE_Win98,           VBOXOSHINT_NONE,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe,       "Windows Me",
       VBOXOSTYPE_WinMe,           VBOXOSHINT_NONE,
-        64,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4,      "Windows NT 4",
       VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
-       128,  16,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000,     "Windows 2000",
       VBOXOSTYPE_Win2k,           VBOXOSHINT_NONE,
-       168,  16,  4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP,       "Windows XP",
       VBOXOSTYPE_WinXP,           VBOXOSHINT_NONE,
-       192,  16, 10 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP_64,    "Windows XP (64 bit)",
       VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       192,  16, 10 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003,     "Windows 2003",
       VBOXOSTYPE_Win2k3,          VBOXOSHINT_NONE,
-       256,  16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003_64,  "Windows 2003 (64 bit)",
       VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       256,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista,    "Windows Vista",
       VBOXOSTYPE_WinVista,        VBOXOSHINT_NONE,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista_64, "Windows Vista (64 bit)",
       VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008,     "Windows 2008",
       VBOXOSTYPE_Win2k8,          VBOXOSHINT_NONE,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64,  "Windows 2008 (64 bit)",
       VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7,        "Windows 7",
       VBOXOSTYPE_Win7,            VBOXOSHINT_NONE,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64,     "Windows 7 (64 bit)",
       VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       512,  16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT,       "Other Windows",
       VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
-       512,  16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux22,         "Linux 2.2",
       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux24,         "Linux 2.4",
       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
-       128,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux24_64,      "Linux 2.4 (64 bit)",
       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-       128,   4,  4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux26,         "Linux 2.6",
       VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,   4,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux26_64,      "Linux 2.6 (64 bit)",
       VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,   4,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_ArchLinux,       "Arch Linux",
       VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_ArchLinux_64,    "Arch Linux (64 bit)",
       VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Debian,          "Debian",
       VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       384,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Debian_64,       "Debian (64 bit)",
       VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       384,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3},
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_OpenSUSE,        "openSUSE",
       VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_OpenSUSE_64,     "openSUSE (64 bit)",
       VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Fedora,          "Fedora",
       VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Fedora_64,       "Fedora (64 bit)",
       VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Gentoo,          "Gentoo",
       VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Gentoo_64,       "Gentoo (64 bit)",
       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Mandriva,        "Mandriva",
       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Mandriva_64,     "Mandriva (64 bit)",
       VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_RedHat,          "Red Hat",
       VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_RedHat_64,       "Red Hat (64 bit)",
       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Turbolinux,      "Turbolinux",
       VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       384,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Turbolinux,      "Turbolinux (64 bit)",
       VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       384,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Ubuntu,          "Ubuntu",
       VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Ubuntu_64,       "Ubuntu (64 bit)",
       VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Xandros,         "Xandros",
       VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Xandros_64,      "Xandros (64 bit)",
       VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-       256,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Oracle,          "Oracle",
       VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Oracle_64,       "Oracle (64 bit)",
       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-       512,  12,  8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Linux,           "Other Linux",
       VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-       256,  12,  8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Solaris", "Solaris",           SchemaDefs_OSTypeId_Solaris,         "Solaris",
       VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
-       768,  12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Solaris", "Solaris",           SchemaDefs_OSTypeId_Solaris_64,      "Solaris (64 bit)",
       VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       768,  12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Solaris", "Solaris",           SchemaDefs_OSTypeId_OpenSolaris,     "OpenSolaris",
       VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_NONE,
-       768,  12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Solaris", "Solaris",           SchemaDefs_OSTypeId_OpenSolaris_64,  "OpenSolaris (64 bit)",
       VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       768,  12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_FreeBSD,         "FreeBSD",
       VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
-       128,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_FreeBSD_64,      "FreeBSD (64 bit)",
       VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       128,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_OpenBSD,         "OpenBSD",
       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
-        64,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_OpenBSD_64,      "OpenBSD (64 bit)",
       VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-        64,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_NetBSD,          "NetBSD",
       VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
-        64,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "BSD",     "BSD",               SchemaDefs_OSTypeId_NetBSD_64,       "NetBSD (64 bit)",
       VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-        64,   4,  2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "OS2",     "IBM OS/2",          SchemaDefs_OSTypeId_OS2Warp3,        "OS/2 Warp 3",
       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX,
-        48,   4,  1 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "OS2",     "IBM OS/2",          SchemaDefs_OSTypeId_OS2Warp4,        "OS/2 Warp 4",
       VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "OS2",     "IBM OS/2",          SchemaDefs_OSTypeId_OS2Warp45,       "OS/2 Warp 4.5",
       VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX,
-        96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "OS2",     "IBM OS/2",          SchemaDefs_OSTypeId_OS2eCS,          "eComStation",
       VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
-        96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "OS2",     "IBM OS/2",          SchemaDefs_OSTypeId_OS2,             "Other OS/2",
       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX,
-        96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "MacOS",   "Mac OS X",          SchemaDefs_OSTypeId_MacOS,           "Mac OS X Server",
       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-      1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE,
+      1024,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE,
         StorageControllerType_ICH6, StorageBus_IDE, ChipsetType_PIIX3  },
     { "MacOS",   "Mac OS X",          SchemaDefs_OSTypeId_MacOS_64,        "Mac OS X Server (64 bit)",
       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-      1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE,
+      1024,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE,
         StorageControllerType_ICH6, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Other",   "Other",             SchemaDefs_OSTypeId_DOS,             "DOS",
       VBOXOSTYPE_DOS,             VBOXOSHINT_NONE,
-        32,   4,      512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        32,   4,  512 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Other",   "Other",             SchemaDefs_OSTypeId_Netware,         "Netware",
       VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
-       512,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Other",   "Other",             SchemaDefs_OSTypeId_L4,              "L4",
       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
-        64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
     { "Other",   "Other",             SchemaDefs_OSTypeId_QNX,             "QNX",
       VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
-       512,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3  },
 };

trunk/src/VBox/Main/GuestOSTypeImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 
 GuestOSType::GuestOSType()
-    : mOSType (VBOXOSTYPE_Unknown)
-    , mOSHint (VBOXOSHINT_NONE)
-    , mRAMSize (0), mVRAMSize (0)
-    , mHDDSize (0), mMonitorCount (0)
-    , mNetworkAdapterType (NetworkAdapterType_Am79C973)
-    , mNumSerialEnabled (0)
+    : mOSType(VBOXOSTYPE_Unknown)
+    , mOSHint(VBOXOSHINT_NONE)
+    , mRAMSize(0), mVRAMSize(0)
+    , mHDDSize(0), mMonitorCount(0)
+    , mNetworkAdapterType(NetworkAdapterType_Am79C973)
+    , mNumSerialEnabled(0)
     , mDvdStorageControllerType(StorageControllerType_PIIX3)
     , mDvdStorageBusType(StorageBus_IDE)
@@ -68 +68 @@
  * @param aRAMSize           recommended RAM size in megabytes
  * @param aVRAMSize          recommended video memory size in megabytes
- * @param aHDDSize           recommended HDD size in megabytes
+ * @param aHDDSize           recommended HDD size in bytes
  */
-HRESULT GuestOSType::init (const char *aFamilyId, const char *aFamilyDescription,
-                           const char *aId, const char *aDescription,
-                           VBOXOSTYPE aOSType, uint32_t aOSHint,
-                           uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize,
-                           NetworkAdapterType_T aNetworkAdapterType,
-                           uint32_t aNumSerialEnabled,
-                           StorageControllerType_T aDvdStorageControllerType,
-                           StorageBus_T aDvdStorageBusType,
-                           StorageControllerType_T aHdStorageControllerType,
-                           StorageBus_T aHdStorageBusType,
-                           ChipsetType_T aChipsetType)
+HRESULT GuestOSType::init(const char *aFamilyId, const char *aFamilyDescription,
+                          const char *aId, const char *aDescription,
+                          VBOXOSTYPE aOSType, uint32_t aOSHint,
+                          uint32_t aRAMSize, uint32_t aVRAMSize, uint64_t aHDDSize,
+                          NetworkAdapterType_T aNetworkAdapterType,
+                          uint32_t aNumSerialEnabled,
+                          StorageControllerType_T aDvdStorageControllerType,
+                          StorageBus_T aDvdStorageBusType,
+                          StorageControllerType_T aHdStorageControllerType,
+                          StorageBus_T aHdStorageBusType,
+                          ChipsetType_T aChipsetType)
 {
 #if 0
@@ -86 +86 @@
                       "aId='%s', aDescription='%s', "
                       "aType=%d, aOSHint=%x, "
-                      "aRAMSize=%d, aVRAMSize=%d, aHDDSize=%d, "
+                      "aRAMSize=%d, aVRAMSize=%d, aHDDSize=%lld, "
                       "aNetworkAdapterType=%d, aNumSerialEnabled=%d, "
                       "aStorageControllerType=%d\n",
@@ -142 +142 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP GuestOSType::COMGETTER(FamilyId) (BSTR *aFamilyId)
+STDMETHODIMP GuestOSType::COMGETTER(FamilyId)(BSTR *aFamilyId)
 {
     CheckComArgOutPointerValid(aFamilyId);
@@ -155 +155 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(FamilyDescription) (BSTR *aFamilyDescription)
+STDMETHODIMP GuestOSType::COMGETTER(FamilyDescription)(BSTR *aFamilyDescription)
 {
     CheckComArgOutPointerValid(aFamilyDescription);
@@ -168 +168 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(Id) (BSTR *aId)
+STDMETHODIMP GuestOSType::COMGETTER(Id)(BSTR *aId)
 {
     CheckComArgOutPointerValid(aId);
@@ -181 +181 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(Description) (BSTR *aDescription)
+STDMETHODIMP GuestOSType::COMGETTER(Description)(BSTR *aDescription)
 {
     CheckComArgOutPointerValid(aDescription);
@@ -194 +194 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(Is64Bit) (BOOL *aIs64Bit)
+STDMETHODIMP GuestOSType::COMGETTER(Is64Bit)(BOOL *aIs64Bit)
 {
     CheckComArgOutPointerValid(aIs64Bit);
@@ -207 +207 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedIOAPIC) (BOOL *aRecommendedIOAPIC)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedIOAPIC)(BOOL *aRecommendedIOAPIC)
 {
     CheckComArgOutPointerValid(aRecommendedIOAPIC);
@@ -220 +220 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedVirtEx) (BOOL *aRecommendedVirtEx)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedVirtEx)(BOOL *aRecommendedVirtEx)
 {
     CheckComArgOutPointerValid(aRecommendedVirtEx);
@@ -233 +233 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedRAM) (ULONG *aRAMSize)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedRAM)(ULONG *aRAMSize)
 {
     CheckComArgOutPointerValid(aRAMSize);
@@ -246 +246 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedVRAM) (ULONG *aVRAMSize)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedVRAM)(ULONG *aVRAMSize)
 {
     CheckComArgOutPointerValid(aVRAMSize);
@@ -259 +259 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHDD) (ULONG *aHDDSize)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHDD)(LONG64 *aHDDSize)
 {
     CheckComArgOutPointerValid(aHDDSize);
@@ -272 +272 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(AdapterType) (NetworkAdapterType_T *aNetworkAdapterType)
+STDMETHODIMP GuestOSType::COMGETTER(AdapterType)(NetworkAdapterType_T *aNetworkAdapterType)
 {
     CheckComArgOutPointerValid(aNetworkAdapterType);
@@ -285 +285 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedPae) (BOOL *aRecommendedPae)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedPae)(BOOL *aRecommendedPae)
 {
     CheckComArgOutPointerValid(aRecommendedPae);
@@ -298 +298 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedFirmware) (FirmwareType_T *aFirmwareType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedFirmware)(FirmwareType_T *aFirmwareType)
 {
     CheckComArgOutPointerValid(aFirmwareType);
@@ -314 +314 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageController) (StorageControllerType_T * aStorageControllerType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageController)(StorageControllerType_T * aStorageControllerType)
 {
     CheckComArgOutPointerValid(aStorageControllerType);
@@ -327 +327 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageBus) (StorageBus_T * aStorageBusType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageBus)(StorageBus_T * aStorageBusType)
 {
     CheckComArgOutPointerValid(aStorageBusType);
@@ -340 +340 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageController) (StorageControllerType_T * aStorageControllerType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageController)(StorageControllerType_T * aStorageControllerType)
 {
     CheckComArgOutPointerValid(aStorageControllerType);
@@ -353 +353 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageBus) (StorageBus_T * aStorageBusType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageBus)(StorageBus_T * aStorageBusType)
 {
     CheckComArgOutPointerValid(aStorageBusType);
@@ -366 +366 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbHid) (BOOL *aRecommendedUsbHid)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbHid)(BOOL *aRecommendedUsbHid)
 {
     CheckComArgOutPointerValid(aRecommendedUsbHid);
@@ -379 +379 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHpet) (BOOL *aRecommendedHpet)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHpet)(BOOL *aRecommendedHpet)
 {
     CheckComArgOutPointerValid(aRecommendedHpet);
@@ -392 +392 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbTablet) (BOOL *aRecommendedUsbTablet)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbTablet)(BOOL *aRecommendedUsbTablet)
 {
     CheckComArgOutPointerValid(aRecommendedUsbTablet);
@@ -405 +405 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedRtcUseUtc) (BOOL *aRecommendedRtcUseUtc)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedRtcUseUtc)(BOOL *aRecommendedRtcUseUtc)
 {
     CheckComArgOutPointerValid(aRecommendedRtcUseUtc);

trunk/src/VBox/Main/MediumFormatImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008 Oracle Corporation
+ * Copyright (C) 2008-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (MediumFormat)
+DEFINE_EMPTY_CTOR_DTOR(MediumFormat)
 
 HRESULT MediumFormat::FinalConstruct()
@@ -49 +49 @@
  * @param aVDInfo  Pointer to a backend info object.
  */
-HRESULT MediumFormat::init (const VDBACKENDINFO *aVDInfo)
-{
-    LogFlowThisFunc (("aVDInfo=%p\n", aVDInfo));
+HRESULT MediumFormat::init(const VDBACKENDINFO *aVDInfo)
+{
+    LogFlowThisFunc(("aVDInfo=%p\n", aVDInfo));
 
     ComAssertRet(aVDInfo, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
     /* The ID of the backend */
@@ -84 +84 @@
         while (pa->pszKey != NULL)
         {
-            Utf8Str defaultValue ("");
+            Utf8Str defaultValue("");
             DataType_T dt;
-            ULONG flags = static_cast <ULONG> (pa->uKeyFlags);
+            ULONG flags = static_cast <ULONG>(pa->uKeyFlags);
             /* Check for the configure data type */
             switch (pa->enmValueType)
@@ -128 +128 @@
             /// capable of defining enums (used to represent bit flags) that
             /// contain 64-bit values)
-            ComAssertRet(pa->uKeyFlags == ((ULONG) pa->uKeyFlags), E_FAIL);
+            ComAssertRet(pa->uKeyFlags == ((ULONG)pa->uKeyFlags), E_FAIL);
 
             /* Create one property structure */
@@ -153 +153 @@
 void MediumFormat::uninit()
 {
-    LogFlowThisFunc (("\n"));
+    LogFlowThisFunc(("\n"));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
-    AutoUninitSpan autoUninitSpan (this);
+    AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
@@ -229 +229 @@
     /// of defining enums (used to represent bit flags) that contain 64-bit
     /// values)
-    ComAssertRet(m.capabilities == ((ULONG) m.capabilities), E_FAIL);
+    ComAssertRet(m.capabilities == ((ULONG)m.capabilities), E_FAIL);
 
     *aCaps = (ULONG) m.capabilities;

trunk/src/VBox/Main/MediumImpl.cpp

@@ -134 +134 @@
     MediumType_T type;
     DeviceType_T devType;
-    uint64_t logicalSize;   /*< In MBytes. */
+    uint64_t logicalSize;
 
     HDDOpenMode hddOpenMode;
@@ -3874 +3874 @@
 
             mediumSize = VDGetFileSize(hdd, 0);
-            mediumLogicalSize = VDGetSize(hdd, 0) / _1M;
+            mediumLogicalSize = VDGetSize(hdd, 0);
 
             success = true;
@@ -5614 +5614 @@
                                format.c_str(),
                                location.c_str(),
-                               task.mSize * _1M,
+                               task.mSize,
                                task.mVariant,
                                NULL,
@@ -5629 +5629 @@
 
             size = VDGetFileSize(hdd, 0);
-            logicalSize = VDGetSize(hdd, 0) / _1M;
+            logicalSize = VDGetSize(hdd, 0);
             unsigned uImageFlags;
             vrc = VDGetImageFlags(hdd, 0, &uImageFlags);
@@ -5797 +5797 @@
 
             size = VDGetFileSize(hdd, VD_LAST_IMAGE);
-            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE) / _1M;
+            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE);
             unsigned uImageFlags;
             vrc = VDGetImageFlags(hdd, 0, &uImageFlags);
@@ -6344 +6344 @@
 
                 size = VDGetFileSize(targetHdd, VD_LAST_IMAGE);
-                logicalSize = VDGetSize(targetHdd, VD_LAST_IMAGE) / _1M;
+                logicalSize = VDGetSize(targetHdd, VD_LAST_IMAGE);
                 unsigned uImageFlags;
                 vrc = VDGetImageFlags(targetHdd, 0, &uImageFlags);
@@ -6614 +6614 @@
 
             size = VDGetFileSize(hdd, VD_LAST_IMAGE);
-            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE) / _1M;
+            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE);
             unsigned uImageFlags;
             vrc = VDGetImageFlags(hdd, 0, &uImageFlags);

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
     /** Unique name of the storage controller. */
     Utf8Str strName;
-    /** The connection type of thestorage controller. */
+    /** The connection type of the storage controller. */
     StorageBus_T mStorageBus;
     /** Type of the Storage controller. */
@@ -135 +135 @@
                         tr("Invalid storage connection type"));
 
+    ULONG maxInstances;
+    HRESULT rc = aParent->getVirtualBox()->getSystemProperties()->GetMaxInstancesOfStorageBus(aStorageBus, &maxInstances);
+    if (FAILED(rc))
+        return rc;
+    if (aInstance >= maxInstances)
+        return setError(E_INVALIDARG,
+                        tr("Too many storage controllers of this type"));
+
     /* Enclose the state transition NotReady->InInit->Ready */
     AutoInitSpan autoInitSpan(this);
@@ -173 +181 @@
             break;
         case StorageBus_Floppy:
-            /** @todo allow 2 floppies later */
             m->bd->mPortCount = 1;
             m->bd->mStorageControllerType = StorageControllerType_I82078;
@@ -429 +436 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    ComPtr<IVirtualBox> VBox;
-    HRESULT rc = m->pParent->COMGETTER(Parent)(VBox.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    ComPtr<ISystemProperties> sysProps;
-    rc = VBox->COMGETTER(SystemProperties)(sysProps.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    rc = sysProps->GetMinPortCountForStorageBus(m->bd->mStorageBus, aMinPortCount);
+    HRESULT rc = m->pSystemProperties->GetMinPortCountForStorageBus(m->bd->mStorageBus, aMinPortCount);
+
     return rc;
 }
@@ -452 +449 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    ComPtr<IVirtualBox> VBox;
-    HRESULT rc = m->pParent->COMGETTER(Parent)(VBox.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    ComPtr<ISystemProperties> sysProps;
-    rc = VBox->COMGETTER(SystemProperties)(sysProps.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    rc = sysProps->GetMaxPortCountForStorageBus(m->bd->mStorageBus, aMaxPortCount);
+    HRESULT rc = m->pSystemProperties->GetMaxPortCountForStorageBus(m->bd->mStorageBus, aMaxPortCount);
+
     return rc;
 }
@@ -525 +512 @@
         case StorageBus_Floppy:
         {
-            /** @todo allow 2 floppies later */
             /*
              * The port count is fixed to 1.

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -240 +240 @@
 }
 
-STDMETHODIMP SystemProperties::COMGETTER(MaxVDISize)(LONG64 *maxVDISize)
-{
-    CheckComArgOutPointerValid(maxVDISize);
+STDMETHODIMP SystemProperties::COMGETTER(InfoVDSize)(LONG64 *infoVDSize)
+{
+    CheckComArgOutPointerValid(infoVDSize);
 
     AutoCaller autoCaller(this);
@@ -251 +251 @@
      * more difficult). This translates to almost 2 TBytes (to be on the safe
      * side, the reported limit is 1 MiByte less than that, as the total number
-     * of sectors should fit in 32 bits, too), which should bei enough for
-     * the moment. The virtual ATA disks support complete LBA48 (although for
-     * example iSCSI is also currently limited to 32 bit LBA), so the
-     * theoretical maximum disk size is 128 PiByte. The user interface cannot
-     * cope with this in a reasonable way yet. */
-    /* no need to lock, this is const */
-    *maxVDISize = 2048 * 1024 - 1;
+     * of sectors should fit in 32 bits, too), which should be enough for the
+     * moment. The virtual ATA/SATA disks support complete LBA48, and SCSI
+     * supports LBA64 (almost, more like LBA55 in practice), so the theoretical
+     * maximum disk size is 128 PiByte/16 EiByte. The GUI works nicely with 6
+     * orders of magnitude, but not with 11/13 orders of magnitude. */
+    /* no need to lock, this is const */
+    *infoVDSize = (2048LL * 1024 - 1) * _1M;
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7204 +7204 @@
      name="ISystemProperties"
      extends="$unknown"
-     uuid="ee9e41c6-8fbe-490b-8602-6272507ed98b"
+     uuid="5e54e767-293c-441b-a5e4-03a1fdbc0dcb"
      wsmap="managed"
      >
@@ -7244 +7244 @@
     </attribute>
 
-    <attribute name="maxVDISize" type="long long" readonly="yes">
-      <desc>Maximum size of a virtual disk image in Megabytes.</desc>
+    <attribute name="infoVDSize" type="long long" readonly="yes">
+      <desc>Maximum size of a virtual disk image in bytes. Informational value,
+      does not reflect the limits of any virtual disk image format.</desc>
     </attribute>
 
@@ -7415 +7416 @@
       <desc>Issue a warning if the free disk space is below (or in some disk
       intensive operation is expected to go below) the given size in
-      Megabytes.</desc>
+      bytes.</desc>
     </attribute>
 
@@ -7426 +7427 @@
       <desc>Issue an error if the free disk space is below (or in some disk
       intensive operation is expected to go below) the given size in
-      Megabytes.</desc>
+      bytes.</desc>
     </attribute>
 
@@ -7583 +7584 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="4fd9cc6e-f5d4-4d00-abad-5bcd1b942281"
+    uuid="432c1546-1354-4abf-bf08-878a32a373f5"
     wsmap="struct"
   >
@@ -7625 +7626 @@
     </attribute>
 
-    <attribute name="recommendedHDD" type="unsigned long" readonly="yes">
-      <desc>Recommended hard disk size in Megabytes.</desc>
+    <attribute name="recommendedHDD" type="long long" readonly="yes">
+      <desc>Recommended hard disk size in bytes.</desc>
     </attribute>
 
@@ -8560 +8561 @@
   <interface
     name="IMedium" extends="$unknown"
-    uuid="858ea9d3-9ade-4aa7-91b7-d8a40f8f9b16"
+    uuid="bfcf5b8c-5155-4f24-9414-9457054b16db"
     wsmap="managed"
   >
@@ -9133 +9134 @@
     <attribute name="logicalSize" type="long long" readonly="yes">
       <desc>
-        Logical size of this medium (in megabytes), as reported to the
+        Logical size of this medium (in bytes), as reported to the
         guest OS running inside the virtual machine this medium is
         attached to. The logical size is defined when the medium is created
@@ -9644 +9645 @@
       </desc>
       <param name="logicalSize" type="long long" dir="in">
-        <desc>Maximum logical size of the medium in megabytes.</desc>
+        <desc>Maximum logical size of the medium in bytes.</desc>
       </param>
       <param name="variant" type="MediumVariant" dir="in">
@@ -9918 +9919 @@
       </desc>
       <param name="logicalSize" type="long long" dir="in">
-        <desc>New nominal capacity of the medium in megabytes.</desc>
+        <desc>New nominal capacity of the medium in bytes.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -9981 +9982 @@
   <enum
     name="MediumFormatCapabilities"
-    uuid="70fcf810-99e8-4edc-aee4-7f51d489e657"
+    uuid="be44ec10-9540-4d3f-aee5-4a4d4c4ad42c"
   >
     <desc>
@@ -10042 +10043 @@
     </const>
 
-    <const name="CapabilityMask" value="0xFF"/>
+    <const name="TcpNetworking" value="0x100">
+      <desc>
+        The format backend uses the TCP networking interface for network access.
+      </desc>
+    </const>
+
+    <const name="CapabilityMask" value="0x1FF"/>
   </enum>
 

trunk/src/VBox/Main/include/Global.h

@@ -61 +61 @@
         const uint32_t                 recommendedRAM;
         const uint32_t                 recommendedVRAM;
-        const uint32_t                 recommendedHDD;
+        const uint64_t                 recommendedHDD;
         const NetworkAdapterType_T     networkAdapterType;
         const uint32_t                 numSerialEnabled;

trunk/src/VBox/Main/include/GuestOSTypeImpl.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +41 @@
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (GuestOSType)
+    DECLARE_EMPTY_CTOR_DTOR(GuestOSType)
 
     HRESULT FinalConstruct();
@@ -47 +47 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (const char *aFamilyId, const char *aFamilyDescription,
-                  const char *aId, const char *aDescription,
-                  VBOXOSTYPE aOSType, uint32_t aOSHint,
-                  uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize,
-                  NetworkAdapterType_T aNetworkAdapterType, uint32_t numSerialEnabled,
-                  StorageControllerType_T aDvdStorageControllerType,
-                  StorageBus_T aDvdStorageBusType,
-                  StorageControllerType_T aHdStorageControllerType,
-                  StorageBus_T aHdStorageBusType,
-                  ChipsetType_T aChipsetType);
+    HRESULT init(const char *aFamilyId, const char *aFamilyDescription,
+                 const char *aId, const char *aDescription,
+                 VBOXOSTYPE aOSType, uint32_t aOSHint,
+                 uint32_t aRAMSize, uint32_t aVRAMSize, uint64_t aHDDSize,
+                 NetworkAdapterType_T aNetworkAdapterType, uint32_t numSerialEnabled,
+                 StorageControllerType_T aDvdStorageControllerType,
+                 StorageBus_T aDvdStorageBusType,
+                 StorageControllerType_T aHdStorageControllerType,
+                 StorageBus_T aHdStorageBusType,
+                 ChipsetType_T aChipsetType);
     void uninit();
 
     // IGuestOSType properties
-    STDMETHOD(COMGETTER(FamilyId)) (BSTR *aFamilyId);
-    STDMETHOD(COMGETTER(FamilyDescription)) (BSTR *aFamilyDescription);
-    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
-    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
-    STDMETHOD(COMGETTER(Is64Bit)) (BOOL *aIs64Bit);
-    STDMETHOD(COMGETTER(RecommendedIOAPIC)) (BOOL *aRecommendedIOAPIC);
-    STDMETHOD(COMGETTER(RecommendedVirtEx)) (BOOL *aRecommendedVirtEx);
-    STDMETHOD(COMGETTER(RecommendedRAM)) (ULONG *aRAMSize);
-    STDMETHOD(COMGETTER(RecommendedVRAM)) (ULONG *aVRAMSize);
-    STDMETHOD(COMGETTER(RecommendedHDD)) (ULONG *aHDDSize);
-    STDMETHOD(COMGETTER(AdapterType)) (NetworkAdapterType_T *aNetworkAdapterType);
-    STDMETHOD(COMGETTER(RecommendedFirmware)) (FirmwareType_T *aFirmwareType);
-    STDMETHOD(COMGETTER(RecommendedDvdStorageBus)) (StorageBus_T *aStorageBusType);
-    STDMETHOD(COMGETTER(RecommendedDvdStorageController)) (StorageControllerType_T *aStorageControllerType);
-    STDMETHOD(COMGETTER(RecommendedHdStorageBus)) (StorageBus_T *aStorageBusType);
-    STDMETHOD(COMGETTER(RecommendedHdStorageController)) (StorageControllerType_T *aStorageControllerType);
-    STDMETHOD(COMGETTER(RecommendedPae)) (BOOL *aRecommendedExtHw);
-    STDMETHOD(COMGETTER(RecommendedUsbHid)) (BOOL *aRecommendedUsbHid);
-    STDMETHOD(COMGETTER(RecommendedHpet)) (BOOL *aRecommendedHpet);
-    STDMETHOD(COMGETTER(RecommendedUsbTablet)) (BOOL *aRecommendedUsbTablet);
-    STDMETHOD(COMGETTER(RecommendedRtcUseUtc)) (BOOL *aRecommendedRtcUseUtc);
+    STDMETHOD(COMGETTER(FamilyId))(BSTR *aFamilyId);
+    STDMETHOD(COMGETTER(FamilyDescription))(BSTR *aFamilyDescription);
+    STDMETHOD(COMGETTER(Id))(BSTR *aId);
+    STDMETHOD(COMGETTER(Description))(BSTR *aDescription);
+    STDMETHOD(COMGETTER(Is64Bit))(BOOL *aIs64Bit);
+    STDMETHOD(COMGETTER(RecommendedIOAPIC))(BOOL *aRecommendedIOAPIC);
+    STDMETHOD(COMGETTER(RecommendedVirtEx))(BOOL *aRecommendedVirtEx);
+    STDMETHOD(COMGETTER(RecommendedRAM))(ULONG *aRAMSize);
+    STDMETHOD(COMGETTER(RecommendedVRAM))(ULONG *aVRAMSize);
+    STDMETHOD(COMGETTER(RecommendedHDD))(LONG64 *aHDDSize);
+    STDMETHOD(COMGETTER(AdapterType))(NetworkAdapterType_T *aNetworkAdapterType);
+    STDMETHOD(COMGETTER(RecommendedFirmware))(FirmwareType_T *aFirmwareType);
+    STDMETHOD(COMGETTER(RecommendedDvdStorageBus))(StorageBus_T *aStorageBusType);
+    STDMETHOD(COMGETTER(RecommendedDvdStorageController))(StorageControllerType_T *aStorageControllerType);
+    STDMETHOD(COMGETTER(RecommendedHdStorageBus))(StorageBus_T *aStorageBusType);
+    STDMETHOD(COMGETTER(RecommendedHdStorageController))(StorageControllerType_T *aStorageControllerType);
+    STDMETHOD(COMGETTER(RecommendedPae))(BOOL *aRecommendedExtHw);
+    STDMETHOD(COMGETTER(RecommendedUsbHid))(BOOL *aRecommendedUsbHid);
+    STDMETHOD(COMGETTER(RecommendedHpet))(BOOL *aRecommendedHpet);
+    STDMETHOD(COMGETTER(RecommendedUsbTablet))(BOOL *aRecommendedUsbTablet);
+    STDMETHOD(COMGETTER(RecommendedRtcUseUtc))(BOOL *aRecommendedRtcUseUtc);
     STDMETHOD(COMGETTER(RecommendedChipset)) (ChipsetType_T *aChipsetType);
 
@@ -102 +102 @@
     const uint32_t mRAMSize;
     const uint32_t mVRAMSize;
-    const uint32_t mHDDSize;
+    const uint64_t mHDDSize;
     const uint32_t mMonitorCount;
     const NetworkAdapterType_T mNetworkAdapterType;

trunk/src/VBox/Main/include/MediumFormatImpl.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -58 +58 @@
     struct Data
     {
-        Data() : capabilities (0) {}
+        Data() : capabilities(0) {}
 
         const Utf8Str       strId;
@@ -69 +69 @@
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(MediumFormat, IMediumFormat)
 
-    DECLARE_NOT_AGGREGATABLE (MediumFormat)
+    DECLARE_NOT_AGGREGATABLE(MediumFormat)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
     BEGIN_COM_MAP(MediumFormat)
-        COM_INTERFACE_ENTRY (ISupportErrorInfo)
-        COM_INTERFACE_ENTRY (IMediumFormat)
-        COM_INTERFACE_ENTRY (IDispatch)
+        COM_INTERFACE_ENTRY(ISupportErrorInfo)
+        COM_INTERFACE_ENTRY(IMediumFormat)
+        COM_INTERFACE_ENTRY(IDispatch)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (MediumFormat)
+    DECLARE_EMPTY_CTOR_DTOR(MediumFormat)
 
     HRESULT FinalConstruct();
@@ -85 +85 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (const VDBACKENDINFO *aVDInfo);
+    HRESULT init(const VDBACKENDINFO *aVDInfo);
     void uninit();
 
     // IMediumFormat properties
-    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
-    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
-    STDMETHOD(COMGETTER(FileExtensions)) (ComSafeArrayOut (BSTR, aFileExtensions));
-    STDMETHOD(COMGETTER(Capabilities)) (ULONG *aCaps);
+    STDMETHOD(COMGETTER(Id))(BSTR *aId);
+    STDMETHOD(COMGETTER(Name))(BSTR *aName);
+    STDMETHOD(COMGETTER(FileExtensions))(ComSafeArrayOut(BSTR, aFileExtensions));
+    STDMETHOD(COMGETTER(Capabilities))(ULONG *aCaps);
 
     // IMediumFormat methods
-    STDMETHOD(DescribeProperties) (ComSafeArrayOut (BSTR, aNames),
-                                   ComSafeArrayOut (BSTR, aDescriptions),
-                                   ComSafeArrayOut (DataType_T, aTypes),
-                                   ComSafeArrayOut (ULONG, aFlags),
-                                   ComSafeArrayOut (BSTR, aDefaults));
+    STDMETHOD(DescribeProperties)(ComSafeArrayOut(BSTR, aNames),
+                                  ComSafeArrayOut(BSTR, aDescriptions),
+                                  ComSafeArrayOut(DataType_T, aTypes),
+                                  ComSafeArrayOut(ULONG, aFlags),
+                                  ComSafeArrayOut(BSTR, aDefaults));
 
     // public methods only for internal purposes

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -39 +39 @@
 public:
 
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (SystemProperties, ISystemProperties)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(SystemProperties, ISystemProperties)
 
     DECLARE_NOT_AGGREGATABLE(SystemProperties)
@@ -46 +46 @@
 
     BEGIN_COM_MAP(SystemProperties)
-        COM_INTERFACE_ENTRY  (ISupportErrorInfo)
-        COM_INTERFACE_ENTRY  (ISystemProperties)
-        COM_INTERFACE_ENTRY2 (IDispatch, ISystemProperties)
+        COM_INTERFACE_ENTRY(ISupportErrorInfo)
+        COM_INTERFACE_ENTRY(ISystemProperties)
+        COM_INTERFACE_ENTRY2(IDispatch, ISystemProperties)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (SystemProperties)
+    DECLARE_EMPTY_CTOR_DTOR(SystemProperties)
 
     HRESULT FinalConstruct();
@@ -57 +57 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (VirtualBox *aParent);
+    HRESULT init(VirtualBox *aParent);
     void uninit();
 
     // ISystemProperties properties
-    STDMETHOD(COMGETTER(MinGuestRAM) (ULONG *minRAM));
-    STDMETHOD(COMGETTER(MaxGuestRAM) (ULONG *maxRAM));
-    STDMETHOD(COMGETTER(MinGuestVRAM) (ULONG *minVRAM));
-    STDMETHOD(COMGETTER(MaxGuestVRAM) (ULONG *maxVRAM));
-    STDMETHOD(COMGETTER(MinGuestCPUCount) (ULONG *minCPUCount));
-    STDMETHOD(COMGETTER(MaxGuestCPUCount) (ULONG *maxCPUCount));
-    STDMETHOD(COMGETTER(MaxGuestMonitors) (ULONG *maxMonitors));
-    STDMETHOD(COMGETTER(MaxVDISize) (LONG64 *maxVDISize));
-    STDMETHOD(COMGETTER(NetworkAdapterCount) (ULONG *count));
-    STDMETHOD(COMGETTER(SerialPortCount) (ULONG *count));
-    STDMETHOD(COMGETTER(ParallelPortCount) (ULONG *count));
-    STDMETHOD(COMGETTER(MaxBootPosition) (ULONG *aMaxBootPosition));
-    STDMETHOD(COMGETTER(DefaultMachineFolder)) (BSTR *aDefaultMachineFolder);
-    STDMETHOD(COMSETTER(DefaultMachineFolder)) (IN_BSTR aDefaultMachineFolder);
-    STDMETHOD(COMGETTER(DefaultHardDiskFolder)) (BSTR *aDefaultHardDiskFolder);
-    STDMETHOD(COMSETTER(DefaultHardDiskFolder)) (IN_BSTR aDefaultHardDiskFolder);
-    STDMETHOD(COMGETTER(MediumFormats)) (ComSafeArrayOut (IMediumFormat *, aMediumFormats));
-    STDMETHOD(COMGETTER(DefaultHardDiskFormat)) (BSTR *aDefaultHardDiskFormat);
-    STDMETHOD(COMSETTER(DefaultHardDiskFormat)) (IN_BSTR aDefaultHardDiskFormat);
+    STDMETHOD(COMGETTER(MinGuestRAM))(ULONG *minRAM);
+    STDMETHOD(COMGETTER(MaxGuestRAM))(ULONG *maxRAM);
+    STDMETHOD(COMGETTER(MinGuestVRAM))(ULONG *minVRAM);
+    STDMETHOD(COMGETTER(MaxGuestVRAM))(ULONG *maxVRAM);
+    STDMETHOD(COMGETTER(MinGuestCPUCount))(ULONG *minCPUCount);
+    STDMETHOD(COMGETTER(MaxGuestCPUCount))(ULONG *maxCPUCount);
+    STDMETHOD(COMGETTER(MaxGuestMonitors))(ULONG *maxMonitors);
+    STDMETHOD(COMGETTER(InfoVDSize))(LONG64 *infoVDSize);
+    STDMETHOD(COMGETTER(NetworkAdapterCount))(ULONG *count);
+    STDMETHOD(COMGETTER(SerialPortCount))(ULONG *count);
+    STDMETHOD(COMGETTER(ParallelPortCount))(ULONG *count);
+    STDMETHOD(COMGETTER(MaxBootPosition))(ULONG *aMaxBootPosition);
+    STDMETHOD(COMGETTER(DefaultMachineFolder))(BSTR *aDefaultMachineFolder);
+    STDMETHOD(COMSETTER(DefaultMachineFolder))(IN_BSTR aDefaultMachineFolder);
+    STDMETHOD(COMGETTER(DefaultHardDiskFolder))(BSTR *aDefaultHardDiskFolder);
+    STDMETHOD(COMSETTER(DefaultHardDiskFolder))(IN_BSTR aDefaultHardDiskFolder);
+    STDMETHOD(COMGETTER(MediumFormats))(ComSafeArrayOut(IMediumFormat *, aMediumFormats));
+    STDMETHOD(COMGETTER(DefaultHardDiskFormat))(BSTR *aDefaultHardDiskFormat);
+    STDMETHOD(COMSETTER(DefaultHardDiskFormat))(IN_BSTR aDefaultHardDiskFormat);
     STDMETHOD(COMGETTER(FreeDiskSpaceWarning))(LONG64 *aFreeDiskSpace);
     STDMETHOD(COMSETTER(FreeDiskSpaceWarning))(LONG64 aFreeDiskSpace);
@@ -88 +88 @@
     STDMETHOD(COMGETTER(FreeDiskSpacePercentError))(ULONG *aFreeDiskSpacePercent);
     STDMETHOD(COMSETTER(FreeDiskSpacePercentError))(ULONG aFreeDiskSpacePercent);
-    STDMETHOD(COMGETTER(RemoteDisplayAuthLibrary)) (BSTR *aRemoteDisplayAuthLibrary);
-    STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary)) (IN_BSTR aRemoteDisplayAuthLibrary);
-    STDMETHOD(COMGETTER(WebServiceAuthLibrary)) (BSTR *aWebServiceAuthLibrary);
-    STDMETHOD(COMSETTER(WebServiceAuthLibrary)) (IN_BSTR aWebServiceAuthLibrary);
-    STDMETHOD(COMGETTER(LogHistoryCount)) (ULONG *count);
-    STDMETHOD(COMSETTER(LogHistoryCount)) (ULONG count);
-    STDMETHOD(COMGETTER(DefaultAudioDriver)) (AudioDriverType_T *aAudioDriver);
+    STDMETHOD(COMGETTER(RemoteDisplayAuthLibrary))(BSTR *aRemoteDisplayAuthLibrary);
+    STDMETHOD(COMSETTER(RemoteDisplayAuthLibrary))(IN_BSTR aRemoteDisplayAuthLibrary);
+    STDMETHOD(COMGETTER(WebServiceAuthLibrary))(BSTR *aWebServiceAuthLibrary);
+    STDMETHOD(COMSETTER(WebServiceAuthLibrary))(IN_BSTR aWebServiceAuthLibrary);
+    STDMETHOD(COMGETTER(LogHistoryCount))(ULONG *count);
+    STDMETHOD(COMSETTER(LogHistoryCount))(ULONG count);
+    STDMETHOD(COMGETTER(DefaultAudioDriver))(AudioDriverType_T *aAudioDriver);
 
-    STDMETHOD(GetMaxDevicesPerPortForStorageBus) (StorageBus_T aBus, ULONG *aMaxDevicesPerPort);
-    STDMETHOD(GetMinPortCountForStorageBus) (StorageBus_T aBus, ULONG *aMinPortCount);
-    STDMETHOD(GetMaxPortCountForStorageBus) (StorageBus_T aBus, ULONG *aMaxPortCount);
+    STDMETHOD(GetMaxDevicesPerPortForStorageBus)(StorageBus_T aBus, ULONG *aMaxDevicesPerPort);
+    STDMETHOD(GetMinPortCountForStorageBus)(StorageBus_T aBus, ULONG *aMinPortCount);
+    STDMETHOD(GetMaxPortCountForStorageBus)(StorageBus_T aBus, ULONG *aMaxPortCount);
     STDMETHOD(GetMaxInstancesOfStorageBus)(StorageBus_T aBus, ULONG *aMaxInstances);
     STDMETHOD(GetDeviceTypesForStorageBus)(StorageBus_T aBus, ComSafeArrayOut(DeviceType_T, aDeviceTypes));