Changeset 48009 in vbox

Timestamp:

Aug 23, 2013 7:38:52 AM (11 years ago)

Author:

vboxsync

Message:

1024 * 1024 => _1M

Location:

trunk/src/VBox/Main

Files:

• src-server/Performance.cpp (modified) (1 diff)
• src-server/linux/PerformanceLinux.cpp (modified) (2 diffs)
• src-server/solaris/PerformanceSolaris.cpp (modified) (2 diffs)
• xml/ovfreader.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -922 +922 @@
     int rc = mHAL->getHostDiskSize(mDiskName.c_str(), &total);
     if (RT_SUCCESS(rc))
-        mTotal->put((ULONG)(total / (1024*1024)));
+        mTotal->put((ULONG)(total / _1M));
 }
 

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -226 +226 @@
 {
     struct statvfs stats;
-    const unsigned _MB = 1024 * 1024;
 
     if (statvfs(path, &stats) == -1)
@@ -234 +233 @@
     }
     uint64_t cbBlock = stats.f_frsize ? stats.f_frsize : stats.f_bsize;
-    *total = (ULONG)(cbBlock * stats.f_blocks / _MB);
-    *used  = (ULONG)(cbBlock * (stats.f_blocks - stats.f_bfree) / _MB);
-    *available = (ULONG)(cbBlock * stats.f_bavail / _MB);
+    *total = (ULONG)(cbBlock * stats.f_blocks / _1M);
+    *used  = (ULONG)(cbBlock * (stats.f_blocks - stats.f_bfree) / _1M);
+    *available = (ULONG)(cbBlock * stats.f_bavail / _1M);
 
     return VINF_SUCCESS;

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -526 +526 @@
 {
     struct statvfs64 stats;
-    const unsigned _MB = 1024 * 1024;
 
     if (statvfs64(path, &stats) == -1)
@@ -534 +533 @@
     }
     uint64_t cbBlock = stats.f_frsize ? stats.f_frsize : stats.f_bsize;
-    *total = (ULONG)(getZfsTotal(cbBlock * stats.f_blocks, stats.f_basetype, path) / _MB);
+    *total = (ULONG)(getZfsTotal(cbBlock * stats.f_blocks, stats.f_basetype, path) / _1M);
     LogFlowThisFunc(("f_blocks=%llu.\n", stats.f_blocks));
-    *used  = (ULONG)(cbBlock * (stats.f_blocks - stats.f_bfree) / _MB);
-    *available = (ULONG)(cbBlock * stats.f_bavail / _MB);
+    *used  = (ULONG)(cbBlock * (stats.f_blocks - stats.f_bfree) / _1M);
+    *available = (ULONG)(cbBlock * stats.f_bavail / _1M);
 
     return VINF_SUCCESS;

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -530 +530 @@
                              || (i.strAllocationUnits == "byte * 2^20")         // suggested by OVF spec DSP0243 page 21
                            )
-                            vsys.ullMemorySize = i.ullVirtualQuantity * 1024 * 1024;
+                            vsys.ullMemorySize = i.ullVirtualQuantity * _1M;
                         else
                             throw OVFLogicError(N_("Error reading \"%s\": Invalid allocation unit \"%s\" specified with memory size item, line %d"),