Changeset 32531 in vbox for trunk/src/VBox/Main/MediumImpl.cpp

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (7 diffs)

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